commit strongswan for openSUSE:Factory
Hello community, here is the log from the commit of package strongswan for openSUSE:Factory checked in at Mon Nov 22 12:59:33 CET 2010. -------- --- strongswan/strongswan.changes 2010-11-16 13:10:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/strongswan/strongswan.changes 2010-11-22 10:12:07.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 22 09:05:30 UTC 2010 - mt@suse.de + +- Cleaned up spec file; use with_mysql,sqlite,gcrypt,nm flags +- Disabled tests sub-package with load-tester and test-vectors + plugins by default using a with_tests flag (causes load error + in "ipsec pki" when enabled but the package is not installed). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strongswan.spec ++++++ --- /var/tmp/diff_new_pack.C3WeDz/_old 2010-11-22 12:58:58.000000000 +0100 +++ /var/tmp/diff_new_pack.C3WeDz/_new 2010-11-22 12:58:58.000000000 +0100 @@ -22,8 +22,13 @@ %define upstream_version 4.5.0 %define strongswan_docdir %{_docdir}/%{name} %define strongswan_plugins %{_libexecdir}/ipsec/plugins +%define with_mysql 1 +%define with_sqlite 0%{suse_version} >= 1110 +%define with_gcrypt 0%{suse_version} >= 1110 +%define with_nm 0%{suse_version} >= 1110 +%define with_tests 0 Version: 4.5.0 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/Security Summary: OpenSource IPsec-based VPN Solution @@ -42,15 +47,20 @@ BuildRequires: bison flex gmp-devel gperf pkg-config BuildRequires: libcap-devel BuildRequires: libopenssl-devel -BuildRequires: libgcrypt-devel BuildRequires: openldap2-devel BuildRequires: curl-devel pam-devel -%if 0%{suse_version} >= 1110 -BuildRequires: libuuid-devel -BuildRequires: NetworkManager-devel +%if %with_mysql +BuildRequires: libmysqlclient-devel +%endif +%if %with_sqlite BuildRequires: sqlite3-devel %endif -BuildRequires: libmysqlclient-devel +%if %with_gcrypt +BuildRequires: libgcrypt-devel +%endif +%if %with_nm +BuildRequires: NetworkManager-devel +%endif %description StrongSwan is an OpenSource IPsec-based VPN Solution for Linux @@ -117,44 +127,6 @@ This package provides the strongswan library and plugins. -%package mysql -License: GPLv2+ -Summary: OpenSource IPsec-based VPN Solution -Group: Productivity/Networking/Security -Requires: strongswan-libs0 = %{version} - -%description mysql -StrongSwan is an OpenSource IPsec-based VPN Solution for Linux - -This package provides the strongswan mysql plugin. - -%if 0%{suse_version} >= 1110 - -%package sqlite -License: GPLv2+ -Summary: OpenSource IPsec-based VPN Solution -Group: Productivity/Networking/Security -Requires: strongswan-libs0 = %{version} - -%description sqlite -StrongSwan is an OpenSource IPsec-based VPN Solution for Linux - -This package provides the strongswan sqlite plugin. - -%endif - -%package tests -License: GPLv2+ -Summary: OpenSource IPsec-based VPN Solution -Group: Productivity/Networking/Security -Requires: strongswan-libs0 = %{version} - -%description tests -StrongSwan is an OpenSource IPsec-based VPN Solution for Linux - -This package provides the strongswan crypto test-vectors plugin -and the load testing plugin for IKEv2 daemon. - %package ikev1 License: GPLv2+ Summary: OpenSource IPsec-based VPN Solution @@ -193,8 +165,6 @@ PreReq: grep %insserv_prereq %fillup_prereq Requires: strongswan-libs0 = %{version} Requires: strongswan-daemon = %{version} -#Recommends: strongswan-ikev1 = %{version} -#Recommends: strongswan-ikev2 = %{version} Provides: strongswan-daemon-starter = %{version} Provides: strongswan = %{version} ipsec VPN Obsoletes: strongswan < %{version} @@ -207,7 +177,37 @@ to maintain both, IKEv1 and IKEv2 daemons, using /etc/ipsec.conf and /etc/ipsec.sectes files. -%if 0%{suse_version} >= 1110 +%if %with_mysql + +%package mysql +License: GPLv2+ +Summary: OpenSource IPsec-based VPN Solution +Group: Productivity/Networking/Security +Requires: strongswan-libs0 = %{version} + +%description mysql +StrongSwan is an OpenSource IPsec-based VPN Solution for Linux + +This package provides the strongswan mysql plugin. + +%endif + +%if %with_sqlite + +%package sqlite +License: GPLv2+ +Summary: OpenSource IPsec-based VPN Solution +Group: Productivity/Networking/Security +Requires: strongswan-libs0 = %{version} + +%description sqlite +StrongSwan is an OpenSource IPsec-based VPN Solution for Linux + +This package provides the strongswan sqlite plugin. + +%endif + +%if %with_nm %package nm License: GPLv2+ @@ -226,6 +226,22 @@ %endif +%if %with_tests + +%package tests +License: GPLv2+ +Summary: OpenSource IPsec-based VPN Solution +Group: Productivity/Networking/Security +Requires: strongswan-libs0 = %{version} + +%description tests +StrongSwan is an OpenSource IPsec-based VPN Solution for Linux + +This package provides the strongswan crypto test-vectors plugin +and the load testing plugin for IKEv2 daemon. + +%endif + %prep %setup -q -n %{name}-%{upstream_version} %patch1 -p0 @@ -269,16 +285,24 @@ --enable-sql \ --enable-attr-sql \ --enable-addrblock \ -%if 0%{suse_version} >= 1110 +%if %with_mysql + --enable-mysql \ +%endif +%if %with_sqlite + --enable-sqlite \ +%endif +%if %with_gcrypt --enable-gcrypt \ +%endif +%if %with_nm --enable-nm \ - --enable-sqlite \ %endif - --enable-ldap \ - --enable-curl \ - --enable-mysql \ +%if %with_tests --enable-load-tester \ - --enable-test-vectors + --enable-test-vectors \ +%endif + --enable-ldap \ + --enable-curl make %{?_smp_mflags:%_smp_mflags} %install @@ -383,16 +407,6 @@ %defattr(-,root,root) %dir %{_libexecdir}/ipsec %{_libexecdir}/ipsec/charon -#%dir %{strongswan_plugins} - -%if 0%{suse_version} >= 1110 - -%files nm -%defattr(-,root,root) -%dir %{_libexecdir}/ipsec -%dir %{strongswan_plugins} -%{strongswan_plugins}/libstrongswan-nm.so -%endif %files doc %defattr(-,root,root) @@ -465,7 +479,7 @@ %{strongswan_plugins}/libstrongswan-eap-sim.so %{strongswan_plugins}/libstrongswan-farp.so %{strongswan_plugins}/libstrongswan-fips-prf.so -%if 0%{suse_version} >= 1110 +%if %with_gcrypt %{strongswan_plugins}/libstrongswan-gcrypt.so %endif %{strongswan_plugins}/libstrongswan-gmp.so @@ -492,12 +506,24 @@ %{strongswan_plugins}/libstrongswan-xcbc.so %dir %ghost %{_localstatedir}/run/strongswan +%if %with_nm + +%files nm +%defattr(-,root,root) +%dir %{_libexecdir}/ipsec +%dir %{strongswan_plugins} +%{strongswan_plugins}/libstrongswan-nm.so +%endif + +%if %with_mysql + %files mysql %defattr(-,root,root) %dir %{strongswan_plugins} %{strongswan_plugins}/libstrongswan-mysql.so +%endif -%if 0%{suse_version} >= 1110 +%if %with_sqlite %files sqlite %defattr(-,root,root) @@ -505,10 +531,13 @@ %{strongswan_plugins}/libstrongswan-sqlite.so %endif +%if %with_tests + %files tests %defattr(-,root,root) %dir %{strongswan_plugins} %{strongswan_plugins}/libstrongswan-load-tester.so %{strongswan_plugins}/libstrongswan-test-vectors.so +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de