Merge lp:~lars.duesing/ubuntu/quantal/aiccu/aiccu-sid-merge into lp:ubuntu/quantal/aiccu

[Lars Düsing]

merge from debian sid

[Mathieu Trudel-Lapierre (cyphermox)]

Please fix your merge so that changes remaining as a delta from Debian are listed: this helps reviewing whether those are still needed later when proceeding with another merge, or deciding if it should be a sync instead.

You can check the delta from Debian within a Ubuntu packaging branch using: bzr diff --old debianlp:sid/aiccu

review: Needs Fixing

[lp:~lars.duesing/ubuntu/quantal/aiccu/aiccu-sid-merge]

18. By Lars Düsing on 2012-06-01

* merge from current debian sid. Remaining changes:
  - upstart configuration

[Lars Düsing (lars.duesing)]

done.

review: Resubmit

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine, I'm uploading this. I've made some minor fixes to changelog along the way.

review: Approve

=== added file '.pc/01_no-shipped-init-script.patch/.timestamp'
=== added file '.pc/02_skip-strip.patch/.timestamp'
=== added file '.pc/03_no-quiet-gcc.patch/.timestamp'
=== added file '.pc/04_kfreebsd.patch/.timestamp'
=== added file '.pc/05_spelling-error.patch/.timestamp'
=== added file '.pc/06_syslog_openlog.patch/.timestamp'
=== modified file '.pc/06_syslog_openlog.patch/common/aiccu.c'
--- .pc/06_syslog_openlog.patch/common/aiccu.c	2010-05-29 21:19:43 +0000
+++ .pc/06_syslog_openlog.patch/common/aiccu.c	2012-06-01 21:54:17 +0000
@@ -212,6 +212,9 @@
 	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");
@@ -228,9 +231,6 @@
 	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");

=== added file '.pc/07_allow_tunnels.patch/.timestamp'
=== modified file '.pc/07_allow_tunnels.patch/unix-console/main.c'
--- .pc/07_allow_tunnels.patch/unix-console/main.c	2010-05-29 21:19:43 +0000
+++ .pc/07_allow_tunnels.patch/unix-console/main.c	2012-06-01 21:54:17 +0000
@@ -471,11 +471,6 @@
 	 */
 	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)

=== added file '.pc/08_setup_script.patch/.timestamp'
=== modified file '.pc/08_setup_script.patch/common/aiccu.c'
--- .pc/08_setup_script.patch/common/aiccu.c	2010-05-29 21:19:43 +0000
+++ .pc/08_setup_script.patch/common/aiccu.c	2012-06-01 21:54:17 +0000
@@ -58,6 +58,9 @@
 	int ret;
 #define CAFILE "ca.pem"
 #endif
+#ifndef _WIN32
+	openlog(NULL, LOG_PID, LOG_DAEMON);
+#endif
 	/* Allocate & Initialize */
 	g_aiccu = (struct AICCU_conf *)malloc(sizeof(*g_aiccu));
 	if (!g_aiccu) return false;

=== modified file '.pc/08_setup_script.patch/unix-console/main.c'
--- .pc/08_setup_script.patch/unix-console/main.c	2010-05-29 21:19:43 +0000
+++ .pc/08_setup_script.patch/unix-console/main.c	2012-06-01 21:54:17 +0000
@@ -50,7 +50,7 @@
 	/* 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,6 +302,21 @@
 		return -1;
 	}
 
+	/* Verify required parameters */
+	if (!g_aiccu->username || !g_aiccu->password)
+	{
+		dolog(LOG_ERR, "Required parameters missing, make sure that username and password are given\n");
+		aiccu_FreeConfig();
+		return -1;
+	}
+
+	if (mode == A_TUNNELS)
+	{
+		int ret = list_tunnels();
+		aiccu_FreeConfig();
+		return ret == 0 ? -1 : 0;
+	}
+
 #ifndef _WIN32
 	/* start or stop? */
 	if (	mode != A_TEST &&
@@ -310,27 +325,12 @@
 		/* Already running? */
 		if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
 		{
-			dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n");
+			dolog(LOG_ERR, "Already running instance signaled, exiting\n");
 			return 0;
 		}
 	}
 #endif
 
-	/* Verify required parameters */
-	if (!g_aiccu->username || !g_aiccu->password)
-	{
-		dolog(LOG_ERR, "Required parameters missing, make sure that username and password are given\n");
-		aiccu_FreeConfig();
-		return -1;
-	}
-
-	if (mode == A_TUNNELS)
-	{
-		int ret = list_tunnels();
-		aiccu_FreeConfig();
-		return ret == 0 ? -1 : 0;
-	}
-
 	/* Get our tunnel */
 	hTunnel = get_tunnel();
 	

