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

[pere at alioth.debian.org]

Author: pere
Date: 2008-05-20 06:08:15 +0000 (Tue, 20 May 2008)
New Revision: 1272

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
Log:
  * Fix wake on lan issue introduced with freebsd patch in version
    2.86.ds1-4 (Closes: #405870).  Patch from Lucas Nussbaum.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-05-19 16:19:38 UTC (rev 1271)
+++ sysvinit/trunk/debian/changelog	2008-05-20 06:08:15 UTC (rev 1272)
@@ -2,6 +2,8 @@
 
   * Remove another bashism in init.d/rc blocking startpar concurrency
     (Closes: #481770).
+  * Fix wake on lan issue introduced with freebsd patch in version
+    2.86.ds1-4 (Closes: #405870).  Patch from Lucas Nussbaum.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 19 May 2008 08:26:01 +0200
 

Modified: sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch	2008-05-19 16:19:38 UTC (rev 1271)
+++ sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch	2008-05-20 06:08:15 UTC (rev 1272)
@@ -5,16 +5,15 @@
 ## DP: Get ifdown working on kFreeBSD. (Closes: #327031)
 
 @DPATCH@
---- sysvinit-2.86.ds1.old/src/ifdown.c	(revisjon 92)
-+++ sysvinit-2.86.ds1/src/ifdown.c	(arbeidskopi)
-@@ -61,10 +61,19 @@
+diff -urNad sysvinit-2.86.ds1~/src/ifdown.c sysvinit-2.86.ds1/src/ifdown.c
+--- sysvinit-2.86.ds1~/src/ifdown.c	2008-04-17 15:49:43.000000000 +0200
++++ sysvinit-2.86.ds1/src/ifdown.c	2008-04-17 15:57:16.000000000 +0200
+@@ -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) {
--				fprintf(stderr, "ifdown: shutdown ");
--				perror(ifr[i].ifr_name);
 +/* Expected in <net/if.h> according to "UNIX Network Programming". */
 +#ifdef ifr_flags
 +#define FLAGS ifr_flags
@@ -22,6 +21,12 @@
 +/* 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) {