Add flex and bison dependency atoms (#221401).

Link libpam only with sockd (#218745).
(Portage version: 2.1.4.4)

4 files changed, 146 insertions, 2 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 4a955b7f32ce..b8fa940367b3 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.41 2008/02/03 15:13:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.42 2008/06/24 20:59:04 mrness Exp $
+
+*dante-1.1.19-r2 (24 Jun 2008)
+
+  24 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  +files/dante-1.1.19-libpam.patch, dante-1.1.19-r1.ebuild,
+  +dante-1.1.19-r2.ebuild:
+  Add flex and bison dependency atoms (#221401). Link libpam only with sockd
+  (#218745).
 
   03 Feb 2008; Fabian Groffen <grobian@gentoo.org> dante-1.1.19-r1.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/net-proxy/dante/dante-1.1.19-r1.ebuild b/net-proxy/dante/dante-1.1.19-r1.ebuild
index 6a8cc9b84c9c..76c6554f49e4 100644
--- a/net-proxy/dante/dante-1.1.19-r1.ebuild
+++ b/net-proxy/dante/dante-1.1.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r1.ebuild,v 1.5 2008/02/03 15:13:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r1.ebuild,v 1.6 2008/06/24 20:59:04 mrness Exp $
 
 inherit fixheadtails eutils
 
@@ -19,6 +19,8 @@ RDEPEND="virtual/libc
 	selinux? ( sec-policy/selinux-dante )
 	userland_GNU? ( sys-apps/shadow )"
 DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/net-proxy/dante/dante-1.1.19-r2.ebuild b/net-proxy/dante/dante-1.1.19-r2.ebuild
new file mode 100644
index 000000000000..9b34fa884c81
--- /dev/null
+++ b/net-proxy/dante/dante-1.1.19-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r2.ebuild,v 1.1 2008/06/24 20:59:04 mrness Exp $
+
+inherit eutils autotools
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tcpd debug selinux pam"
+
+RDEPEND="virtual/libc
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	selinux? ( sec-policy/selinux-dante )
+	userland_GNU? ( sys-apps/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}
+
+	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/files/dante-1.1.19-libpam.patch b/net-proxy/dante/files/dante-1.1.19-libpam.patch
new file mode 100644
index 000000000000..f4e7179b55e2
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.1.19-libpam.patch
@@ -0,0 +1,48 @@
+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-24 22:37:05.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	2008-06-24 22:36:55.000000000 +0200
++++ dante-1.1.19/configure.ac	2008-06-24 22:36:12.000000000 +0200
+@@ -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	2008-06-24 22:36:55.000000000 +0200
++++ dante-1.1.19/sockd/Makefile.am	2008-06-24 22:36:12.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