From a39f60d81253800e6d45b27508c4d395a8a62a11 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Mon, 1 Sep 2014 14:15:47 +0800 Subject: [PATCH] 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 Signed-off-by: Joe MacDonald --- .../disable-pre-ANSI-compilers.patch | 16 -------------- .../inetutils-1.9.1/remove-gets.patch | 21 ------------------- .../fix-disable-ipv6.patch | 0 ...rse-pull-in-features.h-for-__GLIBC__.patch | 0 .../inetutils-1.8-0003-wchar.patch | 0 .../inetutils-1.9-PATH_PROCNET_DEV.patch | 0 .../rexec.xinetd.inetutils | 0 .../rlogin.xinetd.inetutils | 0 .../rsh.xinetd.inetutils | 0 .../telnet.xinetd.inetutils | 0 .../tftpd.xinetd.inetutils | 0 .../version.patch | 2 +- ...{inetutils_1.9.1.bb => inetutils_1.9.2.bb} | 7 ++----- 13 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/fix-disable-ipv6.patch (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/inetutils-1.8-0003-wchar.patch (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/inetutils-1.9-PATH_PROCNET_DEV.patch (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/rexec.xinetd.inetutils (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/rlogin.xinetd.inetutils (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/rsh.xinetd.inetutils (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/telnet.xinetd.inetutils (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/tftpd.xinetd.inetutils (100%) rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.1 => inetutils-1.9.2}/version.patch (93%) rename meta-networking/recipes-connectivity/inetutils/{inetutils_1.9.1.bb => inetutils_1.9.2.bb} (96%) diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch deleted file mode 100644 index a7fa61c798..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending - -disable pre-ANSI compilers - -Signed-off-by: Chunrong Guo ---- 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 ]) - - ### 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 diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch deleted file mode 100644 index 61d16e3a74..0000000000 --- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch +++ /dev/null @@ -1,21 +0,0 @@ -Uptream-Status: Pending - -remove gets function - -Signed-off-by: Chunrong Guo ---- 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; diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/fix-disable-ipv6.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/fix-disable-ipv6.patch similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/fix-disable-ipv6.patch rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/fix-disable-ipv6.patch diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.8-0003-wchar.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0003-wchar.patch similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.8-0003-wchar.patch rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0003-wchar.patch diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.9-PATH_PROCNET_DEV.patch similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/inetutils-1.9-PATH_PROCNET_DEV.patch rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.9-PATH_PROCNET_DEV.patch diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/rexec.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/rexec.xinetd.inetutils rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/rlogin.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/rlogin.xinetd.inetutils rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/rsh.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/rsh.xinetd.inetutils rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/telnet.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/telnet.xinetd.inetutils rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/tftpd.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils similarity index 100% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/tftpd.xinetd.inetutils rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/version.patch similarity index 93% rename from meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch rename to meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/version.patch index ac3181ddb2..1caa2d39d1 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch +++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/version.patch @@ -11,7 +11,7 @@ Signed-off-by: Chunrong Guo -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]) diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb similarity index 96% rename from meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb rename to meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb index 315e37499f..2bae3ee8f5 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb @@ -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