Fixed #96439, #96599 and #102061. Marked ~hppa.

(Portage version: 2.0.53)

5 files changed, 122 insertions, 4 deletions

diff --git a/net-misc/aiccu/ChangeLog b/net-misc/aiccu/ChangeLog
index 675cafbfe3da..b6bd47988ce7 100644
--- a/net-misc/aiccu/ChangeLog
+++ b/net-misc/aiccu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/aiccu
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.4 2005/12/12 19:35:56 gmsoft Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.5 2006/02/05 09:24:07 gmsoft Exp $
+
+*aiccu-2005.01.31-r1 (05 Feb 2006)
+
+  05 Feb 2006; Guy Martin <gmsoft@gentoo.org>
+  +files/patch_aiccu_ticservpar_2005.01.31, +aiccu-2005.01.31-r1.ebuild:
+  Fixed #96439, #96599 and #102061. Marked ~hppa.
 
   12 Dec 2005; Guy Martin <gmsoft@gentoo.org> metadata.xml:
   Update metadata.
diff --git a/net-misc/aiccu/Manifest b/net-misc/aiccu/Manifest
index 855f4fa8f96b..7fc22d650416 100644
--- a/net-misc/aiccu/Manifest
+++ b/net-misc/aiccu/Manifest
@@ -1,4 +1,7 @@
-MD5 c70eed849cf25b746be14e7f798fb323 aiccu-2005.01.31.ebuild 964
 MD5 29b6511a3dcb740b626ec12ca5d312aa ChangeLog 531
-MD5 dc06a62398301cee7dfe5e088a248f9a metadata.xml 245
+MD5 cbe70d92f3a8fe1213e13cf7e12b6fe7 aiccu-2005.01.31-r1.ebuild 1163
+MD5 c70eed849cf25b746be14e7f798fb323 aiccu-2005.01.31.ebuild 964
 MD5 9660dc0f8e9a9022cdcce8b424230519 files/digest-aiccu-2005.01.31 67
