Mon Feb 11 00:05:43 PST 2013

8 files changed, 218 insertions, 8 deletions

diff --git a/community/aiccu/01-no-init-script.patch b/community/aiccu/01-no-init-script.patch
new file mode 100644
index 000000000..930d5d21a
--- /dev/null
+++ b/community/aiccu/01-no-init-script.patch
@@ -0,0 +1,17 @@
+Index: aiccu-20070115/Makefile
+===================================================================
+--- aiccu-20070115.orig/Makefile	2009-10-25 22:25:45.000000000 +0100
++++ aiccu-20070115/Makefile	2009-10-25 22:25:58.000000000 +0100
+@@ -84,9 +84,9 @@
+ 	@cp doc/README ${DESTDIR}${dirdoc}
+ 	@cp doc/LICENSE ${DESTDIR}${dirdoc}
+ 	@cp doc/HOWTO  ${DESTDIR}${dirdoc}
+-	@echo "Installing Debian-style init.d"
+-	@mkdir -p ${DESTDIR}${diretc}init.d
+-	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
++#	@echo "Installing Debian-style init.d"
++#	@mkdir -p ${DESTDIR}${diretc}init.d
++#	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
+ else
+ 	@echo "Installing Redhat-style init.d"
+ 	@mkdir -p ${DESTDIR}${diretc}init.d
diff --git a/community/aiccu/02-allow-tunnels.patch b/community/aiccu/02-allow-tunnels.patch
new file mode 100644
index 000000000..ec1c1dade
--- /dev/null
+++ b/community/aiccu/02-allow-tunnels.patch
@@ -0,0 +1,61 @@
+commit d7c4f7c0d34b80c188fa45228ca282fd8771a41d
+Author: Norman Rasmussen <norman@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();
+ 	
diff --git a/community/aiccu/03-no-quiet-gcc.patch b/community/aiccu/03-no-quiet-gcc.patch
new file mode 100644
index 000000000..27d14addf
--- /dev/null
+++ b/community/aiccu/03-no-quiet-gcc.patch
@@ -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
diff --git a/community/aiccu/04-skip-strip.patch b/community/aiccu/04-skip-strip.patch
new file mode 100644
index 000000000..6249a0fe5
--- /dev/null
+++ b/community/aiccu/04-skip-strip.patch
@@ -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
diff --git a/community/aiccu/05-spelling-error.patch b/community/aiccu/05-spelling-error.patch
new file mode 100644
index 000000000..832dbf9ce
--- /dev/null
+++ b/community/aiccu/05-spelling-error.patch
@@ -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;
+ 	}
+ 
diff --git a/community/aiccu/06-setup-script.patch b/community/aiccu/06-setup-script.patch
new file mode 100644
index 000000000..26010f809
--- /dev/null
+++ b/community/aiccu/06-setup-script.patch
@@ -0,0 +1,40 @@
+Author: Norman Rasmussen <norman@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)
diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD
index 062922dda..118210c38 100644
--- a/community/aiccu/PKGBUILD
+++ b/community/aiccu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84051 2013-02-09 13:54:03Z seblu $
+# $Id: PKGBUILD 84114 2013-02-10 18:32:51Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=aiccu
 pkgver=20070115
-pkgrel=1
+pkgrel=2
 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
 arch=('i686' 'x86_64')
 url='http://www.sixxs.net/tools/aiccu/'
@@ -11,12 +11,27 @@ license=('custom')
 depends=('gnutls' 'iproute2')
 backup=('etc/aiccu.conf')
 source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
-        'aiccu.service')
+        'aiccu.service'
+        '01-no-init-script.patch'
+        '02-allow-tunnels.patch'
+        '03-no-quiet-gcc.patch'
+        '04-skip-strip.patch'
+        '05-spelling-error.patch'
+        '06-setup-script.patch')
 md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
-         'e038c9d7882e6e603d87962bac7a0f2a')
+         'e038c9d7882e6e603d87962bac7a0f2a'
+         '6de05338752bfb01772dee37b1dc0454'
+         'b9b2c0e7186f3f96366caaa39252dccc'
+         'b38db1d95760cd9687330b7db5f4ea1d'
+         '6dfa2df27bb4859c7511bfea91337925'
+         '21a37c376ebfcf787c0e7ee8552053ac'
+         '98e73756609f4e09c45c4e5139fd5aed')
 
 build() {
   cd $pkgname
+  for _p in "$srcdir"/*.patch; do
+    patch -p1 -i "$_p"
+  done
   [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed"
   make
 }
@@ -34,7 +49,6 @@ package() {
   install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
   # systemd
   install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service"
-  rm -r "$pkgdir/etc/init.d"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
index 76d7915bd..53b234b6a 100644
--- a/community/cgminer/PKGBUILD
+++ b/community/cgminer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83058 2013-01-27 09:29:50Z andrea $
+# $Id: PKGBUILD 84079 2013-02-10 07:52:11Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: David Manouchehri <david@davidmanouchehri.com>
 
 pkgname=cgminer
-pkgver=2.10.4
+pkgver=2.10.5
 _build=
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
@@ -51,7 +51,7 @@ package() {
   install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
 }
 
-md5sums=('f165e9060796d07b031aacc9468536f4'
+md5sums=('80b00c77a3c38bcb457a47989dfa153c'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'ee39698273671fee0e98d4af16014c36'
          'bd76fc92fedce18c59ccea2aa79cc664')