commit: d235123608aed83f79535e41849a36eea2201415
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 16:19:04 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 16:19:04 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d2351236
net-libs/libtirpc: musl support has been added to ::gentoo
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-libs/libtirpc/Manifest | 4 --
.../files/libtirpc-1.0.2-bcopy-to-memmove.patch | 49 ----------------
.../libtirpc/files/libtirpc-1.0.3-musl_types.patch | 12 ----
.../libtirpc/files/libtirpc-1.1.4-musl_types.patch | 29 ----------
.../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 ---------------
net-libs/libtirpc/libtirpc-1.0.3.ebuild | 65 ----------------------
net-libs/libtirpc/libtirpc-1.1.4-r1.ebuild | 64 ---------------------
net-libs/libtirpc/libtirpc-1.2.5.ebuild | 64 ---------------------
net-libs/libtirpc/metadata.xml | 11 ----
9 files changed, 342 deletions(-)
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
deleted file mode 100644
index 3d4f7dc..0000000
--- a/net-libs/libtirpc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B
3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e
SHA512
1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
-DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B
1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90
SHA512
392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
-DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B
732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e
SHA512
d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002
-DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B
7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28
SHA512
90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
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 91619b7..0000000
--- 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.0.3-musl_types.patch
b/net-libs/libtirpc/files/libtirpc-1.0.3-musl_types.patch
deleted file mode 100644
index 96ad628..0000000
--- a/net-libs/libtirpc/files/libtirpc-1.0.3-musl_types.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libtirpc-1.0.3.orig/tirpc/rpc/types.h
libtirpc-1.0.3/tirpc/rpc/types.h
---- libtirpc-1.0.3.orig/tirpc/rpc/types.h 2018-03-20 09:30:54.610040509
-0700
-+++ libtirpc-1.0.3/tirpc/rpc/types.h 2018-03-20 09:33:43.502037484 -0700
-@@ -66,7 +66,7 @@
- #define mem_free(ptr, bsize) free(ptr)
-
-
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || (defined(__linux__) &&
!defined(__GLIBC__))
- # define __u_char_defined
- # define __daddr_t_defined
- #endif
diff --git a/net-libs/libtirpc/files/libtirpc-1.1.4-musl_types.patch
b/net-libs/libtirpc/files/libtirpc-1.1.4-musl_types.patch
deleted file mode 100644
index cca35da..0000000
--- a/net-libs/libtirpc/files/libtirpc-1.1.4-musl_types.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 45eb8f19128d061936237bf7f827671310161b82 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 10 Jul 2019 00:39:09 -0500
-Subject: [PATCH 2/2] Consider musl provided built-in defines
-
-Helps compile libtirpc with musl
-
-Signed-off-by: Khem Raj <[email protected]>
-Signed-off-by: Jory Pratt <[email protected]>
----
- tirpc/rpc/types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tirpc/rpc/types.h b/tirpc/rpc/types.h
-index f069efa..36299df 100644
---- a/tirpc/rpc/types.h
-+++ b/tirpc/rpc/types.h
-@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t;
- #define mem_free(ptr, bsize) free(ptr)
-
-
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
- # define __u_char_defined
- # define __daddr_t_defined
- #endif
---
-2.22.0
-
diff --git
a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
deleted file mode 100644
index a5fecc5..0000000
--- a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <[email protected]>
-Date: Sun, 19 Jan 2020 16:57:45 -0500
-Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
-
-GCC 10 enables -fno-common by default.
-
-Bug: https://bugs.gentoo.org/705896
----
- src/rpc_com.h | 3 +--
- src/svc.c | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc_com.h b/src/rpc_com.h
-index 10bec79..76badef 100644
---- a/src/rpc_com.h
-+++ b/src/rpc_com.h
-@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
- void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
-
-
--SVCXPRT **__svc_xports;
--int __svc_maxrec;
-+extern int __svc_maxrec;
-
- #ifdef __cplusplus
- }
-diff --git a/src/svc.c b/src/svc.c
-index b59467b..6db164b 100644
---- a/src/svc.c
-+++ b/src/svc.c
-@@ -57,6 +57,9 @@
-
- #define max(a, b) (a > b ? a : b)
-
-+static SVCXPRT **__svc_xports;
-+int __svc_maxrec;
-+
- /*
- * The services list
- * Each entry represents a set of procedures (an rpc program).
---
-2.25.0
-
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
deleted file mode 100644
index 834e95a..0000000
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ /dev/null
@@ -1,65 +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="http://libtirpc.sourceforge.net/";
-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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- elibc_musl? ( sys-libs/queue-standalone )
- app-arch/xz-utils
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
- "${FILESDIR}/${PN}-1.0.3-musl_types.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.1.4-r1.ebuild
b/net-libs/libtirpc/libtirpc-1.1.4-r1.ebuild
deleted file mode 100644
index db49cf4..0000000
--- a/net-libs/libtirpc/libtirpc-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,64 +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="http://libtirpc.sourceforge.net/";
-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="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- elibc_musl? ( sys-libs/queue-standalone )
- app-arch/xz-utils
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.3-musl_types.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
deleted file mode 100644
index 8cd9355..0000000
--- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- elibc_musl? ( sys-libs/queue-standalone )
- app-arch/xz-utils
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_prepare() {
- cp -r "${WORKDIR}"/tirpc "${S}"/ || die
- local PATCHES=(
- "${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch
- )
- 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/metadata.xml b/net-libs/libtirpc/metadata.xml
deleted file mode 100644
index 36e84cd..0000000
--- a/net-libs/libtirpc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">libtirpc</remote-id>
- </upstream>
-</pkgmetadata>
