Add unit and tmp file for systemd compatibility. Fixes bug 448884

Package-Manager: portage-2.2.0_alpha150/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

5 files changed, 40 insertions, 8 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 42ff27eb31b5..78bbe459bcfe 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.244 2013/01/24 11:44:15 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.245 2013/01/25 08:52:26 xarthisius Exp $
+
+  25 Jan 2013; Kacper Kowalik <xarthisius@gentoo.org> +files/openvpn.service,
+  +files/openvpn.tmpfile, openvpn-2.3.0.ebuild:
+  Add unit and tmp file for systemd compatibility. Fixes bug 448884
 
   24 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.3.0.ebuild:
   Emit message about split out easy-rsa.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 8d93c0eb6936..0a980b511ff7 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -8,18 +8,30 @@ AUX openvpn-2.1.init 4186 SHA256 d1b1f8a00935d77521bceb62535350444df3470fa45f4d3
 AUX openvpn-2.2.2-pkcs11.patch 1184 SHA256 100d545927d2bc4395f96777f1e5f0e577bb71edf3d452e91885da4229c7cb79 SHA512 eff515f5fb17e8e95c93cc6af01fc9f24d0baa83e6d44a8c0c8852150ca7d2b224f35c7b5d970908da8f151f63ddf2ae5c589be44b79d72d4af4628262da187d WHIRLPOOL fad0e2c42ea93c896c6b6dbfdcac9241051109f27a011f283c64844b0e050a5b72cd8db4cbbb146eeeb1d69256b934c5f9251c5a8f1240e532a1c52ab0ba8636
 AUX openvpn-9999-pkcs11.patch 1016 SHA256 60dc57fcb367f3d8fca446b306b645e6d0e17ddbe4872f9663f5767d89d91c2d SHA512 f7d67cc445c4c92fb88c0ae84e988e8e72d2bacb5fa3f73f1f0c7315fc8f50cfbf95c16529883281fa26e1159551d8906590428acc1db5387092723168da87b0 WHIRLPOOL c4cc7220708d9cf36b85900bdb34b6eb65d3f0fd84546918318d573d0d8d0e48589e46837639405f0503c6cb629bad20a45712eb21c0c5db9b99d3912e14432d
 AUX openvpn.init 1486 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf SHA512 450595b9ec82ded74c26ed9f73182122e05f53655262a342b195dcedfe63a06a5d9927a3bbe50d0d04f810cc786ac3eb78843877f426c893e165b967bc8ac012 WHIRLPOOL e549221283b4b92c9ada312a746c4ad4c645493c1c844ddaddefecee4c31e17bd4bd8555618408e065c83143e157aaf7e75b44f01abe43f507835df2aa1149d3
+AUX openvpn.service 335 SHA256 a63a6e1505f2b3e20f2c82588dd0c23da9d8c750e1f36fec2ba20a8b5b0c9de1 SHA512 fbd41b80253aaae6750301ac95d8b3bf09e3a70556cc0513792c8e06faa70a716233d134d4928295f381f0f235fcde0eeac9cfa074924b6666a4b46ff7cf91a9 WHIRLPOOL 16f44d10ab03110a21a69716fbac2e64e5376426edd26783d7946d928dd0cc106810126436488843da8e16277d3aa83d208fe50c4aebd9cff86526ce1762b215
+AUX openvpn.tmpfile 39 SHA256 ef3453056a26487d27908d5ced124285403d8e88deb843fccdba9f6724966826 SHA512 659713b35eee340f2b6578796f4335dda391aa635892e802e3f2531f31c9470460b4e4b3be45457f81f3b08b7d60ce15d16f8d70b968fbf24f846ef5f8611a58 WHIRLPOOL 19e4611ffda68a99851921ccaf3a99d04350cd3e0d8833136da151119c267edc383ff96162aa47a2f77171ae908ad011e4119a7a18961ed0bddcbf38d997b976
 AUX up.sh 2594 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd SHA512 f904d6125ed1ddb48ea632c3b290a7a4a7a7436be0d46b323fc8c92f919f9d076fdc78ff7bed0dd65675f0bc3559e531e372b805fc11ef287efeeb4d54fe52f4 WHIRLPOOL 6ca78403ac7019d4e85d05465e5188d4ca2891bc947e1021f2b8497e83ffd9126544dbf82a5e368b9583c69bf6c42a682f1a7912503f862ae2c3dd5e46f0fdcc
 DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00 SHA512 69725652c95d779371ded032db7efeb51d1287cc270e7c6e47dc06ae4b22438e6d6dd7b6d9fc41b9c2315b83eebcd28ca83df47b3f0f3a2f3d7b1aeba9524802 WHIRLPOOL 1a04b5633df65ffb11fecc71c2dd25da2bd1f83114b3138b22b868b65cc7ac1cda5ca3b80c40e54cb32efc525a1c7458f4077b2c7965d646343b0a11cc6ecf91
 DIST openvpn-2.3.0.tar.gz 1130659 SHA256 4602a8d0f66dfa6ac10b7abfeba35260d7d4c570948f6eba5f8216ffa3a2c490 SHA512 ebac619dd746406d6751d84391480f7eae2b6c442bbacf1ce6e3d21952ee85bccc7ca2d526fe04cb7ecde749d2a5abb4e787c0e63c349818c7129f5747a2769a WHIRLPOOL 07dc500cb524db43dc75c0fdb67f01411e7831330229b71059c52e4df98afd2b665a016f594edded7652b23fbaa9671978c86f8eb87eb86844679332d3a3d042
 EBUILD openvpn-2.2.2.ebuild 4866 SHA256 280336add46c76deed96468d9f53ddb409a4db51c9e33b1b6fe8e4049802f948 SHA512 26a0756be18ae1c38875653f272a99a3c3a6502f7084171408eaa8685975e4b36478fca624a6b9253428bdc3249b21801f3c61cb4542d7c4f10aee8012ebd61b WHIRLPOOL 8d32af07d7dd99985346771c49688370a630b84c6c6041967da9394d107df7f47232da986f423d901f875041ec301a76c1437d3c8b3d6065f8159e3160c84145
