inetutils: uprev to 1.9.2

1. remove unneeded patches:
 inetutils-1.9.1/disable-pre-ANSI-compilers.patch
 inetutils-1.9.1/remove-gets.patch
2. Update the version from 1.9.1 to 1.9.2 in version.patch
3. remove PR

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Roy Li
2014-09-01 14:15:47 +08:00
committed by Joe MacDonald
parent 1db575c270
commit a39f60d812
13 changed files with 3 additions and 43 deletions
@@ -1,16 +0,0 @@
Upstream-Status: Pending
disable pre-ANSI compilers
Signed-off-by: Chunrong Guo <b40290@freescale.com>
--- inetutils-1.9.1/configure.ac 2012-01-06 22:05:05.000000000 +0800
+++ inetutils-1.9.1/configure.ac 2012-11-12 14:05:30.756957063 +0800
@@ -586,7 +586,7 @@
#include <arpa/tftp.h>])
### Checks for compiler characteristics.
-AM_C_PROTOTYPES dnl FIXME: Does inetutils even compile on pre-ANSI compilers?
+#AM_C_PROTOTYPES dnl FIXME: Does inetutils even compile on pre-ANSI compilers?
AC_C_CONST
dnl See if `weak refs' are possible; these make it possible (with shared
@@ -1,21 +0,0 @@
Uptream-Status: Pending
remove gets function
Signed-off-by: Chunrong Guo <b40290@freescale.com>
--- inetutils-1.9.1.org/lib/stdio.in.h 2012-01-06 22:11:13.000000000 +0800
+++ inetutils-1.9.1/lib/stdio.in.h 2012-11-12 14:30:49.044958001 +0800
@@ -715,9 +715,13 @@
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
+#if defined gets
+#undef gets
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
+#endif
+
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
struct obstack;
@@ -11,7 +11,7 @@ Signed-off-by: Chunrong Guo <b40290@freescale.com>
-AC_INIT([GNU inetutils],
- m4_esyscmd([build-aux/git-version-gen .tarball-version 's/inetutils-/v/;s/_/./g']),
+AC_INIT([GNU inetutils],[1.9.1],
+AC_INIT([GNU inetutils],[1.9.2],
[bug-inetutils@gnu.org])
AC_CONFIG_SRCDIR([src/inetd.c])
@@ -8,11 +8,8 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
PR = "r1"
SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
file://disable-pre-ANSI-compilers.patch \
file://version.patch \
file://remove-gets.patch \
file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \
file://inetutils-1.8-0003-wchar.patch \
file://rexec.xinetd.inetutils \
@@ -23,8 +20,8 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
file://inetutils-1.9-PATH_PROCNET_DEV.patch \
"
SRC_URI[md5sum] = "944f7196a2b3dba2d400e9088576000c"
SRC_URI[sha256sum] = "02a9ebde8a198cb85f87545b9d88fb103a183958139864a85fe9e027ad79ff2b"
SRC_URI[md5sum] = "aa1a9a132259db83e66c1f3265065ba2"
SRC_URI[sha256sum] = "0423ea40a160cd4630f817e247df5c08ecc625378d2bb56a0509117a36a89913"
inherit autotools gettext update-alternatives