From ae18bb3dedf33a59fb0e0923f8c01c0ed35d09f5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 16 Sep 2021 22:56:05 +0200 Subject: [PATCH] net-libs/libtirpc: Sync with gentoo This is to get rid of EAPI 5. --- .../coreos-overlay/net-libs/libtirpc/Manifest | 2 +- .../libtirpc-1.0.2-bcopy-to-memmove.patch | 49 ------------------- .../libtirpc-1.0.2-bzero-to-memset.patch | 36 -------------- .../files/libtirpc-1.0.2-exports.patch | 17 ------- .../files/libtirpc-1.0.2-glibc-2.26.patch | 12 ----- ...-1.0.2-r1.ebuild => libtirpc-1.3.2.ebuild} | 43 +++++++--------- .../net-libs/libtirpc/metadata.xml | 3 +- 7 files changed, 21 insertions(+), 141 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch rename sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/{libtirpc-1.0.2-r1.ebuild => libtirpc-1.3.2.ebuild} (51%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest index 16e60b3458..7f745c7d4b 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest @@ -1,2 +1,2 @@ -DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec +DIST libtirpc-1.3.2.tar.bz2 513151 BLAKE2B 375b7bb046244f4666522c4f148428349fe1867b095dc5e268d037ba26982f88df70b0ad21fbe2b99150f644806a46651b524c3b9f7fe2499469806ea50b0331 SHA512 8664d5c4f842ee5acf83b9c1cadb7871f17b8157a7c4500e2236dcfb3a25768cab39f7c5123758dcd7381e30eb028ddfa26a28f458283f2dcea3426c9878c255 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch deleted file mode 100644 index 91619b7ac9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c ---- libtirpc-1.0.2.orig/src/auth_time.c 2017-07-05 11:02:23.000000000 -0400 -+++ libtirpc-1.0.2/src/auth_time.c 2017-07-30 17:48:31.361420071 -0400 -@@ -104,7 +104,7 @@ static int uaddr_to_sockaddr(uaddr, sin) - p_bytes[1] = (unsigned char)a[5] & 0x000000FF; - - sin->sin_family = AF_INET; /* always */ -- bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2); -+ memmove((char *)&sin->sin_port, (char *)&p_bytes, 2); - - return (0); - } -diff -Naurp libtirpc-1.0.2.orig/src/crypt_client.c libtirpc-1.0.2/src/crypt_client.c ---- libtirpc-1.0.2.orig/src/crypt_client.c 2017-07-05 11:02:23.000000000 -0400 -+++ libtirpc-1.0.2/src/crypt_client.c 2017-07-30 17:49:57.911419445 -0400 -@@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms) - des_crypt_1_arg.desbuf.desbuf_val = buf; - des_crypt_1_arg.des_dir = dparms->des_dir; - des_crypt_1_arg.des_mode = dparms->des_mode; -- bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8); -- bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8); -+ memmove(des_crypt_1_arg.des_ivec, dparms->des_ivec, 8); -+ memmove(des_crypt_1_arg.des_key, dparms->des_key, 8); - - result_1 = des_crypt_1(&des_crypt_1_arg, clnt); - if (result_1 == (desresp *) NULL) { -@@ -88,8 +88,8 @@ _des_crypt_call(buf, len, dparms) - - if (result_1->stat == DESERR_NONE || - result_1->stat == DESERR_NOHWDEVICE) { -- bcopy(result_1->desbuf.desbuf_val, buf, len); -- bcopy(result_1->des_ivec, dparms->des_ivec, 8); -+ memmove(buf, result_1->desbuf.desbuf_val, len); -+ memmove(dparms->des_ivec, result_1->des_ivec, 8); - } - - clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1); -diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c ---- libtirpc-1.0.2.orig/src/svc_auth_des.c 2017-07-05 11:02:23.000000000 -0400 -+++ libtirpc-1.0.2/src/svc_auth_des.c 2017-07-30 17:50:36.591419165 -0400 -@@ -145,7 +145,7 @@ _svcauth_des(rqst, msg) - return (AUTH_BADCRED); - } - cred->adc_fullname.name = area->area_netname; -- bcopy((char *)ixdr, cred->adc_fullname.name, -+ memmove(cred->adc_fullname.name, (char *)ixdr, - (u_int)namelen); - cred->adc_fullname.name[namelen] = 0; - ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT); diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch deleted file mode 100644 index 64b516ed82..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c ---- libtirpc-1.0.2.orig/src/auth_time.c 2017-07-05 11:02:23.000000000 -0400 -+++ libtirpc-1.0.2/src/auth_time.c 2017-07-30 17:46:39.481420880 -0400 -@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, ua - sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4); - useua = &ipuaddr[0]; - -- bzero((char *)&sin, sizeof(sin)); -+ memset((char *)&sin, 0, sizeof(sin)); - if (uaddr_to_sockaddr(useua, &sin)) { - msg("unable to translate uaddr to sockaddr."); - if (needfree) -diff -Naurp libtirpc-1.0.2.orig/src/des_impl.c libtirpc-1.0.2/src/des_impl.c ---- libtirpc-1.0.2.orig/src/des_impl.c 2017-07-05 11:02:23.000000000 -0400 -+++ libtirpc-1.0.2/src/des_impl.c 2017-07-30 17:46:49.581420807 -0400 -@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, str - } - tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; - tbuf[0] = tbuf[1] = 0; -- __bzero (schedule, sizeof (schedule)); -+ memset (schedule, 0, sizeof (schedule)); - - return (1); - } -diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c ---- libtirpc-1.0.2.orig/src/svc_auth_des.c 2017-07-05 11:02:23.000000000 -0400 -+++ libtirpc-1.0.2/src/svc_auth_des.c 2017-07-30 17:46:58.771420741 -0400 -@@ -356,7 +356,7 @@ cache_init() - - authdes_cache = (struct cache_entry *) - mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ); -- bzero((char *)authdes_cache, -+ memset((char *)authdes_cache, 0, - sizeof(struct cache_entry) * AUTHDES_CACHESZ); - - authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ); diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch deleted file mode 100644 index 174f4e3471..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch +++ /dev/null @@ -1,17 +0,0 @@ -See -https://bugs.alpinelinux.org/issues/7041 -https://git.alpinelinux.org/cgit/aports/commit/?id=9edb53cea056101c4963a04b747bf102de23f919 -(just hit this myself when building libnsl) -... dilfridge - ---- a/src/libtirpc.map -+++ b/src/libtirpc.map -@@ -298,7 +298,7 @@ - key_gendes; - key_get_conv; - key_setsecret; -- key_secret_is_set; -+ key_secretkey_is_set; - key_setnet; - netname2host; - netname2user; diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch deleted file mode 100644 index 6d583e6149..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c -index d23fbd1..79d6707 100644 ---- a/src/xdr_sizeof.c -+++ b/src/xdr_sizeof.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include "un-namespace.h" - - /* ARGSUSED */ diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2.ebuild similarity index 51% rename from sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2.ebuild index 881e4b158b..ec87a46167 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.3.2.ebuild @@ -1,48 +1,39 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit autotools multilib-minimal toolchain-funcs eutils +inherit multilib-minimal usr-ldscript DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" -HOMEPAGE="http://libtirpc.sourceforge.net/" +HOMEPAGE="https://sourceforge.net/projects/libtirpc/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 mirror://gentoo/${PN}-glibc-nfs.tar.xz" LICENSE="GPL-2" SLOT="0/3" # subslot matches SONAME major -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="ipv6 kerberos static-libs" RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone )" +BDEPEND=" app-arch/xz-utils - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch" - "${FILESDIR}/${PN}-1.0.2-bzero-to-memset.patch" - "${FILESDIR}/${PN}-1.0.2-glibc-2.26.patch" - "${FILESDIR}/${PN}-1.0.2-exports.patch" -) + virtual/pkgconfig" src_prepare() { cp -r "${WORKDIR}"/tirpc "${S}"/ || die - epatch "${PATCHES[@]}" - epatch_user - eautoreconf - - # COREOS: Set netconfig path to /usr so NFS works in PXE/ISO-booted systems. - sed -i -e "s,/etc,/usr/share/tirpc," "${S}/tirpc/netconfig.h" || die + default } multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - $(use_enable ipv6) \ - $(use_enable kerberos gssapi) \ + local myeconfargs=( + $(use_enable ipv6) + $(use_enable kerberos gssapi) $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install() { @@ -55,7 +46,7 @@ multilib_src_install() { multilib_src_install_all() { einstalldocs - insinto /usr/share/tirpc + insinto /etc doins doc/netconfig insinto /usr/include/tirpc @@ -63,5 +54,7 @@ multilib_src_install_all() { # makes sure that the linking order for nfs-utils is proper, as # libtool would inject a libgssglue dependency in the list. - use static-libs || prune_libtool_files + if ! use static-libs ; then + find "${ED}" -name "*.la" -delete || die + fi } diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/metadata.xml index 36e84cdfa7..2033e65a99 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/metadata.xml @@ -1,11 +1,12 @@ - + base-system@gentoo.org Gentoo Base System + cpe:/a:libtirpc_project:libtirpc libtirpc