+MD5 9660dc0f8e9a9022cdcce8b424230519 files/digest-aiccu-2005.01.31-r1 67
+MD5 db3cd9638eb397a6dbc6404f210cae68 files/patch_aiccu_ticservpar_2005.01.31 2368
+MD5 dc06a62398301cee7dfe5e088a248f9a metadata.xml 245
diff --git a/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild b/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild
new file mode 100644
index 000000000000..9887b2fac447
--- /dev/null
+++ b/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2005.01.31-r1.ebuild,v 1.1 2006/02/05 09:24:07 gmsoft Exp $
+
+inherit 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/${PN}/unix/${PN}_${PV}.tar.gz"
+
+LICENSE="AICCU"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~hppa"
+IUSE=""
+DEPEND="sys-apps/iproute2"
+S=${WORKDIR}/${PN}
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/patch_aiccu_ticservpar_${PV}
+	sed -e 's/ip -6 ro /ip -6 route /' -i common/aiccu_linux.c
+}
+
+src_compile() {
+	emake RPM_OPT_FLAGS="${CFLAGS}" || die "Build Failed"
+}
+
+src_install() {
+	dosbin unix-console/aiccu
+	insopts -m 600
+	insinto /etc
+	doins doc/aiccu.conf
+	dodoc doc/{HOWTO,LICENSE,README,changelog}
+	newinitd doc/aiccu.init.gentoo aiccu
+}
+
+pkg_postinst() {
+	einfo "The aiccu ebuild installs an init script named 'aiccu'"
+	einfo "To add support for a SixXS connection at startup, do"
+	einfo "edit your /etc/aiccu.conf and do"
+	einfo "# rc-update add aiccu default"
+}
diff --git a/net-misc/aiccu/files/digest-aiccu-2005.01.31-r1 b/net-misc/aiccu/files/digest-aiccu-2005.01.31-r1
new file mode 100644
index 000000000000..7e95f6ad5cb9
--- /dev/null
+++ b/net-misc/aiccu/files/digest-aiccu-2005.01.31-r1
@@ -0,0 +1 @@
+MD5 7c3da5feab3d59fb5a99a45203e0ca56 aiccu_2005.01.31.tar.gz 45672
diff --git a/net-misc/aiccu/files/patch_aiccu_ticservpar_2005.01.31 b/net-misc/aiccu/files/patch_aiccu_ticservpar_2005.01.31
new file mode 100644
index 000000000000..bc29e3eee919
--- /dev/null
+++ b/net-misc/aiccu/files/patch_aiccu_ticservpar_2005.01.31
@@ -0,0 +1,65 @@
+diff -urN aiccu_2005.01.31/common/aiccu.c aiccu-work/common/aiccu.c
+--- aiccu_2005.01.31/common/aiccu.c	2005-01-11 13:16:09.000000000 +0100
++++ aiccu-work/common/aiccu.c	2005-07-20 14:25:46.000000000 +0200
+@@ -18,6 +18,7 @@
+ struct pl_rule aiccu_conf_rules[] =
+ {
+ 	/* Configuration */
++	{"tic_server",		PLRT_STRING,	offsetof(struct AICCU_conf, tic_server)},
+ 	{"username",		PLRT_STRING,	offsetof(struct AICCU_conf, username)},
+ 	{"password",		PLRT_STRING,	offsetof(struct AICCU_conf, password)},
+ 	{"ipv4_interface",	PLRT_STRING,	offsetof(struct AICCU_conf, ipv4_interface)},
+@@ -87,6 +88,12 @@
+ 
+ 	fprintf(f, "# AICCU Configuration (Automatically stored by aiccu %s)\n", AICCU_VER);
+ 	fprintf(f, "\n");
++	if(g_aiccu->tic_server)
++	{
++		fprintf(f, "# TIC server\n");
++		fprintf(f, "tic_server %s\n", g_aiccu->tic_server);
++		fprintf(f, "\n");
++	}
+ 	fprintf(f, "# Login information\n");
+ 	fprintf(f, "username %s\n", g_aiccu->username);
+ 	fprintf(f, "password %s\n", g_aiccu->password);
+@@ -116,6 +123,8 @@
+ void aiccu_FreeConfig()
+ {
+ 	if (!g_aiccu) return;
++	if (g_aiccu->tic_server)	free(g_aiccu->tic_server);
++	g_aiccu->tic_server = NULL;
+ 	if (g_aiccu->username)		free(g_aiccu->username);
+ 	g_aiccu->username = NULL;
+ 	if (g_aiccu->password)		free(g_aiccu->password);
+diff -urN aiccu_2005.01.31/common/aiccu.h aiccu-work/common/aiccu.h
+--- aiccu_2005.01.31/common/aiccu.h	2005-01-31 20:05:52.000000000 +0100
++++ aiccu-work/common/aiccu.h	2005-07-20 14:24:44.000000000 +0200
+@@ -73,6 +73,7 @@
+ 	bool		verbose;
+ 
+ 	/* Only for AICCU */
++	char		*tic_server;
+ 	char		*username;
+ 	char		*password;
+ 	char		*ipv4_interface;
+diff -urN aiccu_2005.01.31/common/tic.c aiccu-work/common/tic.c
+--- aiccu_2005.01.31/common/tic.c	2005-02-02 19:52:29.000000000 +0100
++++ aiccu-work/common/tic.c	2005-07-20 14:26:08.000000000 +0200
+@@ -63,6 +63,7 @@
+ bool tic_Login(struct TIC_conf *tic, char *username, char *password)
+ {
+ 	char		buf[1024], sSignature[33], sChallenge[1024];
++	char		*server = g_aiccu->tic_server;
+ 	int		i;
+ #ifndef _WIN32
+ 	struct utsname	utsname;
+@@ -74,7 +75,7 @@
+ #endif
+ 
+ /* Connect to the TIC server */
+-	tic->sock = connect_client(TIC_SERVER, TIC_PORT, AF_INET, SOCK_STREAM);
++	tic->sock = connect_client((server?server:TIC_SERVER), TIC_PORT, AF_INET, SOCK_STREAM);
+ 	if (tic->sock == -1)
+ 	{
+ 		dolog(LOG_ERR, "Couldn't connect to the TIC server\n");
+