Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/libtirpc/, net-libs/libtirpc/files/
Date: Wed, 30 May 2012 20:06:46
Message-Id: 1338408389.18c420c6b8f2a5aea68941d90a4205f53b4cc458.blueness@gentoo
1 commit: 18c420c6b8f2a5aea68941d90a4205f53b4cc458
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 30 20:06:29 2012 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed May 30 20:06:29 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=18c420c6
7
8 net-libs/libtirpc: removed, works without alpine patch on uclibc-0.9.33.2
9
10 ---
11 .../libtirpc/files/libtirpc-0.2.1-fortify.patch | 18 ------
12 .../files/libtirpc-0.2.2-rpc-des-prot.patch | 36 ------------
13 .../libtirpc/files/libtirpc-allow-all-arch.patch | 12 ----
14 net-libs/libtirpc/files/libtirpc-no-des.patch | 40 --------------
15 net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild | 58 --------------------
16 net-libs/libtirpc/metadata.xml | 5 --
17 6 files changed, 0 insertions(+), 169 deletions(-)
18
19 diff --git a/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch b/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch
20 deleted file mode 100644
21 index 7375bf8..0000000
22 --- a/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch
23 +++ /dev/null
24 @@ -1,18 +0,0 @@
25 -Index: libtirpc-0.2.1/src/getrpcport.c
26 -===================================================================
27 ---- libtirpc-0.2.1.orig/src/getrpcport.c
28 -+++ libtirpc-0.2.1/src/getrpcport.c
29 -@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto
30 -
31 - if ((hp = gethostbyname(host)) == NULL)
32 - return (0);
33 -+ if (hp->h_length != sizeof(addr.sin_addr.s_addr))
34 -+ return (0);
35 - memset(&addr, 0, sizeof(addr));
36 - addr.sin_family = AF_INET;
37 - addr.sin_port = 0;
38 -- if (hp->h_length > sizeof(addr))
39 -- hp->h_length = sizeof(addr);
40 - memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
41 - /* Inconsistent interfaces need casts! :-( */
42 - return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum,
43
44 diff --git a/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch b/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch
45 deleted file mode 100644
46 index c5de6da..0000000
47 --- a/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch
48 +++ /dev/null
49 @@ -1,36 +0,0 @@
50 -From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001
51 -From: Mike Frysinger <vapier@g.o>
52 -Date: Sat, 11 Jun 2011 15:21:55 -0400
53 -Subject: [PATCH] add multiple inclusion protection to rpc/des.h
54 -
55 -If you try to include this file multiple times, you get a build failure
56 -due to redefinitions of enums and such.
57 -
58 -Signed-off-by: Mike Frysinger <vapier@g.o>
59 ----
60 - tirpc/rpc/des.h | 5 +++++
61 - 1 files changed, 5 insertions(+), 0 deletions(-)
62 -
63 -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
64 -index e3d6897..d2881ad 100644
65 ---- a/tirpc/rpc/des.h
66 -+++ b/tirpc/rpc/des.h
67 -@@ -33,6 +33,9 @@
68 - * Copyright (c) 1986 by Sun Microsystems, Inc.
69 - */
70 -
71 -+#ifndef _RPC_DES_H_
72 -+#define _RPC_DES_H_
73 -+
74 - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */
75 - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */
76 -
77 -@@ -80,3 +83,5 @@ struct desparams {
78 - * Software DES.
79 - */
80 - extern int _des_crypt( char *, int, struct desparams * );
81 -+
82 -+#endif
83 ---
84 -1.7.5.3
85 -
86
87 diff --git a/net-libs/libtirpc/files/libtirpc-allow-all-arch.patch b/net-libs/libtirpc/files/libtirpc-allow-all-arch.patch
88 deleted file mode 100644
89 index 46009be..0000000
90 --- a/net-libs/libtirpc/files/libtirpc-allow-all-arch.patch
91 +++ /dev/null
92 @@ -1,12 +0,0 @@
93 -diff -Naur libtirpc-0.2.2.orig/src/key_call.c libtirpc-0.2.2/src/key_call.c
94 ---- libtirpc-0.2.2.orig/src/key_call.c 2011-05-02 12:10:40.000000000 +0000
95 -+++ libtirpc-0.2.2/src/key_call.c 2012-02-24 04:16:07.000000000 +0000
96 -@@ -359,7 +359,7 @@
97 - #elif defined(sparc)
98 - if (uname(&u) == -1)
99 - #else
100 --#error Unknown architecture!
101 -+ if (uname(&u) == -1)
102 - #endif
103 - #endif
104 - {
105
106 diff --git a/net-libs/libtirpc/files/libtirpc-no-des.patch b/net-libs/libtirpc/files/libtirpc-no-des.patch
107 deleted file mode 100644
108 index 16c6cd0..0000000
109 --- a/net-libs/libtirpc/files/libtirpc-no-des.patch
110 +++ /dev/null
111 @@ -1,40 +0,0 @@
112 -See: http://git.alpinelinux.org/cgit/aports/tree/main/libtirpc/libtirpc-no-des.patch
113 -
114 ---- libtirpc-0.2.2.orig/src/Makefile.am
115 -+++ libtirpc-0.2.2/src/Makefile.am
116 -@@ -40,7 +40,7 @@
117 - # release number of your package. This is an abuse that only fosters
118 - # misunderstanding of the purpose of library versions."
119 - #
120 --libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0
121 -+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0
122 -
123 - libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
124 - clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
125 -@@ -50,7 +50,7 @@
126 - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
127 - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
128 - svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
129 -- auth_time.c auth_des.c authdes_prot.c des_crypt.c
130 -+ auth_time.c
131 -
132 - ## XDR
133 - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
134 ---- libtirpc-0.2.2.orig/src/rpc_soc.c
135 -+++ libtirpc-0.2.2/src/rpc_soc.c
136 -@@ -515,6 +515,7 @@
137 - (resultproc_t) rpc_wrap_bcast, "udp");
138 - }
139 -
140 -+#if 0
141 - /*
142 - * Create the client des authentication object. Obsoleted by
143 - * authdes_seccreate().
144 -@@ -546,6 +547,7 @@
145 - dummy = authdes_seccreate(servername, window, NULL, ckey);
146 - return (dummy);
147 - }
148 -+#endif
149 -
150 - /*
151 - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
152
153 diff --git a/net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild b/net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild
154 deleted file mode 100644
155 index 9ccd955..0000000
156 --- a/net-libs/libtirpc/libtirpc-0.2.2-r99.ebuild
157 +++ /dev/null
158 @@ -1,58 +0,0 @@
159 -# Copyright 1999-2012 Gentoo Foundation
160 -# Distributed under the terms of the GNU General Public License v2
161 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild,v 1.7 2012/02/15 18:04:40 ranger Exp $
162 -
163 -EAPI="4"
164 -
165 -inherit autotools eutils toolchain-funcs
166 -
167 -DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
168 -HOMEPAGE="http://libtirpc.sourceforge.net/"
169 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
170 - mirror://gentoo/${PN}-glibc-nfs.tar.xz"
171 -
172 -LICENSE="GPL-2"
173 -SLOT="0"
174 -KEYWORDS="amd64 mips x86"
175 -IUSE="kerberos static-libs"
176 -
177 -RDEPEND="kerberos? ( net-libs/libgssglue )"
178 -DEPEND="${RDEPEND}
179 - app-arch/xz-utils
180 - dev-util/pkgconfig"
181 -
182 -src_unpack() {
183 - unpack ${A}
184 - cp -r tirpc "${S}"/ || die
185 -}
186 -
187 -src_prepare() {
188 - epatch "${FILESDIR}"/${PN}-0.2.1-fortify.patch
189 - epatch "${FILESDIR}"/${PN}-0.2.2-rpc-des-prot.patch
190 - epatch "${FILESDIR}"/${PN}-allow-all-arch.patch
191 - epatch "${FILESDIR}"/${PN}-no-des.patch
192 - autoreconf
193 -}
194 -
195 -src_configure() {
196 - econf \
197 - $(use_enable kerberos gss) \
198 - $(use_enable static-libs static)
199 -}
200 -
201 -src_install() {
202 - emake install DESTDIR="${D}"
203 - dodoc AUTHORS ChangeLog NEWS README THANKS TODO
204 - insinto /etc
205 - newins doc/etc_netconfig netconfig
206 -
207 - insinto /usr/include/tirpc
208 - doins -r "${WORKDIR}"/tirpc/*
209 -
210 - # libtirpc replaces rpc support in glibc, so we need it in /
211 - gen_usr_ldscript -a tirpc
212 -
213 - # makes sure that the linking order for nfs-utils is proper, as
214 - # libtool would inject a libgssglue dependency in the list.
215 - use static-libs || find "${D}" -name '*.la' -delete
216 -}
217
218 diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
219 deleted file mode 100644
220 index ca66751..0000000
221 --- a/net-libs/libtirpc/metadata.xml
222 +++ /dev/null
223 @@ -1,5 +0,0 @@
224 -<?xml version="1.0" encoding="UTF-8"?>
225 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
226 -<pkgmetadata>
227 -<herd>net-fs</herd>
228 -</pkgmetadata>