Patchwork [meta-oe] inetutils : Update to 1.9.1

login
register
mail settings
Submitter chunrong guo
Date Nov. 12, 2012, 10:37 a.m.
Message ID <1352716647-8613-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/38855/
State Superseded
Headers show

Comments

chunrong guo - Nov. 12, 2012, 10:37 a.m.
Signed-off-by: Chunrong Guo <b40290@freescale.com>
---
 .../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.9.1.bb                   |   61 ++++++++++++++++++++
 4 files changed, 100 insertions(+), 0 deletions(-)
 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
 create mode 100644 meta-oe/recipes-connectivity/inetutils/inetutils_1.9.1.bb
Koen Kooi - Nov. 13, 2012, 11:54 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 12-11-12 11:37, Chunrong Guo schreef:
> Signed-off-by: Chunrong Guo <b40290@freescale.com> --- 
> .../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.9.1.bb                   |   61
> ++++++++++++++++++++ 4 files changed, 100 insertions(+), 0 deletions(-)

When updating please delete the old version as well or explain in the commit
message why the old version needs to be preserved.

regards,

Koen

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

iD8DBQFQojUDMkyGM64RGpERAk03AJ41V0Hl0cJaGoEV9ooeoTxtR1wFxgCfXy+A
WYoWb+MEpkCNU0pEN6xZ6j0=
=Ag8+
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch b/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch
new file mode 100644
index 0000000..b200e58
--- /dev/null
+++ b/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/disable-pre-ANSI-compilers.patch
@@ -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
diff --git a/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch b/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch
new file mode 100644
index 0000000..92abef1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/remove-gets.patch
@@ -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;
diff --git a/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch b/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch
new file mode 100644
index 0000000..6eefcf4
--- /dev/null
+++ b/meta-oe/recipes-connectivity/inetutils/inetutils-1.9.1/version.patch
@@ -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],
+  [bug-inetutils@gnu.org])
+ 
+ AC_CONFIG_SRCDIR([src/inetd.c])
diff --git a/meta-oe/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-oe/recipes-connectivity/inetutils/inetutils_1.9.1.bb
new file mode 100644
index 0000000..2fc9b45
--- /dev/null
+++ b/meta-oe/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -0,0 +1,61 @@ 
+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"
+
+PR = "r1"
+
+SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
+           file://disable-pre-ANSI-compilers.patch \
+           file://version.patch \
+           file://remove-gets.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}
+}