From 6d0766776d61bc4e5cf1f20f12cfc9471b586e6a5a38fb3bdf1117c6933614f2 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 14 May 2010 19:20:22 +0000 Subject: [PATCH] - Enabled dhcp, farp, ha, socket-dynamic, agent, eap and sql plugins. - Enabled NetworkManager nm plugin in a separate strongswan-nm package. OBS-URL: https://build.opensuse.org/package/show/network:vpn/strongswan?expand=0&rev=12 --- strongswan.changes | 6 +-- strongswan.spec | 113 ++++++++++++++++++++++++++++----------------- 2 files changed, 73 insertions(+), 46 deletions(-) diff --git a/strongswan.changes b/strongswan.changes index 8e2c71e..b64797c 100644 --- a/strongswan.changes +++ b/strongswan.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri May 14 14:15:11 UTC 2010 - mt@suse.de +Fri May 14 19:19:04 UTC 2010 - mt@suse.de - Updated to strongSwan 4.4.0 release, changes since 4.3.6 are: * The IKEv2 High Availability plugin has been integrated. It @@ -43,8 +43,8 @@ Fri May 14 14:15:11 UTC 2010 - mt@suse.de - Splitted package into strongswan-ipsec, that install the traditional ipsec service starter scripts, -ikev1 and -ikev2 installing daemons and -libs0, that contains the library and plugins. -- Enabled NetworkManager, dhcp, farp, ha and socket-dynamic plugins, - with NetworkManager plugin in a separate strongswan-nm package. +- Enabled dhcp, farp, ha, socket-dynamic, agent, eap and sql plugins. +- Enabled NetworkManager nm plugin in a separate strongswan-nm package. ------------------------------------------------------------------- Tue Mar 2 21:42:10 CET 2010 - mt@suse.de diff --git a/strongswan.spec b/strongswan.spec index 8e0bf60..bd198a2 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -20,7 +20,8 @@ Name: strongswan %define upstream_version 4.4.0 -%define strongswan_docdir %{_docdir}/%{name} +%define strongswan_docdir %{_docdir}/%{name} +%define strongswan_plugins %{_libexecdir}/ipsec/plugins Version: 4.4.0 Release: 0 License: GPLv2+ @@ -42,9 +43,11 @@ BuildRequires: libcap-devel BuildRequires: libopenssl-devel BuildRequires: libgcrypt-devel BuildRequires: openldap2-devel -BuildRequires: curl-devel +BuildRequires: curl-devel pam-devel +%if 0%{suse_version} >= 1110 BuildRequires: libuuid-devel BuildRequires: NetworkManager-devel +%endif %description StrongSwan is an OpenSource IPsec-based VPN Solution for Linux @@ -163,6 +166,7 @@ This package provides the /etc/init.d/ipsec service script and allows to maintain both, IKEv1 and IKEv2 daemons, using /etc/ipsec.conf and /etc/ipsec.sectes files. +%if 0%{suse_version} >= 1110 %package nm License: GPL v2 or later Summary: OpenSource IPsec-based VPN Solution @@ -178,6 +182,8 @@ This package provides the NetworkManager plugin to control the charon IKEv2 daemon through D-Bus, designed to work using the NetworkManager-strongswan graphical user interface. +%endif + %prep %setup -q -n %{name}-%{upstream_version} %patch1 -p0 @@ -194,22 +200,31 @@ export RPM_OPT_FLAGS CFLAGS %configure \ --enable-integrity-test \ --with-capabilities=libcap \ + --with-plugindir=%{strongswan_plugins} \ --with-resolv-conf=%{_localstatedir}/run/strongswan/resolv.conf \ --enable-smartcard \ --with-default-pkcs11=%{_libdir}/opensc-pkcs11.so \ --enable-cisco-quirks \ --enable-openssl \ -%if 0%{suse_version} >= 1110 - --enable-gcrypt \ -%endif + --enable-agent \ + --enable-eap-md5 \ + --enable-eap-gtc \ + --enable-eap-aka \ + --enable-eap-radius \ + --enable-eap-identity \ + --enable-eap-mschapv2 \ --enable-ha \ --enable-dhcp \ --enable-farp \ + --enable-sql \ --enable-attr-sql \ --enable-socket-dynamic \ +%if 0%{suse_version} >= 1110 + --enable-gcrypt \ + --enable-nm \ +%endif --enable-ldap \ - --enable-curl \ - --enable-nm + --enable-curl make %{?_smp_mflags:%_smp_mflags} %install @@ -298,9 +313,9 @@ fi %{_libexecdir}/ipsec/scepclient %{_libexecdir}/ipsec/starter %{_libexecdir}/ipsec/stroke -%dir %{_libexecdir}/ipsec/plugins -%{_libexecdir}/ipsec/plugins/libstrongswan-stroke.so -%{_libexecdir}/ipsec/plugins/libstrongswan-updown.so +%dir %{strongswan_plugins} +%{strongswan_plugins}/libstrongswan-stroke.so +%{strongswan_plugins}/libstrongswan-updown.so %files ikev1 %defattr(-,root,root) @@ -313,13 +328,15 @@ fi %defattr(-,root,root) %dir %{_libexecdir}/ipsec %{_libexecdir}/ipsec/charon -#%dir %{_libexecdir}/ipsec/plugins +#%dir %{strongswan_plugins} +%if 0%{suse_version} >= 1110 %files nm %defattr(-,root,root) %dir %{_libexecdir}/ipsec -%dir %{_libexecdir}/ipsec/plugins -%{_libexecdir}/ipsec/plugins/libstrongswan-nm.so +%dir %{strongswan_plugins} +%{strongswan_plugins}/libstrongswan-nm.so +%endif %files doc %defattr(-,root,root) @@ -366,37 +383,47 @@ fi %{_libdir}/libstrongswan.so.0.0.0 %dir %{_libexecdir}/ipsec %dir %{_libexecdir}/ipsec/pool -%dir %{_libexecdir}/ipsec/plugins %{_libexecdir}/ipsec/libchecksum.so -%{_libexecdir}/ipsec/plugins/libstrongswan-aes.so -%{_libexecdir}/ipsec/plugins/libstrongswan-attr.so -%{_libexecdir}/ipsec/plugins/libstrongswan-curl.so -%{_libexecdir}/ipsec/plugins/libstrongswan-des.so -%{_libexecdir}/ipsec/plugins/libstrongswan-fips-prf.so -%{_libexecdir}/ipsec/plugins/libstrongswan-gcrypt.so -%{_libexecdir}/ipsec/plugins/libstrongswan-gmp.so -%{_libexecdir}/ipsec/plugins/libstrongswan-hmac.so -%{_libexecdir}/ipsec/plugins/libstrongswan-kernel-netlink.so -%{_libexecdir}/ipsec/plugins/libstrongswan-ldap.so -%{_libexecdir}/ipsec/plugins/libstrongswan-md5.so -%{_libexecdir}/ipsec/plugins/libstrongswan-openssl.so -%{_libexecdir}/ipsec/plugins/libstrongswan-pubkey.so -%{_libexecdir}/ipsec/plugins/libstrongswan-random.so -%{_libexecdir}/ipsec/plugins/libstrongswan-resolve.so -%{_libexecdir}/ipsec/plugins/libstrongswan-sha1.so -%{_libexecdir}/ipsec/plugins/libstrongswan-sha2.so -%{_libexecdir}/ipsec/plugins/libstrongswan-x509.so -%{_libexecdir}/ipsec/plugins/libstrongswan-xcbc.so -%{_libexecdir}/ipsec/plugins/libstrongswan-dnskey.so -%{_libexecdir}/ipsec/plugins/libstrongswan-pem.so -%{_libexecdir}/ipsec/plugins/libstrongswan-pgp.so -%{_libexecdir}/ipsec/plugins/libstrongswan-pkcs1.so -%{_libexecdir}/ipsec/plugins/libstrongswan-socket-dynamic.so -%{_libexecdir}/ipsec/plugins/libstrongswan-socket-raw.so -%{_libexecdir}/ipsec/plugins/libstrongswan-attr-sql.so -%{_libexecdir}/ipsec/plugins/libstrongswan-dhcp.so -%{_libexecdir}/ipsec/plugins/libstrongswan-farp.so -%{_libexecdir}/ipsec/plugins/libstrongswan-ha.so +%dir %{strongswan_plugins} +%{strongswan_plugins}/libstrongswan-aes.so +%{strongswan_plugins}/libstrongswan-agent.so +%{strongswan_plugins}/libstrongswan-attr.so +%{strongswan_plugins}/libstrongswan-attr-sql.so +%{strongswan_plugins}/libstrongswan-curl.so +%{strongswan_plugins}/libstrongswan-des.so +%{strongswan_plugins}/libstrongswan-dhcp.so +%{strongswan_plugins}/libstrongswan-dnskey.so +%{strongswan_plugins}/libstrongswan-eap-aka.so +%{strongswan_plugins}/libstrongswan-eap-gtc.so +%{strongswan_plugins}/libstrongswan-eap-identity.so +%{strongswan_plugins}/libstrongswan-eap-md5.so +%{strongswan_plugins}/libstrongswan-eap-mschapv2.so +%{strongswan_plugins}/libstrongswan-eap-radius.so +%{strongswan_plugins}/libstrongswan-farp.so +%{strongswan_plugins}/libstrongswan-fips-prf.so +%if 0%{suse_version} >= 1110 +%{strongswan_plugins}/libstrongswan-gcrypt.so +%endif +%{strongswan_plugins}/libstrongswan-gmp.so +%{strongswan_plugins}/libstrongswan-ha.so +%{strongswan_plugins}/libstrongswan-hmac.so +%{strongswan_plugins}/libstrongswan-kernel-netlink.so +%{strongswan_plugins}/libstrongswan-ldap.so +%{strongswan_plugins}/libstrongswan-md5.so +%{strongswan_plugins}/libstrongswan-openssl.so +%{strongswan_plugins}/libstrongswan-pem.so +%{strongswan_plugins}/libstrongswan-pgp.so +%{strongswan_plugins}/libstrongswan-pkcs1.so +%{strongswan_plugins}/libstrongswan-pubkey.so +%{strongswan_plugins}/libstrongswan-random.so +%{strongswan_plugins}/libstrongswan-resolve.so +%{strongswan_plugins}/libstrongswan-sha1.so +%{strongswan_plugins}/libstrongswan-sha2.so +%{strongswan_plugins}/libstrongswan-socket-dynamic.so +%{strongswan_plugins}/libstrongswan-socket-raw.so +%{strongswan_plugins}/libstrongswan-sql.so +%{strongswan_plugins}/libstrongswan-x509.so +%{strongswan_plugins}/libstrongswan-xcbc.so %dir %ghost %{_localstatedir}/run/strongswan