Prepare for new release

6 files changed, 81 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index c76df9b..cb27e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,29 @@
-inetutils (2:1.4.2+#DATE#-1) unstable; urgency=low
+inetutils (2:1.4.2+20040207-1) unstable; urgency=low
 
-  * New upstream snapshot. [rmh]
+  * New upstream snapshot.
+    - Upgraded to use autoconf 2.58. (Closes: #223706)
     - Fixes ping paquet size bug. (Closes: #216696)
-    - Fixes buffer overflow problem in ftp. (Closes: #212612)
-	[!!] submitted, but not merged upstream yet
+    - Synced patches against latest upstream source.
+  * Fixes buffer overflow problem in ftp. [guillem]
+    - patches/024_ftp_overflow.patch: New file.
+      Thanks to John Hasler <john@dhh.gt.org> (Closes: #212612)
+  * Now use current gcc: [rmh]
     - control (Build-Depends): Nuked gcc-3.2.
     - rules: Nuked CC=gcc-3.2 hack.
   * Fix lame FTBFS bug. (Closes: #219105) [rmh]
     - control (Build-Depends): Add automake1.7 and autoconf.
     - control (Build-Conflicts): Add autoconf2.13.
   * control (inetutils-tools): Temporarily disable net-tools provides,
-    untill we have a working ifconfig/route. (Closes: #219280) [rmh]
+    untill we have a working ifconfig/route.
+    (Closes: #219280, #219904, #222348)
+    [rmh]
   * debian/control (Uploaders): Put it on one line as some tools cannot cope
     with multi-line declarations. [guillem]
+  * New upstream uses automake 1.8. [guillem]
+    - control (Build-Depends): Use automake1.8.
+    - rules (DEB_AUTO_UPDATE_AUTOMAKE): Likewise.
 
- -- Robert Millan <rmh@debian.org>  #DATE#
+ -- Guillem Jover <guillem@debian.org>  Sat,  7 Feb 2004 19:45:34 +0100
 
 inetutils (2:1.4.2+20031022-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c4f74d9..3afa6c2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jeff Bailey <jbailey@nisa.net>
 Uploaders: Marcus Brinkmann <brinkmd@debian.org>, Robert Millan <rmh@debian.org>, Guillem Jover <guillem@debian.org>
 Standards-Version: 3.5.10
 Build-Depends: cdbs (>= 0.4.13), debhelper (>= 4.1.0), libreadline4-dev
- libpam0g-dev, libopie-dev, automake-1.7, autoconf
+ libpam0g-dev, libopie-dev, automake-1.8, autoconf
 Build-Conflicts: autoconf2.13
 
 Package: inetutils-ftp
diff --git a/debian/patches/20_inetd_pidfile.patch b/debian/patches/20_inetd_pidfile.patch
index bdfc19e..632add0 100644
--- a/debian/patches/20_inetd_pidfile.patch
+++ b/debian/patches/20_inetd_pidfile.patch
@@ -2,23 +2,24 @@
 diff -ur inetutils-20030703.old/inetd/inetd.c inetutils-20030703/inetd/inetd.c
 --- inetutils-20030703.old/inetd/inetd.c	2002-04-29 21:02:54.000000000 +0000
 +++ inetutils-20030703/inetd/inetd.c	2003-08-29 13:36:07.000000000 +0000
-@@ -359,6 +359,16 @@
+@@ -426,6 +426,17 @@
  
    openlog ("inetd", LOG_PID | LOG_NOWAIT, LOG_DAEMON);
  
-+  { FILE *fp = fopen (PATH_INETDPID, "w");
-+  if (fp != NULL)
-+    {
-+      fprintf (fp, "%d\n", getpid ());
-+      (void) fclose (fp);
-+    }
-+  else
-+    syslog (LOG_CRIT, "can't open %s: %s\n", PATH_INETDPID, strerror (errno));
++  {
++    FILE *fp = fopen (PATH_INETDPID, "w");
++    if (fp != NULL)
++      {
++        fprintf (fp, "%d\n", getpid ());
++        (void) fclose (fp);
++      }
++    else
++      syslog (LOG_CRIT, "can't open %s: %s\n", PATH_INETDPID, strerror (errno));
 +  }
 +
- #if defined(HAVE_SIGACTION)
-   {
-     struct sigaction sa;
+   signal_set_handler (SIGALRM, retry);
+   config (0);
+   signal_set_handler (SIGHUP, config);
 diff -ur inetutils-20030703.old/paths inetutils-20030703/paths
 --- inetutils-20030703.old/paths	2001-06-13 16:46:42.000000000 +0000
 +++ inetutils-20030703/paths	2003-08-29 13:30:05.000000000 +0000
diff --git a/debian/patches/23_ifconfig_enable.patch b/debian/patches/23_ifconfig_enable.patch
index de16441..2f77c58 100644
--- a/debian/patches/23_ifconfig_enable.patch
+++ b/debian/patches/23_ifconfig_enable.patch
@@ -1,3 +1,4 @@
+#DPATCHLEVEL=1
 diff -ur inetutils-1.4.2+20031022.old/configure.ac inetutils-1.4.2+20031022/configure.ac
 --- inetutils-1.4.2+20031022.old/configure.ac	2003-05-25 01:36:45.000000000 +0200
 +++ inetutils-1.4.2+20031022/configure.ac	2003-10-23 15:44:15.000000000 +0200
diff --git a/debian/patches/24_ftp_overflow.patch b/debian/patches/24_ftp_overflow.patch
new file mode 100644
index 0000000..5c838d7
--- /dev/null
+++ b/debian/patches/24_ftp_overflow.patch
@@ -0,0 +1,49 @@
+#DPATCHLEVEL=1
+Status: not-applied
+
+diff -Naur old/ftp/ftp_var.h new/ftp/ftp_var.h
+--- old/ftp/ftp_var.h	2003-11-01 13:51:09.000000000 -0600
++++ new/ftp/ftp_var.h	2003-11-01 13:17:56.000000000 -0600
+@@ -41,6 +41,9 @@
+ #ifndef FTP_EXTERN
+ #define FTP_EXTERN extern
+ #endif
++
++#define MAXLINE 200
++
+ /*
+  * Options and other state info.
+  */
+@@ -95,11 +98,11 @@
+ #if HAVE_LIBREADLINE
+ FTP_EXTERN char *line;
+ #else
+-FTP_EXTERN char	line[200];	/* input line buffer */
++FTP_EXTERN char	line[MAXLINE];	/* input line buffer */
+ #endif
+ 
+ FTP_EXTERN char	*stringbase;	/* current scan point in line buffer */
+-FTP_EXTERN char	argbuf[200];	/* argument storage buffer */
++FTP_EXTERN char	argbuf[MAXLINE];	/* argument storage buffer */
+ FTP_EXTERN char	*argbase;	/* current storage point in arg buffer */
+ FTP_EXTERN int	margc;		/* count of arguments on input line */
+ FTP_EXTERN char	*margv[20];	/* args parsed from input line */
+diff -Naur old/ftp/main.c new/ftp/main.c
+--- old/ftp/main.c	2003-11-01 13:51:09.000000000 -0600
++++ new/ftp/main.c	2003-11-01 14:04:40.000000000 -0600
+@@ -317,9 +317,14 @@
+       line = readline (prompt);
+       if (!line)
+ 	quit (0, 0);
++      l = strlen (line);
++      if (l >= MAXLINE)
++	{
++	  printf("Line too long.\n");
++	  break;
++	}
+       if (line && *line)
+ 	add_history (line);
+-      l = strlen (line);
+       if (l == 0)
+ 	break;
+ #else
diff --git a/debian/rules b/debian/rules
index 6c560d1..356c824 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 # This file is PUBLIC DOMAIN.
 
-DEB_TAR_SRCDIR := inetutils-1.4.2+20031022
+DEB_TAR_SRCDIR := inetutils-1.4.2+20040207
 DEB_BUILDDIR = $(DEB_SRCDIR)/build
 
 # ping is setuid
 DEB_FIXPERMS_EXCLUDE = bin/ping
 
-DEB_AUTO_UPDATE_AUTOMAKE=1.7
+DEB_AUTO_UPDATE_AUTOMAKE=1.8
 DEB_AUTO_UPDATE_AUTOCONF=2.50
 
 mandir = usr/share/man