diff options
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 68 | ||||
| -rwxr-xr-x | debian/rules | 13 | ||||
| -rw-r--r-- | debian/strongswan-ike.install | 6 | ||||
| -rw-r--r-- | debian/strongswan-starter.install | 2 |
5 files changed, 64 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index 77bf2a952..3d5476e6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +strongswan (5.1.0-3) UNRELEASED; urgency=low + + * debian/rules: + - enable and install af-ag plugin on Linux. closes: #718292 + - enable certexpire plugin. closes: #718293 + - enable lookip plugin. closes: #718299 + - enable error-notify plugin. closes: #718304 + - enable unity plugin. closes: #718289 + * debian/strongswan-ike.install: + - install certexpire and unity plugins. + - install lookip binary and plugin. + - install error-notify binary and plugin. + * debian/control: + - update long description, thanks to Justin B Rye. closes: #725085 + - strongswan-ike: only depend on iproute on Linux arches. + + -- Yves-Alexis Perez <corsac@debian.org> Tue, 01 Oct 2013 09:35:37 +0200 + strongswan (5.1.0-2) unstable; urgency=medium * urgency=medium since we already spent 16 days in unstable and the fix is diff --git a/debian/control b/debian/control index 54309fcb2..683fbd274 100644 --- a/debian/control +++ b/debian/control @@ -20,13 +20,8 @@ Architecture: all 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 - kernels. It supports both the IKEv1 and IKEv2 protocols. - . - StrongSwan is one of the two remaining forks of the original FreeS/WAN - project and focuses on IKEv2 support, X.509 authentication and complete PKI - support. For a focus on Opportunistic Encryption (OE) and interoperability - with non-standard IPsec features, see Openswan. + The strongSwan VPN suite uses the native IPsec stack in the standard Linux + kernel. It supports both the IKEv1 and IKEv2 protocols. . This metapackage installs the packages required to maintain IKEv1 and IKEv2 connections via ipsec.conf or ipsec.secrets. @@ -38,9 +33,8 @@ Conflicts: strongswan (<< 4.2.12-1) Breaks: strongswan-ikev2 (<< 4.6.4) Replaces: strongswan-ikev2 (<< 4.6.4) Description: strongSwan utility and crypto library - 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. + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . This package provides the underlying library of charon and other strongSwan components. It is built in a modular way and is extendable through various @@ -52,11 +46,10 @@ Section: debug Priority: extra Depends: ${misc:Depends}, strongswan, libstrongswan Description: strongSwan library and binaries - debugging symbols - 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. + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . - This package provides the symbols needed for debugging of strongswan. + This package provides the symbols needed for debugging of strongSwan. Package: strongswan-starter Architecture: any @@ -65,13 +58,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Conflicts: strongswan (<< 4.2.12-1) Description: strongSwan daemon starter and configuration file parser - StrongSwan is an IPsec-based VPN solution for Linux and other Unixes. It uses - the native IPsec stack and runs on any recent kernel (no patching required). - It supports both IKEv1 and the newer IKEv2 protocols. + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . - The starter and the associated "ipsec" script control the charon daemon - from the command line. It parses ipsec.conf and loads the configurations to - the daemon. + The starter and the associated "ipsec" script control the charon daemon from + the command line. It parses ipsec.conf and loads the configurations to the + daemon. Package: strongswan-ike Architecture: any @@ -84,22 +76,20 @@ Provides: ike-server Conflicts: freeswan (<< 2.04-12), openswan, strongswan (<< 4.2.12-1) Replaces: strongswan-ikev1, strongswan-ikev2 Description: strongSwan Internet Key Exchange (v2) 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. + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . - Charon is an IPsec IKEv2 daemon. It is - written from scratch using a fully multi-threaded design and a modular - architecture. Various plugins provide additional functionality. + charon is an IPsec IKEv2 daemon. It is written from scratch using a fully + multi-threaded design and a modular architecture. Various plugins provide + additional functionality. Package: strongswan-nm Architecture: linux-any 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 - native IPsec stack and runs on any recent 2.6 kernel (no patching required). - It supports both IKEv1 and the newer IKEv2 protocols. + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . This plugin provides an interface which allows NetworkManager to configure and control the IKEv2 daemon directly through D-Bus. It is designed to work @@ -111,23 +101,23 @@ Architecture: all Depends: ${misc:Depends}, strongswan-ike Section: oldlibs Priority: extra -Description: strongswan IKEv1 daemon, transitional package - 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. +Description: strongSwan IKEv1 daemon, transitional package + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . This package used to install the pluto daemon, implementing the IKEv1 - protocol. It has been replaced by charon in the strongswan-ike package. + protocol. It has been replaced by charon in the strongswan-ike package, so + this package can be safely removed once it's installed. Package: strongswan-ikev2 Architecture: all Depends: ${misc:Depends}, strongswan-ike Section: oldlibs Priority: extra -Description: strongswan IKEv2 daemon, transitional package - 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. +Description: strongSwan IKEv2 daemon, transitional package + The strongSwan VPN suite uses the native IPsec stack in the standard + Linux kernel. It supports both the IKEv1 and IKEv2 protocols. . This package used to install the charon daemon, implementing the IKEv2 - protocol. It has been replaced the strongswan-ike package. + protocol. It has been replaced the strongswan-ike package, so it can be safely + removed. diff --git a/debian/rules b/debian/rules index 7eb0aef43..e9e4cc427 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,10 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \ --enable-xauth-eap --enable-xauth-pam \ --enable-attr-sql \ --enable-cmd \ + --enable-certexpire \ + --enable-lookip \ + --enable-error-notify \ + --enable-unity \ --disable-blowfish --disable-des # BSD-Young license #--with-user=strongswan --with-group=nogroup # --enable-kernel-pfkey --enable-kernel-klips \ @@ -45,7 +49,8 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux) CONFIGUREARGS += --enable-nm \ --with-capabilities=libcap \ --enable-farp \ - --enable-dhcp + --enable-dhcp \ + --enable-af-alg endif ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd) @@ -84,6 +89,7 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux) 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-kernel-netlink.so + dh_install -p libstrongswan usr/lib/ipsec/plugins/libstrongswan-af-alg.so endif ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd) @@ -109,8 +115,9 @@ endif -Xlibstrongswan-kernel \ -Xlibstrongswan-dhcp.so \ -Xlibstrongswan-farp.so \ - -Xlibstrongswan-padlock.so \ - -Xlibstrongswan-rdrand.so + -Xlibstrongswan-padlock.so \ + -Xlibstrongswan-rdrand.so \ + -Xlibstrongswan-af-alg.so # add additional files not covered by upstream makefile... install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets diff --git a/debian/strongswan-ike.install b/debian/strongswan-ike.install index be9791257..2b94a3c18 100644 --- a/debian/strongswan-ike.install +++ b/debian/strongswan-ike.install @@ -2,8 +2,14 @@ usr/sbin/charon-cmd usr/share/man/man8/charon-cmd.8 usr/lib/ipsec/libcharon.so* usr/lib/ipsec/charon +usr/lib/ipsec/lookip +usr/lib/ipsec/error-notify usr/lib/ipsec/plugins/libstrongswan-socket*.so usr/lib/ipsec/plugins/libstrongswan-eap*.so usr/lib/ipsec/plugins/libstrongswan-agent.so usr/lib/ipsec/plugins/libstrongswan-medsrv.so usr/lib/ipsec/plugins/libstrongswan-medcli.so +usr/lib/ipsec/plugins/libstrongswan-certexpire.so +usr/lib/ipsec/plugins/libstrongswan-lookip.so +usr/lib/ipsec/plugins/libstrongswan-error-notify.so +usr/lib/ipsec/plugins/libstrongswan-unity.so diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install index 7254d11a4..c01380887 100644 --- a/debian/strongswan-starter.install +++ b/debian/strongswan-starter.install @@ -17,8 +17,8 @@ usr/share/man/man8/_updown_espmark.8 #tools usr/lib/ipsec/scepclient usr/lib/ipsec/openac -usr/lib/ipsec/pki usr/lib/ipsec/pool +usr/lib/ipsec/pki usr/share/man/man8/scepclient.8 usr/share/man/man8/openac.8 #stroke |