1 |
commit: 203d711ea427be7d9ffeee8d7a650c5ee1bc875d |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 31 14:20:17 2017 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 31 14:30:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203d711e |
7 |
|
8 |
net-proxy/dante: remove old |
9 |
|
10 |
net-proxy/dante/Manifest | 2 - |
11 |
net-proxy/dante/dante-1.1.19-r4.ebuild | 86 -------------------- |
12 |
net-proxy/dante/dante-1.4.0-r2.ebuild | 97 ----------------------- |
13 |
net-proxy/dante/files/dante-1.1.19-libpam.patch | 76 ------------------ |
14 |
net-proxy/dante/files/dante-1.1.19-socksify.patch | 16 ---- |
15 |
net-proxy/dante/files/dante-sockd-init | 57 ------------- |
16 |
6 files changed, 334 deletions(-) |
17 |
|
18 |
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest |
19 |
index a3aeb6faaa2..b3d5f708e7e 100644 |
20 |
--- a/net-proxy/dante/Manifest |
21 |
+++ b/net-proxy/dante/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936 SHA512 765e0042f323d9cb20e42642b30856132737974cd756c303d544c1a400dde5e86b6528d4233afdcf73f1baf9b3e0efacda8aabe5c04afa50495edf6e8a248b83 WHIRLPOOL c83553cbf58c6ea7651a7bfad408460c38d3cda6342825d46e0c1311a665f5422afeb00c5f936262172673764323a96377545bcd5815356dbcad3ba6c0f54f72 |
24 |
-DIST dante-1.4.0.tar.gz 1253458 SHA256 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b SHA512 978a70eb789dd2d00a9ac4a7671d13450f9ac96344ae41382c38de7a12e98c2e24159c2e140c95caff0cc9119f7cf409a8716130b34957020706a17c0f96de38 WHIRLPOOL 72e03fe8dabb71d25b34600db4e59dbbc2dfacc32ada26c9931bf33fc0050e7bd506182658517d7653027dbc4cc01e27dd1294fafef7dc3589135c16efa92d96 |
25 |
DIST dante-1.4.1.tar.gz 1284288 SHA256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e WHIRLPOOL ab59762ac2f429cb32afd98b396e432f9c62260dd69e8f96d384491cd8620f6530537dcaaf4c39270d0d2448ef06e85cd9018dcc93bb2366e5e8d6606be57b23 |
26 |
|
27 |
diff --git a/net-proxy/dante/dante-1.1.19-r4.ebuild b/net-proxy/dante/dante-1.1.19-r4.ebuild |
28 |
deleted file mode 100644 |
29 |
index c35084d3c92..00000000000 |
30 |
--- a/net-proxy/dante/dante-1.1.19-r4.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,86 +0,0 @@ |
33 |
-# Copyright 1999-2014 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-inherit eutils autotools user |
37 |
- |
38 |
-DESCRIPTION="A free socks4,5 and msproxy implementation" |
39 |
-HOMEPAGE="http://www.inet.no/dante/" |
40 |
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz" |
41 |
- |
42 |
-LICENSE="BSD GPL-2" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
45 |
-IUSE="tcpd debug selinux pam" |
46 |
- |
47 |
-RDEPEND="pam? ( virtual/pam ) |
48 |
- tcpd? ( sys-apps/tcp-wrappers ) |
49 |
- selinux? ( sec-policy/selinux-dante ) |
50 |
- userland_GNU? ( virtual/shadow )" |
51 |
-DEPEND="${RDEPEND} |
52 |
- sys-devel/flex |
53 |
- sys-devel/bison |
54 |
- >=sys-apps/sed-4" |
55 |
- |
56 |
-src_unpack() { |
57 |
- unpack ${A} |
58 |
- |
59 |
- cd "${S}" |
60 |
- epatch "${FILESDIR}/${P}-socksify.patch" |
61 |
- epatch "${FILESDIR}/${P}-libpam.patch" |
62 |
- |
63 |
- sed -i \ |
64 |
- -e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \ |
65 |
- -e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \ |
66 |
- doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5} |
67 |
- |
68 |
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die |
69 |
- |
70 |
- eautoreconf |
71 |
-} |
72 |
- |
73 |
-src_compile() { |
74 |
- econf \ |
75 |
- `use_enable debug` \ |
76 |
- `use_enable tcpd libwrap` \ |
77 |
- `use_with pam` \ |
78 |
- --with-socks-conf=/etc/socks/socks.conf \ |
79 |
- --with-sockd-conf=/etc/socks/sockd.conf \ |
80 |
- || die "bad ./configure" |
81 |
- # the comments in the source say this is only useful for 2.0 kernels ... |
82 |
- # well it may fix 2.0 but it breaks with 2.6 :) |
83 |
- sed -i 's:if HAVE_LINUX_ECCENTRICITIES:if 0:' include/common.h |
84 |
- emake || die "emake failed" |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- emake DESTDIR="${D}" install || die "emake install has failed" |
89 |
- |
90 |
- # bor: comment libdl.so out it seems to work just fine without it |
91 |
- sed -i -e 's:libdl\.so::' "${D}/usr/bin/socksify" || die 'sed failed' |
92 |
- |
93 |
- # default configuration files |
94 |
- insinto /etc/socks |
95 |
- doins "${FILESDIR}"/sock?.conf |
96 |
- cd "${D}/etc/socks" && { |
97 |
- use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch" |
98 |
- use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch" |
99 |
- } |
100 |
- cd "${S}" |
101 |
- |
102 |
- # our init script |
103 |
- newinitd "${FILESDIR}/dante-sockd-init" dante-sockd |
104 |
- newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd |
105 |
- |
106 |
- # install documentation |
107 |
- dodoc BUGS CREDITS NEWS README SUPPORT TODO |
108 |
- docinto txt |
109 |
- cd doc |
110 |
- dodoc README* *.txt SOCKS4.* |
111 |
- docinto example |
112 |
- cd ../example |
113 |
- dodoc *.conf |
114 |
-} |
115 |
- |
116 |
-pkg_postinst() { |
117 |
- enewuser sockd -1 -1 /etc/socks daemon |
118 |
-} |
119 |
|
120 |
diff --git a/net-proxy/dante/dante-1.4.0-r2.ebuild b/net-proxy/dante/dante-1.4.0-r2.ebuild |
121 |
deleted file mode 100644 |
122 |
index 264b96777ac..00000000000 |
123 |
--- a/net-proxy/dante/dante-1.4.0-r2.ebuild |
124 |
+++ /dev/null |
125 |
@@ -1,97 +0,0 @@ |
126 |
-# Copyright 1999-2015 Gentoo Foundation |
127 |
-# Distributed under the terms of the GNU General Public License v2 |
128 |
- |
129 |
-EAPI="5" |
130 |
- |
131 |
-inherit autotools eutils systemd user |
132 |
- |
133 |
-DESCRIPTION="A free socks4,5 and msproxy implementation" |
134 |
-HOMEPAGE="http://www.inet.no/dante/" |
135 |
-MY_P="${P/_/-}" |
136 |
-SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz" |
137 |
- |
138 |
-LICENSE="BSD GPL-2" |
139 |
-SLOT="0" |
140 |
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" |
141 |
-IUSE="debug kerberos pam selinux static-libs tcpd upnp" |
142 |
- |
143 |
-CDEPEND="pam? ( virtual/pam ) |
144 |
- kerberos? ( virtual/krb5 ) |
145 |
- tcpd? ( sys-apps/tcp-wrappers ) |
146 |
- userland_GNU? ( virtual/shadow ) |
147 |
- upnp? ( net-libs/miniupnpc )" |
148 |
-DEPEND="${CDEPEND} |
149 |
- sys-devel/flex |
150 |
- sys-devel/bison" |
151 |
-RDEPEND="${CDEPEND} |
152 |
- selinux? ( sec-policy/selinux-dante ) |
153 |
-" |
154 |
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol" |
155 |
- |
156 |
-S="${WORKDIR}/${MY_P}" |
157 |
- |
158 |
-src_prepare() { |
159 |
- epatch \ |
160 |
- "${FILESDIR}"/${PN}-1.4.0-socksify.patch \ |
161 |
- "${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \ |
162 |
- "${FILESDIR}"/${PN}-1.4.0-cflags.patch \ |
163 |
- "${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch |
164 |
- |
165 |
- sed -i \ |
166 |
- -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \ |
167 |
- -e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \ |
168 |
- doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \ |
169 |
- || die |
170 |
- |
171 |
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die |
172 |
- |
173 |
- eautoreconf |
174 |
-} |
175 |
- |
176 |
-src_configure() { |
177 |
- # hardcoded the libc name otherwise the scan on a amd64 multilib system |
178 |
- # ends up finding /usr/lib32/libc.so.5. That cascades and causes the |
179 |
- # preload/libdsocks to not be built. |
180 |
- econf \ |
181 |
- --with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \ |
182 |
- --with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \ |
183 |
- --enable-preload \ |
184 |
- --enable-clientdl \ |
185 |
- --enable-serverdl \ |
186 |
- --enable-drt-fallback \ |
187 |
- --with-libc=libc.so.6 \ |
188 |
- $(use_enable debug) \ |
189 |
- $(use_with kerberos gssapi) \ |
190 |
- $(use_with pam) \ |
191 |
- $(use_with upnp) \ |
192 |
- $(use_enable static-libs static) \ |
193 |
- $(use_enable tcpd libwrap) |
194 |
-} |
195 |
- |
196 |
-src_install() { |
197 |
- default |
198 |
- |
199 |
- # default configuration files |
200 |
- insinto /etc/socks |
201 |
- doins "${FILESDIR}"/sock?.conf |
202 |
- pushd "${ED}/etc/socks" > /dev/null |
203 |
- use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch" |
204 |
- use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch" |
205 |
- popd > /dev/null |
206 |
- |
207 |
- # init script |
208 |
- newinitd "${FILESDIR}/${PN}-1.3.2-sockd-init" dante-sockd |
209 |
- newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd |
210 |
- |
211 |
- systemd_dounit "${FILESDIR}/dante-sockd.service" |
212 |
- |
213 |
- # example configuration files |
214 |
- docinto examples |
215 |
- dodoc example/*.conf |
216 |
- |
217 |
- use static-libs || find "${ED}" -name '*.la' -exec rm '{}' + |
218 |
-} |
219 |
- |
220 |
-pkg_postinst() { |
221 |
- enewuser sockd -1 -1 /etc/socks daemon |
222 |
-} |
223 |
|
224 |
diff --git a/net-proxy/dante/files/dante-1.1.19-libpam.patch b/net-proxy/dante/files/dante-1.1.19-libpam.patch |
225 |
deleted file mode 100644 |
226 |
index 5c732e2f1e9..00000000000 |
227 |
--- a/net-proxy/dante/files/dante-1.1.19-libpam.patch |
228 |
+++ /dev/null |
229 |
@@ -1,76 +0,0 @@ |
230 |
-diff -Nru dante-1.1.19.orig/acinclude.m4 dante-1.1.19/acinclude.m4 |
231 |
---- dante-1.1.19.orig/acinclude.m4 2005-12-18 21:57:57.000000000 +0100 |
232 |
-+++ dante-1.1.19/acinclude.m4 2008-06-25 22:24:16.000000000 +0200 |
233 |
-@@ -260,4 +260,4 @@ |
234 |
- |
235 |
- tproto($@)]) |
236 |
- |
237 |
--# -- acinclude end -- |
238 |
-\ No newline at end of file |
239 |
-+# -- acinclude end -- |
240 |
-diff -Nru dante-1.1.19.orig/configure.ac dante-1.1.19/configure.ac |
241 |
---- dante-1.1.19.orig/configure.ac 2006-01-15 16:33:37.000000000 +0100 |
242 |
-+++ dante-1.1.19/configure.ac 2008-06-25 22:25:09.000000000 +0200 |
243 |
-@@ -21,7 +21,7 @@ |
244 |
- #NOTE: save CFLAGS; wish to compile without -O2 when debugging |
245 |
- oCFLAGS=$CFLAGS |
246 |
- unset CFLAGS |
247 |
--AC_AIX #evidently also modifies CFLAGS |
248 |
-+#AC_AIX #evidently also modifies CFLAGS |
249 |
- AC_PROG_LIBTOOL |
250 |
- autoconf_compflags=$CFLAGS |
251 |
- CFLAGS=$oCFLAGS |
252 |
-@@ -30,18 +30,6 @@ |
253 |
- |
254 |
- AM_CONDITIONAL(PRERELEASE, test x$prerelease != x) |
255 |
- |
256 |
--#known keywords for --enable/disable-foo(=yes/no)? |
257 |
--LTINTERNAL="dlopen|dlopen_self|dlopen_self_static|fast_install|libtool_lock|win32_dll|shared_with_static_runtimes|shared_with_static_runtimes_CXX|shared_with_static_runtimes_F77" |
258 |
--KNOWN_KEYWORDS="$LTINTERNAL|shared|static|debug|warnings|diagnostic|profiling|linting|libwrap|preload|serverdl|clientdl|internal|pidfile" |
259 |
--for keyword in `set | egrep '^enable_' | sed -e 's/^enable_\(.*\)=.*/\1/'`; |
260 |
--do |
261 |
-- echo $keyword | egrep "^(${KNOWN_KEYWORDS})$" > /dev/null |
262 |
-- if test $? -ne 0; then |
263 |
-- AC_MSG_WARN([unknown option '$keyword', ignoring ...]) |
264 |
-- sleep 10; |
265 |
-- fi |
266 |
--done |
267 |
-- |
268 |
- #Solaris 2.5.1 is broken in many places |
269 |
- case $host in |
270 |
- *-*-solaris2.5.1) |
271 |
-@@ -1288,15 +1288,18 @@ |
272 |
- [ --without-pam disable pam support @<:@default=detect@:>@], |
273 |
- [PAM=$withval]) |
274 |
- |
275 |
-+LIBPAM= |
276 |
- if test "${PAM}" != no; then |
277 |
- #look for PAM header and lib |
278 |
- AC_CHECK_HEADERS(security/pam_appl.h, [have_pam_header=t]) |
279 |
-- AC_SEARCH_LIBS(pam_start, pam, [have_libpam=t]) |
280 |
-+ AC_CHECK_LIB(pam, pam_start, [have_libpam=t]) |
281 |
- |
282 |
- if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then |
283 |
- AC_DEFINE(HAVE_PAM, 1, [PAM support]) |
284 |
-+ LIBPAM=-lpam |
285 |
- fi |
286 |
- fi |
287 |
-+AC_SUBST(LIBPAM) |
288 |
- |
289 |
- #expected select behaviour? |
290 |
- unset nb_select_err |
291 |
-diff -Nru dante-1.1.19.orig/sockd/Makefile.am dante-1.1.19/sockd/Makefile.am |
292 |
---- dante-1.1.19.orig/sockd/Makefile.am 2005-11-06 18:37:14.000000000 +0100 |
293 |
-+++ dante-1.1.19/sockd/Makefile.am 2008-06-25 22:24:16.000000000 +0200 |
294 |
-@@ -35,9 +35,9 @@ |
295 |
- |
296 |
- #XXXhack |
297 |
- if STATIC_SOCKD |
298 |
--sockd_LDADD = ../libscompat/sockatmark.o ${LIBWRAP} |
299 |
-+sockd_LDADD = ../libscompat/sockatmark.o ${LIBWRAP} ${LIBPAM} |
300 |
- else |
301 |
--sockd_LDADD = ../libscompat/libscompat.la ${LIBWRAP} |
302 |
-+sockd_LDADD = ../libscompat/libscompat.la ${LIBWRAP} ${LIBPAM} |
303 |
- endif |
304 |
- |
305 |
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libscompat |
306 |
|
307 |
diff --git a/net-proxy/dante/files/dante-1.1.19-socksify.patch b/net-proxy/dante/files/dante-1.1.19-socksify.patch |
308 |
deleted file mode 100644 |
309 |
index 632deb1f9b5..00000000000 |
310 |
--- a/net-proxy/dante/files/dante-1.1.19-socksify.patch |
311 |
+++ /dev/null |
312 |
@@ -1,16 +0,0 @@ |
313 |
---- dante-1.1.15-pre1/bin/socksify.in.agriffis 2004-11-04 16:07:04.000000000 -0500 |
314 |
-+++ dante-1.1.15-pre1/bin/socksify.in 2004-11-04 16:07:08.977460049 -0500 |
315 |
-@@ -60,7 +60,11 @@ |
316 |
- @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}" |
317 |
- export @PRELOAD_VARIABLE@ |
318 |
- |
319 |
--LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" |
320 |
--export LD_LIBRARY_PATH |
321 |
-+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where |
322 |
-+# LD_PRELOAD can contain a full path to the library. Setting the |
323 |
-+# following breaks socksify on Linux/Alpha at least with |
324 |
-+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis) |
325 |
-+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" |
326 |
-+#export LD_LIBRARY_PATH |
327 |
- |
328 |
- exec "$@" |
329 |
|
330 |
diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init |
331 |
deleted file mode 100644 |
332 |
index 41211a4ad06..00000000000 |
333 |
--- a/net-proxy/dante/files/dante-sockd-init |
334 |
+++ /dev/null |
335 |
@@ -1,57 +0,0 @@ |
336 |
-#!/sbin/openrc-run |
337 |
-# Copyright 1999-2011 Gentoo Foundation |
338 |
-# Distributed under the terms of the GNU General Public License v2 |
339 |
- |
340 |
-SOCKD_OPT="-D" |
341 |
-[ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}" |
342 |
-[ "${SOCKD_DEBUG:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d" |
343 |
-[ "${SOCKD_DISABLE_KEEPALIVE:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n" |
344 |
-PIDFILE=/var/run/sockd.pid |
345 |
-SOCKDIR=/var/lock/dante-sockd/ |
346 |
- |
347 |
-depend() { |
348 |
- need net |
349 |
-} |
350 |
- |
351 |
-checkconfig() { |
352 |
- # first check that it exists |
353 |
- if [ ! -f /etc/socks/sockd.conf ] ; then |
354 |
- eerror "You need to setup /etc/socks/sockd.conf first" |
355 |
- eerror "Examples are in /usr/share/doc/dante[version]/example" |
356 |
- eerror "for more info, see: man sockd.conf" |
357 |
- return 1 |
358 |
- fi |
359 |
- |
360 |
- /usr/sbin/sockd -V >/tmp/dante-sockd.checkconf 2>&1 |
361 |
- if [ $? -ne 0 ]; then |
362 |
- cat /tmp/dante-sockd.checkconf |
363 |
- eerror "Something is wrong with your configuration file" |
364 |
- eerror "for more info, see: man sockd.conf" |
365 |
- return 1 |
366 |
- fi |
367 |
- rm /tmp/dante-sockd.checkconf |
368 |
- |
369 |
- #Create pidfile with owner set to daemon's uid |
370 |
- DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf` |
371 |
- if [ -n "$DAEMON_UID" ]; then |
372 |
- touch $PIDFILE && chown $DAEMON_UID $PIDFILE |
373 |
- mkdir $SOCKDIR && chown $DAEMON_UID $SOCKDIR |
374 |
- [ ! -f $SOCKDIR/.keep ] && touch $SOCKDIR/.keep |
375 |
- fi |
376 |
- |
377 |
- return 0 |
378 |
-} |
379 |
- |
380 |
-start() { |
381 |
- checkconfig || return 1 |
382 |
- ebegin "Starting dante sockd" |
383 |
- start-stop-daemon --start --quiet --pidfile $PIDFILE --env TMPDIR=$SOCKDIR \ |
384 |
- --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} >/dev/null 2>&1 |
385 |
- eend $? "Failed to start sockd" |
386 |
-} |
387 |
- |
388 |
-stop() { |
389 |
- ebegin "Stopping dante sockd" |
390 |
- start-stop-daemon --stop --quiet --pidfile $PIDFILE |
391 |
- eend $? "Failed to stop sockd" |
392 |
-} |