Install systemd unit, bug 477800 by nE0sIghT.

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 81 insertions, 16 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index da9daf5b6219..9b17f7bfca34 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.37 2013/02/13 15:19:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.38 2013/07/29 00:01:43 floppym Exp $
+
+*xl2tpd-1.3.1-r3 (29 Jul 2013)
+
+  29 Jul 2013; Mike Gilbert <floppym@gentoo.org> +files/xl2tpd.conf,
+  +files/xl2tpd.service, +xl2tpd-1.3.1-r3.ebuild:
+  Install systemd unit, bug 477800 by nE0sIghT.
 
   13 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xl2tpd-1.3.1-r2.ebuild:
   Stable for x86, wrt to bug #454694
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 9650a20f052d..68684bc46eeb 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -8,27 +8,20 @@ AUX xl2tpd-1.3.1-no-type-punning-b119c0da.patch 849 SHA256 20d446b8ad52b18212bba
 AUX xl2tpd-dnsretry.patch 1509 SHA256 ac398be2d5fb67cc7c5e5b7247572d89cde85b2dc988e4e99c470afddfc5860c SHA512 7999c8e990f7bcd620042295e5fc6e12cf4b1e4faf7cd560bdd4ade4103b171e76a06cb11caea0046b8141a4fa9592bd8851f933072c5e7f71d8b1f4b6fb2bbd WHIRLPOOL e584d4b46dc6249d41b8228246f856ca263c9c3b6713bbb953b17d3265653ee4e45a582f1e2c80f3ad33a0369ed59ddfab50e4c1b5bab9e3be22814c3d034880
 AUX xl2tpd-init 727 SHA256 d20d2351ab714843cb5ee10452552e3d5c2eebf6c53b277025d66925fd9904a1 SHA512 c28d919c89fc18b34d5b9018ff8ca7764f78950d66cbac325d7fee4280b929571fea59b3259be247bd9790e967045d699a6e3c72a941ece51a0ed3f250d303f8 WHIRLPOOL 6475677981c6d47641f5010d029fae0aeb95ebf6acd6a6b299d09b8b472bdc43cc4d583215474ef40acb34f1b9bf216492225cb9ad210aa7a65517bd521149d4
 AUX xl2tpd-init-r1 385 SHA256 7357aaf234b3fca0d4a76b6ed057e0c10c07b3425da472775ebefbba91af9baf SHA512 a6e047de8c88fc6c3a5dd3263685b2e0650c0c4d1a156989e12571dfa2f8a02b207d1379df7cfe5ada7c68c791bc344646d373232067f2bbf1c9f8315650199b WHIRLPOOL e158848f3c62137d19470f9d7eb912ef5bb5b8585a2f52316c5adf01e1ce22e5e440949d41e8d3ea9634a7d20e1fd854a46c279430dd9120606758d67a3df0e2
