Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 113 insertions, 16 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index af18c8db93cd..f14227f56dcf 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.78 2014/08/19 02:30:06 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.79 2014/09/08 11:44:49 ssuominen Exp $
+
+*dante-1.4.1 (08 Sep 2014)
+
+  08 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> +dante-1.4.1.ebuild:
+  Version bump.
 
 *dante-1.4.0-r2 (19 Aug 2014)
 
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 9355f30fc280..d4f905b4b076 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
@@ -21,6 +21,7 @@ DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a
 DIST dante-1.3.2.tar.gz 949049 SHA256 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb SHA512 ee6214ffcb48904cbb361b275e78af5d4a5e0281a3fab6eb5a6913219f4cfebda2d2a7509a88c561e315f9061102c954339ad495cdecf2125e266f85d7e49ca3 WHIRLPOOL e98d31f0bf725d3961582c540cb4180535e1abfdc3138b04663e478dd228e7e642103fd707fa59b904fce8ccd7762ff975fa4310f82669975a042e4bbcf4f8b0
 DIST dante-1.4.0-pre1.tar.gz 1021746 SHA256 57f450bbb428648bdc9c096166a0a26eb8f8fea0800945976b4370eae1f387df SHA512 d76e1433bdaf5a177b1b596aafd14978a723fa753809df5da263f978b18c70abb1775b28d86f3e134ef77d23e4c178205a471e1570b3ffc362447f0380dde7bb WHIRLPOOL 267c944b7154bdd90358e80807d9a7478d6bcc16289dbfdd8626ebe0bc9950d69e141a6b5d6941677a17b30c790b8a624b2f47f1bcff1f55cac3d6831af25984
 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
 EBUILD dante-1.1.19-r4.ebuild 2390 SHA256 1d7bdb749a5438caa8d310a1b49f0487c003fd6e536fb40b693e740e4ae7eeed SHA512 d13ecf3caaed975873518f0edf073d7b5169c4357c6424af77b0b6403ffa94fc8042158a5020a1a958eb4fe4e7a1a70209801f03a042ed9d3a3993bf6ded2898 WHIRLPOOL 5b39a50139fcdcb8feb94cbe2e2a8b0fe802299abef06ee21a56049d9061a0ea922de6182d1fbdb2cbf3b807539f95d841f8da921f01945c0f1929e97bfb6c0b
 EBUILD dante-1.3.2-r1.ebuild 2208 SHA256 b49ea55b9931e114c715263fdf01ce16ca6a1a7d74ddbf158a65f908cf42e9b8 SHA512 0f0e9aba173eefba1a4bd157efbc0b60a0ffbb7665b9875b315267af44c92c6970c04724c5b70b45c653d106ac14c79d83c92c2ee30d1d4fba7591613f75d241 WHIRLPOOL 062500ccf1bf9fc522f135489425ff9c228d4515e6da9745c3f7e9f89de2d4daf6b27258ca852c51c9a94ee92527c194f965b6ea94d94216a91554646ea15e99
 EBUILD dante-1.3.2.ebuild 2206 SHA256 a2d6afa8cf11f3f7beda7ac789e4be0b81e785f1ef6b693b61abcc35ed8ad71c SHA512 900dc2c3d4ae6d4d59ce0e8cc45bc9c39a4dbc805bf250b8f25e55eb8e984100d6a040732af01ea615534b4c751be9c5f894ee18092d4d856f397d0fb0a92815 WHIRLPOOL 90c9d56507b934668de2f21a29f125dc5ed985b27a4700f6f5618d4314b8673b352d160c2e6e4cefcd1a22bc0cdd7ebc858cd8cf0693eb574294cc1b00617128
@@ -29,22 +30,17 @@ EBUILD dante-1.4.0-r2.ebuild 2705 SHA256 64f45bbca0da085402b4640764800c6da8b19e2
 EBUILD dante-1.4.0.ebuild 2620 SHA256 63c1726d39830347f472857deb2fa2d57e4b53a0f3c1eb9d8e185f2ff4355486 SHA512 ed970158ab70acc120d19e064afc2d4330b7c35106c1b5bea8d2a7dcff2851802d437c8da5727fd6c3529eacdccaac1472575ad02385fd71f0edcb6ba5117354 WHIRLPOOL 17bf96cc1ca58a329ba25fc5e8181e31bed9ba783f5c8b4331b4747f86f7aa0648bcf94c9a18656996748350dc25e2eb1ab9b78eb8fbdd9a316a7e99ea29c374
 EBUILD dante-1.4.0_pre1-r1.ebuild 2277 SHA256 3824190c643244fc7ef27fdcdd965eb7e5a7d210ce7f2a9d9c14925d0efe8354 SHA512 90a3bc74ed93191494d4d9a0e3506003970083b4baebe35e8b71aba4651baa763514a00b29b260178604dcf43d024fbf8e4a81ffbefb70b11ae6e05dcb4e906b WHIRLPOOL 3c856829755fd3e0949e979a3129d57cc8c5b5d5d9f66fbfc19ae307bc77beee318c829c754735c15df852870cde10f72df1c1635b949e3fb85af17316274b61
 EBUILD dante-1.4.0_pre1.ebuild 2268 SHA256 41feb54e177142e8305fab8f6e2dcdf3397eefc86b12b23ffb35f2e5453ec364 SHA512 08f6bd423d644430ea19e0563738ba932ec48d996daa1a54cbc6bf5ed000054b6779e42e19e95f84266da98dd1ea8677e464807ed90c4da7457bd8453537e519 WHIRLPOOL ac6793acd2b41ccf4dc64ff70a947dfe830844aa48f57b99bae4e45a0c7a88b36c9532d93a209b9e66ace394185316b664037140b5c3bce4a9e0dc8e5dc697fb
