From 516bded7798d64b561d754b6ea5415033f6490a8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 29 Aug 2022 14:26:07 -0700 Subject: ypbind-mt: Upgrade to 2.7.2 Disable on musl since its using some non-portable glibc only constructs Drop gettid patch its applied upstream Signed-off-by: Khem Raj --- ...1-Add-configure-time-check-for-gettid-API.patch | 45 ---------------- .../recipes-support/nis/ypbind-mt_2.6.bb | 63 ---------------------- .../recipes-support/nis/ypbind-mt_2.7.2.bb | 63 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 108 deletions(-) delete mode 100644 meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch delete mode 100644 meta-networking/recipes-support/nis/ypbind-mt_2.6.bb create mode 100644 meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb diff --git a/meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch b/meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch deleted file mode 100644 index 9484d0b007..0000000000 --- a/meta-networking/recipes-support/nis/ypbind-mt/0001-Add-configure-time-check-for-gettid-API.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 25d5daf30aa2dc451ba528712f668036d8506054 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 27 Jul 2019 07:50:26 -0700 -Subject: [PATCH] Add configure time check for gettid API - -glibc 2.30 has added this syscalls wrapper - -Signed-off-by: Khem Raj ---- - configure.ac | 1 + - src/log_msg.c | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 9e32a4a..6d1067b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,7 @@ if test -n "$TIRPC_LIBS"; then - AC_DEFINE(HAVE_TIRPC, 1, [Define to 1 if TIRPC is available]) - fi - -+AC_CHECK_FUNCS(gettid) - dnl The difficult part: could we reconfigure NSS or must we use DNS ? - AC_CHECK_FUNCS(__nss_configure_lookup) - if eval "test \"`echo '$ac_cv_func___nss_configure_lookup'`\" != yes"; then -diff --git a/src/log_msg.c b/src/log_msg.c -index 49f0905..37da311 100644 ---- a/src/log_msg.c -+++ b/src/log_msg.c -@@ -26,6 +26,7 @@ - #include "log_msg.h" - - #include -+#if !HAVE_GETTID - #ifdef __NR_gettid - static pid_t - gettid (void) -@@ -39,6 +40,7 @@ gettid (void) - return getpid (); - } - #endif -+#endif - - int debug_flag = 0; - int logfile_flag = 0; diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb deleted file mode 100644 index 2c5e2bd939..0000000000 --- a/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb +++ /dev/null @@ -1,63 +0,0 @@ -# This package builds the NIS ypbind daemon -# The source package is utils/net/NIS/ypbind-mt -# -require nis.inc - -DESCRIPTION = " \ -Multithreaded NIS bind service (ypbind-mt). \ -ypbind-mt is a complete new implementation of a NIS \ -binding daemon for Linux. It has the following \ -features. Supports ypbind protocol V1 and V2. \ -Uses threads for better response. Supports multiple \ -domain bindings. Supports /var/yp/binding/* file \ -for Linux libc 4/5 and glibc 2.x. Supports a list \ -of known secure NIS server (/etc/yp.conf) Binds to \ -the server which answered as first. \ -\ -This is the final IPv4-only version of ypbind-mt. \ -" -HOMEPAGE = "https://github.com/thkukuk/ypbind-mt/" -DEPENDS = " \ - yp-tools \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - " -DEPENDS:append:libc-musl = " bsd-headers nss" -RDEPENDS:${PN} += "yp-tools" - -# ypbind-mt now provides all the functionality of ypbind -# and is used in place of it. -PROVIDES += "ypbind" - -SRC_URI = "https://github.com/thkukuk/ypbind-mt/releases/download/v${PV}/${BPN}-${PV}.tar.xz \ - file://ypbind.init \ - file://ypbind.service \ - file://0001-dns_hosts-Fix-build-with-musl.patch \ - file://0001-Add-configure-time-check-for-gettid-API.patch \ - " -SRC_URI[md5sum] = "7cf89641fdc128d0919207e4b7caaf1d" -SRC_URI[sha256sum] = "0696c0263c4fd48a4ff2ce6c109f05f37aab0f71646d81cb22c7c28591bf80eb" - -inherit systemd update-rc.d - -SYSTEMD_SERVICE:${PN} = "ypbind.service" -INITSCRIPT_NAME = "ypbind" -INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ." - -CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" - -CFLAGS:append = " -I${STAGING_INCDIR}/nss3 -I${STAGING_INCDIR}/nspr" - -do_install:append () { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rcS.d - - install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system -} - - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb new file mode 100644 index 0000000000..a95062bc8b --- /dev/null +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb @@ -0,0 +1,63 @@ +# This package builds the NIS ypbind daemon +# The source package is utils/net/NIS/ypbind-mt +# +require nis.inc + +DESCRIPTION = " \ +Multithreaded NIS bind service (ypbind-mt). \ +ypbind-mt is a complete new implementation of a NIS \ +binding daemon for Linux. It has the following \ +features. Supports ypbind protocol V1 and V2. \ +Uses threads for better response. Supports multiple \ +domain bindings. Supports /var/yp/binding/* file \ +for Linux libc 4/5 and glibc 2.x. Supports a list \ +of known secure NIS server (/etc/yp.conf) Binds to \ +the server which answered as first. \ +\ +This is the final IPv4-only version of ypbind-mt. \ +" +HOMEPAGE = "https://github.com/thkukuk/ypbind-mt/" +DEPENDS = " \ + yp-tools \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +DEPENDS:append:libc-musl = " bsd-headers nss" +RDEPENDS:${PN} += "yp-tools" + +# ypbind-mt now provides all the functionality of ypbind +# and is used in place of it. +PROVIDES += "ypbind" + +SRC_URI = "https://github.com/thkukuk/ypbind-mt/releases/download/v${PV}/${BPN}-${PV}.tar.xz \ + file://0001-dns_hosts-Fix-build-with-musl.patch \ + file://ypbind.init \ + file://ypbind.service \ + " +SRC_URI[sha256sum] = "064f2f185673c5493df83f6400b799f3a359de56118b6ba37c4327111f2fcd8b" + +inherit systemd update-rc.d + +SYSTEMD_SERVICE:${PN} = "ypbind.service" +INITSCRIPT_NAME = "ypbind" +INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ." + +CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" + +CFLAGS:append = " -I${STAGING_INCDIR}/nss3 -I${STAGING_INCDIR}/nspr" + +do_install:append () { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/rcS.d + + install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system +} + +# uses glibc internal APIs e.g. _hostalias +COMPATIBLE_HOST:libc-musl = "null" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" -- cgit v1.2.3-54-g00ecf