=== added file '.pc/09_binutils_gold.patch/.timestamp'
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-04-02 11:40:44 +0000
+++ .pc/applied-patches	2012-06-01 21:54:17 +0000
@@ -1,4 +1,3 @@
-08_setup_script.patch
 01_no-shipped-init-script.patch
 02_skip-strip.patch
 03_no-quiet-gcc.patch
@@ -6,4 +5,5 @@
 05_spelling-error.patch
 06_syslog_openlog.patch
 07_allow_tunnels.patch
+08_setup_script.patch
 09_binutils_gold.patch

=== modified file 'debian/changelog' (properties changed: +x to -x)
--- debian/changelog	2012-04-02 11:40:44 +0000
+++ debian/changelog	2012-06-01 21:54:17 +0000
@@ -1,3 +1,23 @@
+aiccu (20070115-15ubuntu1) quantal; urgency=low
+
+  * merge from current debian sid. Remaining changes:
+    - upstart configuration
+
+ -- Lars <[e-mail]>  Fri, 01 Jun 2012 09:57:52 +0200
+
+aiccu (20070115-15) unstable; urgency=low
+
+  * Upgraded standards-version to 3.9.3
+  * Fix "fix for kfreebsd-* dependencies" Updated control file (Closes: #634102)
+  * Fix "please enable hardening options" Enabled all hardening options 
+    (Closes: #644408)
+  * Lintian clean
+    - Remove postrm.debhelper
+    - Make non-executable debian/changelog debian/control
+    - Add description to patch/09_binutils_gold.patch
+
+ -- Reinier Haasjes <[e-mail]>  Mon, 26 Mar 2012 12:54:54 +0200
+
 aiccu (20070115-14.1ubuntu3) precise; urgency=low
 
   [ Lars Duesing ]

=== modified file 'debian/control' (properties changed: +x to -x)
--- debian/control	2012-02-29 08:41:59 +0000
+++ debian/control	2012-06-01 21:54:17 +0000
@@ -4,18 +4,18 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Reinier Haasjes <[e-mail]>
 Build-Depends: debhelper (>= 7), po-debconf, libgnutls-dev, docbook-to-man, quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://www.sixxs.net/tools/aiccu/
 Vcs-Browser: http://github.com/rhaasjes/aiccu
 Vcs-Git: git://github.com/rhaasjes/aiccu.git
 
 Package: aiccu
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, debconf, lsb-base, ucf,
- iputils-ping [!kfreebsd-i386 !kfreebsd-amd64],
- iputils-tracepath [!kfreebsd-i386 !kfreebsd-amd64],
- iproute [!kfreebsd-i386 !kfreebsd-amd64],
- freebsd-net-tools [kfreebsd-i386 kfreebsd-amd64]
+ iputils-ping [linux-any],
+ iputils-tracepath [linux-any],
+ iproute [linux-any],
+ freebsd-net-tools [kfreebsd-any]
 Recommends: ntpdate | ntp | time-daemon, bind9-host | dnsutils
 Description: SixXS Automatic IPv6 Connectivity Client Utility
  This client configures IPv6 connectivity without having to

=== modified file 'debian/patches/09_binutils_gold.patch'
--- debian/patches/09_binutils_gold.patch	2012-02-01 21:46:24 +0000
+++ debian/patches/09_binutils_gold.patch	2012-06-01 21:54:17 +0000
@@ -1,3 +1,5 @@
+Make aiccu compile with ld.gold
+
 Index: aiccu-20070115/unix-console/Makefile
 ===================================================================
 --- aiccu-20070115.orig/unix-console/Makefile	2011-02-27 17:43:53.872782002 +0000

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-02 11:40:44 +0000
+++ debian/patches/series	2012-06-01 21:54:17 +0000
@@ -1,4 +1,3 @@
-08_setup_script.patch
 01_no-shipped-init-script.patch
 02_skip-strip.patch
 03_no-quiet-gcc.patch
@@ -6,4 +5,5 @@
 05_spelling-error.patch
 06_syslog_openlog.patch
 07_allow_tunnels.patch
+08_setup_script.patch
 09_binutils_gold.patch

=== removed file 'debian/postrm.debhelper'
--- debian/postrm.debhelper	2007-02-07 02:51:36 +0000
+++ debian/postrm.debhelper	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# Automatically added by dh_installdebconf
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-	db_purge
-fi
-# End automatically added section

=== modified file 'debian/rules'
--- debian/rules	2010-03-06 10:08:09 +0000
+++ debian/rules	2012-06-01 21:54:17 +0000
@@ -6,6 +6,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# HARDENING
+export DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" 
+
+# dpkg-buildpackage no longer exports CFLAGS/CXXFLAGS/LDFLAGS/CPPFLAGS/FFLAGS
+# http://lists.debian.org/debian-devel-announce/2011/09/msg00001.html
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+RPM_OPT_FLAGS = $(CFLAGS)
+export RPM_OPT_FLAGS
+
 include /usr/share/quilt/quilt.make
 
 %: