- Remove my patches for now.

- Disable fswcert for now.
- Ignore generated HTML documentation.

5 files changed, 11 insertions, 66 deletions

diff --git a/debian/changelog b/debian/changelog
index 6e4484588..413ce0d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,15 @@ strongswan (2.7.0-1) unstable; urgency=low
 
   * Initial Debian packaging of strongswan. This is directly based on my
     Debian package of openswan 2.4.5-3.
+    Closes: #372267: ITP: strongswan -- second fork of freeswan.
+  * Do not compile and ship fswcert right now, because it is not included
+    in strongswan upstream. If it turns out to be necessary for supporting
+    easy-to-use OE in the future (i.e. for generating the DNS format for the
+    public keys from generated X.509 certificates), I will re-add it to the
+    Debian package.
+  * Also disabled my patches to use /etc/default instead of /etc/sysconfig for
+    now. Something like that will be necessary in the future, but those parts
+    of strongswan differ significanty from openswan.
 
  -- Rene Mayrhofer <rmayr@debian.org>  Mon, 22 May 2006 07:37:00 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 0e2981655..e69de29bb 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +0,0 @@
-01-updown-default-path
-01-updown_x509-default-path
\ No newline at end of file
diff --git a/debian/patches/01-updown-default-path.dpatch b/debian/patches/01-updown-default-path.dpatch
deleted file mode 100755
index 215495cab..000000000
--- a/debian/patches/01-updown-default-path.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_updown-default-path.dpatch by  <rene@mayrhofer.eu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes /etc/sysconfig to /etc/default
-
-@DPATCH@
-
---- openswan/programs/_updown/_updown.in.orig	2006-04-15 22:43:19.159741143 +0100
-+++ openswan/programs/_updown/_updown.in	2006-04-15 22:43:26.851946210 +0100
-@@ -116,7 +116,7 @@
- #       PLUTO_CONNECTION_TYPE
- #
- 
--# Import default _updown configs from the /etc/sysconfig/pluto_updown file
-+# Import default _updown configs from the /etc/default/pluto_updown file
- #
- # Two variables can be set in this file:
- #
-@@ -132,9 +132,9 @@
- #       IPRULEARGS
- #              is the extra argument list for ip rule command
- #
--if [ -f /etc/sysconfig/pluto_updown ]
-+if [ -f /etc/default/pluto_updown ]
- then
--    . /etc/sysconfig/pluto_updown
-+    . /etc/default/pluto_updown
- fi
- 
- # check interface version
diff --git a/debian/patches/01-updown_x509-default-path.dpatch b/debian/patches/01-updown_x509-default-path.dpatch
deleted file mode 100755
index ef53bf202..000000000
--- a/debian/patches/01-updown_x509-default-path.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_updown_x509-default-path.dpatch by  <rene@mayrhofer.eu.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes /etc/sysconfig to /etc/default
-
-@DPATCH@
-
---- openswan/programs/_updown_x509/_updown_x509.in.orig	2006-04-15 22:33:22.443407426 +0100
-+++ openswan/programs/_updown_x509/_updown_x509.in	2006-04-15 22:33:36.822921408 +0100
-@@ -125,7 +125,7 @@
- #       PLUTO_CONNECTION_TYPE
- #
- 
--# Import default _updown configs from the /etc/sysconfig/pluto_updown file
-+# Import default _updown configs from the /etc/default/pluto_updown file
- #
- # Two variables can be set in this file:
- #
-@@ -141,9 +141,9 @@
- #       IPRULEARGS
- #              is the extra argument list for ip rule command
- #
--if [ -f /etc/sysconfig/pluto_updown ]
-+if [ -f /etc/default/pluto_updown ]
- then
--    . /etc/sysconfig/pluto_updown
-+    . /etc/default/pluto_updown
- fi
- 
- # check interface version
diff --git a/debian/rules b/debian/rules
index d0e1090ac..71c5bea53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,9 +55,9 @@ build-stamp: patch
 	$(MAKE) -C doc/ index.html
 	
 	# also generate the fswcert tool
-	$(MAKE) -C programs/fswcert/
+	#$(MAKE) -C programs/fswcert/
 	# ugly hack....
-	$(MAKE) -C programs/fswcert/ programs WERROR='-lcrypto'
+	#$(MAKE) -C programs/fswcert/ programs WERROR='-lcrypto'
 
 	touch build-stamp