+AUX xl2tpd.conf 18 SHA256 9e6280cf9dbd14036dccc3c40a3f9acc65efe279f6c46d7edc1f786adf6f6e6d SHA512 0b3c6d4784b997d12734fe1e5165dc066269db24608638566c0fc317c1927331ed806fdb7a4f816bd16d1f22046b52badd99c2f0977c157b2b3f3ed42071ae42 WHIRLPOOL baedb7e8e2568dad9953894085d2290ce96b5a7c3393b4b4f69cc439a0e2cfe15bda0c505a83c5d0672fa07c4e83eac72ed80e858a28c371409914e3546904e5
+AUX xl2tpd.service 232 SHA256 fa82928fbd632a1c3f2897f371b178b055cee4dd1e46248fd64887e65c1b8e15 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579 WHIRLPOOL b5fa9a92fc399fb2126109694f5f9539f5985c082ec32f13b8a0959bd5c9146761fefd8ff2e2ecbbd084c6609d3d7579dc47da0a29852d1936be8d6ad27efd43
 DIST xl2tpd-1.3.0.tar.gz 550901 SHA256 972b9440d637c7cff3e28ca4cb4131bc33b9394cfcb7d391383202136632c8c0 SHA512 6868060fbce4944919bcc05c603186aaeb04aab52dc9b5276837c1c01dab4739869511c709cb58f6f513e50b7e534cca89edde9ea2ab7d83ee9cc4d4edf30e44 WHIRLPOOL 502317e8433279d24fce4a681b8d0ec7c018c9488950a5a539307d090ad804f3c3a4e1e15eeafbf7d6ba8a82fc6909935438eef099247ce48c11821da4b24836
 DIST xl2tpd-1.3.1.tar.gz 551923 SHA256 147ea96a957628bc31bba6fd5f5ef5522366691f936ce4c0a0988d9876e3ba14 SHA512 2265a19eda1521fd4314ad1b28cc1bb781d2f0edb06ad619afbb364f5896e23db7e444ac10709c1ae9b9ac648e4354aea7af57bb5bc20b706b00e2a131fc29d6 WHIRLPOOL b5465605ae5c3bbf73227f11958a43c66191bb557447ce224de044358e738331cf8e64e783bb5527517683cbcc59d57df9cc17c990f652fe7aed1ab2cfd7f9b2
 EBUILD xl2tpd-1.3.0.ebuild 1156 SHA256 93e9b36c45f104aa9001d4a14319470dcacb6c3bfb760d095446fdc68bfb6d2e SHA512 7e2202396bae2bc7958f4ecc70538c0967fe155ea3fc0bee55547bab8e68349d2846686204e5cb7154c775148f7a9d9a1912f324803701184af2b87637a56597 WHIRLPOOL 40bf4e24473aab5f0adbf97fd2f5754a4860c1e2f97327df8911269fbf5eee2e12bc293b0af1b50393d80acd704d051230a2b6edbe6a4243d9e4bd603bd4af3e
 EBUILD xl2tpd-1.3.1-r1.ebuild 1438 SHA256 3169daa65fa32dd63e4d01f1b7519e3cb76bfcf7cc8b114d4556961839c956ad SHA512 102e34338e256b7f1e0f1b1f782df572b3011850e1122bdbed30cfc1c4fd898fe993e1bc3413173b4d0a004e2cab3ebc01fc84f7aae0a222316a2e0e402b6fda WHIRLPOOL a047fc625f704b583bcce618bafc50cd599fcf44cbd0f1fb2c9d5faa4b07390227662bb1eb2e264a5294684297ee4f91ec536e4d507744af3a44605401b7dcf6
 EBUILD xl2tpd-1.3.1-r2.ebuild 1697 SHA256 befc60185a23f8cd2aa2b1c5f930690342a54e9fa1544ad36cb944916b167866 SHA512 663ff887c43b67200ff3d9d832659b306bd1f98ce0e841a07a6f156ddc925a1facbc7eac58dafc3b7a1a18a6e1be04986ca45cf6564947b3f5049c1812d7e7e7 WHIRLPOOL 22026b4ff68f16547cee7513c0ba8d84be0014930dcf1dce0eac8427df8b29932a91590792304a7b3056fce2e64dba64f146aaee8e1c29553fc3743187768ea5
