Add flex and bison dependency atoms (#221401).

Link libpam only with sockd (#218745).
Package-Manager: portage-2.1.4.4

5 files changed, 160 insertions, 4 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/Manifest b/net-proxy/dante/Manifest
index cd61160978cd..c704994cf943 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dante-1.1.19-libpam.patch 1657 RMD160 bd4141bf5932fafa96c47e7c10140f7fa13dbc51 SHA1 f30ce0651a999b0614e823e04306b5fe56332621 SHA256 110452e8577e900560427157b0adc088df3cf49887142e3b8a41bee78e174c90
 AUX dante-1.1.19-socksify.patch 811 RMD160 4edaad9e92f2ab689cf10b3decd2aa02d24d1f62 SHA1 d6e7ff6699691de9ee2ff836203e5628146ede06 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5
 AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5fd6b002b33ddec46f6d94550d3c7ea26a26f115 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74
 AUX dante-sockd-init 1657 RMD160 7de3590d4a1f5e0e586c041cf533755fe0cc4eb4 SHA1 3eb5302906aa7f3e8a4ff787d6774d9615264b43 SHA256 dd86b5bef46c8fa2a80f5093f43d97c1d48c861c309cd62f3ae792d3c76a2f7a
@@ -6,6 +10,14 @@ AUX sockd.conf-with-libwrap.patch 870 RMD160 f34216f2542bf51563334e1fcaf87f9f687
 AUX sockd.conf-with-pam.patch 295 RMD160 67950c8d3fca41399540644ea47f549631868795 SHA1 599a82ffc4d52e93658dafc13682c9e8530c8a02 SHA256 e67499de8b976e17a9c7c0556e999e03f4bf06e8e57b78ba6dd41a128de0b719
 AUX socks.conf 4185 RMD160 1eaacd974befc24a22fa5f157528fffbfc54992c SHA1 f0f598706e44532f9884dbcadd54942b7acca45e SHA256 3dc8c06ca5a8309015c495ea50f62097ee6a605ac262665ffa5f19e0e8a5a9d8
 DIST dante-1.1.19.tar.gz 895713 RMD160 3649207b061b95fdd5b0950ea1ece9219eb8af4c SHA1 e366a60a880ceff6205f7cd87249c7322b844d3c SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
-EBUILD dante-1.1.19-r1.ebuild 2260 RMD160 37acc0f62bb73d4e79db1dc4ee4864b166bf3b25 SHA1 902003ac3524b6bed9f45f79085a2da70bcef79b SHA256 0657b90afc1b1a637ce1225354f2328dc0943578ed2498d3a70b286fd1fb0e9f
-MISC ChangeLog 12700 RMD160 bd812b3189c4758b0b78964de7ad65261adba897 SHA1 e15b6de028247d080d8fc0ce7860f1410e6a84ed SHA256 189eba2cf196e2701d953795eb38e94db25a2b32a54d31ad0c7047d7d5920fd2
+EBUILD dante-1.1.19-r1.ebuild 2292 RMD160 5dae53e970be15a5c92a627a605cbd8a7650a94e SHA1 e551442998b7a1d6f62086963578ef807d91b62d SHA256 2c216c6c16c810cc76ed60367b4316da8ccf1dd422d4605b5eff527587f440ef
+EBUILD dante-1.1.19-r2.ebuild 2332 RMD160 742e58317796f3922d10c173b0e2826a9660e34f SHA1 82d507b9e8b689811629299275fc065e733350f3 SHA256 685e96bc01bcda283c8647af9545727f2b54c464bf5692769a1dc8f1f6acf3ec
+MISC ChangeLog 12957 RMD160 abd1f92f5ff7fe822c49095ed29f89c9812da430 SHA1 c8e098708e4ad9f764cf440a159faa02865b7dea SHA256 d08ed9cb65c28413c3af748fe2649b2a094957bc7c573713264a2771f3617838
 MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhhYCcACgkQ+fWpoTWIA9ENtgCggTpLWtm317nbveEh+DJSOwll
+lucAnRdVAQjWUCCIEU7xWTYzw0jAW16F
+=7UJ2
+-----END PGP SIGNATURE-----
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