Skip to contentSkip to conversation

inetutils : Update to 1.9.1

PATCH Superseded Chunrong Guo 2 participants 2 messages Nov 14, 2012

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 inetutils : Update to 1.9.1

---
 .../inetutils/inetutils-1.8/fix-disable-ipv6.patch |   58 -----------
 ...tf-parse-pull-in-features.h-for-__GLIBC__.patch |   27 -----
 ...rgp-fix-program_invocation_name-detection.patch |   51 ---------
 .../inetutils-1.8/inetutils-1.8-0003-wchar.patch   |   12 --
 ...me-ruserpass-to-avoid-C-library-collision.patch |   58 -----------
 ...detect-__rcmd_errstr-support-in-the-C-lib.patch |   57 ----------
 ...e-daemon-from-the-C-library-when-possible.patch |   42 --------
 .../inetutils-1.8-1004-detect-fork-support.patch   |   54 ----------
 ...-1.8-1005-ftpd-add-daemon-D-nommu-support.patch |  109 --------------------
 .../disable-pre-ANSI-compilers.patch               |   11 ++
 .../inetutils/inetutils-1.9.1/remove-gets.patch    |   16 +++
 .../inetutils/inetutils-1.9.1/version.patch        |   12 ++
 .../inetutils/inetutils_1.8.bb                     |   65 ------------
 .../inetutils/inetutils_1.9.1.bb                   |   61 +++++++++++
 14 files changed, 100 insertions(+), 533 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/fix-disable-ipv6.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0003-wchar.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1002-rshd-detect-__rcmd_errstr-support-in-the-C-lib.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1003-use-daemon-from-the-C-library-when-possible.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1004-detect-fork-support.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1005-ftpd-add-daemon-D-nommu-support.patch
 create mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch
 create mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch
 create mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch
 delete mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils_1.8.bb
 create mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils_1.9.1.bb
