commit: 203d711ea427be7d9ffeee8d7a650c5ee1bc875d Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Thu Aug 31 14:20:17 2017 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Thu Aug 31 14:30:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203d711e
net-proxy/dante: remove old net-proxy/dante/Manifest | 2 - net-proxy/dante/dante-1.1.19-r4.ebuild | 86 -------------------- net-proxy/dante/dante-1.4.0-r2.ebuild | 97 ----------------------- net-proxy/dante/files/dante-1.1.19-libpam.patch | 76 ------------------ net-proxy/dante/files/dante-1.1.19-socksify.patch | 16 ---- net-proxy/dante/files/dante-sockd-init | 57 ------------- 6 files changed, 334 deletions(-) diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest index a3aeb6faaa2..b3d5f708e7e 100644 --- a/net-proxy/dante/Manifest +++ b/net-proxy/dante/Manifest @@ -1,3 +1 @@ -DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936 SHA512 765e0042f323d9cb20e42642b30856132737974cd756c303d544c1a400dde5e86b6528d4233afdcf73f1baf9b3e0efacda8aabe5c04afa50495edf6e8a248b83 WHIRLPOOL c83553cbf58c6ea7651a7bfad408460c38d3cda6342825d46e0c1311a665f5422afeb00c5f936262172673764323a96377545bcd5815356dbcad3ba6c0f54f72 -DIST dante-1.4.0.tar.gz 1253458 SHA256 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b SHA512 978a70eb789dd2d00a9ac4a7671d13450f9ac96344ae41382c38de7a12e98c2e24159c2e140c95caff0cc9119f7cf409a8716130b34957020706a17c0f96de38 WHIRLPOOL 72e03fe8dabb71d25b34600db4e59dbbc2dfacc32ada26c9931bf33fc0050e7bd506182658517d7653027dbc4cc01e27dd1294fafef7dc3589135c16efa92d96 DIST dante-1.4.1.tar.gz 1284288 SHA256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e WHIRLPOOL ab59762ac2f429cb32afd98b396e432f9c62260dd69e8f96d384491cd8620f6530537dcaaf4c39270d0d2448ef06e85cd9018dcc93bb2366e5e8d6606be57b23 diff --git a/net-proxy/dante/dante-1.1.19-r4.ebuild b/net-proxy/dante/dante-1.1.19-r4.ebuild deleted file mode 100644 index c35084d3c92..00000000000 --- a/net-proxy/dante/dante-1.1.19-r4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils autotools user - -DESCRIPTION="A free socks4,5 and msproxy implementation" -HOMEPAGE="http://www.inet.no/dante/"; -SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"; - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="tcpd debug selinux pam" - -RDEPEND="pam? ( virtual/pam ) - tcpd? ( sys-apps/tcp-wrappers ) - selinux? ( sec-policy/selinux-dante ) - userland_GNU? ( virtual/shadow )" -DEPEND="${RDEPEND} - sys-devel/flex - sys-devel/bison - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-socksify.patch" - epatch "${FILESDIR}/${P}-libpam.patch" - - sed -i \ - -e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \ - -e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \ - doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5} - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - - eautoreconf -} - -src_compile() { - econf \ - `use_enable debug` \ - `use_enable tcpd libwrap` \ - `use_with pam` \ - --with-socks-conf=/etc/socks/socks.conf \ - --with-sockd-conf=/etc/socks/sockd.conf \ - || die "bad ./configure" - # the comments in the source say this is only useful for 2.0 kernels ... - # well it may fix 2.0 but it breaks with 2.6 :) - sed -i 's:if HAVE_LINUX_ECCENTRICITIES:if 0:' include/common.h - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install has failed" - - # bor: comment libdl.so out it seems to work just fine without it - sed -i -e 's:libdl\.so::' "${D}/usr/bin/socksify" || die 'sed failed' - - # default configuration files - insinto /etc/socks - doins "${FILESDIR}"/sock?.conf - cd "${D}/etc/socks" && { - use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch" - use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch" - } - cd "${S}" - - # our init script - newinitd "${FILESDIR}/dante-sockd-init" dante-sockd - newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd - - # install documentation - dodoc BUGS CREDITS NEWS README SUPPORT TODO - docinto txt - cd doc - dodoc README* *.txt SOCKS4.* - docinto example - cd ../example - dodoc *.conf -} - -pkg_postinst() { - enewuser sockd -1 -1 /etc/socks daemon -} diff --git a/net-proxy/dante/dante-1.4.0-r2.ebuild b/net-proxy/dante/dante-1.4.0-r2.ebuild deleted file mode 100644 index 264b96777ac..00000000000 --- a/net-proxy/dante/dante-1.4.0-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools eutils systemd user - -DESCRIPTION="A free socks4,5 and msproxy implementation" -HOMEPAGE="http://www.inet.no/dante/"; -MY_P="${P/_/-}" -SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"; - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="debug kerberos pam selinux static-libs tcpd upnp" - -CDEPEND="pam? ( virtual/pam ) - kerberos? ( virtual/krb5 ) - tcpd? ( sys-apps/tcp-wrappers ) - userland_GNU? ( virtual/shadow ) - upnp? ( net-libs/miniupnpc )" -DEPEND="${CDEPEND} - sys-devel/flex - sys-devel/bison" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-dante ) -" -DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.4.0-socksify.patch \ - "${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \ - "${FILESDIR}"/${PN}-1.4.0-cflags.patch \ - "${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch - - sed -i \ - -e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \ - -e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \ - doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \ - || die - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die - - eautoreconf -} - -src_configure() { - # hardcoded the libc name otherwise the scan on a amd64 multilib system - # ends up finding /usr/lib32/libc.so.5. That cascades and causes the - # preload/libdsocks to not be built. - econf \ - --with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \ - --with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \ - --enable-preload \ - --enable-clientdl \ - --enable-serverdl \ - --enable-drt-fallback \ - --with-libc=libc.so.6 \ - $(use_enable debug) \ - $(use_with kerberos gssapi) \ - $(use_with pam) \ - $(use_with upnp) \ - $(use_enable static-libs static) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - # default configuration files - insinto /etc/socks - doins "${FILESDIR}"/sock?.conf - pushd "${ED}/etc/socks" > /dev/null - use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch" - use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch" - popd > /dev/null - - # init script - newinitd "${FILESDIR}/${PN}-1.3.2-sockd-init" dante-sockd - newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd - - systemd_dounit "${FILESDIR}/dante-sockd.service" - - # example configuration files - docinto examples - dodoc example/*.conf - - use static-libs || find "${ED}" -name '*.la' -exec rm '{}' + -} - -pkg_postinst() { - enewuser sockd -1 -1 /etc/socks daemon -} diff --git a/net-proxy/dante/files/dante-1.1.19-libpam.patch b/net-proxy/dante/files/dante-1.1.19-libpam.patch deleted file mode 100644 index 5c732e2f1e9..00000000000 --- a/net-proxy/dante/files/dante-1.1.19-libpam.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Nru dante-1.1.19.orig/acinclude.m4 dante-1.1.19/acinclude.m4 ---- dante-1.1.19.orig/acinclude.m4 2005-12-18 21:57:57.000000000 +0100 -+++ dante-1.1.19/acinclude.m4 2008-06-25 22:24:16.000000000 +0200 -@@ -260,4 +260,4 @@ - - tproto($@)]) - --# -- acinclude end -- -\ No newline at end of file -+# -- acinclude end -- -diff -Nru dante-1.1.19.orig/configure.ac dante-1.1.19/configure.ac ---- dante-1.1.19.orig/configure.ac 2006-01-15 16:33:37.000000000 +0100 -+++ dante-1.1.19/configure.ac 2008-06-25 22:25:09.000000000 +0200 -@@ -21,7 +21,7 @@ - #NOTE: save CFLAGS; wish to compile without -O2 when debugging - oCFLAGS=$CFLAGS - unset CFLAGS --AC_AIX #evidently also modifies CFLAGS -+#AC_AIX #evidently also modifies CFLAGS - AC_PROG_LIBTOOL - autoconf_compflags=$CFLAGS - CFLAGS=$oCFLAGS -@@ -30,18 +30,6 @@ - - AM_CONDITIONAL(PRERELEASE, test x$prerelease != x) - --#known keywords for --enable/disable-foo(=yes/no)? --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" --KNOWN_KEYWORDS="$LTINTERNAL|shared|static|debug|warnings|diagnostic|profiling|linting|libwrap|preload|serverdl|clientdl|internal|pidfile" --for keyword in `set | egrep '^enable_' | sed -e 's/^enable_\(.*\)=.*/\1/'`; --do -- echo $keyword | egrep "^(${KNOWN_KEYWORDS})$" > /dev/null -- if test $? -ne 0; then -- AC_MSG_WARN([unknown option '$keyword', ignoring ...]) -- sleep 10; -- fi --done -- - #Solaris 2.5.1 is broken in many places - case $host in - *-*-solaris2.5.1) -@@ -1288,15 +1288,18 @@ - [ --without-pam disable pam support @<:@default=detect@:>@], - [PAM=$withval]) - -+LIBPAM= - if test "${PAM}" != no; then - #look for PAM header and lib - AC_CHECK_HEADERS(security/pam_appl.h, [have_pam_header=t]) -- AC_SEARCH_LIBS(pam_start, pam, [have_libpam=t]) -+ AC_CHECK_LIB(pam, pam_start, [have_libpam=t]) - - if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then - AC_DEFINE(HAVE_PAM, 1, [PAM support]) -+ LIBPAM=-lpam - fi - fi -+AC_SUBST(LIBPAM) - - #expected select behaviour? - unset nb_select_err -diff -Nru dante-1.1.19.orig/sockd/Makefile.am dante-1.1.19/sockd/Makefile.am ---- dante-1.1.19.orig/sockd/Makefile.am 2005-11-06 18:37:14.000000000 +0100 -+++ dante-1.1.19/sockd/Makefile.am 2008-06-25 22:24:16.000000000 +0200 -@@ -35,9 +35,9 @@ - - #XXXhack - if STATIC_SOCKD --sockd_LDADD = ../libscompat/sockatmark.o ${LIBWRAP} -+sockd_LDADD = ../libscompat/sockatmark.o ${LIBWRAP} ${LIBPAM} - else --sockd_LDADD = ../libscompat/libscompat.la ${LIBWRAP} -+sockd_LDADD = ../libscompat/libscompat.la ${LIBWRAP} ${LIBPAM} - endif - - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libscompat diff --git a/net-proxy/dante/files/dante-1.1.19-socksify.patch b/net-proxy/dante/files/dante-1.1.19-socksify.patch deleted file mode 100644 index 632deb1f9b5..00000000000 --- a/net-proxy/dante/files/dante-1.1.19-socksify.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- dante-1.1.15-pre1/bin/socksify.in.agriffis 2004-11-04 16:07:04.000000000 -0500 -+++ dante-1.1.15-pre1/bin/socksify.in 2004-11-04 16:07:08.977460049 -0500 -@@ -60,7 +60,11 @@ - @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}" - export @PRELOAD_VARIABLE@ - --LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" --export LD_LIBRARY_PATH -+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where -+# LD_PRELOAD can contain a full path to the library. Setting the -+# following breaks socksify on Linux/Alpha at least with -+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis) -+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" -+#export LD_LIBRARY_PATH - - exec "$@" diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init deleted file mode 100644 index 41211a4ad06..00000000000 --- a/net-proxy/dante/files/dante-sockd-init +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -SOCKD_OPT="-D" -[ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}" -[ "${SOCKD_DEBUG:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d" -[ "${SOCKD_DISABLE_KEEPALIVE:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n" -PIDFILE=/var/run/sockd.pid -SOCKDIR=/var/lock/dante-sockd/ - -depend() { - need net -} - -checkconfig() { - # first check that it exists - if [ ! -f /etc/socks/sockd.conf ] ; then - eerror "You need to setup /etc/socks/sockd.conf first" - eerror "Examples are in /usr/share/doc/dante[version]/example" - eerror "for more info, see: man sockd.conf" - return 1 - fi - - /usr/sbin/sockd -V >/tmp/dante-sockd.checkconf 2>&1 - if [ $? -ne 0 ]; then - cat /tmp/dante-sockd.checkconf - eerror "Something is wrong with your configuration file" - eerror "for more info, see: man sockd.conf" - return 1 - fi - rm /tmp/dante-sockd.checkconf - - #Create pidfile with owner set to daemon's uid - DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf` - if [ -n "$DAEMON_UID" ]; then - touch $PIDFILE && chown $DAEMON_UID $PIDFILE - mkdir $SOCKDIR && chown $DAEMON_UID $SOCKDIR - [ ! -f $SOCKDIR/.keep ] && touch $SOCKDIR/.keep - fi - - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting dante sockd" - start-stop-daemon --start --quiet --pidfile $PIDFILE --env TMPDIR=$SOCKDIR \ - --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} >/dev/null 2>&1 - eend $? "Failed to start sockd" -} - -stop() { - ebegin "Stopping dante sockd" - start-stop-daemon --stop --quiet --pidfile $PIDFILE - eend $? "Failed to stop sockd" -}
