[Pkg-sysvinit-commits] r1876 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2010-04-23 20:46:03 +0000 (Fri, 23 Apr 2010)
New Revision: 1876

Removed:
   sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
Drop 21_ifdown_kfreebsd.patch, now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-04-23 20:41:03 UTC (rev 1875)
+++ sysvinit/trunk/debian/changelog	2010-04-23 20:46:03 UTC (rev 1876)
@@ -4,6 +4,7 @@
     - Drop 11_doc_shutdown-c.dpatch, now included upstream.
     - Drop 14_doc_fsf_addr.dpatch, now included upstream.
     - Drop 15_doc_upstream_email.dpatch, now included upstream.
+    - Drop 21_ifdown_kfreebsd.patch, now included upstream.
     - Drop 46_pidof_symlinkman.patch, now included upstream.
     - Drop 50_bootlogd_devsubdir.dpatch, now included upstream.
     - Drop 54_bootlogd_findptyfail.dpatch, now included upstream.

Deleted: sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch	2010-04-23 20:41:03 UTC (rev 1875)
+++ sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch	2010-04-23 20:46:03 UTC (rev 1876)
@@ -1,35 +0,0 @@
-Purpose: Get ifdown working on kFreeBSD.
-Authour: Robert Millan <rmh at aybabtu.com>
-Fixes:   #327031
-Status:  unknown
-
---- a/src/ifdown.c
-+++ b/src/ifdown.c
-@@ -61,10 +61,25 @@
- 				continue;
- 			if (strchr(ifr[i].ifr_name, ':') != NULL)
- 				continue;
--			ifr[i].ifr_flags &= ~(IFF_UP);
--			if (ioctl(fd, SIOCSIFFLAGS, &ifr[i]) < 0) {
-+/* Expected in <net/if.h> according to "UNIX Network Programming". */
-+#ifdef ifr_flags
-+#define FLAGS ifr_flags
-+#else
-+/* Present on kFreeBSD, fixes bug #327031. */
-+#define FLAGS ifr_flagshigh
-+#endif
-+			/* Read interface flags */
-+			if (ioctl(fd, SIOCGIFFLAGS, &ifr[i]) < 0) {
- 				fprintf(stderr, "ifdown: shutdown ");
- 				perror(ifr[i].ifr_name);
-+				continue;
-+			}
-+			if (ifr[i].FLAGS & IFF_UP) {
-+				ifr[i].FLAGS &= ~(IFF_UP);
-+				if (ioctl(fd, SIOCSIFFLAGS, &ifr[i]) < 0) {
-+					fprintf(stderr, "ifdown: shutdown ");
-+					perror(ifr[i].ifr_name);
-+				}
- 			}
- 		}
- 	}

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2010-04-23 20:41:03 UTC (rev 1875)
+++ sysvinit/trunk/debian/patches/series	2010-04-23 20:46:03 UTC (rev 1876)
@@ -1,4 +1,3 @@
 10_doc_manuals.dpatch
-21_ifdown_kfreebsd.dpatch
 63_init_keep_utf8_ttyflag.patch
 91_sulogin_lockedpw.dpatch