Add unit file (#493978)

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

4 files changed, 93 insertions, 17 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 8bdc7594d7d4..55ef0156bb1d 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.149 2013/08/06 12:35:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.150 2013/12/22 09:29:27 pacho Exp $
+
+*stunnel-4.56-r2 (22 Dec 2013)
+
+  22 Dec 2013; Pacho Ramos <pacho@gentoo.org> +files/stunnel.tmpfiles.conf,
+  +stunnel-4.56-r2.ebuild:
+  Add unit file (#493978)
 
   06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> stunnel-4.56-r1.ebuild:
   Stable for s390, wrt bug #460278
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 236895c929ff..d0815f95382b 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX stunnel-3.26-gentoo.diff 941 SHA256 e2a9fab361699b01ccd004ef598bb868d5f6f37bd40d05b7a16a97cd9ecee2f2 SHA512 73461f59505ee6583e7ba0f7422f1bf3e1cbec6349497ef77bf7987b0c4c8c87bbafdd1c6256c47aa24e3577d5198ce0347f32880f7c0ac48604cfc720137a0f WHIRLPOOL 478ac545efd0c77ef0cc130637788a56b861bf6f203f14319f589086bcbbaebbacd13bac087dafcf8d62cd9ad66ed52a1b608d66b66b66e648c953084c37dbf7
 AUX stunnel-4.44-listen-queue.diff 2205 SHA256 5b94f4b1b2e1daec6a4f28fccf2bbc738581fdb7efcf700d9394af71e5d734fa SHA512 9df8ec5ade5bafea935b73b76d9528146757db4f53b1304188399e3194161b0394d92458c8f5573af69270f08fb9c2c649b6e513bcb98853e8f13f6be1fc04d2 WHIRLPOOL 8356ce215b9f2bb8a9e3359dedcff186d787f44ac46c1699f47662df739cd5235796987961b88569425b29aaff9d030b95601d9f4265574207497546bb94d16c
@@ -12,6 +12,7 @@ AUX stunnel.conf 1423 SHA256 be8deb0e051f594e14c898c2ec8a4a6879adcd48a5628609365
 AUX stunnel.initd 1986 SHA256 4f97093f81b854099851ba32552b36036906933933f7a794c7b1e6aa1c006e3b SHA512 8d764b0687d0d219e30dd489c6f16da20f8bac9d9797d2de937368e03fb18ddfec6c69c6e4bfdafb8bd8e7d751984c34a4351ce2ec1521bf2082fdc5f661f031 WHIRLPOOL 4d1cc28389b8d7b5e2ad16ea7e4b2e8b35ad634e4f8680a6d725389684f44cdc0aff633785d7ada6272c17891869a9b05484717dc296f7a79940ddbc975bec4e
 AUX stunnel.initd-start-stop-daemon 1401 SHA256 65297430933a971e4c96b62666c478b6f37dfd1be5422d1b42fbfa117f445ae9 SHA512 413c6be816bd4e27cdc573a89968362cddcc77d211f745c8e9e3cb86e6a8d44ed54ddf191fda1857e5f99331412a215b80437f52edb4f8029dd05090659cae81 WHIRLPOOL f082360b92bc6870140af22790c161706635022730e1be1dd1f4aa55ba5516b7d2a93a30188b95d3827969faab1c63d61eeaa5925bc4f97f2412fd100e1e765f
 AUX stunnel.rc6 779 SHA256 b2128e3bfe38485ef4afad35b57d8711666281087f3fcf920d5d313642e06dea SHA512 f603be13b92e5221dcedb5715f166d8ab57a1b2e76594bbe9a6ef6adacd033f13daad639be214c0304d42b37963b081b69d8cfe383aa2eb431aade28a09e46cb WHIRLPOOL 6c202615995368bfc2b68769f78e4a12b7331409ac2ebf1f732e17068df3f7268e98b9292b862fa6699c7d1a414427c38515000c7c2294c8af75d7b028061317
+AUX stunnel.tmpfiles.conf 42 SHA256 e27c3f9fe440550ddc03446c0315710b80ebddb51085f169bbc765d7ab56ea63 SHA512 f4a1fa8a03796fd445b5851df22bbaba40b9b5821809a654733b5482c89be9d03a36f893ad4f69f9ae9a10bfc03c84f281082ed716be3597e594fc75be850493 WHIRLPOOL b4c19746e34edb6b4e7f4665b6c11ce0a0d8db0828e93b5f371bc6044d019d35f7df9339a4c0ed1d1cb8710b1b1b2236772d29a8c525ed1f8a67920a5c107354
 DIST stunnel-3.26.tar.gz 228923 SHA256 d2a55b089d46d14bc4b456bb1927303492dab6649867c67a005d2c9d1ededfb3 SHA512 5eb5abc7c74af00a36163ea43b1e8bd9072d4b5aa15c22d48f48252b1c9d0e2fd6ad8a9b7ce49bfa57ce88babb968ee17491bc64049f731f5e6a09675c75399a WHIRLPOOL dadc4fef2442a00e02952368f6245b11fcd53357ec3ce7a95e86e8c7f2a6ba2985bfce39e1c4f577b43254d68716319ce32a38fd3627d8f0f9539d6f1b515b05
 DIST stunnel-4.44.tar.gz 568861 SHA256 fa0dfc33f323abfbc94aa993d90d37481cd2f652ee93ec2f8c333ac7a496c7b9 SHA512 439036efc4d2ad12b8412e7c78670fcca1a8650f822bd9b6bde61003d24671794514b79fa14e1b6ff2776ba992be044d4c4beafd3ab5e345c1a699fa5e003a55 WHIRLPOOL d003aec5b06beb0192b963c23c714bf145297b46fcff94e7c6e3920ec87590ec3ca079bfde4efd1156363efe9643773fa783fc2510fe271f27942d0871d46c1f
 DIST stunnel-4.54.tar.gz 535202 SHA256 b7e1b9e63569574dbdabee8af90b8ab88db3fe13dcb1268d59a1408c56e6de7b SHA512 50533d7d7c33788aadc353321d96935dc41d078a096076d007238b9890fcb32a0d0c99bc69415c4e77122ce37fbfcd2c527b2fc37bc903f3b044ccff341880fd WHIRLPOOL 7efd8fe6bc3ae62a51cacfee2febbe2f28e71761100c0b6f80fe629792953333fa4971ac6fcb9816076f80410aec5e0e3b70bf179f4c8454bbd2916127e1e0d6
@@ -20,22 +21,13 @@ EBUILD stunnel-3.26.ebuild 728 SHA256 7e48fb3cedb7e87cf1461f1eca9a406b82a56985d7
 EBUILD stunnel-4.44.ebuild 2261 SHA256 2478f1a96da39456e398bd20ff24b83973c5d399543ac30f559ff2af6e91fceb SHA512 be43d44c9d9d165bc52a4b0af0ddaf069e7b55e745dc239dc0d83f481e48fc2e4b0d7d51ef47185d1da27a8e02582f7870b0d289513170c5b92376703c415bf8 WHIRLPOOL 9b62493987844651b7993187d817f0d48d25d21c7215f876816bdefb1efae036db2fd2d04fceea5feef0f0c029db6c3ea29090fd7a6731f4a5e2fb5617fbd5cf
 EBUILD stunnel-4.54.ebuild 2344 SHA256 20ef28efb3e7a82262c91ac2c2cf623550547c50f0f48214e18ef28cc5edbb93 SHA512 6d0f50e6852fba738cf093eebed4bf01270a8d199d76168d83dac641f10cb6842c1213eba235e7e1229ca5d684730dedd5d3009b7f85895149d1b66cd5aada2f WHIRLPOOL d7f2b67758dce5252b12ab879ed072642db51feba0f7e12b3db225212362e71d817fcecc2f253dad58bafba434f77c3bad9cc915917a08047381391b67b3ca47
 EBUILD stunnel-4.56-r1.ebuild 2247 SHA256 104923786658ba8f2aa5f73cb7ab7f8e137140b65d73ecfa3746a3304cb75cf9 SHA512 f85de3070e5a6a226de5c8f36174b91d7c659f727d09cf6d53bbed1599b5285a8f672434e7123aefb6593ec069587d95e5ffc3064c91a1a20d34d2330e67d27d WHIRLPOOL 04aa364108d450cbd92698fae438d505b5314a6d9e3d8f62236c4134657da7bee9a9b7899bed4070f1728ec06bf9fb0ba4d9edce96027c689ac9416f4ff31840
-MISC ChangeLog 22153 SHA256 c32560468cc266ed6e6aaa544d71e6232572d61554a59781254489a66307439c SHA512 25d520691c7957cb5da32274c8609d6336ce33c5b76599ed5815c61972c810ed50cc723b6b67cbc2616692ebad3f1c3a97dccb1b66a5fcd6bd1b99d27a45aee1 WHIRLPOOL 5995cda39028337244de783d2f7fcc954cdd26bd41f3ade3964a5f226a4408de878b9e4f76549dbf86db709a97c42d347b236f50671fd10ed44c2bfaecf11d57
+EBUILD stunnel-4.56-r2.ebuild 2383 SHA256 f6291d49fe8400e73959871a83030bd9b5772f9508be708db04a250ff3605159 SHA512 3c9ae76d0eac3c9749488293cd5be0b4cfd3be2c1caceb9b655a134968dbcadb95f27be5d77c27eb3d853c363dc8a897b7f82e7346bd382e6448697131caf6b2 WHIRLPOOL c284464fcdd221f5d360b6b04f6945eb3086ca65e315b1750301559210d41107b99d1c9d6b35772167799a5c7f1c6802220e6c0b606143d2ed16f727af634645
+MISC ChangeLog 22317 SHA256 074cf860419023a9486c5add58c4471cee793b9797108779a89220d76a124263 SHA512 b7f1dbcdd31fca11db69d7917215b147c067bf8e7f8825d8da8f2715c501e3ada62170fdf55af782799f1c7b1731d4a448205cf0103178e6f5a83f8a3d3e5591 WHIRLPOOL 19f62c9d4380af400a9eb2cc8c4fa29502caa0635c94c12b50ba4fb03e3c77dce9a7d7f4a21b927bc00874aeb987444eb03e6d35a047668b7146a4f3d1a22d1a
 MISC metadata.xml 786 SHA256 89e26645a5b0f47e4eeff63f207e868f4f05d313c170c3efeb4ce2af1c73cfb7 SHA512 dcd39ea294b27109f7e9a8d0e8ded9a42e5e27018b25d202af39ff12adf60caa987e326c45912a7bc52ad357dcc87bf618725cd34208888164a8117588466801 WHIRLPOOL 39d384fbfd8b6d618272c844436bc9531aa58a34edcd43807edc7315795ef31b5f26cab4e69adae463ed11c83d8c5953e04935612af22b3002c0e83048ad0e1a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSAOzOAAoJELp701BxlEWfrzAP/11rfC3ZGL+8dO2chvSOfMDe
-EmX8/qYdIUfSOajRNLLRV88XEzdPEAmnz02mcm6FKnyWAZ0z0u6ONfgtp/uAEWUu
-Rbqq4/W14wOban4q3R4SCNQpctod4PQfvhIdhGC90volhZBvpWUUbsoWbMccXRZE
-+8F4kz+BTPM5NxqHs1KhiNZKQsPjEFaB3+nnjUsD0xqML9AvM61wb20GzG4ZBCP6
-uN6a5nhS9OnCWY3LDlJrCiR8jHnHMpBSZNOsO8PTyjB4hBJvZUT8PXv5mKbm+iDm
-VlXF5V7t4Hk85+/SZFQUtPaVHdb9j7SvciouD57qpxZv/nuNJT5GNGj05W35svrS
-xXz32M8UE2FlFDK44cwAiEMjxueZmCZdCPzdZvRCRIVlrCztnxb2FyqYCar+L9LW
-2z2cR5qLOzubXod7vtVhFQ5GgQaNlwCutBXpmZjBZc40ce5G3VmlWI1OwLjQS/MR
-YHvgtvYDtvnaZg1uDcVVNupB3nvzYtr5u1WrTCjM3EnjG5H8G2gw5SIjty6wko5J
-eOFfv3KGs8bU1I+sY/mXpX11Epk9pnT7NDJY3bjzNjb9KKaVEsWNu0gf25QDlDmE
-y766Mw+h2/+F2eoEn3nRQEgM3PxRZnd9IZJhBw+uDl9GXDVTVpsfUVSJES1qExhQ
-AtpNIOUPF4REVFmAfh4L
-=t+Fn
+iEYEAREIAAYFAlK2sPgACgkQCaWpQKGI+9SUNQCfRAftSx2oIpigcM9sTQQBBRZ5
+bcgAn0zVPiEg3vxKUeWgUSjl/4Nz7IVX
+=6tkz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/files/stunnel.tmpfiles.conf b/net-misc/stunnel/files/stunnel.tmpfiles.conf
new file mode 100644
index 000000000000..f118e68a0be0
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/stunnel 0770 stunnel stunnel -
diff --git a/net-misc/stunnel/stunnel-4.56-r2.ebuild b/net-misc/stunnel/stunnel-4.56-r2.ebuild
new file mode 100644
index 000000000000..f4e0d6aaf158
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.56-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.56-r2.ebuild,v 1.1 2013/12/22 09:29:27 pacho Exp $
+
+EAPI="5"
+
+inherit ssl-cert eutils systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://stunnel.mirt.net/"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 selinux tcpd xforward listen-queue"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/openssl-0.9.8k"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	use xforward && epatch "${FILESDIR}/${P}-xforwarded-for.patch"
+	use listen-queue && epatch "${FILESDIR}/${P}-listen-queue.patch"
+
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel.initd-start-stop-daemon stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}