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

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-03-22 22:42:32 +0000 (Sat, 22 Mar 2014)
New Revision: 5457

Removed:
   trunk/freebsd-utils/debian/patches/ifi_vhid.diff
   trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
Remove the remaining kludges

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-03-22 22:35:59 UTC (rev 5456)
+++ trunk/freebsd-utils/debian/changelog	2014-03-22 22:42:32 UTC (rev 5457)
@@ -4,8 +4,7 @@
   * Fetch pf.conf(5) and pf.os(5) from new location.
 
   [ Robert Millan ]
-  * Remove local ifmediareq kludge. B-D on libc0.1-dev >= 2.18-2
-    instead.
+  * Remove ifmediareq kludges. B-D on libc0.1-dev >= 2.18-2 instead.
 
  -- Robert Millan <rmh at debian.org>  Sat, 22 Mar 2014 23:09:57 +0100
 

Deleted: trunk/freebsd-utils/debian/patches/ifi_vhid.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/ifi_vhid.diff	2014-03-22 22:35:59 UTC (rev 5456)
+++ trunk/freebsd-utils/debian/patches/ifi_vhid.diff	2014-03-22 22:42:32 UTC (rev 5457)
@@ -1,12 +0,0 @@
---- a/src/sbin/ifconfig/ifconfig.c
-+++ b/src/sbin/ifconfig/ifconfig.c
-@@ -1091,6 +1091,9 @@
- 	}
- }
- 
-+// FIXME: remove when <net/if.h> is updated
-+#define ifi_vhid ifi_spare_char1
-+
- void
- print_vhid(const struct ifaddrs *ifa, const char *s)
- {

Deleted: trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff	2014-03-22 22:35:59 UTC (rev 5456)
+++ trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff	2014-03-22 22:42:32 UTC (rev 5457)
@@ -1,26 +0,0 @@
---- a/src/sbin/ifconfig/iffib.c
-+++ b/src/sbin/ifconfig/iffib.c
-@@ -43,6 +43,14 @@
- 
- #include "ifconfig.h"
- 
-+/* Since there's no ifr_fib field yet, we abuse another member of the
-+   union which has the same size (but not the same signedness). */
-+#ifdef ifr_fib
-+#error "Please remove this kludge! Build-Depend on suitable libc0.1-dev instead"
-+#else
-+#define ifr_fib		ifr_media
-+#endif
-+
- static void
- fib_status(int s)
- {
-@@ -58,7 +66,7 @@
- 	if (ifr.ifr_fib == 0)
- 		return;
- 
--	printf("\tfib: %u\n", ifr.ifr_fib);
-+	printf("\tfib: %u\n", (unsigned) ifr.ifr_fib);
- }
- 
- static void

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2014-03-22 22:35:59 UTC (rev 5456)
+++ trunk/freebsd-utils/debian/patches/series	2014-03-22 22:42:32 UTC (rev 5457)
@@ -35,6 +35,4 @@
 rpc.lockd-startup-fix.diff
 
 # Patches that are likely to be Debian-specific
-ifr_fib_kludge.diff
-ifi_vhid.diff
 makefiles.diff