mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-16 18:40:03 +00:00
inetutils : Update to 1.9.1
* There are difference spaces between inetutils-1.8/COPYING
and inetutils-1.9.1/COPYING,so md5sum is changed.
* the following patches are accepted by inetutils 1.9.1 upstream
inetutils-1.8-1005-ftpd-add-daemon-D-nommu-support.patch
inetutils-1.8-1004-detect-fork-support.patch
inetutils-1.8-1003-use-daemon-from-the-C-library-when-possible.patch
inetutils-1.8-1002-rshd-detect-__rcmd_errstr-support-in-the-C-lib.patch
inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch
inetutils-1.8-0002-argp-fix-program_invocation_name-detection.patch
Signed-off-by: Chunrong Guo <b40290@freescale.com>
This commit is contained in:
chunrong guo
committed by
Joe MacDonald
Joe MacDonald
parent
eb63724f43
commit
11a6ce97f7
+16
@@ -0,0 +1,16 @@
|
||||
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
|
||||
@@ -0,0 +1,60 @@
|
||||
Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
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;
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
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__
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
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
|
||||
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
--- 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
|
||||
@@ -0,0 +1,21 @@
|
||||
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;
|
||||
@@ -0,0 +1,17 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
remove m4_esyscmd function
|
||||
|
||||
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: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],
|
||||
[bug-inetutils@gnu.org])
|
||||
|
||||
AC_CONFIG_SRCDIR([src/inetd.c])
|
||||
@@ -0,0 +1,63 @@
|
||||
DESCRIPTION = "The GNU inetutils are a collection of common \
|
||||
networking utilities and servers including ftp, ftpd, rcp, \
|
||||
rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
|
||||
talkd, telnet, telnetd, tftp, tftpd, and uucpd."
|
||||
SECTION = "libs"
|
||||
DEPENDS = "ncurses"
|
||||
LICENSE = "GPLv3"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
|
||||
|
||||
|
||||
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://fix-disable-ipv6.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "944f7196a2b3dba2d400e9088576000c"
|
||||
SRC_URI[sha256sum] = "02a9ebde8a198cb85f87545b9d88fb103a183958139864a85fe9e027ad79ff2b"
|
||||
|
||||
inherit autotools gettext
|
||||
|
||||
noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}"
|
||||
EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \
|
||||
--with-path-procnet-dev=/proc/net/dev \
|
||||
${noipv6} \
|
||||
"
|
||||
|
||||
do_configure_prepend () {
|
||||
export HELP2MAN='true'
|
||||
cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath
|
||||
rm -f ${S}/glob/configure*
|
||||
}
|
||||
|
||||
do_install () {
|
||||
autotools_do_install
|
||||
install -d ${D}${base_sbindir} ${D}${base_bindir}
|
||||
mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN}
|
||||
mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${PN}
|
||||
mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
|
||||
mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${PN}
|
||||
mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
|
||||
mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_${PN} () {
|
||||
update-alternatives --install ${bindir}/tftp tftp tftp.${PN} 100
|
||||
update-alternatives --install ${bindir}/telnet telnet telnet.${PN} 100
|
||||
update-alternatives --install ${bindir}/logger logger logger.${PN} 100
|
||||
update-alternatives --install ${bindir}/traceroute traceroute traceroute.${PN} 100
|
||||
update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 100
|
||||
update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_${PN} () {
|
||||
update-alternatives --remove tftp tftp.${PN}
|
||||
update-alternatives --remove telnet telnet.${PN}
|
||||
update-alternatives --remove logger logger.${PN}
|
||||
update-alternatives --remove traceroute traceroute.${PN}
|
||||
update-alternatives --remove ifconfig ifconfig.${PN}
|
||||
}
|
||||
Reference in New Issue
Block a user