Version bump to 1.4.0_pre1.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 113 insertions, 22 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index b716e9036b73..66654bb25fd7 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/dante
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.64 2012/04/26 16:53:40 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.65 2013/03/04 12:41:03 tomwij Exp $
+
+*dante-1.4.0_pre1 (04 Mar 2013)
+
+  04 Mar 2013; Tom Wijsman <TomWij@gentoo.org> +dante-1.4.0_pre1.ebuild:
+  Version bump to 1.4.0_pre1.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> dante-1.3.2.ebuild:
   keyword ~amd64-fbsd
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 833c1504c3c1..40a2ce5f972c 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,26 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX dante-1.1.19-libpam.patch 2688 RMD160 120d53814c7d9b51cad038ffd08e8794eb50b8dc SHA1 11f4807397c0e8a32ac3c55253f481f66e2344d5 SHA256 e78503cc9ece8347cfe0f11d77e0952bec9e2286dd1bea0916540f489d86ab54
-AUX dante-1.1.19-socksify.patch 811 RMD160 4edaad9e92f2ab689cf10b3decd2aa02d24d1f62 SHA1 d6e7ff6699691de9ee2ff836203e5628146ede06 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5
-AUX dante-1.3.0-socksify.patch 987 RMD160 479f3418c600a5ef9d0f327d804490fae7d0ce9d SHA1 c0b55bdaac92b8122c5bd9f8c5daad98b772c566 SHA256 d5482aba9f049c879d646e8831e31ed9af0d69be9eada742323b2be05d66b7a1
-AUX dante-1.3.1-flags.patch 1012 RMD160 ded829fa9a0c3722694a1fa1b6691148a89d3b9e SHA1 d723b49e92d5ece6f6c583d7da68b98cef7372a9 SHA256 731758799fc94be04d141310482800f3948e4b1ca2c1089543d63f94a90a0824
-AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5fd6b002b33ddec46f6d94550d3c7ea26a26f115 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74
-AUX dante-sockd-init 1812 RMD160 7a551070d7cde15e3caef4150b7a4a7948bdc3a6 SHA1 d37f936e64a5b28d918d927a43844ab4f22918b8 SHA256 5956be225fd9e90c96127721b04ead92c201fd7d674ccfc7373b2b9de12c496f
-AUX sockd.conf 7031 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 SHA1 ef6f69870af7167d8b5c73577c0de5a41501d653 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7
-AUX sockd.conf-with-libwrap.patch 870 RMD160 f34216f2542bf51563334e1fcaf87f9f687d6fe8 SHA1 c97d9843ef93184c91a69c78b9c09195c5cff232 SHA256 ba4bb30ad5933b890d1b09c6468708f37abf012de3f8696482d1c46c5c1f2978
-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
-DIST dante-1.3.2.tar.gz 949049 RMD160 600bf1cda8795c9ba313bf89b491223ee592820a SHA1 92c559fcdee5523a4e7289d50f003eb88564d1c6 SHA256 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb
-EBUILD dante-1.1.19-r4.ebuild 2310 RMD160 dc5b943ee9efc141079ed146699d43c336f456a4 SHA1 3fc375dbd0f8b8f59ecf52700f58e0133cfe9960 SHA256 e158198621423a42302d85072c3aadbee54c53bfa521520adbc3cd6209032c79
-EBUILD dante-1.3.2.ebuild 2124 RMD160 6726ebe2dc447f5c83a8458d8756f67622fea757 SHA1 d67058244019d7d24ddda9e14c636e9210955f69 SHA256 3bd120668f9f2cfc1d0cd2e6ea2e55d95fb3746b8e40207d4ca8b0debe6caebd
-MISC ChangeLog 16155 RMD160 44da7dda2a3fcdb4ec7c3db265d0f0cdf3d8b46c SHA1 1433777182e4c6fb176289b58ffb4e3d9efd98d1 SHA256 9dc44849ebe77754f8bf717247f4d4ae1557818ffb6d7b5eae3b32b9530f1ede
-MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
+AUX dante-1.1.19-libpam.patch 2688 SHA256 e78503cc9ece8347cfe0f11d77e0952bec9e2286dd1bea0916540f489d86ab54 SHA512 ae65a7d58e93b7e0f883c8194166e23fd378b27537fa4005dd1f751889d6bdf807bab3c09327b5b1348193dff2350b6483baac29ff652a5d2cbcc9f912842e01 WHIRLPOOL e9b8ee2651db965a1d1ac93529a240d83bb8ed8785382ea462f98cfed528a3831deb7585e907b8652911e05ce16edb815d91dc19e2fab637243402fc445e885b
+AUX dante-1.1.19-socksify.patch 811 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5 SHA512 2f5616e788de6764eec22a7f561be367b58c7b6d3420dab7fa9dee8204bf78cf5342e65b66df5cc02766c8a5454e932b72ea73d9d155d9062c0c4875e93dda30 WHIRLPOOL d6ed423f3ea2425cd138e9a675304cba5015624f6abb52572439500a18a24bfc1f04abe9df3182238733b38fb5787c80b99da9ff73fd2c475cfae4762bc87425
+AUX dante-1.3.0-socksify.patch 987 SHA256 d5482aba9f049c879d646e8831e31ed9af0d69be9eada742323b2be05d66b7a1 SHA512 a5d8217da81226afe4c6cd11ebf6eb207c86703a2b2fce156e79e5506a71216aa916bb989b298aabce4b1a535a9f7c2f654a4d024f4657164627e83711ea0cfb WHIRLPOOL d2d4a41ca4fd6b8c1d347bb12326e77a63c50d7a36cc71a9e013a15ed20a0b2cfeebfbb2f11b7af4396981d79cc731fc99e7865ebdcf2a5effecdb84b4203ab5
+AUX dante-1.3.1-flags.patch 1012 SHA256 731758799fc94be04d141310482800f3948e4b1ca2c1089543d63f94a90a0824 SHA512 4508b16f9a66779d589e9fe334798a8cee342117697e97bccadc784000404fad46c48154b029de061a68a0e530be7cb5f80d6bdcd6b2f332641ac0f78fa75f04 WHIRLPOOL 6e3000917489216cc0d1ee912b680840b5650de51c00f4edb39cf1a125ffa915fa11bde10c88b2b15e502c709008d9d07fb1069a08f99d234dd36060a3055d4d
+AUX dante-sockd-conf 463 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74 SHA512 5987980cb74ac69a8eba383eeadeef9d20bfe2317873eed70bec844509167b49dc8408ba3911cea7ef71900f559dd524b4c7099a93b8a777b513de750c032621 WHIRLPOOL ae2484a8b4e63a1c5d96cd04a88fb00b08be024204d35d0a172c0c9c2b55d663be6ef80d122156c63f961cfe61fe2cc11eee83d9344a2f719546ed5e72ddf448
+AUX dante-sockd-init 1812 SHA256 5956be225fd9e90c96127721b04ead92c201fd7d674ccfc7373b2b9de12c496f SHA512 00f37c35b84489260badd78550a6ffa48e2e5430ca63863457d2ab9b79e5c0efb3807d9ba4a62dce54b580a17c31f1e0965fac643c5befda0486042c6575ea4d WHIRLPOOL 261bef0b8392787addec1356ca30e869710e63698dbbbcb6aeb63cbfea29a0b801cd8fdfd7914201c2eeb1c2e3abf1e89ff0a6e386c0cfaa222d907dad8e90d4
+AUX sockd.conf 7031 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7 SHA512 a443ea203aefd3ed51b10c7140dde2fc64dfa31c2fb08539a45353ab77daea42c63b160c276f0ef9e4c683032260f93228af64db83ade7476ff6d353b63dec19 WHIRLPOOL 130a0a017071129061d6ca6987448d51c515785f3802e18b99f7df0150e41d8e03b2f2d88dea21769d5ec0d544d9d82eaccd813c86a1360881598a453f7e6e7f
+AUX sockd.conf-with-libwrap.patch 870 SHA256 ba4bb30ad5933b890d1b09c6468708f37abf012de3f8696482d1c46c5c1f2978 SHA512 087cec0bcdfb989e6cbcb0c7006ae014b7e94fe268f68e1e6516dbb034f9e7e64523ea7edab669433eb16faeb4f6232a9794c401acd2eacce08e1b560469315f WHIRLPOOL edeb4b19ff5d39cd889777bc417b36d3d6d1ab7eaf4e926a239968253260bdb502b7f3b68354556f4ac33b37cd9e18af5dbbaf3c11cac570a7dae3f01b1f5367
+AUX sockd.conf-with-pam.patch 295 SHA256 e67499de8b976e17a9c7c0556e999e03f4bf06e8e57b78ba6dd41a128de0b719 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630 WHIRLPOOL aa68139d3766446d43987eab1d4f2d9b22deb0e0eb3acbfcd9adb198f359b1c039eb71f07359362e9d99fe64f5194103c8fa77b603d8b7aac882926dea93d271
+AUX socks.conf 4185 SHA256 3dc8c06ca5a8309015c495ea50f62097ee6a605ac262665ffa5f19e0e8a5a9d8 SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb WHIRLPOOL e7c39b3f9711f2a6f32d3a7d7c44bc0105d1dc236ae2b51be7257a38dc15f211a38a44c0869fbee4c381dacf946da88909b85b91a7628aeaadab737f2169d480
+DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
+DIST dante-1.3.2.tar.gz 949049 SHA256 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb
+DIST dante-1.4.0-pre1.tar.gz 1021746 SHA256 57f450bbb428648bdc9c096166a0a26eb8f8fea0800945976b4370eae1f387df SHA512 d76e1433bdaf5a177b1b596aafd14978a723fa753809df5da263f978b18c70abb1775b28d86f3e134ef77d23e4c178205a471e1570b3ffc362447f0380dde7bb WHIRLPOOL 267c944b7154bdd90358e80807d9a7478d6bcc16289dbfdd8626ebe0bc9950d69e141a6b5d6941677a17b30c790b8a624b2f47f1bcff1f55cac3d6831af25984
+EBUILD dante-1.1.19-r4.ebuild 2310 SHA256 e158198621423a42302d85072c3aadbee54c53bfa521520adbc3cd6209032c79 SHA512 c693bc21caf17351ed563b9d2b3c623a866cb8a7965e833957e45bf2150169266e456d35884364f9a65c9bb1260268cef3b303fa51bc65de8c77bce6f6e5d82a WHIRLPOOL bdf450ad9c872187b58f7d63c1785548be03ee73d4a505cf3e96e55a2b7a6a8ae6774fb92ae8a389687db8ad14e14ba7753a89844dcb128b566f93ab039f7881
+EBUILD dante-1.3.2.ebuild 2124 SHA256 3bd120668f9f2cfc1d0cd2e6ea2e55d95fb3746b8e40207d4ca8b0debe6caebd SHA512 3ce9821d552756a6cd53cad72aa3c7f41d7cb37bb2bb7b0d291adec6676b028142127d132f132b005d4e2a6f02bc7093b979270fc6fa27c28a7f7336337b866e WHIRLPOOL 65bf2016d9d18064d2ba1c571dfc2d22d9e0c925cf55fb4df0d8576cbb086122c072ba33c4daeaf65015db0ff5b6a48b4e7b3cd17447bc040b6fca922fbbd4d3
+EBUILD dante-1.4.0_pre1.ebuild 2128 SHA256 6ca5fde0d1e60ef5a3360adeed096fccfd890a0423d9937de89ff4ce336cfed1 SHA512 7d12e90a5360590c3315765e0cfbcf43b187c9aa1bb1c81c921606912de23945e4c55743aba8d9af7e6921865b03f38695b033cc2b260b64464e8a049fe090c8 WHIRLPOOL 8402e9b4f6e16ada1537ec5dca675a25be3f2c4c8004cb9e19dad893f1f8736a13a878b6e85aae52c3365d699ddac0c5fda2f620a3015738ad7c2082c5728b81
+MISC ChangeLog 16290 SHA256 52b1a70ff8fab5b49f52a7d6a95148448186e4fb22c6678443e3ccd28ac81715 SHA512 bcb4e62478840929513e296056364b8f500cecec0a22d9c48f8fbef1508a6b2046fb4676596e5fc8cbf1539114fdb1458dc570729c59b0a3ac807e31159e52ef WHIRLPOOL 2ce961bf9678160299e9a34b27515a4a0afa8ca9db45ffaa78c92706377c08104842ea1412ec65686d0ef35e824c2b57d549b8a70e894f20d3eb558f8ae10615
+MISC metadata.xml 246 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add SHA512 da5edb1cbf3b7e72b1bf22120bcc2efcc794e1e2f032e57426286de9817dba3ef39d95313dbee4cba51c0198f8b4297ac8f1d412335ee00d32e470799d05b7c4 WHIRLPOOL f5a9fd6f048d1732243da133861886c7a8ff3bd024ca831c98496d3150441512929c86bb263a8d89ff96ee5720dcc06c423227cdcc840a9062d9f8bcaf7197e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZfZkACgkQvFcC4BYPU0oegwCggXAeZoWZVR9QGOOXM7IOMk9n
-U0QAnj2oxoqyzrhQf1fLD+WHzGTj6GRO
-=DhCG
+iQEcBAEBCAAGBQJRNJZeAAoJEJWyH81tNOV9nZwIAKZO9ag3ItQXLezTP5WjcGdF
+8VMTZ/bunGAw07U4i8Q69fVqcbr8Em/OSyVqeg6CSOKbJMWZDhbkWmCVi5ypog/h
+fykhhaxaZEqHaSAqHSITTfCTar16jUHimkVvi564ne1hlC2EqMYJrTR8ITSE9bhy
+vYuDngbZz/xMvfei0ZOvo3fBFS2uh93Ln4kfov7d15LhgvTMHUZENL8KxeCXBTCX
+orJjEm/BJ4OIJJOKBnBF04hgSILdFTnYQ9MyU2MkUeg9i0XeYnMJo8DCGLXInwwY
+m5oyrBdrOa7RQCLM+WFUrXkiSmMoVxj0UcLU5FnOQWSwickFLwqhmUfwSECKYdk=
+=JdRY
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.4.0_pre1.ebuild b/net-proxy/dante/dante-1.4.0_pre1.ebuild
new file mode 100644
index 000000000000..dd003b6f1dd9
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.0_pre1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 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.1 2013/03/04 12:41:03 tomwij 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"
+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"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-dante )
+	tcpd? ( sys-apps/tcp-wrappers )
+	userland_GNU? ( virtual/shadow )"
+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.3.0-socksify.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
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
+		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
+		--without-upnp \
+		$(use_enable debug) \
+		$(use_with kerberos gssapi) \
+		$(use_with pam) \
+		$(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}/dante-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
+}