diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/30_ping_suid_perms.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 5 |
4 files changed, 5 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 7bb1a74..67bf01d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ inetutils (2:1.8-4) UNRELEASED; urgency=low * Add new inetutils-inetd default configuration file for the init script, allowing to pass INETD_OPTS to it on start. (Closes: #606954) * Use dh_lintian instead of manually installing the overrides. + * Override upstream SUIDMODE at make time, instead of patching the source. -- Guillem Jover <guillem@debian.org> Wed, 02 Feb 2011 05:43:10 +0100 diff --git a/debian/patches/30_ping_suid_perms.patch b/debian/patches/30_ping_suid_perms.patch deleted file mode 100644 index d3f2cf3..0000000 --- a/debian/patches/30_ping_suid_perms.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - ping/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/ping/Makefile.am -+++ b/ping/Makefile.am -@@ -36,7 +36,7 @@ ping_SOURCES = ping.c ping_common.c ping - ping_router.c ping_timestamp.c ping_common.h ping_impl.h ping.h libping.c - ping6_SOURCES = ping6.c ping_common.c ping_common.h ping6.h - --SUIDMODE = -o root -m 4775 -+SUIDMODE = -o root -m 4755 - - install-ping-hook: - -@for x in $(bin_PROGRAMS); do \ diff --git a/debian/patches/series b/debian/patches/series index 13d1e05..06ef68f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ 02_remove_unused_opie_check.patch 10_syslog_klog_doc.patch 22_syslogd_conf.patch -30_ping_suid_perms.patch 50_split_load_conffile.patch 51_add_load_confdir_support.patch 53_man_inetd_max_conn.patch diff --git a/debian/rules b/debian/rules index 0593525..5d9980c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,9 @@ else CFLAGS += -O2 endif +# Override default upstream setuid mode, as they rejected this change. +SUIDMODE="-o root -m 4755" + # Set proper Provides ifeq ($(DEB_HOST_ARCH_OS),linux) syslogd_provides = linux-kernel-log-daemon @@ -95,7 +98,7 @@ install: build dh_prep dh_installdirs -a - $(MAKE) install DESTDIR=$(D) + $(MAKE) install DESTDIR=$(D) SUIDMODE=$(SUIDMODE) # Move ping to /bin mkdir -p $(D)/bin |