Version bump; also restores upnp and libdsocks support.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

8 files changed, 190 insertions, 15 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 390a07781ebe..9cf8c73e98a6 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/dante
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.68 2013/05/05 21:53:24 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.69 2014/01/05 23:33:03 robbat2 Exp $
+
+*dante-1.4.0 (05 Jan 2014)
+
+  05 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> +dante-1.4.0.ebuild,
+  +files/dante-1.4.0-cflags.patch, +files/dante-1.4.0-socksify.patch,
+  +files/dante-1.4.0_pre1-osdep-format-macro.patch, dante-1.4.0_pre1-r1.ebuild,
+  dante-1.4.0_pre1.ebuild, files/dante-1.4.0-osdep-format-macro.patch:
+  Version bump; also restores upnp and libdsocks support.
 
   05 May 2013; Tom Wijsman <TomWij@gentoo.org> dante-1.1.19-r4.ebuild,
   dante-1.3.2-r1.ebuild, dante-1.3.2.ebuild, dante-1.4.0_pre1-r1.ebuild,
diff --git a/net-proxy/dante/dante-1.4.0.ebuild b/net-proxy/dante/dante-1.4.0.ebuild
new file mode 100644
index 000000000000..dcc343e750b7
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0.ebuild,v 1.1 2014/01/05 23:33:03 robbat2 Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+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"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-dante )
+	tcpd? ( sys-apps/tcp-wrappers )
+	userland_GNU? ( virtual/shadow )
+	upnp? ( net-libs/miniupnpc )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+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
+
+	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 \
+		--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
+
+	# 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.0_pre1-r1.ebuild b/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
index d95bda53ea59..5ecd1b3e1572 100644
--- a/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
+++ b/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild,v 1.2 2013/05/05 21:53:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild,v 1.3 2014/01/05 23:33:03 robbat2 Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch	"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+		"${FILESDIR}"/${PN}-1.4.0_pre1-osdep-format-macro.patch
 
 	sed -i \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
diff --git a/net-proxy/dante/dante-1.4.0_pre1.ebuild b/net-proxy/dante/dante-1.4.0_pre1.ebuild
index a5fb5a5a62aa..168f81da4b9e 100644
--- a/net-proxy/dante/dante-1.4.0_pre1.ebuild
+++ b/net-proxy/dante/dante-1.4.0_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.4 2013/05/05 21:53:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.5 2014/01/05 23:33:03 robbat2 Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch	"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+		"${FILESDIR}"/${PN}-1.4.0_pre1-osdep-format-macro.patch
 
 	sed -i \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
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
index 52af3d73ec97..02a0d916e563 100644
--- 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
@@ -1,15 +1,15 @@
-diff -urN dante-1.4.0-pre1-orig/include/osdep.h dante-1.4.0-pre1/include/osdep.h
---- dante-1.4.0-pre1-orig/include/osdep.h	2013-03-05 16:05:17.097007863 -0800
-+++ dante-1.4.0-pre1/include/osdep.h	2013-03-05 16:05:39.259007921 -0800
-@@ -225,9 +225,9 @@
+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) format(x)
+-#define FORMAT(x, y, z) format(x, y, z)
 +#define FORMAT(...) format(__VA_ARGS__)
  #else
--#define FORMAT(x)
+-#define FORMAT(x, y, z)
 +#define FORMAT(...)
  #endif /* HAVE_DECL_FORMAT */
  
- #if HAVE_LINUX_BUGS
+ #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-1.4.0_pre1-osdep-format-macro.patch b/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch
new file mode 100644
index 000000000000..52af3d73ec97
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch
@@ -0,0 +1,15 @@
+diff -urN dante-1.4.0-pre1-orig/include/osdep.h dante-1.4.0-pre1/include/osdep.h
+--- dante-1.4.0-pre1-orig/include/osdep.h	2013-03-05 16:05:17.097007863 -0800
++++ dante-1.4.0-pre1/include/osdep.h	2013-03-05 16:05:39.259007921 -0800
+@@ -225,9 +225,9 @@
+ #endif /* HAVE_DECL_NONNULL */
+ 
+ #if HAVE_DECL_FORMAT
+-#define FORMAT(x) format(x)
++#define FORMAT(...) format(__VA_ARGS__)
+ #else
+-#define FORMAT(x)
++#define FORMAT(...)
+ #endif /* HAVE_DECL_FORMAT */
+ 
+ #if HAVE_LINUX_BUGS