Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libtirpc/, net-libs/libtirpc/files/
Date: Sat, 28 Sep 2019 18:27:32
Message-Id: 1569695232.68d8e6b191da940f0b553b24f9d7bedffd771b8a.mattst88@gentoo
1 commit: 68d8e6b191da940f0b553b24f9d7bedffd771b8a
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 28 18:07:39 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 28 18:27:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d8e6b1
7
8 net-libs/libtirpc: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 net-libs/libtirpc/Manifest | 2 -
13 .../files/libtirpc-1.0.2-bzero-to-memset.patch | 36 ------------
14 .../libtirpc/files/libtirpc-1.0.2-exports.patch | 17 ------
15 .../libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch | 12 ----
16 net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild | 65 ----------------------
17 net-libs/libtirpc/libtirpc-1.0.3.ebuild | 63 ---------------------
18 6 files changed, 195 deletions(-)
19
20 diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
21 index 96612140117..ee8d1d01072 100644
22 --- a/net-libs/libtirpc/Manifest
23 +++ b/net-libs/libtirpc/Manifest
24 @@ -1,4 +1,2 @@
25 -DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
26 -DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
27 DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
28 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
29
30 diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch
31 deleted file mode 100644
32 index 64b516ed826..00000000000
33 --- a/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch
34 +++ /dev/null
35 @@ -1,36 +0,0 @@
36 -diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c
37 ---- libtirpc-1.0.2.orig/src/auth_time.c 2017-07-05 11:02:23.000000000 -0400
38 -+++ libtirpc-1.0.2/src/auth_time.c 2017-07-30 17:46:39.481420880 -0400
39 -@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, ua
40 - sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4);
41 - useua = &ipuaddr[0];
42 -
43 -- bzero((char *)&sin, sizeof(sin));
44 -+ memset((char *)&sin, 0, sizeof(sin));
45 - if (uaddr_to_sockaddr(useua, &sin)) {
46 - msg("unable to translate uaddr to sockaddr.");
47 - if (needfree)
48 -diff -Naurp libtirpc-1.0.2.orig/src/des_impl.c libtirpc-1.0.2/src/des_impl.c
49 ---- libtirpc-1.0.2.orig/src/des_impl.c 2017-07-05 11:02:23.000000000 -0400
50 -+++ libtirpc-1.0.2/src/des_impl.c 2017-07-30 17:46:49.581420807 -0400
51 -@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, str
52 - }
53 - tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
54 - tbuf[0] = tbuf[1] = 0;
55 -- __bzero (schedule, sizeof (schedule));
56 -+ memset (schedule, 0, sizeof (schedule));
57 -
58 - return (1);
59 - }
60 -diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c
61 ---- libtirpc-1.0.2.orig/src/svc_auth_des.c 2017-07-05 11:02:23.000000000 -0400
62 -+++ libtirpc-1.0.2/src/svc_auth_des.c 2017-07-30 17:46:58.771420741 -0400
63 -@@ -356,7 +356,7 @@ cache_init()
64 -
65 - authdes_cache = (struct cache_entry *)
66 - mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);
67 -- bzero((char *)authdes_cache,
68 -+ memset((char *)authdes_cache, 0,
69 - sizeof(struct cache_entry) * AUTHDES_CACHESZ);
70 -
71 - authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ);
72
73 diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch
74 deleted file mode 100644
75 index 174f4e3471f..00000000000
76 --- a/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch
77 +++ /dev/null
78 @@ -1,17 +0,0 @@
79 -See
80 -https://bugs.alpinelinux.org/issues/7041
81 -https://git.alpinelinux.org/cgit/aports/commit/?id=9edb53cea056101c4963a04b747bf102de23f919
82 -(just hit this myself when building libnsl)
83 -... dilfridge
84 -
85 ---- a/src/libtirpc.map
86 -+++ b/src/libtirpc.map
87 -@@ -298,7 +298,7 @@
88 - key_gendes;
89 - key_get_conv;
90 - key_setsecret;
91 -- key_secret_is_set;
92 -+ key_secretkey_is_set;
93 - key_setnet;
94 - netname2host;
95 - netname2user;
96
97 diff --git a/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch b/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch
98 deleted file mode 100644
99 index 6d583e6149d..00000000000
100 --- a/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch
101 +++ /dev/null
102 @@ -1,12 +0,0 @@
103 -diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c
104 -index d23fbd1..79d6707 100644
105 ---- a/src/xdr_sizeof.c
106 -+++ b/src/xdr_sizeof.c
107 -@@ -39,6 +39,7 @@
108 - #include <rpc/xdr.h>
109 - #include <sys/types.h>
110 - #include <stdlib.h>
111 -+#include <stdint.h>
112 - #include "un-namespace.h"
113 -
114 - /* ARGSUSED */
115
116 diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
117 deleted file mode 100644
118 index 36dc12d642f..00000000000
119 --- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
120 +++ /dev/null
121 @@ -1,65 +0,0 @@
122 -# Copyright 1999-2019 Gentoo Authors
123 -# Distributed under the terms of the GNU General Public License v2
124 -
125 -EAPI="5"
126 -
127 -inherit autotools multilib-minimal toolchain-funcs eutils usr-ldscript
128 -
129 -DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
130 -HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
131 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
132 - mirror://gentoo/${PN}-glibc-nfs.tar.xz"
133 -
134 -LICENSE="GPL-2"
135 -SLOT="0/3" # subslot matches SONAME major
136 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
137 -IUSE="ipv6 kerberos static-libs"
138 -
139 -RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
140 -DEPEND="${RDEPEND}
141 - elibc_musl? ( sys-libs/queue-standalone )
142 - app-arch/xz-utils
143 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
144 -
145 -PATCHES=(
146 - "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
147 - "${FILESDIR}/${PN}-1.0.2-bzero-to-memset.patch"
148 - "${FILESDIR}/${PN}-1.0.2-glibc-2.26.patch"
149 - "${FILESDIR}/${PN}-1.0.2-exports.patch"
150 -)
151 -
152 -src_prepare() {
153 - cp -r "${WORKDIR}"/tirpc "${S}"/ || die
154 - epatch "${PATCHES[@]}"
155 - epatch_user
156 - eautoreconf
157 -}
158 -
159 -multilib_src_configure() {
160 - ECONF_SOURCE=${S} \
161 - econf \
162 - $(use_enable ipv6) \
163 - $(use_enable kerberos gssapi) \
164 - $(use_enable static-libs static)
165 -}
166 -
167 -multilib_src_install() {
168 - default
169 -
170 - # libtirpc replaces rpc support in glibc, so we need it in /
171 - gen_usr_ldscript -a tirpc
172 -}
173 -
174 -multilib_src_install_all() {
175 - einstalldocs
176 -
177 - insinto /etc
178 - doins doc/netconfig
179 -
180 - insinto /usr/include/tirpc
181 - doins -r "${WORKDIR}"/tirpc/*
182 -
183 - # makes sure that the linking order for nfs-utils is proper, as
184 - # libtool would inject a libgssglue dependency in the list.
185 - use static-libs || prune_libtool_files
186 -}
187
188 diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
189 deleted file mode 100644
190 index 5a60e1bb7b0..00000000000
191 --- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
192 +++ /dev/null
193 @@ -1,63 +0,0 @@
194 -# Copyright 1999-2019 Gentoo Authors
195 -# Distributed under the terms of the GNU General Public License v2
196 -
197 -EAPI=6
198 -
199 -inherit autotools multilib-minimal toolchain-funcs usr-ldscript
200 -
201 -DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
202 -HOMEPAGE="https://sourceforge.net/projects/libtirpc/"
203 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
204 - mirror://gentoo/${PN}-glibc-nfs.tar.xz"
205 -
206 -LICENSE="GPL-2"
207 -SLOT="0/3" # subslot matches SONAME major
208 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
209 -IUSE="ipv6 kerberos static-libs"
210 -
211 -RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
212 -DEPEND="${RDEPEND}
213 - app-arch/xz-utils
214 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
215 -
216 -PATCHES=(
217 - "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
218 -)
219 -
220 -src_prepare() {
221 - cp -r "${WORKDIR}"/tirpc "${S}"/ || die
222 - default
223 - eautoreconf
224 -}
225 -
226 -multilib_src_configure() {
227 - local myeconfargs=(
228 - $(use_enable ipv6)
229 - $(use_enable kerberos gssapi)
230 - $(use_enable static-libs static)
231 - )
232 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
233 -}
234 -
235 -multilib_src_install() {
236 - default
237 -
238 - # libtirpc replaces rpc support in glibc, so we need it in /
239 - gen_usr_ldscript -a tirpc
240 -}
241 -
242 -multilib_src_install_all() {
243 - einstalldocs
244 -
245 - insinto /etc
246 - doins doc/netconfig
247 -
248 - insinto /usr/include/tirpc
249 - doins -r "${WORKDIR}"/tirpc/*
250 -
251 - # makes sure that the linking order for nfs-utils is proper, as
252 - # libtool would inject a libgssglue dependency in the list.
253 - if ! use static-libs ; then
254 - find "${ED}" -name "*.la" -delete || die
255 - fi
256 -}