Add after ntpd (bug 390611, thanks Ewoud Kohl van Wijngaarden), fix setupscript functionality (bug 353803, thanks Mateusz Dziadko), assign RDEPEND

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

6 files changed, 118 insertions, 9 deletions

diff --git a/net-misc/aiccu/ChangeLog b/net-misc/aiccu/ChangeLog
index cd14b5386be6..b1bec3cef8cc 100644
--- a/net-misc/aiccu/ChangeLog
+++ b/net-misc/aiccu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/aiccu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.31 2012/08/01 04:56:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.32 2012/08/01 06:39:07 xmw Exp $
+
+*aiccu-2007.01.15-r2 (01 Aug 2012)
+
+  01 Aug 2012; Michael Weber <xmw@gentoo.org> +aiccu-2007.01.15-r2.ebuild,
+  +files/aiccu-2007.01.15-r2-init.gentoo.patch,
+  +files/aiccu-2007.01.15-setupscript.patch, aiccu-2007.01.15-r1.ebuild:
+  Add after ntpd (bug 390611, thanks Ewoud Kohl van Wijngaarden), fix
+  setupscript functionality (bug 353803, thanks Mateusz Dziadko), assign RDEPEND
 
   01 Aug 2012; Michael Weber <xmw@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/net-misc/aiccu/Manifest b/net-misc/aiccu/Manifest
index de150dd45cdf..205f81253bc1 100644
--- a/net-misc/aiccu/Manifest
+++ b/net-misc/aiccu/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA256
 
 AUX aiccu-2007.01.15-Makefile.patch 2128 SHA256 8e282eb8004da15927cb4811e3a3c007cbfb39fab15483b5b918f78e0cfbfcd6 SHA512 bafc7d397edcfc24138fc32137dc0ee6eb2afedd5e14656e3b769ff50790619a421b5dc3860c316e4c2150890154ded1149eaa5e23734dd0e2471464ff032544 WHIRLPOOL ec96c82ef7b2058a82fe4ec2c2a0217a5bd9447eb6b392b9b77db6d9527b393cff2b6892f34d6645728d181cc754dfb66ba27ab687843c82d9cca315e0acfa48
+AUX aiccu-2007.01.15-r2-init.gentoo.patch 677 SHA256 80f1503eb963484ffc8c7dd5a4ef132721439695f5fef77eed0220edc1927a47 SHA512 06ca8ca7d860fddf3c1f30eecbfcb7fb8b2e62b66ea3fbdba25af16b03fd91d47c26c54f9b5589c1e91b3a2dc7efeeb457b98db7dde85484402f6c24db0e2570 WHIRLPOOL 1a039cfdc006023ff48f6d37833c37a73bee1ca86fbbdabe079454b1c205064e3c9bd8dfccae246e7db5b161dbf93a5a1810f42b6caa889f4668f9321bd9447c
+AUX aiccu-2007.01.15-setupscript.patch 414 SHA256 f1bcc87aac41d1c9bbb667c3a26097bf8939279f983245a76c1f7224a1f5c675 SHA512 6170c9c52516d58ea68f2acd61c78379f21a1810a9c19867c57249547aa07ca35b1281ae4dea905ac4600d2b2643b3a1c7050e3adbad963efb3554688dc4ac0a WHIRLPOOL f6257d70de47c9003da2fc9afa7367d770f9b1a9793aca6c847b238acf6f353d6f18a35ec9611dd0db9fbc4eae59c340ad0d1aecd95a45bdff278e61d3eac55b
 AUX aiccu.init.gentoo.patch 651 SHA256 bcb1e6f002b83c519fed4dd54012a20828e86e82e54d1f0142fe1b50c1a59011 SHA512 bfc40346453cb1aad7ae326e3b4ebf66f540817c3a3666ba3b2485af727e2f7f998a306030b3811dd4aa4af1589cf0c940cd72e47e258986946a22bf338a69c2 WHIRLPOOL 9df742b071d25060a7a433e4276673ba463bdf7f4d6c4aca0a6842b37b6d9671c37559608467ae14024e625fa146c822e89be898d48d193326e8c480d3aa7742
