7 files changed, 41 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 5bb256aeb..6214751b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+strongswan (4.5.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/strongswan-starter.ipsec.init: Init script should depends on
+    remote_fs instead of local_fs, also provide ipsec instead of vpn as
+    the other ipsec implementations (Closes: #629675)
+  * debian/patches/0001-fix-fprintf-format.patch: Fix FTBFS with gcc 4.6,
+    taken from upstream (Closes: #614486)
+  * debian/control: Tighten dependency version against libstrongswan
+    (Closes: #626170)
+  * debian/strongswan-starter.lintian-overrides, debian/rules:
+    Correctly set restricted permissions on /etc/ipsec.d/private/
+    and /var/lib/strongswan (Closes: #598827)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 04 Jul 2011 10:58:59 +0200
+
 strongswan (4.5.2-1) unstable; urgency=low
 
   * New upstream version 4.5.2. This removes a lot of old manpages that were
diff --git a/debian/control b/debian/control
index f0b44f5fa..8d591e7f9 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Description: strongSwan library and binaries - debugging symbols
 
 Package: strongswan-starter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan, strongswan-ikev1 | strongswan-ikev2
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version}), strongswan-ikev1 | strongswan-ikev2
 Conflicts: strongswan (<< 4.2.12-1)
 Description: strongSwan daemon starter and configuration file parser
  StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
@@ -73,7 +73,7 @@ Description: strongSwan daemon starter and configuration file parser
 Package: strongswan-ikev1
 Architecture: any
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-starter, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version}), strongswan-starter, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
 Suggests: curl
 Provides: ike-server
 Conflicts: freeswan (<< 2.04-12), openswan, strongswan (<< 4.2.12-1)
@@ -91,7 +91,7 @@ Description: strongSwan Internet Key Exchange (v1) daemon
 Package: strongswan-ikev2
 Architecture: any
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan, strongswan-starter | strongswan-nm, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version}), strongswan-starter | strongswan-nm, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
 Suggests: curl
 Provides: ike-server
 Conflicts: freeswan (<< 2.04-12), openswan, strongswan (<< 4.2.12-1)
diff --git a/debian/patches/0001-fix-fprintf-format.patch b/debian/patches/0001-fix-fprintf-format.patch
new file mode 100644
index 000000000..24ec36a82
--- /dev/null
+++ b/debian/patches/0001-fix-fprintf-format.patch
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with gcc 4.6
+Author: Laurent Bigonville <bigon@debian.org>
+Bug-Debian: http://bugs.debian.org/614486
+
+--- a/src/libcharon/plugins/stroke/stroke_ca.c
++++ b/src/libcharon/plugins/stroke/stroke_ca.c
+@@ -319,7 +319,7 @@
+ 	{
+ 		if (first)
+ 		{
+-			fprintf(out, label);
++			fprintf(out, "%s", label);
+ 			first = FALSE;
+ 		}
+ 		else
diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb..00075f1c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-fprintf-format.patch
diff --git a/debian/rules b/debian/rules
index 591025405..72e28e0f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,6 +115,7 @@ endif
 	chmod 600 $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets
 	#chmod 644 $(CURDIR)/debian/strongswan-starter/etc/ipsec.conf
 	chmod 700 -R $(CURDIR)/debian/strongswan-starter/etc/ipsec.d/private/
+	chmod 700 -R $(CURDIR)/debian/strongswan-starter/var/lib/strongswan/
 	# don't know why they come with +x set by default...
 	#chmod 644 $(CURDIR)/debian/strongswan-starter/etc/ipsec.d/policies/*
 	#chmod 644 $(CURDIR)/debian/strongswan-starter/etc/ipsec.d/examples/*
@@ -153,7 +154,6 @@ endif
 binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installdirs
 	dh_installinit --name=ipsec
 	dh_installdebconf
 	dh_installchangelogs NEWS
@@ -161,7 +161,7 @@ binary-common:
 	dh_link
 	dh_strip --dbg-package=strongswan-dbg
 	dh_compress
-	dh_fixperms -X etc/ipsec.secrets -X etc/ipsec.d
+	dh_fixperms -X etc/ipsec.secrets -X etc/ipsec.d -X var/lib/strongswan
 	dh_lintian
 	dh_makeshlibs
 	dh_installdeb
diff --git a/debian/strongswan-starter.ipsec.init b/debian/strongswan-starter.ipsec.init
index 484a4e0b3..cfdbb8426 100644
--- a/debian/strongswan-starter.ipsec.init
+++ b/debian/strongswan-starter.ipsec.init
@@ -1,8 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          vpn
-# Required-Start:    $network $local_fs
-# Required-Stop:     $network $local_fs
+# Provides:          ipsec
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Strongswan IPsec services
diff --git a/debian/strongswan-starter.lintian-overrides b/debian/strongswan-starter.lintian-overrides
index 02731f348..7c2257195 100644
--- a/debian/strongswan-starter.lintian-overrides
+++ b/debian/strongswan-starter.lintian-overrides
@@ -1,4 +1,4 @@
 # as here private data is stored we need tighter perms here
 strongswan-starter: non-standard-dir-perm etc/ipsec.d/private/ 0700 != 0755
 strongswan-starter: non-standard-file-perm etc/ipsec.secrets 0600 != 0644
-strongswan-starter: non-standard-dir-perm var/lib/openswan/ 0700 != 0755
+strongswan-starter: non-standard-dir-perm var/lib/strongswan/ 0700 != 0755