libtirpc: stop dropping in NIS headers
PATCH 1/2 libtirpc: stop dropping in NIS headers
libtirpc prior to 1.0.2 assumed that the system provided nis.h but this isn't always true. Until now we've been using a tarball of the missing files from Gentoo, but libtirpc 1.0.2 added a copy of nis.h to the sources so this isn't required anymore.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb +3 -10
@@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ PROVIDES = "virtual/librpc" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ - ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://export_key_secretkey_is_set.patch \ file://0001-replace-__bzero-with-memset-API.patch \ file://0001-include-stdint.h-for-uintptr_t.patch \
@@ -20,19 +19,13 @@ SRC_URI_append_libc-musl = " \ file://Use-netbsd-queue.h.patch \ " -SRC_URI[libtirpc.md5sum] = "d5a37f1dccec484f9cabe2b97e54e9a6" -SRC_URI[libtirpc.sha256sum] = "723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5" -SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445" -SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83" +SRC_URI[md5sum] = "d5a37f1dccec484f9cabe2b97e54e9a6" +SRC_URI[sha256sum] = "723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5" inherit autotools pkgconfig EXTRA_OECONF = "--disable-gssapi" -do_configure_prepend () { - cp -r ${WORKDIR}/tirpc ${S} -} - do_install_append() { chown root:root ${D}${sysconfdir}/netconfig }
Signature · 1 line
2.11.0
PATCH 2/2 libtirpc: refresh patches
Signed-off-by Ross Burton <[email protected]>
--- .../0001-include-stdint.h-for-uintptr_t.patch | 23 ++++----- .../0001-replace-__bzero-with-memset-API.patch | 58 +++++++++++++++++----- .../libtirpc/export_key_secretkey_is_set.patch | 29 +++++++---- 3 files changed, 74 insertions(+), 36 deletions(-)
meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch +10 -13
@@ -1,17 +1,15 @@ -From b80d3b573c1dade2b29b22f8acc3b9e2c7ddefd7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 20 May 2017 13:36:43 -0700 -Subject: [PATCH] include stdint.h for uintptr_t +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> -Fixes -| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? -| if (len < (uintptr_t)xdrs->x_base) { -| ^~~~~~~~~ +From acb9a37977cf0a9630eac74af9adebf35e38e719 Mon Sep 17 00:00:00 2001 +From: Thorsten Kukuk <[email protected]> +Date: Tue, 14 Nov 2017 10:39:08 -0500 +Subject: [PATCH] Include stdint.h from xdr_sizeof.c to avoid missing + declaration errors. -Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Thorsten Kukuk <[email protected]> +Signed-off-by: Steve Dickson <[email protected]> --- -Upstream-Status: Pending - src/xdr_sizeof.c | 1 + 1 file changed, 1 insertion(+)
@@ -28,5 +26,4 @@ index d23fbd1..79d6707 100644 /* ARGSUSED */ -- -2.13.0 - +1.8.3.1
meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch +46 -12
69 lines not on this page · raw message
meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch +18 -11
@@ -1,18 +1,23 @@ -Add key_secretkey_is_set to exported symbols map +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> -key_secret_is_set is a typo in libtirpc map -Patch taken from +From e51d67549b516b2dac6c71d92c8499f6e67125ad Mon Sep 17 00:00:00 2001 +From: Thorsten Kukuk <[email protected]> +Date: Tue, 14 Nov 2017 10:43:53 -0500 +Subject: [PATCH] Fix typo in src/libtirpc.map -https://sourceforge.net/p/libtirpc/discussion/637321/thread/fd73d431/ +Which prevents that key_secretkey_is_set will be exported. -Upstream-Status: Pending +Signed-off-by: Thorsten Kukuk <[email protected]> +Signed-off-by: Steve Dickson <[email protected]> +--- + src/libtirpc.map | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Signed-off-by: Khem Raj <[email protected]> - -Index: libtirpc-1.0.1/src/libtirpc.map -=================================================================== ---- libtirpc-1.0.1.orig/src/libtirpc.map -+++ libtirpc-1.0.1/src/libtirpc.map +diff --git a/src/libtirpc.map b/src/libtirpc.map +index f385de5..21d6065 100644 +--- a/src/libtirpc.map ++++ b/src/libtirpc.map @@ -298,7 +298,7 @@ TIRPC_0.3.2 { key_gendes; key_get_conv;
@@ -22,3 +27,5 @@ Index: libtirpc-1.0.1/src/libtirpc.map key_setnet; netname2host; netname2user; +-- +1.8.3.1
Signature · 1 line
2.11.0