[Glibc-bsd-commits] r4814 - trunk/kfreebsd-8/debian/patches

[Robert Millan]

Author: rmh
Date: 2013-07-28 22:09:45 +0000 (Sun, 28 Jul 2013)
New Revision: 4814

Modified:
   trunk/kfreebsd-8/debian/patches/EN-12_02.ipv6refcount.patch
   trunk/kfreebsd-8/debian/patches/SA-12_04.sysret.patch
   trunk/kfreebsd-8/debian/patches/SA-12_08.linux.patch
   trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff
Log:
Refresh a few patches

Modified: trunk/kfreebsd-8/debian/patches/EN-12_02.ipv6refcount.patch
===================================================================
--- trunk/kfreebsd-8/debian/patches/EN-12_02.ipv6refcount.patch	2013-07-28 19:48:43 UTC (rev 4813)
+++ trunk/kfreebsd-8/debian/patches/EN-12_02.ipv6refcount.patch	2013-07-28 22:09:45 UTC (rev 4814)
@@ -4,10 +4,8 @@
 Bug: http://security.freebsd.org/advisories/FreeBSD-EN-12:02.ipv6refcount.asc
 Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=236953
 
-Index: kfreebsd-8.trunk/sys/netinet6/in6.c
-===================================================================
---- kfreebsd-8.trunk.orig/sys/netinet6/in6.c	2012-06-15 13:47:20.000000000 +0100
-+++ kfreebsd-8.trunk/sys/netinet6/in6.c	2012-06-15 13:48:02.400285623 +0100
+--- a/sys/netinet6/in6.c
++++ b/sys/netinet6/in6.c
 @@ -1548,14 +1548,19 @@
  			hostid = IFA_IN6(ifa);
  
@@ -53,10 +51,8 @@
  	return NULL;
  }
  
-Index: kfreebsd-8.trunk/sys/netinet6/ip6_input.c
-===================================================================
---- kfreebsd-8.trunk.orig/sys/netinet6/ip6_input.c	2012-06-15 13:47:20.000000000 +0100
-+++ kfreebsd-8.trunk/sys/netinet6/ip6_input.c	2012-06-15 13:48:02.414267508 +0100
+--- a/sys/netinet6/ip6_input.c
++++ b/sys/netinet6/ip6_input.c
 @@ -734,19 +734,23 @@
  	 * as our interface address (e.g. multicast addresses, addresses
  	 * within FAITH prefixes and such).
@@ -91,10 +87,8 @@
  		}
  	}
  
-Index: kfreebsd-8.trunk/sys/netinet/tcp_input.c
-===================================================================
---- kfreebsd-8.trunk.orig/sys/netinet/tcp_input.c	2012-06-15 13:47:20.000000000 +0100
-+++ kfreebsd-8.trunk/sys/netinet/tcp_input.c	2012-06-15 13:48:02.434279348 +0100
+--- a/sys/netinet/tcp_input.c
++++ b/sys/netinet/tcp_input.c
 @@ -538,6 +538,8 @@
  			    (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
  		return IPPROTO_DONE;

Modified: trunk/kfreebsd-8/debian/patches/SA-12_04.sysret.patch
===================================================================
--- trunk/kfreebsd-8/debian/patches/SA-12_04.sysret.patch	2013-07-28 19:48:43 UTC (rev 4813)
+++ trunk/kfreebsd-8/debian/patches/SA-12_04.sysret.patch	2013-07-28 22:09:45 UTC (rev 4814)
@@ -6,9 +6,9 @@
 Bug-Debian: http://bugs.debian.org/677297
 Applied-Upstream: http://svnweb.freebsd.org/base/stable/9/sys/amd64/amd64/trap.c?revision=236953&view=markup
 
---- a/sys/amd64/amd64/trap.c.orig
-+++ b/sys/amd64/amd64/trap.c	(working copy)
-@@ -972,4 +972,21 @@
+--- a/sys/amd64/amd64/trap.c
++++ b/sys/amd64/amd64/trap.c
+@@ -945,4 +945,21 @@
  	     syscallname(td->td_proc, sa.code)));
  
  	syscallret(td, error, &sa);

Modified: trunk/kfreebsd-8/debian/patches/SA-12_08.linux.patch
===================================================================
--- trunk/kfreebsd-8/debian/patches/SA-12_08.linux.patch	2013-07-28 19:48:43 UTC (rev 4813)
+++ trunk/kfreebsd-8/debian/patches/SA-12_08.linux.patch	2013-07-28 22:09:45 UTC (rev 4814)
@@ -1,8 +1,6 @@
-Index: sys/compat/linux/linux_ioctl.c
-===================================================================
---- a/sys/compat/linux/linux_ioctl.c	(revision 242578)
-+++ b/sys/compat/linux/linux_ioctl.c	(working copy)
-@@ -2260,8 +2260,9 @@ again:
+--- a/sys/compat/linux/linux_ioctl.c
++++ b/sys/compat/linux/linux_ioctl.c
+@@ -2253,8 +2253,9 @@
  
  	ifc.ifc_len = valid_len; 
  	sbuf_finish(sb);

Modified: trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff	2013-07-28 19:48:43 UTC (rev 4813)
+++ trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff	2013-07-28 22:09:45 UTC (rev 4814)
@@ -1,8 +1,6 @@
-Index: sys/netinet/sctp_pcb.c
-===================================================================
---- a/sys/netinet/sctp_pcb.c	(revision 239446)
-+++ b/sys/netinet/sctp_pcb.c	(revision 239447)
-@@ -2048,8 +2048,6 @@
+--- a/sys/netinet/sctp_pcb.c
++++ b/sys/netinet/sctp_pcb.c
+@@ -2050,8 +2050,6 @@
  	struct sctp_nets *net;
  	struct sctp_tcb *stcb;
  
@@ -11,9 +9,3 @@
  	SCTP_INP_INFO_RLOCK();
  	head = &SCTP_BASE_INFO(sctp_asochash)[SCTP_PCBHASH_ASOC(vtag,
  	    SCTP_BASE_INFO(hashasocmark))];
-
-Property changes on: sys
-___________________________________________________________________
-Modified: svn:mergeinfo
-   Merged /head/sys:r239041
-