diff options
author | Tim Harder <radhermit@gentoo.org> | 2017-08-31 10:20:17 -0400 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2017-08-31 10:30:41 -0400 |
commit | 203d711ea427be7d9ffeee8d7a650c5ee1bc875d (patch) | |
tree | 797f444a64a922c1f0ee63e577e98a12845f64e5 /net-proxy/dante/files | |
parent | net-proxy/sshuttle: remove old (diff) | |
download | gentoo-203d711ea427be7d9ffeee8d7a650c5ee1bc875d.tar.gz gentoo-203d711ea427be7d9ffeee8d7a650c5ee1bc875d.tar.bz2 gentoo-203d711ea427be7d9ffeee8d7a650c5ee1bc875d.zip |
net-proxy/dante: remove old
Diffstat (limited to 'net-proxy/dante/files')
-rw-r--r-- | net-proxy/dante/files/dante-1.1.19-libpam.patch | 76 | ||||
-rw-r--r-- | net-proxy/dante/files/dante-1.1.19-socksify.patch | 16 | ||||
-rw-r--r-- | net-proxy/dante/files/dante-sockd-init | 57 |
3 files changed, 0 insertions, 149 deletions
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 5c732e2f1e92..000000000000 --- 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 632deb1f9b58..000000000000 --- 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 41211a4ad06e..000000000000 --- 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" -} |