summaryrefslogtreecommitdiff
path: root/net-libs/libtirpc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-libs/libtirpc
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-libs/libtirpc')
-rw-r--r--net-libs/libtirpc/Manifest6
-rw-r--r--net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch49
-rw-r--r--net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch31
-rw-r--r--net-libs/libtirpc/libtirpc-1.1.4.ebuild63
-rw-r--r--net-libs/libtirpc/libtirpc-1.2.5.ebuild6
5 files changed, 37 insertions, 118 deletions
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 9c961ccb2184..57ed5efdd4f4 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,8 +1,6 @@
-AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00
AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b49f07335685d01bef8bd1c0127647e097a5fbd58f9ddcfbe1179bedd306917755ce39428fcb4c130f9b628f60233dc2464da96c748fcf96ae SHA512 dd72fdc6fd457d89780c4784772c372eb493df3deac928a7c06709cd3517be5586584751a2a9324fc90157838a6fe594ffe91b4f8baebd6115482d76e94985ca
-DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
+AUX libtirpc-1.2.5-endian.h.patch 754 BLAKE2B 7ccb2c99a77757f02b7633246431a104e326cafc4261f4ca214ca4c5f0a6c3426502b6b31888e99f5c1e9cad9ffae2fd189a5b6970b8f7f0bb01d449aef68df4 SHA512 c91cb5b516d97b5349aee4ee3ddcd2cef7283adb7316a731c7c86332baa79e8c5e5d60d045360023886b75e2f55d72b0a778a595a363f5757df3781c1aa27c4b
DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.1.4.ebuild 1555 BLAKE2B cae3dfc27f62a0e0fe0f2033ae95bd17e74d7c0b5ad160d71e5e793bf10a74f1dc1c5b4f0a4fffeb814e7f3503d32e67f886f02a02a47212341db41f3ead7ca2 SHA512 e97fd09ab0f1fd7ba552667e1dd18bf7b1f9c5b9deb3107d277851a2351b46e71adbace4e1d7a27528b9bb2754dcbbe5d7e345a24ca5c8a6b480f88519cf403f
-EBUILD libtirpc-1.2.5.ebuild 1588 BLAKE2B 64456d2406af2a72c682f4c2a95a2f846b6d104350cc1176307fe605a271317010fe3606c8a7be1753e70fdb1ac29f121409d471847f6fdba461324242ef766f SHA512 fb082eec0a392c21718dc7c348b719e94b0c0e462c3d0684a67a78f9e1f557b0894937c17eb6c03961311d5d764f1015ea9d43a438803f1bd3a206874daa1dc0
+EBUILD libtirpc-1.2.5.ebuild 1672 BLAKE2B bf1a679d379e7b7b7d18cc63ed401237e86d46d565586825aaa73bf6d5d3488183d56848938e91bf7312e7b00862c8f650cb8c6db6d84641a501046f8ca8f109 SHA512 cd058d4716bb1dfb418030a6576041c17ff4b91bb5f5f66a569341c7826709a705a3d6928d38dfb31fdf0131d2a2cf3dbe927dede95f4d24adc60178bcfef4b5
MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch
deleted file mode 100644
index 91619b7ac9fb..000000000000
--- a/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/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch
new file mode 100644
index 000000000000..8245d022bde6
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-1.2.5-endian.h.patch
@@ -0,0 +1,31 @@
+From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Tue, 21 Jan 2020 11:51:16 -0500
+Subject: [PATCH] xdr_float: do not include bits/endian.h
+
+bits/endian.h is an internal header. endian.h should be included.
+
+Fixes compilation with recent musl.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ src/xdr_float.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdr_float.c b/src/xdr_float.c
+index 26bc865..349d48f 100644
+--- a/src/xdr_float.c
++++ b/src/xdr_float.c
+@@ -83,7 +83,7 @@ static struct sgl_limits {
+ };
+ #else
+
+-#include <bits/endian.h>
++#include <endian.h>
+ #define IEEEFP
+
+ #endif /* vax */
+--
+1.8.3.1
+
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
deleted file mode 100644
index 139c19984af1..000000000000
--- a/net-libs/libtirpc/libtirpc-1.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-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 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
-)
-
-src_prepare() {
- cp -r "${WORKDIR}"/tirpc "${S}"/ || die
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable ipv6)
- $(use_enable kerberos gssapi)
- $(use_enable static-libs static)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- default
-
- # libtirpc replaces rpc support in glibc, so we need it in /
- gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- insinto /etc
- doins doc/netconfig
-
- insinto /usr/include/tirpc
- doins -r "${WORKDIR}"/tirpc/*
-
- # makes sure that the linking order for nfs-utils is proper, as
- # libtool would inject a libgssglue dependency in the list.
- if ! use static-libs ; then
- find "${ED}" -name "*.la" -delete || die
- fi
-}
diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
index c2680357f980..fe70ea837553 100644
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild
@@ -12,11 +12,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-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}"
+DEPEND="${RDEPEND}
+ elibc_musl? ( sys-libs/queue-standalone )"
BDEPEND="
app-arch/xz-utils
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
@@ -25,6 +26,7 @@ src_prepare() {
cp -r "${WORKDIR}"/tirpc "${S}"/ || die
local PATCHES=(
"${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch
+ "${FILESDIR}"/libtirpc-1.2.5-endian.h.patch
)
default
eautoreconf