diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-proxy/dante | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-proxy/dante')
21 files changed, 1099 insertions, 0 deletions
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest new file mode 100644 index 000000000000..a3aeb6faaa28 --- /dev/null +++ b/net-proxy/dante/Manifest @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000000..5cb9c6c8558f --- /dev/null +++ b/net-proxy/dante/dante-1.1.19-r4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 000000000000..e2443d8d772f --- /dev/null +++ b/net-proxy/dante/dante-1.4.0-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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/dante-1.4.1.ebuild b/net-proxy/dante/dante-1.4.1.ebuild new file mode 100644 index 000000000000..edd98b91e92e --- /dev/null +++ b/net-proxy/dante/dante-1.4.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + tcpd? ( sys-apps/tcp-wrappers ) + upnp? ( net-libs/miniupnpc ) + userland_GNU? ( virtual/shadow )" +DEPEND="${CDEPEND} + sys-devel/bison + sys-devel/flex" +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 + + prune_libtool_files +} + +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 new file mode 100644 index 000000000000..5c732e2f1e92 --- /dev/null +++ b/net-proxy/dante/files/dante-1.1.19-libpam.patch @@ -0,0 +1,76 @@ +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 new file mode 100644 index 000000000000..632deb1f9b58 --- /dev/null +++ b/net-proxy/dante/files/dante-1.1.19-socksify.patch @@ -0,0 +1,16 @@ +--- 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-1.3.0-socksify.patch b/net-proxy/dante/files/dante-1.3.0-socksify.patch new file mode 100644 index 000000000000..45fd0fd2ed54 --- /dev/null +++ b/net-proxy/dante/files/dante-1.3.0-socksify.patch @@ -0,0 +1,26 @@ +--- dante-1.3.0/bin/socksify.in.orig ++++ dante-1.3.0/bin/socksify.in +@@ -53,8 +53,6 @@ + exit 1 + fi + +-SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@" +- + SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}" + + if test x`uname` = xDarwin; then +@@ -80,8 +78,12 @@ + @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:+:}${SOCKS_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 + + if test x"@ISA64DIR@" != x; then + SOCKS_LIB64DIR="${LIB64DIR:-${SOCKS_LIBDIR}/@ISA64DIR@}" diff --git a/net-proxy/dante/files/dante-1.3.1-flags.patch b/net-proxy/dante/files/dante-1.3.1-flags.patch new file mode 100644 index 000000000000..fb8c211b3a0a --- /dev/null +++ b/net-proxy/dante/files/dante-1.3.1-flags.patch @@ -0,0 +1,43 @@ +Respect CFLAGS (bug #377353) -JeR + + +--- a/configure.ac ++++ b/configure.ac +@@ -199,18 +199,6 @@ + #XXX make sure compiling with compiler options works + esac + +-AC_MSG_CHECKING([for support for -pipe compiler flag]) +-oCFLAGS=$CFLAGS +-CFLAGS="$CFLAGS -pipe" +-AC_TRY_RUN([ +-int main() +-{ +- return 0; +-}], [AC_MSG_RESULT([yes]) +- comp_flags="${comp_flags} -pipe"], +- AC_MSG_RESULT([no])) +-CFLAGS="$oCFLAGS" +- + AC_MSG_CHECKING([for support for -Wbounded compiler flag]) + oCFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Wbounded" +@@ -233,18 +221,11 @@ + fi]) + + if test x$debug_enabled = xt; then +- #no optimization wanted +- if test $ac_cv_prog_cc_g = yes; then +- CFLAGS="$CFLAGS -g" +- fi + CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=1" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- #autoconf_compflags is set to "-g -O2" with GCC +- #override CFLAGS when running configure to avoid this + CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=0" +- CFLAGS="$CFLAGS $autoconf_compflags" + fi + + #-Wall ? diff --git a/net-proxy/dante/files/dante-1.3.2-sockd-init b/net-proxy/dante/files/dante-1.3.2-sockd-init new file mode 100644 index 000000000000..e2b90fd57510 --- /dev/null +++ b/net-proxy/dante/files/dante-1.3.2-sockd-init @@ -0,0 +1,57 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +SOCKD_OPT="" +[ "${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 + + DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf` + if [ -n "$DAEMON_UID" ]; then + [ ! -d $SOCKDIR ] && 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 \ + --background --pidfile $PIDFILE --make-pidfile --env TMPDIR=$SOCKDIR \ + --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" +} diff --git a/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch b/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch new file mode 100644 index 000000000000..d8e2c220ce92 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch @@ -0,0 +1,11 @@ +--- a/libscompat.m4 ++++ b/libscompat.m4 +@@ -373,7 +373,7 @@ + + return 0; + }], [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_SENDBUF_IOCTL, TIOCOUTQ, [send buffer data]) ++ AC_DEFINE(HAVE_SENDBUF_IOCTL, 1, [send buffer data]) + AC_DEFINE(SENDBUF_IOCTLVAL, TIOCOUTQ, [send buffer ioctl])], + [AC_MSG_RESULT(no)])], + [dnl assume no when cross-compiling diff --git a/net-proxy/dante/files/dante-1.4.0-cflags.patch b/net-proxy/dante/files/dante-1.4.0-cflags.patch new file mode 100644 index 000000000000..eccb64a5d7d8 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-cflags.patch @@ -0,0 +1,32 @@ +The upstream code tries to remove -g from CFLAGS, but the logic also matches +the -g in the middle of flags, like: +-frecord-gcc-switches => -frecordcc-switches +-ggdb3 => ggdb3 +Both of which cause GCC to fail horribly! + +Fix the grep & sed to only match standalone instances. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar dante-1.4.0.orig/compiler.m4 dante-1.4.0/compiler.m4 +--- dante-1.4.0.orig/compiler.m4 2013-10-24 13:20:23.000000000 -0700 ++++ dante-1.4.0/compiler.m4 2014-01-05 15:18:03.544336373 -0800 +@@ -375,14 +375,14 @@ + gcc) + if test x"$aixldbug" != x; then + #disable debug info +- if echo $CFLAGS | grep -- "-g" >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" ++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then ++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`" + fi + CFLAGS="$CFLAGS${CFLAGS:+ }-g0" + else + #use -ggdb also when not debugging +- if echo $CFLAGS | grep -- "-g" >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" ++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then ++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`" + fi + CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb" + fi diff --git a/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch b/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch new file mode 100644 index 000000000000..02a0d916e563 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch @@ -0,0 +1,15 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/include/osdep.h dante-1.4.0/include/osdep.h +--- dante-1.4.0.orig/include/osdep.h 2013-10-27 08:24:41.000000000 -0700 ++++ dante-1.4.0/include/osdep.h 2014-01-05 15:06:45.346071952 -0800 +@@ -254,9 +254,9 @@ + #endif /* HAVE_DECL_NONNULL */ + + #if HAVE_DECL_FORMAT +-#define FORMAT(x, y, z) format(x, y, z) ++#define FORMAT(...) format(__VA_ARGS__) + #else +-#define FORMAT(x, y, z) ++#define FORMAT(...) + #endif /* HAVE_DECL_FORMAT */ + + #if HAVE_DECL_BOUNDED diff --git a/net-proxy/dante/files/dante-1.4.0-socksify.patch b/net-proxy/dante/files/dante-1.4.0-socksify.patch new file mode 100644 index 000000000000..2063327b42c5 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-socksify.patch @@ -0,0 +1,27 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/bin/socksify.in dante-1.4.0/bin/socksify.in +--- dante-1.4.0.orig/bin/socksify.in 2013-10-27 08:24:41.000000000 -0700 ++++ dante-1.4.0/bin/socksify.in 2014-01-05 15:04:32.495670262 -0800 +@@ -53,7 +53,7 @@ + exit 1 + fi + +-SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@" ++#SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@" + SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}" + + #platform that requires full path to libdsocks? +@@ -82,8 +82,12 @@ + @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}" + export @PRELOAD_VARIABLE@ + +-LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" +-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="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" ++#export LD_LIBRARY_PATH + + #SunOS 64-bit library path + if test x"@ISA64DIR@" != x; then diff --git a/net-proxy/dante/files/dante-sockd-conf b/net-proxy/dante/files/dante-sockd-conf new file mode 100644 index 000000000000..1957925c6efd --- /dev/null +++ b/net-proxy/dante/files/dante-sockd-conf @@ -0,0 +1,14 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Number of processes to fork off +# 1 is plenty for most users +# increment SLOWLY for bigger demand +SOCKD_FORKDEPTH=1 + +# set this to 1 to enable debug +SOCKD_DEBUG=0 + +# disable TCP keepalive for better resource usage +SOCKD_DISABLE_KEEPALIVE=1 diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init new file mode 100644 index 000000000000..8b95e4a79adc --- /dev/null +++ b/net-proxy/dante/files/dante-sockd-init @@ -0,0 +1,58 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" +} diff --git a/net-proxy/dante/files/dante-sockd.service b/net-proxy/dante/files/dante-sockd.service new file mode 100644 index 000000000000..647a2dcc8cd8 --- /dev/null +++ b/net-proxy/dante/files/dante-sockd.service @@ -0,0 +1,9 @@ +[Unit] +Description=SOCKS v4 and v5 compatible proxy server and client +After=network.target + +[Service] +ExecStart=/usr/sbin/sockd + +[Install] +WantedBy=multi-user.target diff --git a/net-proxy/dante/files/sockd.conf b/net-proxy/dante/files/sockd.conf new file mode 100644 index 000000000000..70b18747ba34 --- /dev/null +++ b/net-proxy/dante/files/sockd.conf @@ -0,0 +1,243 @@ +# The configfile is divided into two parts; first serversettings, +# then the rules. +# +# The recommended order is: +# Serversettings: +# logoutput +# internal +# external +# method +# clientmethod +# users +# compatibility +# extension +# connecttimeout +# iotimeout +# srchost +# +# Rules: +# client block/pass +# from to +# log +# +# block/pass +# from to +# method +# command +# log +# protocol +# proxyprotocol + +# the server will log both via syslog, to stdout and to /var/log/lotsoflogs +#logoutput: syslog stdout /var/log/lotsoflogs +logoutput: syslog + +# The server will bind to the address 10.1.1.1, port 1080 and will only +# accept connections going to that address. +#internal: 10.1.1.1 port = 1080 +# Alternatively, the interface name can be used instead of the address. +#internal: eth0 port = 1080 + +# all outgoing connections from the server will use the IP address +# 195.168.1.1 +#external: 192.168.1.1 + +# list over acceptable methods, order of preference. +# A method not set here will never be selected. +# +# If the method field is not set in a rule, the global +# method is filled in for that rule. +# + +# methods for socks-rules. +#method: username none #rfc931 + +# methods for client-rules. +#clientmethod: none + +#or if you want to allow rfc931 (ident) too +#method: username rfc931 none + +# +# An important section, pay attention. +# + +# when doing something that can require privilege, +# it will use the userid "sockd". +user.privileged: sockd + +# when running as usual, +# it will use the unprivileged userid of "sockd". +user.notprivileged: sockd + +# +# some options to help clients with compatibility: +# + +# when a client connection comes in the socksserver will try to use +# the same port as the client is using, when the socksserver +# goes out on the clients behalf (external: IP address). +# If this option is set, Dante will try to do it for reserved ports aswell. +# This will usually require user.privileged to be set to "root". +#compatibility: sameport + +# If you are using the bind extension and have trouble running servers +# via the server, you might try setting this. The consequences of it +# are unknown. +#compatibility: reuseaddr + +# +# The Dante server supports some extensions to the socks protocol. +# These require that the socks client implements the same extension and +# can be enabled using the "extension" keyword. +# +# enable the bind extension. +#extension: bind + + +# +# +# misc options. +# + +# how many seconds can pass from when a client connects til it has +# sent us it's request? Adjust according to your network performance +# and methods supported. +#connecttimeout: 30 # on a lan, this should be enough if method is "none". + +# how many seconds can the client and it's peer idle without sending +# any data before we dump it? Unless you disable tcp keep-alive for +# some reason, it's probably best to set this to 0, which is +# "forever". +#iotimeout: 0 # or perhaps 86400, for a day. + +# do you want to accept connections from addresses without +# dns info? what about addresses having a mismatch in dnsinfo? +#srchost: nounknown nomismatch + +# +# The actual rules. There are two kinds and they work at different levels. +# +# The rules prefixed with "client" are checked first and say who is allowed +# and who is not allowed to speak/connect to the server. I.e the +# ip range containing possibly valid clients. +# It is especially important that these only use IP addresses, not hostnames, +# for security reasons. +# +# The rules that do not have a "client" prefix are checked later, when the +# client has sent its request and are used to evaluate the actual +# request. +# +# The "to:" in the "client" context gives the address the connection +# is accepted on, i.e the address the socksserver is listening on, or +# just "0.0.0.0/0" for any address the server is listening on. +# +# The "to:" in the non-"client" context gives the destination of the clients +# socksrequest. +# +# "from:" is the source address in both contexts. +# + + +# the "client" rules. All our clients come from the net 10.0.0.0/8. +# + +# Allow our clients, also provides an example of the port range command. +#client pass { +# from: 10.0.0.0/8 port 1-65535 to: 0.0.0.0/0 +# method: rfc931 # match all idented users that also are in passwordfile +#} + +# This is identical to above, but allows clients without a rfc931 (ident) +# too. In practise this means the socksserver will try to get a rfc931 +# reply first (the above rule), if that fails, it tries this rule. +#client pass { +# from: 10.0.0.0/8 port 1-65535 to: 0.0.0.0/0 +#} + + +# drop everyone else as soon as we can and log the connect, they are not +# on our net and have no business connecting to us. This is the default +# but if you give the rule yourself, you can specify details. +#client block { +# from: 0.0.0.0/0 to: 0.0.0.0/0 +# log: connect error +#} + + +# the rules controlling what clients are allowed what requests +# + +# you probably don't want people connecting to loopback addresses, +# who knows what could happen then. +#block { +# from: 0.0.0.0/0 to: 127.0.0.0/8 +# log: connect error +#} + +# the people at the 172.16.0.0/12 are bad, no one should talk to them. +# log the connect request. +#block { +# from: 0.0.0.0/0 to: 172.16.0.0/12 +# log: connect error +#} + +# unless you need it, you could block any bind requests. +#block { +# from: 0.0.0.0/0 to: 0.0.0.0/0 +# command: bind +# log: connect error +#} + +# or you might want to allow it, for instance "active" ftp uses it. +# Note that a "bindreply" command must also be allowed, it +# should usually by from "0.0.0.0/0", i.e if a client of yours +# has permission to bind, it will also have permission to accept +# the reply from anywhere. +#pass { +# from: 10.0.0.0/8 to: 0.0.0.0/0 +# command: bind +# log: connect error +#} + +# some connections expect some sort of "reply", this might be +# the reply to a bind request or it may be the reply to a +# udppacket, since udp is packetbased. +# Note that nothing is done to verify that it's a "genuine" reply, +# that is in general not possible anyway. The below will allow +# all "replies" in to your clients at the 10.0.0.0/8 net. +#pass { +# from: 0.0.0.0/0 to: 10.0.0.0/8 +# command: bindreply udpreply +# log: connect error +#} + + +# pass any http connects to the example.com domain if they +# authenticate with username. +# This matches "example.com" itself and everything ending in ".example.com". +#pass { +# from: 10.0.0.0/8 to: .example.com port = http +# log: connect error +# method: username +#} + +# block any other http connects to the example.com domain. +#block { +# from: 0.0.0.0/0 to: .example.com port = http +# log: connect error +#} + +# everyone from our internal network, 10.0.0.0/8 is allowed to use +# tcp and udp for everything else. +#pass { +# from: 10.0.0.0/8 to: 0.0.0.0/0 +# protocol: tcp udp +#} + +# last line, block everyone else. This is the default but if you provide +# one yourself you can specify your own logging/actions +#block { +# from: 0.0.0.0/0 to: 0.0.0.0/0 +# log: connect error +#} diff --git a/net-proxy/dante/files/sockd.conf-with-libwrap.patch b/net-proxy/dante/files/sockd.conf-with-libwrap.patch new file mode 100644 index 000000000000..97d2a33f71bb --- /dev/null +++ b/net-proxy/dante/files/sockd.conf-with-libwrap.patch @@ -0,0 +1,41 @@ +--- sockd.conf.orig 2005-06-04 13:57:39.770322448 +0300 ++++ sockd.conf 2005-06-04 13:47:47.000000000 +0300 +@@ -18,12 +18,14 @@ + # Rules: + # client block/pass + # from to ++# libwrap + # log + # + # block/pass + # from to + # method + # command ++# libwrap + # log + # protocol + # proxyprotocol +@@ -73,6 +75,10 @@ + # it will use the unprivileged userid of "sockd". + user.notprivileged: sockd + ++# when running libwrap commands, ++# it will use the userid "sockd". ++user.libwrap: sockd ++ + # + # some options to help clients with compatibility: + # +@@ -179,9 +185,11 @@ + #} + + # the people at the 172.16.0.0/12 are bad, no one should talk to them. +-# log the connect request. ++# log the connect request and also provide an example on how to ++# interact with libwrap. + #block { + # from: 0.0.0.0/0 to: 172.16.0.0/12 ++# libwrap: spawn finger @%a + # log: connect error + #} + diff --git a/net-proxy/dante/files/sockd.conf-with-pam.patch b/net-proxy/dante/files/sockd.conf-with-pam.patch new file mode 100644 index 000000000000..d6735a1cf30e --- /dev/null +++ b/net-proxy/dante/files/sockd.conf-with-pam.patch @@ -0,0 +1,12 @@ +--- sockd.conf.orig 2005-06-04 14:01:40.492727080 +0300 ++++ sockd.conf 2005-06-04 13:57:39.770322448 +0300 +@@ -58,6 +58,9 @@ + #or if you want to allow rfc931 (ident) too + #method: username rfc931 none + ++#or for PAM authentification ++#method: pam ++ + # + # An important section, pay attention. + # diff --git a/net-proxy/dante/files/socks.conf b/net-proxy/dante/files/socks.conf new file mode 100644 index 000000000000..4a7d1520a7b5 --- /dev/null +++ b/net-proxy/dante/files/socks.conf @@ -0,0 +1,127 @@ +# The configfile is divided into two parts; first misc. settings, +# then the routes. Objects in '[]' are optional. +# +# +# recommended order is: +# [debug] +# [logoutput] +# [resolveprotocol] +# +# routes: +# from to via +# [command] +# [extension] +# [protocol] +# [proxyprotocol] + + +#debug: 1 # uncomment to enable debugging + +#logoutput: stdout # users usually don't want to be bothered with that. + +# What protocol should be used for resolving hostnames? It's important +# to set this right. +#resolveprotocol: udp # default +#resolveprotocol: tcp # set this if your socksserver only supports socksv4. +#resolveprotocol: fake # set this if your clients can't access nameserver, + # neither directly nor proxied. + + + +# +# the routes +# + +# specifying routes for accepting remote connections (via bind()) is +# difficult since we can't know what the "to:" address is +# until we actually get the connection Since we support letting +# the client accept connections both via the proxyserver and +# "directly" at the same time, we have two options though: +# a) specify a route for bind (only) first going via the proxyserver. +# This will also handle "direct" connections. +# b) specify a route for bind (only) first going "direct". +# This means clients will only be able to accept "direct" +# connections. + +# we want to accept remote connections via the proxyserver. +#route { +# from: 0.0.0.0/0 to: 0.0.0.0/0 via: 10.1.1.1 port = 1080 +# command: bind +#} + +# we do not want to accept remote connections via the proxyserver. +#route { +# from: 0.0.0.0/0 to: 0.0.0.0/0 via: direct +# command: bind +#} + + +# if you don't route all local connections via direct, you should +# at least route nameserver connections via direct connections if you +# can. That can make for much better performance, depending on +# your setup. Make sure the nameserver line is the first. +# +# Assuming your nameserver runs on address 10.1.1.1, you can do it like this: +#route { +# from: 0.0.0.0/0 to: 10.1.1.1/32 port = domain via: direct +#} + + +# have a route making all connections to loopback addresses be direct. +#route { +# from: 0.0.0.0/0 to: 127.0.0.0/8 via: direct +# command: connect udpassociate # everything but bind, bind confuses us. +#} + +# Our net is the 10.0.0.0/8 net, let clients going to local address go +# direct, not via server. +#route { +# from: 0.0.0.0/0 to: 10.0.0.0/8 via: direct +#} + +# for poor souls trapped behind a msproxy server. +#route { +# from: 0.0.0.0/0 to: 0.0.0.0/0 via: 10.1.1.1 port = 1745 +# protocol: tcp # server supports tcp +# proxyprotocol: msproxy_v2 # server runs msproxy_v2 +#} + +# clients going anywhere else go via server listening at +# IP address 10.1.1.1, port 1080. Note that unless you have +# specified a direct connection for DNS, or the socksserver is resolvable +# without network traffic, you can't give a hostname for the socksserver, +# you must give a IP address. (the reasons for that are logical enough, +# you would create a loop otherwise.) +#route { +# from: 0.0.0.0/0 to: 0.0.0.0/0 via: 10.1.1.1 port = 1080 +# protocol: tcp udp # server supports tcp and udp. +# proxyprotocol: socks_v4 socks_v5 # server supports socks v4 and v5. +# method: none #username # we are willing to authenticate via +# # method "none", not "username". +#} + +# this is identical to the above, but it matches hostnames instead. +# This is if you have clients that are unable to resolve hostnames. +# It can be important that hostname routes come after address routes. +#route { +# from: 0.0.0.0/0 to: . via: 10.1.1.1 port = 1080 +# protocol: tcp udp # server supports tcp and udp. +# proxyprotocol: socks_v4 socks_v5 # server supports socks v4 and v5. +# method: none #username # we are willing to authenticate via +# # method "none", not "username". +#} + +# identical to above two routes, but using a httpproxy instead. +# + +#route { +# from: 0.0.0.0/0 to: 0.0.0.0/0 via: 10.1.1.1 port = 3128 +# command: connect # only thing a httproxy supports. +# proxyprotocol: http_v1.0 +#} + +#route { +# from: 0.0.0.0/0 to: . via: 10.1.1.1 port = 3128 +# command: connect # only thing a httproxy supports. +# proxyprotocol: http_v1.0 +#} diff --git a/net-proxy/dante/metadata.xml b/net-proxy/dante/metadata.xml new file mode 100644 index 000000000000..11217cab087e --- /dev/null +++ b/net-proxy/dante/metadata.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer><email>robbat2@gentoo.org</email></maintainer> +<longdescription>A free socks4, socks5 and msproxy implementation</longdescription> +</pkgmetadata> |