Add unit file (#500500)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 117 insertions, 15 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 918ef9a80a3b..06a0d21cea3f 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2014/01/08 06:24:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.71 2014/02/15 13:03:39 pacho Exp $
+
+*dante-1.4.0-r1 (15 Feb 2014)
+
+  15 Feb 2014; Pacho Ramos <pacho@gentoo.org> +dante-1.4.0-r1.ebuild,
+  +files/dante-sockd.service:
+  Add unit file (#500500)
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> dante-1.1.19-r4.ebuild,
   dante-1.3.2-r1.ebuild, dante-1.3.2.ebuild, dante-1.4.0.ebuild,
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 7c467985c970..d22f726a61da 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -12,6 +12,7 @@ AUX dante-1.4.0-socksify.patch 1203 SHA256 4ee5e22067ef6b3cd5bfaf1774bb19940e1ae
 AUX dante-1.4.0_pre1-osdep-format-macro.patch 479 SHA256 76946857b980acfac393a4bf4ece14e5f65c1f6f67b618b3d075b64b7cf964fb SHA512 09e5c1a820eccbdc7846d0cb71e8a6984715ad996af476a33265090e4252c2f41f4bdb231f0cf3fdb825b7099a5fc7900ce57495632bd14b3b89f00b28f15ce4 WHIRLPOOL b0fd457c25efd61b1917613174c9f8dc33fd8cc7d579ec2e07f89fad72054b23980363a82912695164d2f6b1797fb1d031aa457e8222714e7d7d68779c6d290b
 AUX dante-sockd-conf 463 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74 SHA512 5987980cb74ac69a8eba383eeadeef9d20bfe2317873eed70bec844509167b49dc8408ba3911cea7ef71900f559dd524b4c7099a93b8a777b513de750c032621 WHIRLPOOL ae2484a8b4e63a1c5d96cd04a88fb00b08be024204d35d0a172c0c9c2b55d663be6ef80d122156c63f961cfe61fe2cc11eee83d9344a2f719546ed5e72ddf448
 AUX dante-sockd-init 1812 SHA256 5956be225fd9e90c96127721b04ead92c201fd7d674ccfc7373b2b9de12c496f SHA512 00f37c35b84489260badd78550a6ffa48e2e5430ca63863457d2ab9b79e5c0efb3807d9ba4a62dce54b580a17c31f1e0965fac643c5befda0486042c6575ea4d WHIRLPOOL 261bef0b8392787addec1356ca30e869710e63698dbbbcb6aeb63cbfea29a0b801cd8fdfd7914201c2eeb1c2e3abf1e89ff0a6e386c0cfaa222d907dad8e90d4
+AUX dante-sockd.service 167 SHA256 81e3dd10ca13fd022905147000661598a3fd6183998a2f7068e66af3c4c7cb53 SHA512 0acc71e1ab429d38c61db45dc5eb3c9ea58d822eefc83912ae9d569486eb281184f07183a40754eaf6e4f6f67c46a3683629734d6333767623d702f98bc720de WHIRLPOOL 6b6258f43872a8344cfd4b418846092d0f63e6de9f769793f721b027fd69c7c7c84d3839d60dd9f4a67a7c6994fcb47a569fbf10189cb08f7f95715224fd57e4
 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
@@ -23,25 +24,16 @@ DIST dante-1.4.0.tar.gz 1253458 SHA256 55d448f2d523e69b5637ef12c05556f39201a2c39
 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
+EBUILD dante-1.4.0-r1.ebuild 2681 SHA256 01601797357dd5177849e280ffa15dad7863b147bf5f86267dee4010bb2ec582 SHA512 24031f9fd09c055e947a419be8af598a0b61290dd551af5587ecd9939b2091e800814f3a2314e965ffa438ef340bd8a6a7fee58ac19f4f968f51c64462d658e7 WHIRLPOOL 5d7ce9b4d3d29a006e6f4b276873d0fdee2646a46ca37e7ef699f5acd72328cbfc8be8cfeee07f754bff086a71e14247908686809369e83836eb438702a0a22a
 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 17975 SHA256 016a6cbc9848bafd3fa726023446c639d560a93e3a330730816864e9e224382a SHA512 d1428a8af1d4f6d1f017b9f331fcc42b5f0c5d73e05d29b55c703c30e9c058994b625d911118daa298820d5afa8729462e8d248e19e69b30c9239a780e38159b WHIRLPOOL 2d1e786d73dbcf5e514884d879167b851a09d289ce460d5da3bacad122fdb8f730c1a28fd3d3cd80c3110cb283252a85a7379861e76e1a71d611e59364c52def
+MISC ChangeLog 18132 SHA256 39fb36eed317c76e7ba4a3a5eda0c3a5b96ba9b645e2126cd57bd692f73ecd8d SHA512 20539c4424e7f72cfa9c5cab5215ce52df31c60289595d216cdc03d9af68b9d727136510401f310e6de517740322db1d81d221d9a3505d6d66271879fe030fd7 WHIRLPOOL c260ce358b0409f0b4beaa16b60c62d2edc7c9a56250a85ca911bd182f8b6adfaeb7610bf6b57c4ff4de81560343708c85bdf824ecd913d991918b83328ab2d0
 MISC metadata.xml 246 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add SHA512 da5edb1cbf3b7e72b1bf22120bcc2efcc794e1e2f032e57426286de9817dba3ef39d95313dbee4cba51c0198f8b4297ac8f1d412335ee00d32e470799d05b7c4 WHIRLPOOL f5a9fd6f048d1732243da133861886c7a8ff3bd024ca831c98496d3150441512929c86bb263a8d89ff96ee5720dcc06c423227cdcc840a9062d9f8bcaf7197e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzO8RAAoJEPGu1DbS6WIAmPwP/A1ODvPn8UWooJCESowAOMrg
-QI8veV403psvlJXo6ufwlOYyz+scIGk8x95a5G+no0FUHpoWyKwXZdC7Rs68tKiB
-CiztHDBtvNWVDwVRJ26x6vHMhdABeKEP71OCB2LmiOvtsBAgM361LY7/djl0pawt
-jsHX6FCMZcGllblXIbsKCKI38syn/nsHpfpIfk6sPnkSmbbwvhvFE7MpS8oqhjEO
-zscT8C1KmaLFEeehfHe69zZvMBqiElVCXNKpqlAlXucAdr5Y9Ehq1ji5f+FwDPCp
-fvkmC79RcsrZdFYex5QQiS4t3IguzzPK66yE2Hus5X2An5M52aPFvv+cSgniY6C0
-hP7AhdbvM+hE3XZDbk25EWX1wv6D9m0LOHH9kLRNAeRVUr3qmz7dae9mxpoIb6M6
-EKDXPT6zscO4SDmem/2lKVY4axegV+69LPGMjhM9fKr8kPPQBvGPsCwp6jltIpck
-26Sh5eo/iQ/qbTbyBv2ATzgqf75qF4S48RfdRZskFWk0gW03joc5l2BnWIhWN4XD
-u0AyoW+lcbxFetm0kzKhHUHlkOZt3zoO+JrIJ4ilUXRrYfAxwde0vpavNFlG/pA/
-CaxQfIW6fcPthes4/Mp1IeOEAauftUah0JpuusIG5RfUUMEg+WEeue6RrLkh14wH
-W8aBMYz8kuD/+vn3muTC
-=68pY
+iEYEAREIAAYFAlL/ZawACgkQCaWpQKGI+9QH5ACeJyu3nnlEZW5jP3csF/8EYvng
+WVAAnAsmfgr2p5zXkMte/GES49XTxDxk
+=GGsH
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.4.0-r1.ebuild b/net-proxy/dante/dante-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..7af97074f280
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.0-r1.ebuild
@@ -0,0 +1,95 @@
+# 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-r1.ebuild,v 1.1 2014/02/15 13:03:39 pacho 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="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
+
+	systemd_dounit "${FILESDIR}/dante-sockd.service"
+
+	# 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/files/dante-sockd.service b/net-proxy/dante/files/dante-sockd.service
new file mode 100644
index 000000000000..647a2dcc8cd8
--- /dev/null
+++ b/net-proxy/dante/files/dante-sockd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=SOCKS v4 and v5 compatible proxy server and client
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/sockd 
+
+[Install]
+WantedBy=multi-user.target