diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 28 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | debian/strongswan-ikev1.install | 4 |
4 files changed, 18 insertions, 34 deletions
diff --git a/debian/changelog b/debian/changelog index 88ae83d9d..eef0669e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,16 @@ strongswan (5.0.1-1) UNRELEASED; urgency=low - 03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali removed, included upstream. - 04-Fixed-IPv6-source-address-lookup dropped, included upstream. + * debian/rules: + - --enable-smartcard, --with-default-pkcs11 and --enable-nat-transport not + valid anymore for ./configure, remove them. + - add --enable-xauth-eap and --enable-xauth-pam. + - remove pluto handling since it's gone + - don't special-case XAuth on kFreeBSD anymore. + * debian/control: + - drop strongswan-ikev1 package + - rename strongswan-ikev2 package to strongswan-ike for now. + * debian/strongswan-ikev1.install removed. -- Yves-Alexis Perez <corsac@debian.org> Wed, 02 Jan 2013 14:18:34 +0100 diff --git a/debian/control b/debian/control index 8751c213d..ef2e3f473 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Homepage: http://www.strongswan.org Package: strongswan Architecture: all -Depends: ${misc:Depends}, strongswan-ikev1, strongswan-ikev2 +Depends: ${misc:Depends}, strongswan-ike Suggests: network-manager-strongswan Description: IPsec VPN solution metapackage The strongSwan VPN suite is based on the IPsec stack in standard Linux 2.6 @@ -61,7 +61,7 @@ Description: strongSwan library and binaries - debugging symbols Package: strongswan-starter Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libstrongswan (= ${binary:Version}), strongswan-ikev1 | strongswan-ikev2, + libstrongswan (= ${binary:Version}), strongswan, adduser Conflicts: strongswan (<< 4.2.12-1) Description: strongSwan daemon starter and configuration file parser @@ -74,27 +74,7 @@ Description: strongSwan daemon starter and configuration file parser the daemons. While the IKEv2 daemon can use other configuration backends, the IKEv1 daemon is limited to configurations from ipsec.conf. -Package: strongswan-ikev1 -Architecture: linux-any -Pre-Depends: debconf | debconf-2.0 -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) -Replaces: openswan -Description: strongSwan Internet Key Exchange (v1) daemon - StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the - native IPsec stack and runs on any recent 2.6 kernel (no patching required). - It supports both IKEv1 and the newer IKEv2 protocols. - . - Pluto is an IPsec IKEv1 daemon. It was inherited from the FreeS/WAN - project, but provides improved X.509 certificate support and other features. - . - Pluto can run in parallel with charon, the newer IKEv2 daemon. - -Package: strongswan-ikev2 +Package: strongswan-ike Architecture: any Pre-Depends: debconf | debconf-2.0 Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -116,7 +96,7 @@ Description: strongSwan Internet Key Exchange (v2) daemon Package: strongswan-nm Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-ikev2 +Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-ike Recommends: network-manager-strongswan Description: strongSwan plugin to interact with NetworkManager StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the diff --git a/debian/rules b/debian/rules index dabf6794a..b469913da 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \ --enable-ldap --enable-curl \ - --enable-smartcard --enable-pkcs11 \ - --with-default-pkcs11=/usr/lib/$(DEB_HOST_MULTIARCH)/opensc-pkcs11.so \ + --enable-pkcs11 \ --enable-mediation --enable-medsrv --enable-medcli \ --enable-openssl --enable-agent \ --enable-ctr --enable-ccm --enable-gcm --enable-addrblock \ @@ -15,7 +14,8 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \ --enable-sql --enable-integrity-test \ --enable-ha \ --enable-led --enable-gcrypt \ - --enable-test-vectors --enable-nat-transport \ + --enable-test-vectors \ + --enable-xauth-eap --enable-xauth-pam \ --disable-blowfish --disable-des # BSD-Young license #--with-user=strongswan --with-group=nogroup # --enable-kernel-pfkey --enable-kernel-klips \ @@ -46,7 +46,7 @@ ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd) # http://wiki.strongswan.org/projects/strongswan/wiki/FreeBSD CONFIGUREARGS += --disable-kernel-netlink \ --enable-kernel-pfkey --enable-kernel-pfroute \ - --disable-pluto --with-group=wheel + --with-group=wheel endif override_dh_auto_configure: @@ -76,7 +76,6 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux) # handle Linux-only plugins dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-dhcp.so dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-farp.so - dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-xauth.so dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so endif @@ -98,7 +97,6 @@ endif -Xlibstrongswan-kernel \ -Xlibstrongswan-dhcp.so \ -Xlibstrongswan-farp.so \ - -Xlibstrongswan-xauth.so \ -Xlibstrongswan-padlock.so # add additional files not covered by upstream makefile... diff --git a/debian/strongswan-ikev1.install b/debian/strongswan-ikev1.install deleted file mode 100644 index 5f91e1b7c..000000000 --- a/debian/strongswan-ikev1.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/ipsec/pluto -usr/lib/ipsec/_pluto_adns -usr/lib/ipsec/whack -usr/share/man/man8/pluto.8 |