From 4cb226954a909d0d6456bffbc857a8d966cc26c0 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 7 Jan 2016 01:31:10 -0800 Subject: iputils: s20121221 -> s20151218 * Remove fix-build-command-line-argument-with-gnutls.patch which is already in the source. * Add libgcrypt to DEPENDS since it depends on it. (From OE-Core rev: 119a121e4dbf48db67544c4c7fca40a1abcf1146) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- ...x-build-command-line-argument-with-gnutls.patch | 37 ----------- meta/recipes-extended/iputils/iputils_s20121221.bb | 73 ---------------------- meta/recipes-extended/iputils/iputils_s20151218.bb | 72 +++++++++++++++++++++ 3 files changed, 72 insertions(+), 110 deletions(-) delete mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch delete mode 100644 meta/recipes-extended/iputils/iputils_s20121221.bb create mode 100644 meta/recipes-extended/iputils/iputils_s20151218.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch b/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch deleted file mode 100644 index b9cd82ee88..0000000000 --- a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Backport - -From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001 -From: Arjan van de Ven -Date: Wed, 16 Jan 2013 03:12:15 +0900 -Subject: [PATCH] ping6: Fix build command line argument with gnutls. - -The ping6 command can use either openssl or gnutls... -and the Makefile has a bunch of setup for defining which of the two to use. - -Unfortunately, the final -D define on the commandline to enable gnutls -inside the ping6.c file didn't actually make it onto the gcc -commandline. -This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap. - -Signed-off-by: Arjan van de Ven -Signed-off-by: YOSHIFUJI Hideaki ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index c62d9df..89249f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP) - DEF_ping_common = $(DEF_CAP) $(DEF_IDN) - DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) - LIB_ping = $(LIB_CAP) $(LIB_IDN) --DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) -+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO) - LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) - - ping: ping_common.o --- -1.7.2.5 - diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/meta/recipes-extended/iputils/iputils_s20121221.bb deleted file mode 100644 index 49913d68bd..0000000000 --- a/meta/recipes-extended/iputils/iputils_s20121221.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Network monitoring tools" -DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ -tracepath, tracepath6, ping, ping6 and arping." -HOMEPAGE = "http://www.skbuff.net/iputils" -SECTION = "console/network" - -LICENSE = "BSD & GPLv2+" - -LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f00766dd278d82 \ - file://tracepath.c;beginline=1;endline=10;md5=0ecea2bf60bff2f3d840096d87647f3d \ - file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \ - file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " - -DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap" - - -SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ - file://debian/use_gethostbyname2.diff \ - file://debian/targets.diff \ - file://nsgmls-path-fix.patch \ - file://fix-build-command-line-argument-with-gnutls.patch \ - " - -SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171" -SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f" - -UPSTREAM_CHECK_REGEX = "iputils-(?Ps\d+).tar" - -do_compile () { - oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man -} - -do_install () { - install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 - # SUID root programs - install -m 4555 ping ${D}${base_bindir}/ping - install -m 4555 ping6 ${D}${base_bindir}/ping6 - install -m 4555 traceroute6 ${D}${base_bindir}/ - install -m 4555 clockdiff ${D}${base_bindir}/ - # Other programgs - for i in arping tracepath tracepath6; do - install -m 0755 $i ${D}${base_bindir}/ - done - # Manual pages for things we build packages for - for i in tracepath.8 traceroute6.8 ping.8 arping.8; do - install -m 0644 doc/$i ${D}${mandir}/man8/ || true - done -} - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN}-ping = "ping" -ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" - -ALTERNATIVE_${PN}-ping6 = "ping6" -ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" - -PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" - -FILES_${PN} = "" -FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" -FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" -FILES_${PN}-arping = "${base_bindir}/arping" -FILES_${PN}-tracepath = "${base_bindir}/tracepath" -FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" -FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" -FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" -FILES_${PN}-doc = "${mandir}/man8" diff --git a/meta/recipes-extended/iputils/iputils_s20151218.bb b/meta/recipes-extended/iputils/iputils_s20151218.bb new file mode 100644 index 0000000000..4c3523d425 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils_s20151218.bb @@ -0,0 +1,72 @@ +SUMMARY = "Network monitoring tools" +DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ +tracepath, tracepath6, ping, ping6 and arping." +HOMEPAGE = "http://www.skbuff.net/iputils" +SECTION = "console/network" + +LICENSE = "BSD & GPLv2+" + +LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f00766dd278d82 \ + file://tracepath.c;beginline=1;endline=10;md5=0ecea2bf60bff2f3d840096d87647f3d \ + file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \ + file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " + +DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap libgcrypt" + + +SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ + file://debian/use_gethostbyname2.diff \ + file://debian/targets.diff \ + file://nsgmls-path-fix.patch \ + " + +SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc753ce" +SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1" + +UPSTREAM_CHECK_REGEX = "iputils-(?Ps\d+).tar" + +do_compile () { + oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man +} + +do_install () { + install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8 + # SUID root programs + install -m 4555 ping ${D}${base_bindir}/ping + install -m 4555 ping6 ${D}${base_bindir}/ping6 + install -m 4555 traceroute6 ${D}${base_bindir}/ + install -m 4555 clockdiff ${D}${base_bindir}/ + # Other programgs + for i in arping tracepath tracepath6; do + install -m 0755 $i ${D}${base_bindir}/ + done + # Manual pages for things we build packages for + for i in tracepath.8 traceroute6.8 ping.8 arping.8; do + install -m 0644 doc/$i ${D}${mandir}/man8/ || true + done +} + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN}-ping = "ping" +ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" + +ALTERNATIVE_${PN}-ping6 = "ping6" +ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" + +PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" + +ALLOW_EMPTY_${PN} = "1" +RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" + +FILES_${PN} = "" +FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" +FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" +FILES_${PN}-arping = "${base_bindir}/arping" +FILES_${PN}-tracepath = "${base_bindir}/tracepath" +FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" +FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" +FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" +FILES_${PN}-doc = "${mandir}/man8" -- cgit v1.2.3-54-g00ecf