-DIST aiccu_20070115.tar.gz 70056 SHA256 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760
-EBUILD aiccu-2007.01.15-r1.ebuild 1284 SHA256 166b77c57dc27d83ebacd86c76e7c42b961ca715445c84a875511b706e0a0fd3 SHA512 4ecd07a2fb93e4f082ea361a8bd0edc5c147cea5ac88a7d63bc4250c049df5b9eea9a6e29f3ebeef2b9d325ffd3e7392b46191031e20d38865cf2b5a82532c07 WHIRLPOOL 4688b83fe07d5a50372c431501010cb5125d3e91f3438b83aaba119d38de50cf746045a5b74b6907b9eb4645216246abe97c5fe7338b2deb50e2e11dfc6d347e
-MISC ChangeLog 4571 SHA256 a6ac25f60b8e3dfa76c221b913b088bee0c197bb1a1e58c5ee81fea2fcc4ad72 SHA512 55d4aba2f16b7c6860028cebff85d6e1bef0fbadf50967458aba873bfe1c82ddd02f41b207560ec5e4b5e35e9e3ab2ddb25a091b21d90b88d91ef182c0a408e6 WHIRLPOOL 76ec1d956026f226b6de19931b707544fe78656cde98a0574596c0efb99f4232079cd36742dd202efe5a798d34f0eaa08e96ad53fcf6d4733231c92edb1ec16e
+DIST aiccu_20070115.tar.gz 70056 SHA256 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 SHA512 15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78 WHIRLPOOL a5743e9c28ec3b9f6bc43f1b715553842a13872f18281239ed76d3b322e3a4c3c3e0f0c5d80b47694bbedaf831d1b3feed285af9f37174cac323b2c1814813d7
+EBUILD aiccu-2007.01.15-r1.ebuild 1303 SHA256 bf9f24609d68678a9c6aecf0c37326d38cb8d0e06356d60af4829ab4fea60050 SHA512 0df7ba7db6d161ee0722d94ca3174fffd0ab5147efbd3d69e3dedf993742fe84c333155ecb385e6e014a7812717bfa32098cb05e00ec78e25a89ba5bc828a89c WHIRLPOOL a96f43eb049063b44b299d4a6352c9455cb7dfce397c1d603ade4f8bf908233cecb4d2d69695326232cbea5d2bd8a0f11d4e4cd61a829e8a1000bdb36a980da1
+EBUILD aiccu-2007.01.15-r2.ebuild 1103 SHA256 fcf1cbc3189b02c5eee0a35d7ad08ad3f11168f2ee11afdd2d80d439428f7614 SHA512 eaa792ac8485daa5b1e1558f9e00abe02fdee470274c0f2082141ffc7bd303f307e7241733b20c3455fd60e03253c187bea6ef0580fe895d91e3fe2075e196bb WHIRLPOOL 41ae029b6f66560a8a0f38e6477932675e35208365b4e0272768eb7a21730efac3244b1eaef4ae6014c7821ecb7ee24e91979fa388dcc5607dbadd015360cde0
+MISC ChangeLog 4955 SHA256 29af9005b95f05ae65b354f3917528e127c21af560713da27f6890797e770ee4 SHA512 24fc8c7cfd51984b4ecf1378a8585568370c07915ad3d7e83c76a51741ddecae465033821dbb134e3c548eca7f7241004dbe1186110e56b726ca9161bd5fe25c WHIRLPOOL 437d269d125b26071534672c19f2e6cf61a9a1302bd3b25adfbe38720c9167d194d884b2c29cd143af32768f9d887092aaa2c26d11e64ef54c96d8c507737966
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAYtqcACgkQknrdDGLu8JA5EgD+IrgwL/kmckMfpTk+KIgiPJRS
-4AWo2T4JRFNyozgtcQIBAJCPP0Hplj+m9N8UVvEcsilOktL6AQHYAaKHX1JgFzWM
-=Z/xd
+iF4EAREIAAYFAlAYzsYACgkQknrdDGLu8JCmcAEAhNvn+7mKJmgOdteLxVWHk8Nc
+cQJInmd04d2nNSho/2EA/1xyVSKICYHYd9vdXAro7m5RWVliE8o6ZpQS8dPrETYt
+=+KRj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
index 821b90679b1c..61ca1f27b938 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild,v 1.6 2011/06/24 18:58:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15-r1.ebuild,v 1.7 2012/08/01 06:39:07 xmw Exp $
 
 EAPI=3
 
@@ -14,8 +14,11 @@ LICENSE="SixXS"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc sparc x86"
 IUSE=""
+
 DEPEND="net-libs/gnutls
 	sys-apps/iproute2"
+RDEPEND="${DEPEND}"
+
 S=${WORKDIR}/aiccu
 
 src_prepare() {
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild
new file mode 100644
index 000000000000..3203ddd82e98
--- /dev/null
+++ b/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild,v 1.1 2012/08/01 06:39:07 xmw Exp $
+
+EAPI=4
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS"
+HOMEPAGE="http://www.sixxs.net/tools/aiccu"
+SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV//\./}.tar.gz"
+
+LICENSE="SixXS"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/gnutls
+	sys-apps/iproute2"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/aiccu
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-init.gentoo.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-setupscript.patch
+}
+
+src_compile() {
+	# Don't use main Makefile since it requires additional
+	# dependencies which are useless for us.
+	emake CC=$(tc-getCC) STRIP= -C unix-console
+}
+
+src_install() {
+	dosbin unix-console/${PN}
+
+	insopts -m 600
+	insinto /etc
+	doins doc/${PN}.conf
+	newinitd doc/${PN}.init.gentoo ${PN}
+
+	dodoc doc/{HOWTO,README,changelog}
+}
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch b/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
new file mode 100644
index 000000000000..35ca2b8a6719
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
@@ -0,0 +1,33 @@
+--- aiccu/doc/aiccu.init.gentoo
++++ aiccu/doc/aiccu.init.gentoo
+@@ -2,7 +2,7 @@
+ 
+ depend() {
+ 	need net
+-	after ntp-client
++	after ntp-client ntpd
+ }
+ 
+ checkconfig() {
+@@ -23,14 +23,19 @@
+ start() {
+ 	checkconfig || return 1
+ 	ebegin "Starting aiccu"
+-	start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start
++	start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start
+ 	eend $?
+ }
+ 
+ 
+ stop() {
+ 	ebegin "Stopping aiccu"
+-	start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop
++	start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop
+ 	eend $?
+ }
+ 
++restart() {
++	stop
++	sleep 3
++	start
++}
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch b/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch
new file mode 100644
index 000000000000..8981530435f3
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch
@@ -0,0 +1,17 @@
+--- aiccu/unix-console/main.c
++++ aiccu/unix-console/main.c
+@@ -471,6 +471,14 @@
+ 	 */
+ 	if (aiccu_setup(hTunnel, true))
+ 	{
++
++		/* Running setup script */
++		if (g_aiccu->setupscript)
++		{
++			aiccu_exec("%s", g_aiccu->setupscript);
++		}
++
++
+ 		/* We need to stay running when doing Heartbeat or AYIYA */
+ 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
+ 			strcasecmp(hTunnel->sType, "ayiya") == 0)