meta-oe/recipes-connectivity/inetutils/inetutils-1.8/fix-disable-ipv6.patch deleted +0 -58
deleted file mode 100644
index 75d51a1..0000000
@@ -1,58 +0,0 @@
-Upstream: http://www.mail-archive.com/[email protected]/msg02103.html
-
-diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h
---- inetutils-1.8.orig/ping/ping_common.h	2010-05-15 20:55:47.000000000 +0930
-+++ inetutils-1.8/ping/ping_common.h	2010-12-01 12:19:08.000000000 +1030
-@@ -17,10 +17,14 @@
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see `http://www.gnu.org/licenses/'. */
- 
-+#include <config.h>
-+
- #include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
-+#ifdef HAVE_IPV6
- #include <netinet/icmp6.h>
-+#endif
- #include <icmp.h>
- #include <error.h>
- #include <progname.h>
-@@ -66,13 +70,19 @@
-   (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\
- } while (0)
- 
-+#ifdef HAVE_IPV6
- /* Not sure about this step*/
- #define _PING_BUFLEN(p, USE_IPV6) ((USE_IPV6)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \
- 				   ((p)->ping_datalen + sizeof (icmphdr_t)))
-+#else
-+#define _PING_BUFLEN(p, USE_IPV6) ((p)->ping_datalen + sizeof (icmphdr_t))
-+#endif
- 
-+#ifdef HAVE_IPV6
- typedef int (*ping_efp6) (int code, void *closure, struct sockaddr_in6 * dest,
- 			  struct sockaddr_in6 * from, struct icmp6_hdr * icmp,
- 			  int datalen);
-+#endif
- 
- typedef int (*ping_efp) (int code,
- 			 void *closure,
-@@ -81,13 +91,17 @@
- 			 struct ip * ip, icmphdr_t * icmp, int datalen);
- 
- union event {
-+#ifdef HAVE_IPV6
-   ping_efp6 handler6;
-+#endif
-   ping_efp handler;
- };
- 
- union ping_address {
-   struct sockaddr_in ping_sockaddr;
-+#ifdef HAVE_IPV6
-   struct sockaddr_in6 ping_sockaddr6;
-+#endif
- };
- 
- typedef struct ping_data PING;
meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch deleted +0 -27
deleted file mode 100644
index d328f13..0000000
@@ -1,27 +0,0 @@
-From 552a7d64ad4a7188a9b7cd89933ae7caf7ebfe90 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier at gentoo.org>
-Date: Thu, 18 Nov 2010 16:59:14 -0500
-Subject: [PATCH gnulib] printf-parse: pull in features.h for __GLIBC__
-
-Signed-off-by: Mike Frysinger <vapier at gentoo.org>
----
- lib/printf-parse.h |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/lib/printf-parse.h b/lib/printf-parse.h
-index 67a4a2a..3bd6152 100644
---- a/lib/printf-parse.h
-+++ b/lib/printf-parse.h
-@@ -25,6 +25,9 @@
- 
- #include "printf-args.h"
- 
-+#ifdef HAVE_FEATURES_H
-+# include <features.h>	/* for __GLIBC__ */
-+#endif
- 
- /* Flags */
- #define FLAG_GROUP       1      /* ' flag */
--- 
-1.7.3.2
-
meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch deleted +0 -51

51 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-0003-wchar.patch deleted +0 -12
deleted file mode 100644
index 21635a7..0000000
@@ -1,12 +0,0 @@
---- inetutils-1.8/lib/wchar.in.h
-+++ inetutils-1.8/lib/wchar.in.h
-@@ -70,6 +70,9 @@
- /* The include_next requires a split double-inclusion guard.  */
- #if @HAVE_WCHAR_H@
- # @INCLUDE_NEXT@ @NEXT_WCHAR_H@
-+#else
-+# include <stddef.h>
-+# define MB_CUR_MAX 1
- #endif
- 
- #undef _GL_ALREADY_INCLUDING_WCHAR_H
meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch deleted +0 -58

58 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1002-rshd-detect-__rcmd_errstr-support-in-the-C-lib.patch deleted +0 -57

57 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1003-use-daemon-from-the-C-library-when-possible.patch deleted +0 -42

42 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1004-detect-fork-support.patch deleted +0 -54

54 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1005-ftpd-add-daemon-D-nommu-support.patch deleted +0 -109

109 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch new file +11 -0
new file mode 100644
index 0000000..b200e58
@@ -0,0 +1,11 @@
+--- 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
meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch new file +16 -0
new file mode 100644
index 0000000..92abef1
@@ -0,0 +1,16 @@
+--- 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;
meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch new file +12 -0
new file mode 100644
index 0000000..6eefcf4
@@ -0,0 +1,12 @@
+--- inetutils-1.9.1/configure.ac	2012-01-06 22:05:05.000000000 +0800
++++ inetutils-1.9.1/configure.ac	2012-11-12 14:01:11.732957019 +0800
+@@ -20,8 +20,7 @@
+ 
+ AC_PREREQ(2.59)
+ 
+-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],
+  [[email protected]])
+ 
+ AC_CONFIG_SRCDIR([src/inetd.c])
meta-oe/recipes-connectivity/inetutils/inetutils_1.8.bb deleted +0 -65

65 lines not on this page · raw message

meta-oe/recipes-connectivity/inetutils/inetutils_1.9.1.bb new file +61 -0

61 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 14-11-12 03:07, Chunrong Guo schreef:

Quoted 15 lines
.../inetutils/inetutils-1.8/fix-disable-ipv6.patch |   58 ----------- 
...tf-parse-pull-in-features.h-for-__GLIBC__.patch |   27 ----- 
...rgp-fix-program_invocation_name-detection.patch |   51 --------- 
.../inetutils-1.8/inetutils-1.8-0003-wchar.patch   |   12 -- 
...me-ruserpass-to-avoid-C-library-collision.patch |   58 ----------- 
...detect-__rcmd_errstr-support-in-the-C-lib.patch |   57 ---------- 
...e-daemon-from-the-C-library-when-possible.patch |   42 -------- 
.../inetutils-1.8-1004-detect-fork-support.patch   |   54 ---------- 
...-1.8-1005-ftpd-add-daemon-D-nommu-support.patch |  109
-------------------- .../disable-pre-ANSI-compilers.patch               |
11 ++ .../inetutils/inetutils-1.9.1/remove-gets.patch    |   16 +++ 
.../inetutils/inetutils-1.9.1/version.patch        |   12 ++ 
.../inetutils/inetutils_1.8.bb                     |   65 ------------ 
.../inetutils/inetutils_1.9.1.bb                   |   61 +++++++++++

Can you resend it as v3 with -M --find-copies-harder please?

Quoted 2 lines

+LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" + +PR = "r1"

Why does the new recipe start at r1?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQo3yPMkyGM64RGpERAgQVAJ0ZAlCicMWOILHHcClTMwD2FcEnQQCfdO3s eSJvnDDjOmoDL0+KaY1WWB8=
=6sMi
-----END PGP SIGNATURE-----