-EBUILD openvpn-2.3.0.ebuild 3821 SHA256 846f33b16394057efa458c339cafc9838ee3750f2a70f2b95677d886095cf83d SHA512 00da0b456562ea88b345cf264eca964479ffdf79b5286812b6053a67af53ac3863110b375a2702658b5c6bf15a3f10a5273cb8f8666375e0ecd16de4b8bd25ad WHIRLPOOL 458f2b9c015a15b05106a047ec1fbef8d311d8e824ebb592d22ff18b7516c8d48c134333c2722b68d684811bbd17c70698ff011935eb8820cf6ed950399fd123
+EBUILD openvpn-2.3.0.ebuild 3976 SHA256 1764bde23183f883b8a6622e972080635f4115627fdb838c827f0839b818db5f SHA512 73d99d5e8532f44d7bc0d7eaf1f189d96a5f85f78a1d176ded2b197d29d21c9b4935b3958f4bbeb7ce796267eeefe55f832dae57b0aa2e842e0c06556d0d228f WHIRLPOOL 71c717e575a5f06be6bf9755d27e62c10baf9ce0214c93c7ab56522e1a20ecb1b4a08a4b67014c463bbbb0a9b8a185e9a8d611b4157b37536a9d229895aa3a9b
 EBUILD openvpn-9999.ebuild 3765 SHA256 2bbffee6e7ff0e8b9ed6fa4d0fe016c80cbc9de58472e478c3697692b2080ca0 SHA512 21b7cd15f30321dab3be947aeb86386bb90c94d0a2365e30834223c68af43d676cb9613cfd3c96327da7778c81d589f83074d5071094d14e0307d7d3c2bf1f4e WHIRLPOOL 2e19f54e97839f1aca0dc578c95188f1ac1d6bbbdd6ff9a12996a3ed1f294add6ce294559d84e32c54d021095673e692a9b9125017ff621bca9e518dc5189ff8
