rules, oping.overrides: Install /usr/bin/noping setuid root.

… and document that in overrides.

diff --git a/debian/changelog b/debian/changelog
index 5d637f70787ddca091b0046584b8c2d0c0a38f34..a3db5b7dbf547f23a1081067fba3985a01421a29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ liboping (1.4.0-1) unstable; urgency=low
     - Added /usr/bin/noping.
   * debian/oping.links:
     - Make noping.8 be a symlink to oping.8.
+  * debian/rules, debian/oping.overrides:
+    - Install /usr/bin/noping setuid root and document that in overrides.
 
- -- Sebastian Harl <tokkee@debian.org>  Mon, 14 Jun 2010 23:32:26 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 15 Jun 2010 00:08:46 +0200
 
 liboping (1.3.4-1) unstable; urgency=low
 

diff --git a/debian/oping.overrides b/debian/oping.overrides
index f76af8dfd09d1ad5cbb99bcb402d51fbeff88c85..b7a97c75d90c319e96a9dbc87e64871e29acba3f 100644 (file)
--- a/debian/oping.overrides
+++ b/debian/oping.overrides
@@ -1,2 +1,3 @@
-oping: setuid-binary
+oping: setuid-binary usr/bin/oping 4755 root/root
+oping: setuid-binary usr/bin/noping 4755 root/root
 

diff --git a/debian/rules b/debian/rules
index e7d74ff41d6be4392fd765778f7c40cafa373836..3024bb46328f6a16560d2241d8a436ca8f9d13ed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ install: build
        
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
        
-       chmod u+s debian/tmp/usr/bin/oping
+       chmod u+s debian/tmp/usr/bin/oping debian/tmp/usr/bin/noping
        mkdir -p debian/oping/usr/share/lintian/overrides/
        cp debian/oping.overrides debian/oping/usr/share/lintian/overrides/oping
        
@@ -98,7 +98,7 @@ binary-arch: build install
        dh_link
        dh_strip
        dh_compress
-       dh_fixperms -Xusr/bin/oping
+       dh_fixperms -Xusr/bin/oping -Xusr/bin/noping
        dh_makeshlibs
        dh_installdeb
        dh_shlibdeps -ldebian/liboping0/usr/lib/