-MISC ChangeLog 6500 SHA256 8d7e454884352792ae960fa0944c47a555462c454851f1f09df2f3cf444db5fa SHA512 df12124238182f2c9dd6d6bc0f610d4300f6d4dae801f5396be3d3d5e8cb12716b28a69b035f9e80b411496b2b28069c41ad4cf26ad0ff38cb36ce32254c42c9 WHIRLPOOL 5386fd66f58d325d7e1ad6b350ce5e1d9cd280d99253189ed570f3a4013d75ca19f16043def98b4d4c240a16d895238e934c5d0169bfce37af33f43797c05b56
+EBUILD xl2tpd-1.3.1-r3.ebuild 1758 SHA256 ab369c4f665ac78932b1b898fe19e7d34ef385e0bb7a9677ee65f93598fad922 SHA512 d5ec56e7e08d3fdf352908c186d99cc976062e3ad96939ed44419cf7f5a88f00e6ab3f56dc2060057b94de46b7dd1d2073468e592aded956a65a5b423f7e8d45 WHIRLPOOL 9ec2f4607c4b0a90669549e8424589f8bdecbf4ac3ae700978808e6ab34ff278f2a395c22a0a1b8f2d462a40abee4f75c1f430bd1b755ee943d00be9552ce7a0
+MISC ChangeLog 6704 SHA256 e2b9a8408d1f6519c5d02fb16294c6ebde74be22b60f9c7c750cd72d0a34e57f SHA512 e341a0dc2a7bd07242b8451155ae1f87e91a4b224f0a75bf117dee4632745e463d0dc7303c2503d9e7b393be41c5de3edc127bf1473f96816ef331a754d659d9 WHIRLPOOL b888b099bfa81e380cef8b19ddf255521de577359b28fbeb01a2f9171377f34f2ae94a1a1be1c4bf4390d8249d4caa5e46bc50ba8303751f69650433465a5fd1
 MISC metadata.xml 545 SHA256 e53b5282c8bfe7c0ba7b40db85094c632985cde0a5f85cca35461af4f0605381 SHA512 9db75b3c78b63e7acf7a77ae9179e7f2fd074d31da81aaa9ebd837da31a41aa3d26382533c26f13b70c10e0c334f7f74f53b02e9a1eb243f157df729de59722d WHIRLPOOL 740271692bf2f582336958c40208d427b4e6e893a2a758ff9369f95c1db6a49028d26831ef86d418844c5472904dc137dbd3af1a8f3c59b85eb9f5fa8f28dd43
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRG68KAAoJELp701BxlEWfigYP/jz0Nve3+O9zaDH0Z+t4P0eY
-1dEiBcW3x/2/F678JkPTp1e6qBE7bqR+wIxZqDH3ViKo7axzpqAWcjO5DCly47b2
-m5Nv9J89T60XGlGonM+H4+d63DMftqQYrKekvrhvUzAG9PhGCDoxNJl/clWdCzLS
-SrSrKnTqIyInSaxvMWJ3C/qjonjpWh9diybP5ep/YggKy704QMdIEoUMZCDk5K6i
-dlW9Bkc9R/CgkLgrNFbaG9UuKeIKl6d3VM4BINmI3SPA65/pVFlCd4WP10PxgExc
-XCDCwuP1UHMp1ia5stUOYlJQBRZASa7IaAUZ+8iJ3wE0SDVOTAs7Qh/kLJBGg+GU
-OPXpfm0wo/uxdFu6fR8xOHA8BCyRGtqhgpfrKqZtj8MSh7cLMBf6sMAREoPrHTdK
-zuuhF/ltnHtHJD5DJgywR98yreOyIziTXhJGuhowycYf/7DE21D7aXtZsbaSSfS8
-QuAg5V6AedBHMRHVhltFfTwLz49gXCMgSZo97NNFF82eby9Yqzksb2ZJC5CISSj4
-gxROIruILYb8oDTTKqYFTA2t92ZzMzggxf5p1i3hY4XaH12FB2eTkBXjS/L2Uz/Q
-iIwJHVqg3q3/q8Lqkn9jN1zO8dh2BxSHglA9pzU3o0BoyoKooGPRO0EN23jQox2k
-rxqhjQeK8x0zdtQ4CLrR
-=ufyV
+iF4EAREIAAYFAlH1sOgACgkQC77qH+pIQ6S33gD5AZZTMxK9SES4J0/Pxt0tT7yf
+6T6EGzkLxy3aK+E53jQBAKSuyZ4jZ3YU4NX/nV7WhhbHASHAbKxUX+vqyoX0au/0
+=6MC0
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/xl2tpd/files/xl2tpd.conf b/net-dialup/xl2tpd/files/xl2tpd.conf
new file mode 100644
index 000000000000..67162b26df06
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd.conf
@@ -0,0 +1 @@
+d /var/run/xl2tpd
diff --git a/net-dialup/xl2tpd/files/xl2tpd.service b/net-dialup/xl2tpd/files/xl2tpd.service
new file mode 100644
index 000000000000..37d46cc63493
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Layer 2 Tunneling Protocol Daemon (L2TP)
+After=syslog.target network.target
+After=ipsec.service
+
+[Service]
+ExecStart=/usr/sbin/xl2tpd -D
+KillSignal=SIGINT
+SuccessExitStatus=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..fd718ba4106e
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild,v 1.1 2013/07/29 00:01:43 floppym Exp $
+
+EAPI="5"
+
+inherit eutils systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
+SRC_URI="https://github.com/xelerance/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dnsretry +kernel"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	net-dialup/ppp"
+DEPEND+=" kernel? ( >=sys-kernel/linux-headers-2.6.23 )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-CFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-no-type-punning-b119c0da.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-kernelmode.patch"
+	sed -i Makefile -e 's| -O2||g' || die "sed Makefile"
+	# The below patch is questionable. Why wasn't it submitted upstream? If it
+	# ever breaks, it will just be removed. -darkside 20120914
+	use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
+	# Remove bundled headers
+	rm -r linux || die
+}
+
+src_compile() {
+	tc-export CC
+	export OSFLAGS="-DLINUX"
+	use kernel && OSFLAGS+=" -DUSE_KERNEL"
+	emake
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	dodoc CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents doc/rfc2661.txt
+	insinto /etc/xl2tpd
+	newins doc/l2tpd.conf.sample l2tpd.conf
+	newins doc/l2tp-secrets.sample l2tp-secrets
+	fperms 0600 /etc/xl2tpd/l2tp-secrets
+	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
+	systemd_dounit "${FILESDIR}"/xl2tpd.service
+	systemd_dotmpfilesd "${FILESDIR}"/xl2tpd.conf
+}