[arch-commits] Commit in ifplugd/trunk (3 files)

[Thomas Bächler]

    Date: Wednesday, August 29, 2012 @ 16:00:37
  Author: thomas
Revision: 165778

ifplugd:

* Fix return values to match documentation (how does that go unnoticed for 7 years?)
* systemd: Allow 1 and 2 as "success" return values

Added:
  ifplugd/trunk/ifplugd-fix-return-value.patch
Modified:
  ifplugd/trunk/PKGBUILD
  ifplugd/trunk/ifplugd.systemd

--------------------------------+
 PKGBUILD                       |    9 ++++++---
 ifplugd-fix-return-value.patch |   12 ++++++++++++
 ifplugd.systemd                |    1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-29 19:13:31 UTC (rev 165777)
+++ PKGBUILD	2012-08-29 20:00:37 UTC (rev 165778)
@@ -16,18 +16,21 @@
 options=('!makeflags')
 source=($url/${pkgname}-${pkgver}.tar.gz
         ifplugd-0.28-interface.patch
+        ifplugd-fix-return-value.patch
         ifplugd
         ifplugd-daemon
         ifplugd.systemd)
 md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3'
          '54eb22844b5aeed161c0b80aa9008570'
+         'f26dbd7597d9d637f0b2b104b11ab820'
          '158bda9014eb35979af9b094feca5fe1'
-         'f2e8a37af52b79ee0e3c5bcc2470ce10 '
-         'cd97aad168c109e23824c1011165f94f')
+         'f2e8a37af52b79ee0e3c5bcc2470ce10'
+         '3dc2ce45d0e12d155ecc7a5bc9e3ee04')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 -i $srcdir/ifplugd-0.28-interface.patch
+  patch -p0 -i ${srcdir}/ifplugd-0.28-interface.patch
+  patch -p1 -i ${srcdir}/ifplugd-fix-return-value.patch
   sed 's|/var/run|/run|' -i src/ifplugd.c
   ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --sysconfdir=/etc \
       --with-initdir=/etc/rc.d --disable-xmltoman --disable-subversion --disable-lynx

Added: ifplugd-fix-return-value.patch
===================================================================
--- ifplugd-fix-return-value.patch	                        (rev 0)
+++ ifplugd-fix-return-value.patch	2012-08-29 20:00:37 UTC (rev 165778)
@@ -0,0 +1,12 @@
+diff -Nur ifplugd-0.28.orig/src/ifplugd.c ifplugd-0.28/src/ifplugd.c
+--- ifplugd-0.28.orig/src/ifplugd.c	2005-06-04 21:21:51.000000000 +0200
++++ ifplugd-0.28/src/ifplugd.c	2012-08-29 21:51:53.137644163 +0200
+@@ -447,7 +447,7 @@
+             goto finish;
+ 
+     if (send_retval && daemonize && wait_on_fork) {
+-        char c = status == IFSTATUS_UP ? 2 : (status == IFSTATUS_DOWN ? 3 : 1);
++        char c = status == IFSTATUS_UP ? 1 : (status == IFSTATUS_DOWN ? 2 : 3);
+         daemon_retval_send(c);
+         send_retval = 0;
+     }

Modified: ifplugd.systemd
===================================================================
--- ifplugd.systemd	2012-08-29 19:13:31 UTC (rev 165777)
+++ ifplugd.systemd	2012-08-29 20:00:37 UTC (rev 165778)
@@ -5,6 +5,7 @@
 Type=forking
 PIDFile=/run/ifplugd.%i.pid
 ExecStart=/usr/bin/ifplugd-daemon %i
+SuccessExitStatus=0 1 2
 
 [Install]
 WantedBy=multi-user.target