-MISC ChangeLog 35425 SHA256 4efb67aadf3709cf956e90f3dcb922d4a68bccda131a9d4ad2689c070f89f5d6 SHA512 77d5caa933af478fa06cb5a33d0e12bb1eb5b6d4c4aa0c24cb45dba9f7da03faeff4668f05fc5e6104cdf5c1d7846d369b978453659b6505bb1366d476cf53b9 WHIRLPOOL c1827774dc5d3a17c9538594945fe0873b9349a705b96ce9d66186a475d3a5d99630665c6116e1a5d75f965bfd1ba3b3248ebf40914b2a9de7b725f905c573e7
+MISC ChangeLog 35627 SHA256 977726d5bd539733a9e21c1bb690b25f1764cad005b8ac90333c2f2088dd6e8b SHA512 92212dbb34ddd61bd8e7a566a5b729226b302a394be1942bc649e177cf815cad1fff69d7d57a40d39c579da337c940a537ca9c67c9635b78462ea16f2678ef12 WHIRLPOOL d1fe5a1a91fdb2c27e1d7787c3693ee7af6d06f6a70fed54cd03d51c852ba245a404820971b4df54dcd21350de8b71ab145ca697eb77e68105ac15cc71a0d158
 MISC metadata.xml 881 SHA256 a280fc0f47388260c207e1027f89f05cfb381b4684165dded250b78de22dc0e5 SHA512 09d527b64c5730b72f84c22339ca1561f3b2bca5b22f87106b6b4344258bf0ec27172ffcef3c41359d32c3b66aaf47cf5362164a42238aba25329b7bcefe17e4 WHIRLPOOL c4d6b5e0a1ffd8766b7ee34218dbb7f781e60de592969efab2d7c13a172e3a63ce91cf38fb15b8cabf0e67a2993db75d90946a33e9b0f8a0dc44194c2c73cb69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEBIdMACgkQxeMuLWsGW/sDWQCdHt6YGRD4SBf3s5jAV2iUqWp2
-G48AoLin7sxAM0wQ0K/WXpwZWfnQkJBS
-=w+Kp
+iQIcBAEBCAAGBQJRAkfgAAoJEF0huFKJUZL5yxcP/ROh8Rr7OS7rcVD+sY8E0pWX
+4ffRaDrs61go6luCrWYDimD3pE0pePxn/fteZbnjM2bPQNkHxOnfoW5dXbBwbzCr
+oNCs1YriVkfIyQhX85bvVQGw6PiG44sb15+Krm9NLmBbMoIlnSHp0u6fkeEhUpXm
+6gp0Sw3tQ5l4gkbNTrjjX55Gz1lnp+A+REmga7YH9UVueXVQSg0Qlg3BNmY6yW9x
+7w2KOAllHuFIt9oa84cuwCRtd7it1u1XgB/KHUyvgbKPLNsrKphOlDsV0mwJgQuf
+wiL7brWNGcpJEpP/Eizmk4mAYKwQ4E2LoHNlTxxEneroLQlL0C844qktj5qMO74w
+M5PD+eD4qE2d+pGHWjc80jJEzcfJKAQm5n3bCnwVv79rZAg18MkT0a05cJE/Bx+h
+wgtdeBqWfo3yx2+aPosKmKguquNUGqIEEUX5NrqiYi6Jy2WwdEfTlifP54qXX8Nw
+WKW2aIP7OSO+/ZstQ+7tozjiG+m0cy01buahjPEbwb5boZwBi4fXNSMQwJrqLAC3
+m1HiHl+KlEl8jZr9K+py/irI58QrBCuDnTWAGfeFx/H1TpgzmOWUFvQq2QsBTzyA
+qxixBkW4x00ZBro4Jk3Tdic2+bLBkNfJOBMlAauwVDZMsjjVTiWcD7XqmLBOw4d7
+Gow0Zm7Wa9Kc/dzLPfgY
+=+s6k
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/files/openvpn.service b/net-misc/openvpn/files/openvpn.service
new file mode 100644
index 000000000000..358dcb791a3c
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I
+After=syslog.target network.target
+
+[Service]
+PrivateTmp=true
+Type=forking
+PIDFile=/var/run/openvpn/%i.pid
+ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openvpn/files/openvpn.tmpfile b/net-misc/openvpn/files/openvpn.tmpfile
new file mode 100644
index 000000000000..d5fca71a00a0
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn.tmpfile
@@ -0,0 +1 @@
+D /var/run/openvpn 0710 root openvpn -
diff --git a/net-misc/openvpn/openvpn-2.3.0.ebuild b/net-misc/openvpn/openvpn-2.3.0.ebuild
index 28f4b1bf6e01..5eed9fc986ee 100644
--- a/net-misc/openvpn/openvpn-2.3.0.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.0.ebuild,v 1.2 2013/01/24 11:44:15 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.0.ebuild,v 1.3 2013/01/25 08:52:26 xarthisius Exp $
 
 EAPI=4
 
-inherit multilib autotools flag-o-matic user
+inherit multilib autotools flag-o-matic user systemd
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
 SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
@@ -71,6 +71,9 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r sample contrib
 	fi
+
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf || die
+	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service' || die
 }
 
 pkg_postinst() {