From 73d958b50bb2f993070add862fa1ef79dfcf5da3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Apr 2018 11:05:44 -0700 Subject: yp-tools: Upgrade to 4.2.3 Switch to github for SRC_URI Signed-off-by: Khem Raj Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- ...ding_dup.c-Include-string.h-for-strdup-de.patch | 28 ------------- ...mp_bindings.c-Include-string.h-for-memset.patch | 30 -------------- .../recipes-support/nis/yp-tools_4.2.2.bb | 46 --------------------- .../recipes-support/nis/yp-tools_4.2.3.bb | 47 ++++++++++++++++++++++ 4 files changed, 47 insertions(+), 104 deletions(-) delete mode 100644 meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch delete mode 100644 meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch delete mode 100644 meta-networking/recipes-support/nis/yp-tools_4.2.2.bb create mode 100644 meta-networking/recipes-support/nis/yp-tools_4.2.3.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch b/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch deleted file mode 100644 index 3d4d4f278d..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 420cb6927553bbca5b49b7681cf208e6df6e4d7c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 8 Sep 2017 08:42:45 -0700 -Subject: [PATCH 1/2] ypbind3_binding_dup.c: Include string.h for strdup - declaration - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - lib/ypbind3_binding_dup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/ypbind3_binding_dup.c b/lib/ypbind3_binding_dup.c -index ce4aadf..8199c0b 100644 ---- a/lib/ypbind3_binding_dup.c -+++ b/lib/ypbind3_binding_dup.c -@@ -19,6 +19,7 @@ - - #if defined(HAVE_YPBIND3) - -+#include - #include - #include "internal.h" - --- -2.14.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch b/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch deleted file mode 100644 index 0562e58afb..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 03ccabb6264c008430c4b1739351df5a63829f8e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 8 Sep 2017 08:52:32 -0700 -Subject: [PATCH 2/2] yp_dump_bindings.c: Include string.h for memset - -Fixes -error: implicitly declaring library function 'memset' - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - src/yp_dump_binding.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/yp_dump_binding.c b/src/yp_dump_binding.c -index a5ab920..d75e2c2 100644 ---- a/src/yp_dump_binding.c -+++ b/src/yp_dump_binding.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb deleted file mode 100644 index 9ac973812c..0000000000 --- a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -# This package builds tools to manage NIS -# The source package is utils/net/NIS/yp-tools -# -require nis.inc - -SUMMARY = "NIS client programs" -DESCRIPTION = " \ -Network Information Service tools. \ -This package contains ypcat, ypmatch, ypset, \ -ypwhich, yppasswd, domainname, nisdomainname \ -and ypdomainname. \ -" - -SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ - file://domainname.service \ - file://0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch \ - file://0002-yp_dump_bindings.c-Include-string.h-for-memset.patch \ - " -SRC_URI[md5sum] = "fb4a8bffb44ae5d3390351d67f320ef3" -SRC_URI[sha256sum] = "137f19a986382b275bf4a2b1a69eb26689d6f4ac056ddaa21784d6b80eb98faa" - -DEPENDS = "libtirpc libnsl2" - -inherit autotools systemd -SYSTEMD_SERVICE_${PN} = "domainname.service" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - -CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" - -EXTRA_OECONF = " \ - --disable-rpath --disable-domainname \ - " -CFLAGS_append_libc-musl = " -Wno-error=cpp" - -FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" -FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug" -FILES_${PN}-dev += " ${libdir}/yp-nis/*.so ${libdir}/yp-nis/*.so.[12] ${libdir}/yp-nis/*.la" -FILES_${PN}-staticdev += " ${libdir}/yp-nis/*.a" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system -} diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb new file mode 100644 index 0000000000..4e27e32d48 --- /dev/null +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb @@ -0,0 +1,47 @@ +# This package builds tools to manage NIS +# The source package is utils/net/NIS/yp-tools +# +require nis.inc + +SUMMARY = "NIS client programs" +DESCRIPTION = " \ +Network Information Service tools. \ +This package contains ypcat, ypmatch, ypset, \ +ypwhich, yppasswd, domainname, nisdomainname \ +and ypdomainname. \ +" + +# v4.2.3 +SRCREV = "1bfda29c342a81b97cb1995ffd9e8da5de63e7ab" + +SRC_URI = "git://github.com/thkukuk/yp-tools \ + file://domainname.service \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "libtirpc libnsl2" + +inherit autotools systemd +SYSTEMD_SERVICE_${PN} = "domainname.service" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" + +CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" + +EXTRA_OECONF = " \ + --disable-rpath --disable-domainname \ + " +CFLAGS_append_libc-musl = " -Wno-error=cpp" + +FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" +FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug" +FILES_${PN}-dev += " ${libdir}/yp-nis/*.so ${libdir}/yp-nis/*.so.[12] ${libdir}/yp-nis/*.la" +FILES_${PN}-staticdev += " ${libdir}/yp-nis/*.a" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system +} -- cgit v1.2.3-54-g00ecf