[arch-commits] Commit in aiccu/repos (18 files)
Andreas Radke
andyrtr at archlinux.org
Fri Apr 17 21:18:23 UTC 2015
Date: Friday, April 17, 2015 @ 23:18:23
Author: andyrtr
Revision: 131565
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
aiccu/repos/community-staging-i686/
aiccu/repos/community-staging-i686/02-allow-tunnels.patch
(from rev 131564, aiccu/trunk/02-allow-tunnels.patch)
aiccu/repos/community-staging-i686/03-no-quiet-gcc.patch
(from rev 131564, aiccu/trunk/03-no-quiet-gcc.patch)
aiccu/repos/community-staging-i686/04-skip-strip.patch
(from rev 131564, aiccu/trunk/04-skip-strip.patch)
aiccu/repos/community-staging-i686/05-spelling-error.patch
(from rev 131564, aiccu/trunk/05-spelling-error.patch)
aiccu/repos/community-staging-i686/06-setup-script.patch
(from rev 131564, aiccu/trunk/06-setup-script.patch)
aiccu/repos/community-staging-i686/PKGBUILD
(from rev 131564, aiccu/trunk/PKGBUILD)
aiccu/repos/community-staging-i686/aiccu.service
(from rev 131564, aiccu/trunk/aiccu.service)
aiccu/repos/community-staging-i686/gnutls-3.4.0.patch
(from rev 131564, aiccu/trunk/gnutls-3.4.0.patch)
aiccu/repos/community-staging-x86_64/
aiccu/repos/community-staging-x86_64/02-allow-tunnels.patch
(from rev 131564, aiccu/trunk/02-allow-tunnels.patch)
aiccu/repos/community-staging-x86_64/03-no-quiet-gcc.patch
(from rev 131564, aiccu/trunk/03-no-quiet-gcc.patch)
aiccu/repos/community-staging-x86_64/04-skip-strip.patch
(from rev 131564, aiccu/trunk/04-skip-strip.patch)
aiccu/repos/community-staging-x86_64/05-spelling-error.patch
(from rev 131564, aiccu/trunk/05-spelling-error.patch)
aiccu/repos/community-staging-x86_64/06-setup-script.patch
(from rev 131564, aiccu/trunk/06-setup-script.patch)
aiccu/repos/community-staging-x86_64/PKGBUILD
(from rev 131564, aiccu/trunk/PKGBUILD)
aiccu/repos/community-staging-x86_64/aiccu.service
(from rev 131564, aiccu/trunk/aiccu.service)
aiccu/repos/community-staging-x86_64/gnutls-3.4.0.patch
(from rev 131564, aiccu/trunk/gnutls-3.4.0.patch)
--------------------------------------------------+
community-staging-i686/02-allow-tunnels.patch | 61 +++++++++++++++++++++
community-staging-i686/03-no-quiet-gcc.patch | 16 +++++
community-staging-i686/04-skip-strip.patch | 16 +++++
community-staging-i686/05-spelling-error.patch | 46 +++++++++++++++
community-staging-i686/06-setup-script.patch | 40 +++++++++++++
community-staging-i686/PKGBUILD | 54 ++++++++++++++++++
community-staging-i686/aiccu.service | 12 ++++
community-staging-i686/gnutls-3.4.0.patch | 20 ++++++
community-staging-x86_64/02-allow-tunnels.patch | 61 +++++++++++++++++++++
community-staging-x86_64/03-no-quiet-gcc.patch | 16 +++++
community-staging-x86_64/04-skip-strip.patch | 16 +++++
community-staging-x86_64/05-spelling-error.patch | 46 +++++++++++++++
community-staging-x86_64/06-setup-script.patch | 40 +++++++++++++
community-staging-x86_64/PKGBUILD | 54 ++++++++++++++++++
community-staging-x86_64/aiccu.service | 12 ++++
community-staging-x86_64/gnutls-3.4.0.patch | 20 ++++++
16 files changed, 530 insertions(+)
Copied: aiccu/repos/community-staging-i686/02-allow-tunnels.patch (from rev 131564, aiccu/trunk/02-allow-tunnels.patch)
===================================================================
--- community-staging-i686/02-allow-tunnels.patch (rev 0)
+++ community-staging-i686/02-allow-tunnels.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,61 @@
+commit d7c4f7c0d34b80c188fa45228ca282fd8771a41d
+Author: Norman Rasmussen <norman at rasmussen.co.za>
+Date: Sun Jan 10 21:45:55 2010 +0000
+
+ Allow 'tunnels' mode when there's an already running instance.
+
+diff --git a/unix-console/main.c b/unix-console/main.c
+index 8a4d9a9..388d988 100755
+--- a/unix-console/main.c
++++ b/unix-console/main.c
+@@ -50,7 +50,7 @@ int sigrunning(int sig)
+ /* Close the file again */
+ fclose(f);
+
+- /* If we can HUP it, it still runs */
++ /* If we can signal it, it still runs */
+ return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0);
+ }
+
+@@ -302,20 +302,6 @@ int main(int argc, char *argv[])
+ return -1;
+ }
+
+-#ifndef _WIN32
+- /* start or stop? */
+- if ( mode != A_TEST &&
+- mode != A_AUTOTEST)
+- {
+- /* Already running? */
+- if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
+- {
+- dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n");
+- return 0;
+- }
+- }
+-#endif
+-
+ /* Verify required parameters */
+ if (!g_aiccu->username || !g_aiccu->password)
+ {
+@@ -331,6 +317,20 @@ int main(int argc, char *argv[])
+ return ret == 0 ? -1 : 0;
+ }
+
++#ifndef _WIN32
++ /* start or stop? */
++ if ( mode != A_TEST &&
++ mode != A_AUTOTEST)
++ {
++ /* Already running? */
++ if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
++ {
++ dolog(LOG_ERR, "Already running instance signaled, exiting\n");
++ return 0;
++ }
++ }
++#endif
++
+ /* Get our tunnel */
+ hTunnel = get_tunnel();
+
Copied: aiccu/repos/community-staging-i686/03-no-quiet-gcc.patch (from rev 131564, aiccu/trunk/03-no-quiet-gcc.patch)
===================================================================
--- community-staging-i686/03-no-quiet-gcc.patch (rev 0)
+++ community-staging-i686/03-no-quiet-gcc.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,16 @@
+It's better for us to see gcc output in the build log to ease debugging.
+Quiet builds make that much harder.
+
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:33:06.000000000 +0100
++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:33:12.000000000 +0100
+@@ -26,7 +26,7 @@
+
+ #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
+ CFLAGS += $(CWARNS) -D_GNU_SOURCE
+-CC = @gcc
++CC = gcc
+ RM = rm
+
+ # Add -O3 when nothing is specified yet
Copied: aiccu/repos/community-staging-i686/04-skip-strip.patch (from rev 131564, aiccu/trunk/04-skip-strip.patch)
===================================================================
--- community-staging-i686/04-skip-strip.patch (rev 0)
+++ community-staging-i686/04-skip-strip.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,16 @@
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:31:57.000000000 +0100
++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:32:04.000000000 +0100
+@@ -145,11 +145,6 @@
+
+ aiccu: $(OBJS) ${SRCS} ${INCS}
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
+-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
+- strip $@
+-endif
+-endif
+
+ clean:
+ $(RM) -f $(OBJS) aiccu
Copied: aiccu/repos/community-staging-i686/05-spelling-error.patch (from rev 131564, aiccu/trunk/05-spelling-error.patch)
===================================================================
--- community-staging-i686/05-spelling-error.patch (rev 0)
+++ community-staging-i686/05-spelling-error.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,46 @@
+Fix some spelling errors to satisfy lintian
+
+--- aiccu.orig/common/aiccu_test.c
++++ aiccu/common/aiccu_test.c
+@@ -133,7 +133,7 @@
+ printf("### This confirms the reachability of the other side of the tunnel\n");
+ printf("### If it doesn't reply then check your interface and routing tables\n");
+ printf("### Don't forget to check your firewall of course\n");
+- printf("### If the previous test was succesful then this could be both\n");
++ printf("### If the previous test was successful then this could be both\n");
+ printf("### a firewalling and a routing/interface problem\n");
+ printf("\n");
+ system_arg(PING6, PINGCOUNT, hTunnel->sIPv6_POP);
+--- aiccu.orig/common/common.c
++++ aiccu/common/common.c
+@@ -484,7 +484,7 @@
+ return false;
+ }
+
+- dolog(LOG_DEBUG, "TLS Handshake completed succesfully\n");
++ dolog(LOG_DEBUG, "TLS Handshake completed successfully\n");
+
+ sock->tls_active = true;
+ return true;
+--- aiccu.orig/common/tic.c
++++ aiccu/common/tic.c
+@@ -517,8 +517,8 @@
+ struct in6_addr ipv6_ll, ipv6_local;
+ char ll[100];
+
+- /* Log that the fetch was succesful */
+- dolog(LOG_INFO, "Succesfully retrieved tunnel information for %s\n", sId);
++ /* Log that the fetch was successful */
++ dolog(LOG_INFO, "Successfully retrieved tunnel information for %s\n", sId);
+
+ /*
+ * Some TUN/TAP devices don't have any
+@@ -652,7 +652,7 @@
+ /* All went okay? */
+ if (buf[0] == '2' && buf[1] == '0' && buf[2] == '2')
+ {
+- dolog(LOG_INFO, "Succesfully retrieved POP information for %s\n", sId);
++ dolog(LOG_INFO, "Successfully retrieved POP information for %s\n", sId);
+ return pop;
+ }
+
Copied: aiccu/repos/community-staging-i686/06-setup-script.patch (from rev 131564, aiccu/trunk/06-setup-script.patch)
===================================================================
--- community-staging-i686/06-setup-script.patch (rev 0)
+++ community-staging-i686/06-setup-script.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,40 @@
+Author: Norman Rasmussen <norman at rasmussen.co.za>
+
+ Make setupscript work and add teardownscript setting.
+
+--- aiccu.orig/common/aiccu.c
++++ aiccu/common/aiccu.c
+@@ -212,9 +212,6 @@
+ fprintf(f, "# Try to automatically login and setup the tunnel?\n");
+ fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false");
+ fprintf(f, "\n");
+- fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
+- fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
+- fprintf(f, "\n");
+ fprintf(f, "# TLS Required?\n");
+ fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false");
+ fprintf(f, "\n");
+@@ -231,6 +228,9 @@
+ fprintf(f, "# PID File\n");
+ fprintf(f, "pidfile %s\n", g_aiccu->pidfile);
+ fprintf(f, "\n");
++ fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
++ fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
++ fprintf(f, "\n");
+ fprintf(f, "# Make heartbeats (default true)\n");
+ fprintf(f, "# In general you don't want to turn this off\n");
+ fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n");
+--- aiccu.orig/unix-console/main.c
++++ aiccu/unix-console/main.c
+@@ -471,6 +471,11 @@
+ */
+ if (aiccu_setup(hTunnel, true))
+ {
++ 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)
Copied: aiccu/repos/community-staging-i686/PKGBUILD (from rev 131564, aiccu/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=aiccu
+pkgver=20070115
+pkgrel=5
+pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
+arch=('i686' 'x86_64')
+url='http://www.sixxs.net/tools/aiccu/'
+license=('custom')
+depends=('gnutls' 'iproute2')
+backup=('etc/aiccu.conf')
+source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
+ 'aiccu.service'
+ '02-allow-tunnels.patch'
+ '03-no-quiet-gcc.patch'
+ '04-skip-strip.patch'
+ '05-spelling-error.patch'
+ '06-setup-script.patch'
+ 'gnutls-3.4.0.patch')
+md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
+ '891b0fa527c1b847ce803dac047cf80d'
+ 'b9b2c0e7186f3f96366caaa39252dccc'
+ 'b38db1d95760cd9687330b7db5f4ea1d'
+ '6dfa2df27bb4859c7511bfea91337925'
+ '21a37c376ebfcf787c0e7ee8552053ac'
+ '98e73756609f4e09c45c4e5139fd5aed'
+ '592de37319b62e6a85129735a5dab564')
+
+prepare() {
+ cd $pkgname
+ for _p in "$srcdir"/*.patch; do
+ patch -p1 -i "$_p"
+ done
+}
+
+build() {
+ cd $pkgname
+ [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed"
+ make
+}
+
+package() {
+ install -Dm644 aiccu.service "$pkgdir/usr/lib/systemd/system/aiccu.service"
+ cd $pkgname
+ install -Dm755 unix-console/aiccu "$pkgdir/usr/bin/aiccu"
+ install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+ install -Dm644 doc/aiccu.1 "$pkgdir/usr/share/man/man1/aiccu.1"
+ install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: aiccu/repos/community-staging-i686/aiccu.service (from rev 131564, aiccu/trunk/aiccu.service)
===================================================================
--- community-staging-i686/aiccu.service (rev 0)
+++ community-staging-i686/aiccu.service 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,12 @@
+[Unit]
+Description=SixXS Automatic IPv6 Connectivity Configuration Utility
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/aiccu.pid
+ExecStart=/usr/bin/aiccu start
+ExecStop=/usr/bin/aiccu stop
+
+[Install]
+WantedBy=multi-user.target
Copied: aiccu/repos/community-staging-i686/gnutls-3.4.0.patch (from rev 131564, aiccu/trunk/gnutls-3.4.0.patch)
===================================================================
--- community-staging-i686/gnutls-3.4.0.patch (rev 0)
+++ community-staging-i686/gnutls-3.4.0.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,20 @@
+--- aiccu/common/common.c 2015-04-17 23:08:32.543680010 +0200
++++ aiccu/common/common.c.new 2015-04-17 23:14:02.152457972 +0200
+@@ -272,7 +272,6 @@
+ {
+ #ifdef AICCU_GNUTLS
+ /* Allow connections to servers that have OpenPGP keys as well */
+- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
+ int ret;
+ #endif /* AICCU_GNUTLS*/
+
+@@ -300,8 +299,7 @@
+ gnutls_set_default_priority(sock->session);
+ /* XXX: Return value is not documented in GNUTLS documentation! */
+
+- gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
+- /* XXX: Return value is not documented in GNUTLS documentation! */
++ gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
+
+ /* Configure the x509 credentials for the current session */
+ gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred);
Copied: aiccu/repos/community-staging-x86_64/02-allow-tunnels.patch (from rev 131564, aiccu/trunk/02-allow-tunnels.patch)
===================================================================
--- community-staging-x86_64/02-allow-tunnels.patch (rev 0)
+++ community-staging-x86_64/02-allow-tunnels.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,61 @@
+commit d7c4f7c0d34b80c188fa45228ca282fd8771a41d
+Author: Norman Rasmussen <norman at rasmussen.co.za>
+Date: Sun Jan 10 21:45:55 2010 +0000
+
+ Allow 'tunnels' mode when there's an already running instance.
+
+diff --git a/unix-console/main.c b/unix-console/main.c
+index 8a4d9a9..388d988 100755
+--- a/unix-console/main.c
++++ b/unix-console/main.c
+@@ -50,7 +50,7 @@ int sigrunning(int sig)
+ /* Close the file again */
+ fclose(f);
+
+- /* If we can HUP it, it still runs */
++ /* If we can signal it, it still runs */
+ return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0);
+ }
+
+@@ -302,20 +302,6 @@ int main(int argc, char *argv[])
+ return -1;
+ }
+
+-#ifndef _WIN32
+- /* start or stop? */
+- if ( mode != A_TEST &&
+- mode != A_AUTOTEST)
+- {
+- /* Already running? */
+- if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
+- {
+- dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n");
+- return 0;
+- }
+- }
+-#endif
+-
+ /* Verify required parameters */
+ if (!g_aiccu->username || !g_aiccu->password)
+ {
+@@ -331,6 +317,20 @@ int main(int argc, char *argv[])
+ return ret == 0 ? -1 : 0;
+ }
+
++#ifndef _WIN32
++ /* start or stop? */
++ if ( mode != A_TEST &&
++ mode != A_AUTOTEST)
++ {
++ /* Already running? */
++ if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
++ {
++ dolog(LOG_ERR, "Already running instance signaled, exiting\n");
++ return 0;
++ }
++ }
++#endif
++
+ /* Get our tunnel */
+ hTunnel = get_tunnel();
+
Copied: aiccu/repos/community-staging-x86_64/03-no-quiet-gcc.patch (from rev 131564, aiccu/trunk/03-no-quiet-gcc.patch)
===================================================================
--- community-staging-x86_64/03-no-quiet-gcc.patch (rev 0)
+++ community-staging-x86_64/03-no-quiet-gcc.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,16 @@
+It's better for us to see gcc output in the build log to ease debugging.
+Quiet builds make that much harder.
+
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:33:06.000000000 +0100
++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:33:12.000000000 +0100
+@@ -26,7 +26,7 @@
+
+ #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
+ CFLAGS += $(CWARNS) -D_GNU_SOURCE
+-CC = @gcc
++CC = gcc
+ RM = rm
+
+ # Add -O3 when nothing is specified yet
Copied: aiccu/repos/community-staging-x86_64/04-skip-strip.patch (from rev 131564, aiccu/trunk/04-skip-strip.patch)
===================================================================
--- community-staging-x86_64/04-skip-strip.patch (rev 0)
+++ community-staging-x86_64/04-skip-strip.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,16 @@
+Index: aiccu-20070115/unix-console/Makefile
+===================================================================
+--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:31:57.000000000 +0100
++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:32:04.000000000 +0100
+@@ -145,11 +145,6 @@
+
+ aiccu: $(OBJS) ${SRCS} ${INCS}
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
+-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
+- strip $@
+-endif
+-endif
+
+ clean:
+ $(RM) -f $(OBJS) aiccu
Copied: aiccu/repos/community-staging-x86_64/05-spelling-error.patch (from rev 131564, aiccu/trunk/05-spelling-error.patch)
===================================================================
--- community-staging-x86_64/05-spelling-error.patch (rev 0)
+++ community-staging-x86_64/05-spelling-error.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,46 @@
+Fix some spelling errors to satisfy lintian
+
+--- aiccu.orig/common/aiccu_test.c
++++ aiccu/common/aiccu_test.c
+@@ -133,7 +133,7 @@
+ printf("### This confirms the reachability of the other side of the tunnel\n");
+ printf("### If it doesn't reply then check your interface and routing tables\n");
+ printf("### Don't forget to check your firewall of course\n");
+- printf("### If the previous test was succesful then this could be both\n");
++ printf("### If the previous test was successful then this could be both\n");
+ printf("### a firewalling and a routing/interface problem\n");
+ printf("\n");
+ system_arg(PING6, PINGCOUNT, hTunnel->sIPv6_POP);
+--- aiccu.orig/common/common.c
++++ aiccu/common/common.c
+@@ -484,7 +484,7 @@
+ return false;
+ }
+
+- dolog(LOG_DEBUG, "TLS Handshake completed succesfully\n");
++ dolog(LOG_DEBUG, "TLS Handshake completed successfully\n");
+
+ sock->tls_active = true;
+ return true;
+--- aiccu.orig/common/tic.c
++++ aiccu/common/tic.c
+@@ -517,8 +517,8 @@
+ struct in6_addr ipv6_ll, ipv6_local;
+ char ll[100];
+
+- /* Log that the fetch was succesful */
+- dolog(LOG_INFO, "Succesfully retrieved tunnel information for %s\n", sId);
++ /* Log that the fetch was successful */
++ dolog(LOG_INFO, "Successfully retrieved tunnel information for %s\n", sId);
+
+ /*
+ * Some TUN/TAP devices don't have any
+@@ -652,7 +652,7 @@
+ /* All went okay? */
+ if (buf[0] == '2' && buf[1] == '0' && buf[2] == '2')
+ {
+- dolog(LOG_INFO, "Succesfully retrieved POP information for %s\n", sId);
++ dolog(LOG_INFO, "Successfully retrieved POP information for %s\n", sId);
+ return pop;
+ }
+
Copied: aiccu/repos/community-staging-x86_64/06-setup-script.patch (from rev 131564, aiccu/trunk/06-setup-script.patch)
===================================================================
--- community-staging-x86_64/06-setup-script.patch (rev 0)
+++ community-staging-x86_64/06-setup-script.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,40 @@
+Author: Norman Rasmussen <norman at rasmussen.co.za>
+
+ Make setupscript work and add teardownscript setting.
+
+--- aiccu.orig/common/aiccu.c
++++ aiccu/common/aiccu.c
+@@ -212,9 +212,6 @@
+ fprintf(f, "# Try to automatically login and setup the tunnel?\n");
+ fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false");
+ fprintf(f, "\n");
+- fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
+- fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
+- fprintf(f, "\n");
+ fprintf(f, "# TLS Required?\n");
+ fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false");
+ fprintf(f, "\n");
+@@ -231,6 +228,9 @@
+ fprintf(f, "# PID File\n");
+ fprintf(f, "pidfile %s\n", g_aiccu->pidfile);
+ fprintf(f, "\n");
++ fprintf(f, "# Script to run after setting up the interfaces (default: none)\n");
++ fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>");
++ fprintf(f, "\n");
+ fprintf(f, "# Make heartbeats (default true)\n");
+ fprintf(f, "# In general you don't want to turn this off\n");
+ fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n");
+--- aiccu.orig/unix-console/main.c
++++ aiccu/unix-console/main.c
+@@ -471,6 +471,11 @@
+ */
+ if (aiccu_setup(hTunnel, true))
+ {
++ 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)
Copied: aiccu/repos/community-staging-x86_64/PKGBUILD (from rev 131564, aiccu/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=aiccu
+pkgver=20070115
+pkgrel=5
+pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
+arch=('i686' 'x86_64')
+url='http://www.sixxs.net/tools/aiccu/'
+license=('custom')
+depends=('gnutls' 'iproute2')
+backup=('etc/aiccu.conf')
+source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
+ 'aiccu.service'
+ '02-allow-tunnels.patch'
+ '03-no-quiet-gcc.patch'
+ '04-skip-strip.patch'
+ '05-spelling-error.patch'
+ '06-setup-script.patch'
+ 'gnutls-3.4.0.patch')
+md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
+ '891b0fa527c1b847ce803dac047cf80d'
+ 'b9b2c0e7186f3f96366caaa39252dccc'
+ 'b38db1d95760cd9687330b7db5f4ea1d'
+ '6dfa2df27bb4859c7511bfea91337925'
+ '21a37c376ebfcf787c0e7ee8552053ac'
+ '98e73756609f4e09c45c4e5139fd5aed'
+ '592de37319b62e6a85129735a5dab564')
+
+prepare() {
+ cd $pkgname
+ for _p in "$srcdir"/*.patch; do
+ patch -p1 -i "$_p"
+ done
+}
+
+build() {
+ cd $pkgname
+ [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed"
+ make
+}
+
+package() {
+ install -Dm644 aiccu.service "$pkgdir/usr/lib/systemd/system/aiccu.service"
+ cd $pkgname
+ install -Dm755 unix-console/aiccu "$pkgdir/usr/bin/aiccu"
+ install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+ install -Dm644 doc/aiccu.1 "$pkgdir/usr/share/man/man1/aiccu.1"
+ install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: aiccu/repos/community-staging-x86_64/aiccu.service (from rev 131564, aiccu/trunk/aiccu.service)
===================================================================
--- community-staging-x86_64/aiccu.service (rev 0)
+++ community-staging-x86_64/aiccu.service 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,12 @@
+[Unit]
+Description=SixXS Automatic IPv6 Connectivity Configuration Utility
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/aiccu.pid
+ExecStart=/usr/bin/aiccu start
+ExecStop=/usr/bin/aiccu stop
+
+[Install]
+WantedBy=multi-user.target
Copied: aiccu/repos/community-staging-x86_64/gnutls-3.4.0.patch (from rev 131564, aiccu/trunk/gnutls-3.4.0.patch)
===================================================================
--- community-staging-x86_64/gnutls-3.4.0.patch (rev 0)
+++ community-staging-x86_64/gnutls-3.4.0.patch 2015-04-17 21:18:23 UTC (rev 131565)
@@ -0,0 +1,20 @@
+--- aiccu/common/common.c 2015-04-17 23:08:32.543680010 +0200
++++ aiccu/common/common.c.new 2015-04-17 23:14:02.152457972 +0200
+@@ -272,7 +272,6 @@
+ {
+ #ifdef AICCU_GNUTLS
+ /* Allow connections to servers that have OpenPGP keys as well */
+- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
+ int ret;
+ #endif /* AICCU_GNUTLS*/
+
+@@ -300,8 +299,7 @@
+ gnutls_set_default_priority(sock->session);
+ /* XXX: Return value is not documented in GNUTLS documentation! */
+
+- gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
+- /* XXX: Return value is not documented in GNUTLS documentation! */
++ gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
+
+ /* Configure the x509 credentials for the current session */
+ gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred);
More information about the arch-commits
mailing list