-MISC ChangeLog 18991 SHA256 12141dfdbf8530557a73c7aa9535ad530f81d818c24657c99a0d61f69ce6c0a2 SHA512 c2bd69d5120a0e198b64aa9085844ea183320728267365d9769711186e783a97a97410af68dd4261021c8944dd91d6f4f0909b1a63fae94d80d4435cba0304b8 WHIRLPOOL ab38b9bfb090140bdb0e6a5a4d8d1292715ac063bdb298c0ff3943340882bd889332d63b558d0071d5557b71b4dbe5b809c4ad03853c9d512794b3858fe6c2fe
+EBUILD dante-1.4.1.ebuild 2667 SHA256 93d5cb61fe06e927b0c77236c6807996b5eb2eae007db49746c8399b724581dd SHA512 ce8b75a25c2c9b662aa49b3fc299db562c5280ac39c947b861dfbf06f3498d87cc2777ee25baa4d6d4c445792dcf2afd4966d70fa8ca95b34ea0585530f70693 WHIRLPOOL e989624038c4c9c9e85d8d601843e33bc609cfbcddea011c1986e7dd313db2d2152a8f331a99453243c1d1ec453f9c33aaf77462fc4addc73a444e2637660808
+MISC ChangeLog 19111 SHA256 c37b9df4dc07415e03bd99fc5d38070f9f3c9e98017016f55a54232e2e70185d SHA512 6496bf489f90a239912386ffa73d93cac37f4d890c3f56eb49805abdf767723e38fdb1bcb6ba916d9b5921431716e3c85a9f7745ea30e9d95ca40f616dfe242a WHIRLPOOL 413fc92b956059885114dd1b46845575cc7167d319eccbe4bcd3085140b1a946083d8d66bc18390bf24d453d4c0a30d81ee620d09ec01a7471a29e476ce26ff6
 MISC metadata.xml 246 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add SHA512 da5edb1cbf3b7e72b1bf22120bcc2efcc794e1e2f032e57426286de9817dba3ef39d95313dbee4cba51c0198f8b4297ac8f1d412335ee00d32e470799d05b7c4 WHIRLPOOL f5a9fd6f048d1732243da133861886c7a8ff3bd024ca831c98496d3150441512929c86bb263a8d89ff96ee5720dcc06c423227cdcc840a9062d9f8bcaf7197e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJT8ra5AAoJEKXdFCfdEflKWoMP/2bDPQIoTlufLwDbJOyLy8AD
-UX4/aObJSGqeTk+36U6xRLqdxbP/wD3wSlMx9QVPDPqSusWw6+RncIkDbTsbUnjD
-l6VtdfqVolZemwbxfm0yfIcpsIBHkkhRJv8IlryOseJfMBUFYLfH2dzRA7dnvA7j
-1jOAZ8xYLli5/00k1cCmnwcRPGMd1XqgDOoWlN7ajhUz2cXXd9a4CJqWHgceqWK3
-Z2DHx0dcNE9D7V5gz79hvCmklFzQdvneDKvPW+T1yFfnx6GHx4Oq7TcSvLFIZnwq
-oBR4RxUgg5ZQkWeLX+znLmS9P6uDzUa3ncPoRTKve453lp9K3a8AUI3ElPTj/mZR
-bggvLYsTFSaaCM0CrnskaYCU41vI09VHxL7wmUDv+HoGZvG12wdKzn20138DVlTH
-QpkAxbFp7TPgSBWEAMhji0NSMKPKDrbSIHbsiXWElbXjIjly+OvVDPBXiziQgzBL
-ur+vKYFpwT2yvAcYM0HWU8Dbba4EVzGQx2xLPiIBoC83LS3iMQ8zCuBsFRnDWSCw
-Vrv4+yXpapJdqoOr5oizRkmGyDypj/gRJy3F6UsNCeLyNSDu61yLQf6j9jnH/Xu0
-7abb5WfHBFoK5XWZFaSsqIPwcxllpDsbtm49vBCLHpB8kfUPcahsaCDYvekqfhHS
-lnTR5MjtOcl2Ux9YjRve
-=VTup
+iQEcBAEBCAAGBQJUDZXrAAoJEEdUh39IaPFNRxgH/2OWmhWtZmmp6moS7PsoMGmd
+gnUtj47PGchPFpPjVMlkQrhRkr4s0jd00I9T2EipABr0mEGJHnukqYbhRJzDYtWP
+cYfNbdkSN0WbyqX6MD8in+gry0KiQQX5iXt1EGa+r95mcJe7RVA2YA2rHb8lNZ2X
+KCHSJBgnVsUUSvCd1/LC/LKo15EgeZNcsJV9j158dbMiokhibn9V+Jdegwf40Qt8
++pmKEmXszRf2dT20m+Nlnz3Ro/qTL/1z/Rb0uCo9ULtUU/sIJclBdkjz49Yv7sBm
++lQ0fG1JOHcAAAqnoWsyszRSvFCGuW8ZBKMiw8dhzE/hR/8fnF+mfu7GTxMF19U=
+=MS5E
 -----END PGP SIGNATURE-----
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..1adbd456d870
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.1.ebuild
@@ -0,0 +1,96 @@
+# 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.1.ebuild,v 1.1 2014/09/08 11:44:49 ssuominen Exp $
+
+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"
+
+RDEPEND="kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-dante )
+	tcpd? ( sys-apps/tcp-wrappers )
+	upnp? ( net-libs/miniupnpc )
+	userland_GNU? ( virtual/shadow )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+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 \
+		--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
+}