Fix systemd support (#482690 by Yichao Zhou)

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

5 files changed, 96 insertions, 7 deletions

diff --git a/net-misc/isatapd/ChangeLog b/net-misc/isatapd/ChangeLog
index def8fd688768..4b2c5eecbb75 100644
--- a/net-misc/isatapd/ChangeLog
+++ b/net-misc/isatapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/isatapd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/isatapd/ChangeLog,v 1.2 2013/09/28 11:18:07 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/isatapd/ChangeLog,v 1.3 2014/03/30 10:09:14 pacho Exp $
+
+*isatapd-0.9.7-r1 (30 Mar 2014)
+
+  30 Mar 2014; Pacho Ramos <pacho@gentoo.org> +files/isatapd.service-r1,
+  +files/isatapd.service.conf, +isatapd-0.9.7-r1.ebuild:
+  Fix systemd support (#482690 by Yichao Zhou)
 
 *isatapd-0.9.7 (28 Sep 2013)
 
diff --git a/net-misc/isatapd/Manifest b/net-misc/isatapd/Manifest
index 2ad133269eb4..661f46f277d7 100644
--- a/net-misc/isatapd/Manifest
+++ b/net-misc/isatapd/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX isatapd.service 159 SHA256 cd7d7650050a53cb7b9b4103e42d5e4655582d0b78acff68e96d6d2dda9c8bdc SHA512 a75bec03b042c1b82c64c6fba569e681a49fe8f0f0baa046847171e48d1f56408ca672e44f59570d602cee0b883fd42bcb6dcc5f8b2695e114d449688315ebcc WHIRLPOOL 0a862debb342a10764b76352faa531c2eca43b9a5573f9bddca9e40f2ba8bd4bb20ee47d36ac374d06e935166256d0aa05ff6dcdb866b097433545d586749f07
+AUX isatapd.service-r1 336 SHA256 918323686332ce7e184a5e88a505ea9734f74964da1e27f9562504bf4f3fa03a SHA512 e8a1b1f92c901169eb7d07ed581d0867ce3b6d25d6b03dd479604b2dddcb39e53100457a174cf96fdc34adf31e8e650519273e1cd81e1bd8f8bd299dc511f37d WHIRLPOOL 9c4224d84cdb8f4fdfff7146d801987fa8ccb4e07be0699f9aa96df63ee1bbb3b71dfd318dcc24130c0ca826d52a1b5080e1891f48cdd346b8aa4cab2e354cd5
+AUX isatapd.service.conf 1026 SHA256 a3c5999d739c50850ef7ead2e932703556c5db3036f14eafc95fbd2f5087428f SHA512 d87ace4cb331d561e817c9dd7fce1ab4b9df60016bba40bfc53728f6c8ee418b17ae71753f6caa0e1647f569037b59d93a3a9778c4f7dcdf543eee702be95c76 WHIRLPOOL 138b0285746b849c09f0536367496e1d965aa62f2d6e05274aba6f3116ef65907e91f681b5af8f743f446d8be6b1233bd0741ccfc235b63abe6ce08228751089
 DIST isatapd-0.9.6.tar.gz 101361 SHA256 a147caa42721a735b2d85219bf1309c263d32d626265746c5da16b5bf4eeb81b SHA512 09a75294ff19474f57d80231bf7ba3cdc532b89036bdbc35e64372b9c222749a5ede5802da1918360be86f9404bb5560cc54846cc05e01d205804fa5e1cddcf7 WHIRLPOOL de4719d872d9d870291a9c77e1d7f13d41c1cabbda3d9651e12c5d04d111e5f1e5f2ca2bf1e6bfcfe349bf58ac90c4d0036bec5dc0ce8aeff3a0bc53c99ef1df
 DIST isatapd-0.9.7.tar.gz 111524 SHA256 927e1bb5fff4582723c642b41561c5ee6d57b15d05c19ea00c589168898897fa SHA512 3ddfc8385b666ec8c0552c7b46841f2b5e8ebb5d9aa3119a9a6d4cacea728cb81dced802d51b7c98da4bbb839de6fe68ef1bc5f62914b48638b6f168fc06100a WHIRLPOOL 8f5cde92cf61ef2cd1c0027802a18ec0aba8e8c0935be30650c62a22f011e03e255976e4858a7490844ab55afee6e83303f616e95fb72c13c61db8ad8e7895a4
 EBUILD isatapd-0.9.6.ebuild 785 SHA256 45eb2bc65da0421903567c43cabdd0c79276484ff248178ead798663572411ea SHA512 0286f96f95b418ff4bcd2d8b49fda0b49b50b139ca06fac4084714bb86e9ff1f4c1e2321c0a66b39ac58588e24929cd99da04866f8a8b7bdf3c9764fc91287c6 WHIRLPOOL 45dd473062b9fb275706a942358e8e0de60d2ffd8b5ae69bc1184a639a6ebd87e411dc8b357164d285ae602c26931e22d600fccd1711409cd9259226993539f9
+EBUILD isatapd-0.9.7-r1.ebuild 918 SHA256 d7d584bf95d47518951df86a6bc15b702d80b90efe764fc69ae3bcc380250099 SHA512 ca120fbd72f251cd384b6a073c28120e68b53aaf35636ad286e9f24f4b44f1df004f977f61f9013abdd089439e7e4ddbb754ad7b42ac7c004da091eed9e72365 WHIRLPOOL 92c084365ce1331a3c49e75b0281735ced0bd8268c32fa0eac4ba55450fda6f134900eb404a410ccce470b827d317154215c33dc3bf3ee4fe6faecbe7a3b9ab6
 EBUILD isatapd-0.9.7.ebuild 838 SHA256 40e5de7557b50e2edfa34a65426474e0c020f00409589efa8823df510f36de98 SHA512 b273500ef40e6910ad588998c6cb11931d9b75ca296fb41e64e23470f645ca9ef71526ad67876f6ef0e1f98a2eb5f533064d4930534fca979bc9d3db467eeeca WHIRLPOOL 062beda4b9acb17512c2671e429df762a4090bf5eefb729f43c7b4f87c08e86a2d4f0bb55dbf8f8305e8d3b88cc32844a119ce4f808b831ec2f827d0fa3247d2
-MISC ChangeLog 531 SHA256 9bddac4c12d92c6de047ee8141cdadb1a79ffaaa2ecbae8be288970af199da27 SHA512 2939d634e05afa9b7fc93611f5ca12e7cd4f81a46f8a6370ad4a0abdbc1f32507f8513c45b85510696c5a479369bfb3d3eb9c1e865c1698a4b9123ae817d26af WHIRLPOOL a87f3e6527697d527f45b6371280cb26dc88d0adbc28561b468f4d425f80ad820994c3effd8a4f6596d8be6a6e7c8b45957aa37e737b9020008a8f3318518b0f
+MISC ChangeLog 742 SHA256 96cf978e12cc81ffcca25b9fd7cd68c9c6340084532693ffed2c7054710ca50b SHA512 0511658db2cc1b9b7cebcc3100ed9b2ada7a2d425f239881aba1e9733b455f765ca12227b1b27b9b0bf28081e6b8c0678a221fee1f8b80052827d56be647c9a3 WHIRLPOOL b7116871e4c4bc7974a2753dbdbf4c882eeae18e0eb85a96d036b6ccf69ed7521400f3d28fb8b93962bf40dfdc5030f5fc4df95ac4f3ba411be0e08e80e31389
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJGuvAACgkQCaWpQKGI+9SO4ACfTtgv1RnM9NTv3l8Su6IpCRY6
-PKcAn2OR0x+Qnk9R8mbSHO+ZBUmhavgD
-=+jXR
+iEYEAREIAAYFAlM37UsACgkQCaWpQKGI+9QouwCfTSZKbOgkU8TouFCWuNasGHrc
+LHMAniwQXmKRG/auuj2w/HZNjHgRitvt
+=jLM7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/isatapd/files/isatapd.service-r1 b/net-misc/isatapd/files/isatapd.service-r1
new file mode 100644
index 000000000000..d1caf3bc1f90
--- /dev/null
+++ b/net-misc/isatapd/files/isatapd.service-r1
@@ -0,0 +1,15 @@
+[Unht]
+Description=ISATAP Client for Linux
+After=network.target nss-lookup.target
+
+[Service]
+ExecStart=/usr/sbin/isatapd ${DAEMON_OPTS} \
+	--interval ${ISATAP_INTERVAL} \
+	--name ${ISATAP_NAME} \
+	--link ${ISATAP_LINK} \
+	--mtu ${ISATAP_MTU} \
+	--check-dns ${ISATAP_CHECK_DNS} \
+	${ISATAP_ROUTERS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/isatapd/files/isatapd.service.conf b/net-misc/isatapd/files/isatapd.service.conf
new file mode 100644
index 000000000000..87fe0be4a23d
--- /dev/null
+++ b/net-misc/isatapd/files/isatapd.service.conf
@@ -0,0 +1,30 @@
+[Service]
+# A space separated list of one or more hostnames/IPv4 addresses to use as
+# potential routers.
+# The default is the unqualified hostname 'isatap'
+Environment="ISATAP_ROUTERS=isatap"
+
+# Interval in seconds to send router solicitations.
+# Default (unset): 'auto'
+Environment="ISATAP_INTERVAL=auto"
+
+# Interval in seconds to check for DNS changes. Set to 0 to disable.
+# Default: 3600
+Environment="ISATAP_CHECK_DNS=3600"
+
+# Link tunnel to device
+# Default (unset): automatically find outgoing device
+Environment="ISATAP_LINK=auto"
+
+# The name of the ISATAP tunnel device
+# Default is 'is0' if ISATAP_LINK is unset and 'is_${ISATAP_LINK}' otherwise.
+Environment="ISATAP_NAME=auto"
+
+# IPv6 MTU of the created ISATAP tunnel interface. The IPv4 path to
+# the ISATAP router and all other ISATAP clients should be able to
+# handle at least MTU+20 bytes. 
+# The minimum IPv6 MTU (1280 Bytes) is the safest choice here
+Environment="ISATAP_MTU=1280"
+
+# Additional options, see isatapd(8) for details
+Environment="DAEMON_OPTS="
diff --git a/net-misc/isatapd/isatapd-0.9.7-r1.ebuild b/net-misc/isatapd/isatapd-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..605ad3fb7995
--- /dev/null
+++ b/net-misc/isatapd/isatapd-0.9.7-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/isatapd/isatapd-0.9.7-r1.ebuild,v 1.1 2014/03/30 10:09:14 pacho Exp $
+
+EAPI=5
+inherit linux-info systemd
+
+DESCRIPTION="creates and maintains an ISATAP tunnel (rfc5214)"
+HOMEPAGE="http://www.saschahlusiak.de/linux/isatap.htm"
+SRC_URI="http://www.saschahlusiak.de/linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+CONFIG_CHECK="~TUN"
+ERROR_TUN="CONFIG_TUN is needed for isatapd to work"
+
+src_prepare() {
+	sed -e '/^opts/s:opts:extra_started_commands:' \
+		-i openrc/isatapd.init.d || die
+}
+
+src_install() {
+	default
+
+	newinitd openrc/isatapd.init.d isatapd
+	newconfd openrc/isatapd.conf.d isatapd
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf
+}