[Glibc-bsd-commits] r5644 - in trunk/freebsd-utils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-19 01:49:07 +0000 (Sun, 19 Oct 2014)
New Revision: 5644

Added:
   trunk/freebsd-utils/debian/patches/abi_breaks.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
* Bump to upstream SVN r273233 (almost RC3)
* netstat: work around a kfreebsd 9->10 ABI break;  allows tcp sockets
  to be shown again when running on kfreebsd-9 (Closes: 761418)


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-10-17 21:05:42 UTC (rev 5643)
+++ trunk/freebsd-utils/debian/changelog	2014-10-19 01:49:07 UTC (rev 5644)
@@ -1,10 +1,10 @@
-freebsd-utils (10.1~svn272464-1) UNRELEASED; urgency=medium
+freebsd-utils (10.1~svn273233-1) UNRELEASED; urgency=medium
 
   [ Petr Salinger ]
   * Build-Depend on freebsd-mk >= 10.0-5 for MK_HYPERV
 
   [ Steven Chamberlain ]
-  * New upstream snapshot of 10.1-RC1
+  * New upstream snapshot of 10.1-RC3
   * Refresh patches: (with unexpanded revision tags;  a/ b/ paths;  no
     Index field;  no 'C function' context, not applicable here)
     - ppp_macros.diff
@@ -15,6 +15,8 @@
     instead
   * Set kern.ipc.shmall=32768 in /etc/sysctl.conf, as the kernel
     default is too low for some Qt applications (Closes: #763706)
+  * netstat: work around a kfreebsd 9->10 ABI break;  allows tcp sockets
+    to be shown again when running on kfreebsd-9 (Closes: 761418)
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 08 Oct 2014 22:18:48 +0100
 
@@ -31,7 +33,7 @@
   [ Christoph Egger ]
   * Upload to unstable
 
- -- Steven Chamberlain <steven at pyro.eu.org>  Fri, 26 Sep 2014 20:42:16 +0100
+ -- Steven Chamberlain <steven at pyro.eu.org>  Fri, 17 Oct 2014 16:21:26 +0000
 
 freebsd-utils (10.1~svn271687+really10.1~svn271687-1) experimental; urgency=medium
 

Added: trunk/freebsd-utils/debian/patches/abi_breaks.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/abi_breaks.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/abi_breaks.diff	2014-10-19 01:49:07 UTC (rev 5644)
@@ -0,0 +1,19 @@
+--- a/src/usr.bin/netstat/inet.c
++++ b/src/usr.bin/netstat/inet.c
+@@ -356,6 +356,16 @@
+ 			tp = &((struct xtcpcb *)xig)->xt_tp;
+ 			inp = &((struct xtcpcb *)xig)->xt_inp;
+ 			so = &((struct xtcpcb *)xig)->xt_socket;
++			/* :XXX: work around a kfreebsd 9->10 ABI break:
++			 * struct tcpcb gained a u_int, so on kfreebsd-9
++			 * the xt_socket member starts earlier */
++			if (((struct xtcpcb *)xig)->xt_len == 900) {
++				/* kfreebsd-i386 9.0 kernel */
++				so = &((struct xtcpcb *)((char *)xig-4))->xt_socket;
++			} else if (((struct xtcpcb *)xig)->xt_len == 1208) {
++				/* kfreebsd-amd64 9.0 kernel */
++				so = &((struct xtcpcb *)((char *)xig-8))->xt_socket;
++			}
+ 		} else {
+ 			inp = &((struct xinpcb *)xig)->xi_inp;
+ 			so = &((struct xinpcb *)xig)->xi_socket;

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2014-10-17 21:05:42 UTC (rev 5643)
+++ trunk/freebsd-utils/debian/patches/series	2014-10-19 01:49:07 UTC (rev 5644)
@@ -39,3 +39,4 @@
 netstat_maddrs.diff
 netstat_oqdrops.diff
 sysctl.diff
+abi_breaks.diff