diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/61_inetd_listen_on_tcpmux_ports.patch | 15 |
2 files changed, 8 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 6dd1618..369a2c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +inetutils (2:1.8-3) UNRELEASED; urgency=low + + * Revert wrong hunk from the tcpmux services fix. + Thanks to Mats Erik Andersson. + + -- Guillem Jover <guillem@debian.org> Thu, 18 Nov 2010 04:01:33 +0100 + inetutils (2:1.8-2) experimental; urgency=low * Fix FTBFS on GNU/Hurd and GNU/kFreeBSD systems. (Closes: #596638) diff --git a/debian/patches/61_inetd_listen_on_tcpmux_ports.patch b/debian/patches/61_inetd_listen_on_tcpmux_ports.patch index 68e4a32..5ac63c2 100644 --- a/debian/patches/61_inetd_listen_on_tcpmux_ports.patch +++ b/debian/patches/61_inetd_listen_on_tcpmux_ports.patch @@ -3,9 +3,8 @@ From: Guillem Jover <guillem@hadrons.org> Date: Mon, 6 Sep 2010 09:00:58 +0200 Subject: [PATCH] inetd: Listen on ports for tcpmux services -* src/inetd.c (nextconfig): Call expand_enter instead of enter for +* src/inetd.c (fix_tcpmux): Call expand_enter instead of enter for tcpmux services. -(fix_tcpmux): Likewise. --- src/inetd.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) @@ -14,18 +13,6 @@ diff --git a/src/inetd.c b/src/inetd.c index 354ae1d..1c51a51 100644 --- a/src/inetd.c +++ b/src/inetd.c -@@ -1161,10 +1161,8 @@ nextconfig (const char *file) - { - sep->se_fd = -1; - sep->se_checked = 1; -- enter (sep); - } -- else -- expand_enter (sep); -+ expand_enter (sep); - freeconfig (sep); - } - endconfig (fconfig); @@ -1249,7 +1247,7 @@ fix_tcpmux (void) if (debug) fprintf (stderr, "inserting default tcpmux entry\n"); |