From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- .../iputils/files/debian/targets.diff | 15 +++++++++ .../iputils/files/debian/use_gethostbyname2.diff | 31 ++++++++++++++++++ ...x-build-command-line-argument-with-gnutls.patch | 37 ++++++++++++++++++++++ .../iputils/files/nsgmls-path-fix.patch | 27 ++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 meta/recipes-extended/iputils/files/debian/targets.diff create mode 100644 meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff create mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch create mode 100644 meta/recipes-extended/iputils/files/nsgmls-path-fix.patch (limited to 'meta/recipes-extended/iputils/files') diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff new file mode 100644 index 0000000000..2cb5576c62 --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/targets.diff @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [disable feature] + +Index: iputils-s20121221/Makefile +=================================================================== +--- iputils-s20121221.orig/Makefile ++++ iputils-s20121221/Makefile +@@ -106,7 +106,7 @@ endif + endif + + # ------------------------------------- +-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd ++IPV4_TARGETS=tracepath ping clockdiff arping + IPV6_TARGETS=tracepath6 traceroute6 ping6 + TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) + diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff new file mode 100644 index 0000000000..d3b18868c0 --- /dev/null +++ b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff @@ -0,0 +1,31 @@ +Upstream-Status: Pending [from other distro Debian] + +Index: iputils-s20121221/tracepath.c +=================================================================== +--- iputils-s20121221.orig/tracepath.c ++++ iputils-s20121221/tracepath.c +@@ -370,9 +370,9 @@ main(int argc, char **argv) + } + #endif + +- he = gethostbyname(p); ++ he = gethostbyname2(argv[0], AF_INET); + if (he == NULL) { +- herror("gethostbyname"); ++ herror("gethostbyname2"); + exit(1); + } + +Index: iputils-s20121221/ping.c +=================================================================== +--- iputils-s20121221.orig/ping.c ++++ iputils-s20121221/ping.c +@@ -279,7 +279,7 @@ main(int argc, char **argv) + #else + idn = target; + #endif +- hp = gethostbyname(idn); ++ hp = gethostbyname2(idn, AF_INET); + if (!hp) { + fprintf(stderr, "ping: unknown host %s\n", target); + exit(2); 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 new file mode 100644 index 0000000000..b9cd82ee88 --- /dev/null +++ b/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch @@ -0,0 +1,37 @@ +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/files/nsgmls-path-fix.patch b/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch new file mode 100644 index 0000000000..92bf946f2a --- /dev/null +++ b/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch @@ -0,0 +1,27 @@ +Fix nsgmls path issue + +Upstream-Status: Pending + +Signed-off-by: Zhai Edwin + +Index: iputils-s20101006/doc/Makefile +=================================================================== +--- iputils-s20101006.orig/doc/Makefile 2011-09-13 20:42:27.000000000 +0800 ++++ iputils-s20101006/doc/Makefile 2011-09-13 21:01:52.000000000 +0800 +@@ -27,10 +27,15 @@ + # docbook2man produces utterly ugly output and I did not find + # any way to customize this but hacking backend perl script a little. + # Well, hence... ++# nsgmls seems append path to search directory according to the sysid path. ++# e.g. if input ../index.db, it would search $search_directory/../ rather than ++# $search_directory, which leads searching failure. Fixing nsgmls probably ++# introduce some side effects, so use this ugly hack: running nsgmls in current ++# directory, and running docbook2man in tmp directory. + + $(MANFILES): index.db + @-mkdir tmp.db2man +- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. ++ @set -e; nsgmls $< >tmp.db2man/output; cd tmp.db2man; cat output | sgmlspl ../docbook2man-spec.pl ; mv $@ .. + @-rm -rf tmp.db2man + + clean: -- cgit v1.2.3-54-g00ecf