Le 2015-02-18 00:35, Mehdi Dogguy a écrit :
Le 2014-12-10 16:19, Adam D. Barratt a écrit :
Control: tags -1 + moreinfo
On 2014-12-10 14:34, Pali Rohár wrote:
Please unblock package netplug
New version of netplug package (1.2.9.2-2) which is on
http://mentors.debian.org/package/netplug fix more bugs reported to
Debian.
Ner version is not from upstream, but contains only new patches
which
fixing bugs reported in Debian.
Please attach a debdiff, as requested by
https://release.debian.org/jessie/freeze_policy.html (and I believe
by
reportbug).
The debdiff is attached. There are no bug fixes for issues that can be
considered as RC. Based on that, I am closing this bugreport. The
submitter can still re-open the bug-report if he has more information
to share.
Forgot to attach the debdiff. :) Now done.
Regards,diff -Nru netplug-1.2.9.2/debian/changelog netplug-1.2.9.2/debian/changelog
--- netplug-1.2.9.2/debian/changelog2010-08-07 17:07:58.0 +0200
+++ netplug-1.2.9.2/debian/changelog2014-12-26 14:56:56.0 +0100
@@ -1,3 +1,19 @@
+netplug (1.2.9.2-2) unstable; urgency=low
+
+ * debian/control:
+- New maintainer (Closes: #730573)
+- Depend on iproute2 instead of transitional iproute (Closes: #753747)
+- Add info about difference between netplugd and ifplugd packages
+ to package long description (Closes: #690129)
+- Fix Standards-Version
+ * debian/rules:
+- Fix missing recommended target
+- Fix dpkg-buildflags missing
+ * Handle ST_DOWNANDOUT state (Closes: #652418)
+ * Allow to specify custom script file via new param '-s' (Closes: #702495)
+
+ -- Pali Rohár Sat, 29 Nov 2014 00:34:05 +0100
+
netplug (1.2.9.2-1) unstable; urgency=low
* New upstream version:
diff -Nru netplug-1.2.9.2/debian/control netplug-1.2.9.2/debian/control
--- netplug-1.2.9.2/debian/control 2010-08-07 16:33:11.0 +0200
+++ netplug-1.2.9.2/debian/control 2014-12-26 14:56:56.0 +0100
@@ -1,20 +1,21 @@
Source: netplug
Section: net
Priority: optional
-Maintainer: Philipp Matthias Hahn
+Maintainer: Pali Rohár
Build-Depends: debhelper (>> 7)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.6
Homepage: http://www.red-bean.com/~bos/
Package: netplug
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- iproute
+ iproute2 | iproute
Description: network link monitor daemon
This daemon monitors the link status of network cards and configures
the network on plug- and un-plug-events.
.
It's similar to ifplugd, but uses NETLINK instead of regularly polling
the link status. This improves power-consumption with laptops, but does
- not work with all network card.
+ not work with all network card. And it can't be configured to ignore short
+ unplugged or plugged periods like ifplugd.
diff -Nru netplug-1.2.9.2/debian/patches/50downoutstate.patch
netplug-1.2.9.2/debian/patches/50downoutstate.patch
--- netplug-1.2.9.2/debian/patches/50downoutstate.patch 1970-01-01
01:00:00.0 +0100
+++ netplug-1.2.9.2/debian/patches/50downoutstate.patch 2014-11-29
12:52:37.0 +0100
@@ -0,0 +1,11 @@
+Handle ST_DOWNANDOUT state (Bug #652418)
+--- a/if_info.c
b/if_info.c
+@@ -186,6 +186,7 @@
+ if (newflags & IFF_UP) {
+ switch(info->state) {
+ case ST_DOWN:
++case ST_DOWNANDOUT:
+ info->state = ST_INACTIVE;
+ break;
+
diff -Nru netplug-1.2.9.2/debian/patches/60custom-script.patch
netplug-1.2.9.2/debian/patches/60custom-script.patch
--- netplug-1.2.9.2/debian/patches/60custom-script.patch1970-01-01
01:00:00.0 +0100
+++ netplug-1.2.9.2/debian/patches/60custom-script.patch2014-11-29
12:52:37.0 +0100
@@ -0,0 +1,113 @@
+Allow to specify custom script file via new param '-s' (Bug #702495)
+diff --git a/lib.c b/lib.c
+index 5507daf..46de348 100644
+--- a/lib.c
b/lib.c
+@@ -29,6 +29,7 @@
+
+ #include "netplug.h"
+
++const char *script_file = NP_SCRIPT_DIR "/netplug";
+
+ void
+ do_log(int pri, const char *fmt, ...)
+@@ -109,11 +110,11 @@ run_netplug_bg(char *ifname, char *action)
+ setpgrp(); /* become group leader */
+
+ do_log(LOG_INFO, "%s %s %s -> pid %d",
+- NP_SCRIPT, ifname, action, getpid());
++ script_file, ifname, action, getpid());
+
+-execl(NP_SCRIPT, NP_SCRIPT, ifname, action, NULL);
++execl(script_file, script_file, ifname, action, NULL);
+
+-do_log(LOG_ERR, NP_SCRIPT ": %m");
++do_log(LOG_ERR, "%s: %m", script_file);
+ exit(1);
+ }
+
+diff --git a/main.c b/main.c
+index fe949a9..a3cdf63 100644
+--- a/main.c
b/main.c
+@@ -91,7 +91,7 @@ handle_interface(struct nlmsghdr *hdr, void *arg)
+ static void
+ usage(char *progname, int exitcode)
+ {
+-fprintf(stderr, "Usage: %s [-DFP] [-c config-file] [-i interface] [-p
pid-file]\n",
++fprintf(stderr, "Usage: %s [-DFP] [-c config-file] [-s script-file] [-i
interface] [-p pid
