Compare commits

...

31 Commits

Author SHA1 Message Date
Paul Wouters
9d159bf0d0 - Resolves: rhbz#2214186 strongswan-5.9.11 is available 2023-07-14 13:45:25 -04:00
Python Maint
f779b6c7bb Rebuilt for Python 3.12 2023-06-13 23:05:47 +02:00
Paul Wouters
9d642ad352 no longer use patches merged upstream 2023-03-02 11:02:38 -05:00
Paul Wouters
0132cc5668 - Update to 5.9.10 2023-03-02 10:24:58 -05:00
Paul Wouters
33fb3b13a3 - Resolves: CVE-2023-26463 authorization bypass in TLS-based EAP methods 2023-02-28 17:38:50 -05:00
Petr Menšík
6000262f47 Use configure paths in manual pages (#2106120) 2023-01-16 19:46:37 +01:00
Petr Menšík
d7206ab591 Switch all URLs to https
Include also github repository link in package to simplify upstream
changes tracking.
2023-01-16 14:04:39 +01:00
Petr Menšík
585aca3015 Update to 5.9.9 (#2157850) 2023-01-15 15:33:16 +01:00
Jitka Plesnikova
ea8056eb33 Add BR perl-generators to automatically generates run-time dependencies
for installed Perl files
2022-12-08 16:46:43 +01:00
Paul Wouters
199f1d8708 fixup systemd build requires 2022-10-16 22:42:15 -04:00
Paul Wouters
243ac7aa4a remove obsoleted --enable-imc-swid, --enable-imv-swid 2022-10-16 21:55:29 -04:00
Arne Reiter
d8e91f4aa4 Resolves rhbz#2112274 strongswan-5.9.8 is available
Patch1 removes CFLAGS -Wno-format which interferes with -Werror=format-security
Add BuildRequire for autoconf and automake, now required for release
Remove obsolete patches
2022-10-16 11:47:16 +02:00
Fedora Release Engineering
27a4aa8167 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 09:32:45 +00:00
Petr Menšík
ea8baece11 fixup! Remove signature key from a cache, include it inside git 2022-06-23 19:41:55 +02:00
Petr Menšík
de70bbe3c5 Remove signature key from a cache, include it inside git
Key should be tracked by git. It is small and should not change very
often. Ensure signature has trust anchor.
2022-06-23 17:15:48 +02:00
Arne Reiter
271d4eca54 Resolves rhbz#2080070 strongswan-5.9.6 is available 2022-06-23 08:54:21 +02:00
Arne Reiter
9f5e4942d3 Resolves rhbz#2080070 strongswan-5.9.6 is available 2022-06-22 18:02:45 +02:00
Python Maint
15e47bc297 Rebuilt for Python 3.11 2022-06-13 17:17:06 +02:00
Davide Cavalca
c164f65462 Fix changelog entry 2022-03-04 20:49:42 -08:00
reitear
29f8c752f8 Resolves: rhbz#048108 - segfault at 18 ip 00007f4c7c0d841c sp 00007ffe49f61b70 error 4 in libc.so.6 2022-03-04 23:44:00 +01:00
Paul Wouters
e2ccbbed7e - Use newly published/cleaned strongswan gpg key 2022-01-25 09:14:37 -05:00
Paul Wouters
3f12242eea - Resolves rhbz#2044361 strongswan-5.9.5 is available (CVE-2021-45079) 2022-01-24 22:05:17 -05:00
Fedora Release Engineering
3067ecdcc7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 01:46:58 +00:00
Neal Gompa
2f04e6389f Disable TPM/TSS 1.2 support for F36+ / RHEL9+
TPM/TSS 1.2 has long since been superseded by TPM/TSS 2.0,
and trousers is more or less dead and replaced by the tpm-tss toolkit
for TPM/TSS 2.0.

Resolves: rhbz#2033299
2021-12-16 08:22:26 -05:00
Petr Menšík
b7c6e022d4 Add timeout and verbosity to tests
In case any test hangs, ensure it would release builder.
Increase verbosity to know more about possible failures. Interactive
debugging is not possible on builders.
2021-11-12 21:12:04 +01:00
Petr Menšík
0e9ffbc66d Enable additional module for testing 2021-11-12 21:12:04 +01:00
Petr Menšík
f751d41f23 Add quirks needed for python install
--enable-python-eggs is required to provide correct version. But
otherwise does different thing than is required for python bindings
package. Rebuild python after installation of main package, because it
changed destination directory used later by install.

Related: rhbz#1419441
2021-11-12 21:12:04 +01:00
Petr Menšík
3d925e79dd Add optional support for tests running
Now my tests did not finish successfully even on local build. Not
enabling them by default.
2021-11-12 21:12:02 +01:00
Petr Menšík
b097119cff Add pytest 2021-11-12 21:10:01 +01:00
Petr Menšík
a894518822 Add python3 and perl vici bindings
Work in progress to enable vici bindings. It seems they are not under
active support, because changes required for python3 are not in upstream
code.
2021-11-12 21:09:58 +01:00
Paul Wouters
8d04445d34 strongswan: don't use RuntimeDirectory in systemd service file
Because there are two services, strongswan and strongswan-starter
that use this directory. Otherwise when stopping a service, the
directory is removed from /run and the other service that does
not start anymore.

Also cleanup old patches that are obsolete.
2021-11-08 20:45:23 -05:00
8 changed files with 306 additions and 84 deletions

11
.gitignore vendored
View File

@@ -4,3 +4,14 @@
/strongswan-5.9.2.tar.bz2 /strongswan-5.9.2.tar.bz2
/strongswan-5.9.3.tar.bz2 /strongswan-5.9.3.tar.bz2
/strongswan-5.9.4.tar.bz2 /strongswan-5.9.4.tar.bz2
/948F158A4E76A27BF3D07532DF42C170B34DBA77
/strongswan-5.9.5.tar.bz2
/strongswan-5.9.5.tar.bz2.sig
/strongswan-5.9.6.tar.bz2
/strongswan-5.9.6.tar.bz2.sig
/strongswan-5.9.8.tar.bz2
/strongswan-5.9.8.tar.bz2.sig
/strongswan-5.9.9.tar.bz2
/strongswan-5.9.9.tar.bz2.sig
/strongswan-5.9.10.tar.bz2
/strongswan-5.9.10.tar.bz2.sig

View File

@@ -0,0 +1,48 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=ze82
-----END PGP PUBLIC KEY BLOCK-----

View File

@@ -1 +1,2 @@
SHA512 (strongswan-5.9.4.tar.bz2) = 796356c1d5c1ad410f0ed944ab4a131076d26f120ec6fa57796fe4060b0741201199625883ddc9ebd8a7ad299495f073cec76a6780ebd8f375605aae16750cf3 SHA512 (strongswan-5.9.10.tar.bz2) = cf1d4a79ec02ac0502494ce6bfcab7399ddff151e2bc39bd4fbb9562bae7d0c66cf8d1e387b3c36a35e4387d597889fd7519e7bce07d3a7f764b1b73bd8a4667
SHA512 (strongswan-5.9.10.tar.bz2.sig) = 174c3582c50505d7f35638eb68f717fd16e426009dff135125a847635fea1184d81fb7e81e24e3539bda1faa3fa9b1a42b679a841521c82d8048523d6b972fd3

View File

@@ -1,15 +0,0 @@
diff -Naur strongswan-5.6.2-orig/src/libcharon/plugins/stroke/stroke_socket.c strongswan-5.6.2/src/libcharon/plugins/stroke/stroke_socket.c
--- strongswan-5.6.2-orig/src/libcharon/plugins/stroke/stroke_socket.c 2017-11-09 10:57:30.000000000 -0500
+++ strongswan-5.6.2/src/libcharon/plugins/stroke/stroke_socket.c 2018-05-24 00:00:32.382953618 -0400
@@ -628,6 +628,11 @@
return FALSE;
}
+ if (len < offsetof(stroke_msg_t, buffer))
+ {
+ DBG1(DBG_CFG, "invalid stroke message length %d", len);
+ return FALSE;
+ }
/* read message (we need an additional byte to terminate the buffer) */
msg = malloc(len + 1);
msg->length = len;

View File

@@ -1,24 +0,0 @@
diff -ur strongswan-5.8.4.orig/init/systemd/strongswan.service.in strongswan-5.8.4/init/systemd/strongswan.service.in
--- strongswan-5.8.4.orig/init/systemd/strongswan.service.in 2019-08-27 16:26:53.000000000 +0300
+++ strongswan-5.8.4/init/systemd/strongswan.service.in 2020-04-12 12:05:57.383596844 +0300
@@ -9,6 +9,8 @@
ExecReload=@SBINDIR@/swanctl --reload
ExecReload=@SBINDIR@/swanctl --load-all --noprompt
Restart=on-abnormal
+RuntimeDirectory=strongswan
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target
diff -ur strongswan-5.8.4.orig/init/systemd-starter/strongswan-starter.service.in strongswan-5.8.4/init/systemd-starter/strongswan-starter.service.in
--- strongswan-5.8.4.orig/init/systemd-starter/strongswan-starter.service.in 2019-08-27 16:26:53.000000000 +0300
+++ strongswan-5.8.4/init/systemd-starter/strongswan-starter.service.in 2020-04-12 12:05:51.810559482 +0300
@@ -6,6 +6,8 @@
ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
StandardOutput=syslog
Restart=on-abnormal
+RuntimeDirectory=strongswan
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target

View File

@@ -1,12 +0,0 @@
diff -Naur strongswan-5.9.1-orig/init/systemd-starter/strongswan-starter.service.in strongswan-5.9.1/init/systemd-starter/strongswan-starter.service.in
--- strongswan-5.9.1-orig/init/systemd-starter/strongswan-starter.service.in 2020-10-16 08:36:37.000000000 -0400
+++ strongswan-5.9.1/init/systemd-starter/strongswan-starter.service.in 2021-02-12 14:06:09.985042362 -0500
@@ -5,6 +5,8 @@
[Service]
ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
Restart=on-abnormal
+RuntimeDirectory=strongswan
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target

View File

@@ -0,0 +1,12 @@
diff --git a/configure.ac b/configure.ac
index f9e6e55c2..247d055d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1480,7 +1480,6 @@ else
fi
# disable some warnings, whether explicitly enabled above or by default
# these are not compatible with our custom printf specifiers
-WARN_CFLAGS="$WARN_CFLAGS -Wno-format"
WARN_CFLAGS="$WARN_CFLAGS -Wno-format-security"
# we generally use comments, but GCC doesn't seem to recognize many of them
WARN_CFLAGS="$WARN_CFLAGS -Wno-implicit-fallthrough"

View File

@@ -1,41 +1,72 @@
%global _hardened_build 1 %global _hardened_build 1
#%%define prerelease dr1 #%%define prerelease dr1
%bcond_without python3
%bcond_without perl
%bcond_with check
%if (0%{?fedora} && 0%{?fedora} < 36) || (0%{?rhel} && 0%{?rhel} < 9)
# trousers was retired for F36+ and no longer available in RHEL with 9+
%bcond_without tss_trousers
%else
%bcond_with tss_trousers
%endif
%global forgeurl0 https://github.com/strongswan/strongswan
Name: strongswan Name: strongswan
Version: 5.9.4 Version: 5.9.11
Release: 1%{?dist} Release: 1%{?dist}
Summary: An OpenSource IPsec-based VPN and TNC solution Summary: An OpenSource IPsec-based VPN and TNC solution
License: GPLv2+ License: GPLv2+
URL: http://www.strongswan.org/ URL: https://www.strongswan.org/
Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2 VCS: git:%{forgeurl0}
Source1: tmpfiles-strongswan.conf Source0: https://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2
Patch0: strongswan-5.9.1-runtime-dir.patch Source1: https://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2.sig
Patch1: strongswan-5.6.0-uintptr_t.patch Source2: https://download.strongswan.org/STRONGSWAN-RELEASE-PGP-KEY
Patch3: strongswan-5.6.2-CVE-2018-5388.patch Source3: tmpfiles-strongswan.conf
Patch0: strongswan-5.6.0-uintptr_t.patch
# https://github.com/strongswan/strongswan/issues/1198
Patch1: strongswan-5.9.7-error-no-format.patch
# only needed for pre-release versions BuildRequires: autoconf
#BuildRequires: autoconf automake BuildRequires: automake
BuildRequires: gnupg2
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
BuildRequires: systemd
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: trousers-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: json-c-devel BuildRequires: json-c-devel
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: systemd-devel
BuildRequires: iptables-devel BuildRequires: iptables-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: tpm2-tss-devel BuildRequires: tpm2-tss-devel
Recommends: tpm2-tools Recommends: tpm2-tools
%if %{with python3}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pytest
%endif
%if %{with perl}
BuildRequires: perl-devel perl-generators
BuildRequires: perl(ExtUtils::MakeMaker)
%endif
%if %{with tss_trousers}
BuildRequires: trousers-devel
%endif
BuildRequires: NetworkManager-libnm-devel BuildRequires: NetworkManager-libnm-devel
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
@@ -55,8 +86,8 @@ in userland, using TUN devices and its own IPsec implementation libipsec.
%package charon-nm %package charon-nm
Summary: NetworkManager plugin for Strongswan Summary: NetworkManager plugin for Strongswan
Requires: dbus Requires: dbus
Obsoletes: %{name}-NetworkManager < 0:5.0.4-5 Obsoletes: strongswan-NetworkManager < 0:5.0.4-5
Conflicts: %{name}-NetworkManager < 0:5.0.4-5 Conflicts: strongswan-NetworkManager < 0:5.0.4-5
Conflicts: NetworkManager-strongswan < 1.4.2-1 Conflicts: NetworkManager-strongswan < 1.4.2-1
%description charon-nm %description charon-nm
NetworkManager plugin integrates a subset of Strongswan capabilities NetworkManager plugin integrates a subset of Strongswan capabilities
@@ -64,14 +95,14 @@ to NetworkManager.
%package sqlite %package sqlite
Summary: SQLite support for strongSwan Summary: SQLite support for strongSwan
Requires: %{name} = %{version}-%{release} Requires: strongswan = %{version}-%{release}
%description sqlite %description sqlite
The sqlite plugin adds an SQLite database backend to strongSwan. The sqlite plugin adds an SQLite database backend to strongSwan.
%package tnc-imcvs %package tnc-imcvs
Summary: Trusted network connect (TNC)'s IMC/IMV functionality Summary: Trusted network connect (TNC)'s IMC/IMV functionality
Requires: %{name} = %{version}-%{release} Requires: strongswan = %{version}-%{release}
Requires: %{name}-sqlite = %{version}-%{release} Requires: strongswan-sqlite = %{version}-%{release}
%description tnc-imcvs %description tnc-imcvs
This package provides Trusted Network Connect's (TNC) architecture support. This package provides Trusted Network Connect's (TNC) architecture support.
It includes support for TNC client and server (IF-TNCCS), IMC and IMV message It includes support for TNC client and server (IF-TNCCS), IMC and IMV message
@@ -82,11 +113,39 @@ modules can be used by any third party TNC Client/Server implementation
possessing a standard IF-IMC/IMV interface. In addition, it implements possessing a standard IF-IMC/IMV interface. In addition, it implements
PT-TLS to support TNC over TLS. PT-TLS to support TNC over TLS.
%if %{with python3}
%package -n python3-vici
Summary: Strongswan Versatile IKE Configuration Interface python bindings
BuildArch: noarch
%description -n python3-vici
VICI is an attempt to improve the situation for system integrators by providing
a stable IPC interface, allowing external tools to query, configure
and control the IKE daemon.
The Versatile IKE Configuration Interface (VICI) python bindings provides module
for Strongswan runtime configuration from python applications.
%endif
%if %{with perl}
%package -n perl-vici
Summary: Strongswan Versatile IKE Configuration Interface perl bindings
BuildArch: noarch
%description -n perl-vici
VICI is an attempt to improve the situation for system integrators by providing
a stable IPC interface, allowing external tools to query, configure
and control the IKE daemon.
The Versatile IKE Configuration Interface (VICI) perl bindings provides module
for Strongswan runtime configuration from perl applications.
%endif
# TODO: make also ruby-vici
%prep %prep
%setup -q -n %{name}-%{version}%{?prerelease} %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%patch0 -p1 %autosetup -n %{name}-%{version}%{?prerelease} -p1
%patch1 -p1
%patch3 -p1
%build %build
# only for snapshots # only for snapshots
@@ -105,7 +164,7 @@ PT-TLS to support TNC over TLS.
--with-piddir=%{_rundir}/strongswan \ --with-piddir=%{_rundir}/strongswan \
--with-nm-ca-dir=%{_sysconfdir}/strongswan/ipsec.d/cacerts/ \ --with-nm-ca-dir=%{_sysconfdir}/strongswan/ipsec.d/cacerts/ \
--enable-bypass-lan \ --enable-bypass-lan \
--enable-tss-trousers \ --enable-tss-tss2 \
--enable-nm \ --enable-nm \
--enable-systemd \ --enable-systemd \
--enable-openssl \ --enable-openssl \
@@ -160,8 +219,6 @@ PT-TLS to support TNC over TLS.
--enable-imv-attestation \ --enable-imv-attestation \
--enable-imv-os \ --enable-imv-os \
--enable-imc-os \ --enable-imc-os \
--enable-imc-swid \
--enable-imv-swid \
--enable-imc-swima \ --enable-imc-swima \
--enable-imv-swima \ --enable-imv-swima \
--enable-imc-hcd \ --enable-imc-hcd \
@@ -169,26 +226,77 @@ PT-TLS to support TNC over TLS.
--enable-curl \ --enable-curl \
--enable-cmd \ --enable-cmd \
--enable-acert \ --enable-acert \
--enable-aikgen \
--enable-vici \ --enable-vici \
--enable-swanctl \ --enable-swanctl \
--enable-duplicheck \ --enable-duplicheck \
%ifarch x86_64 %{ix86} %ifarch x86_64 %{ix86}
--enable-aesni \ --enable-aesni \
%endif
%if %{with python3}
PYTHON=%{python3} --enable-python-eggs \
%endif
%if %{with perl}
--enable-perl-cpan \
%endif
%if %{with check}
--enable-test-vectors \
%endif
%if %{with tss_trousers}
--enable-tss-trousers \
--enable-aikgen \
%endif %endif
--enable-kernel-libipsec \ --enable-kernel-libipsec \
--with-capabilities=libcap \ --with-capabilities=libcap \
CPPFLAGS="-DSTARTER_ALLOW_NON_ROOT" CPPFLAGS="-DSTARTER_ALLOW_NON_ROOT"
# TODO: --enable-python-eggs-install not python3 ready
# disable certain plugins in the daemon configuration by default # disable certain plugins in the daemon configuration by default
for p in bypass-lan; do for p in bypass-lan; do
echo -e "\ncharon.plugins.${p}.load := no" >> conf/plugins/${p}.opt echo -e "\ncharon.plugins.${p}.load := no" >> conf/plugins/${p}.opt
done done
make %{?_smp_mflags} # ensure manual page is regenerated with local configuration
rm -f src/ipsec/_ipsec.8
%make_build
pushd src/libcharon/plugins/vici
%if %{with python3}
pushd python
%make_build
sed -e "s,/var/run/charon.vici,%{_rundir}/strongswan/charon.vici," -i vici/session.py
#py3_build
popd
%endif
%if %{with perl}
pushd perl/Vici-Session/
perl Makefile.PL INSTALLDIRS=vendor
%make_build
popd
%endif
popd
%install %install
make install DESTDIR=%{buildroot} %make_install
pushd src/libcharon/plugins/vici
%if %{with python3}
pushd python
# TODO: --enable-python-eggs breaks our previous build. Do it now
# propose better way to upstream
%py3_build
%py3_install
popd
%endif
%if %{with perl}
%make_install -C perl/Vici-Session
rm -f %{buildroot}{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Vici/Session/.packlist}
%endif
popd
# prefix man pages # prefix man pages
for i in %{buildroot}%{_mandir}/*/*; do for i in %{buildroot}%{_mandir}/*/*; do
if echo "$i" | grep -vq '/strongswan[^\/]*$'; then if echo "$i" | grep -vq '/strongswan[^\/]*$'; then
@@ -207,16 +315,31 @@ for i in aacerts acerts certs cacerts crls ocspcerts private reqs; do
install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/${i} install -d -m 700 %{buildroot}%{_sysconfdir}/strongswan/ipsec.d/${i}
done done
install -d -m 0700 %{buildroot}%{_rundir}/strongswan install -d -m 0700 %{buildroot}%{_rundir}/strongswan
install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf install -D -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
install -D -m 0644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/strongswan-starter.conf
%check
%if %{with check}
# Seen some tests hang. Ensure we do not block builder forever
export TESTS_VERBOSITY=1
timeout 600 %make_build check
%endif
%if %{with python}
pushd src/libcharon/plugins/vici
%pytest
popd
%endif
:
%post %post
%systemd_post %{name}.service %systemd_post strongswan.service strongswan-starter.service
%preun %preun
%systemd_preun %{name}.service %systemd_preun strongswan.service strongswan-starter.service
%postun %postun
%systemd_postun_with_restart %{name}.service %systemd_postun_with_restart strongswan.service strongswan-starter.service
%files %files
%doc README NEWS TODO ChangeLog %doc README NEWS TODO ChangeLog
@@ -251,6 +374,7 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
%{_datadir}/strongswan/templates/database/ %{_datadir}/strongswan/templates/database/
%attr(0755,root,root) %dir %{_rundir}/strongswan %attr(0755,root,root) %dir %{_rundir}/strongswan
%attr(0644,root,root) %{_tmpfilesdir}/strongswan.conf %attr(0644,root,root) %{_tmpfilesdir}/strongswan.conf
%attr(0644,root,root) %{_tmpfilesdir}/strongswan-starter.conf
%files sqlite %files sqlite
%{_libdir}/strongswan/plugins/libstrongswan-sqlite.so %{_libdir}/strongswan/plugins/libstrongswan-sqlite.so
@@ -277,7 +401,84 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/strongswan.conf
%{_datadir}/dbus-1/system.d/nm-strongswan-service.conf %{_datadir}/dbus-1/system.d/nm-strongswan-service.conf
%{_libexecdir}/strongswan/charon-nm %{_libexecdir}/strongswan/charon-nm
%if %{with python3}
%files -n python3-vici
%license COPYING
%doc src/libcharon/plugins/vici/python/README.rst
%{python3_sitelib}/vici
%{python3_sitelib}/vici-%{version}-py*.egg-info
%endif
%if %{with perl}
%license COPYING
%files -n perl-vici
%{perl_vendorlib}/Vici
%endif
%changelog %changelog
* Fri Jul 14 2023 Paul Wouters <paul.wouters@aiven.io - 5.9.11-1
- Resolves: rhbz#2214186 strongswan-5.9.11 is available
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 5.9.10-2
- Rebuilt for Python 3.12
* Thu Mar 02 2023 Paul Wouters <paul.wouters@aiven.io - 5.9.10-1
- Update to 5.9.10
* Tue Feb 28 2023 Paul Wouters <paul.wouters@aiven.io - 5.9.9-3
- Resolves: CVE-2023-26463 authorization bypass in TLS-based EAP methods
* Mon Jan 16 2023 Petr Menšík <pemensik@redhat.com> - 5.9.9-2
- Use configure paths in manual pages (#2106120)
* Sun Jan 15 2023 Petr Menšík <pemensik@redhat.com> - 5.9.9-1
- Update to 5.9.9 (#2157850)
* Thu Dec 08 2022 Jitka Plesnikova <jplesnik@redhat.com> - 5.9.8-2
- Add BR perl-generators to automatically generates run-time dependencies
for installed Perl files
* Sun Oct 16 2022 Arne Reiter <redhat@arnereiter.de> - 5.9.8-1
- Resolves rhbz#2112274 strongswan-5.9.8 is available
- Patch1 removes CFLAGS -Wno-format which interferes with -Werror=format-security
- Add BuildRequire for autoconf and automake, now required for release
- Remove obsolete patches
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jun 22 2022 Arne Reiter <redhat@arnereiter.de> - 5.9.6-1
- Resolves rhbz#2080070 strongswan-5.9.6 is available
- Fixed missing format string in enum_flags_to_string()
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.9.5-4
- Rebuilt for Python 3.11
* Fri Feb 25 2022 Arne Reiter <redhat@arnereiter.de> - 5.9.5-3
- Resolves: rhbz#2048108 - segfault at 18 ip 00007f4c7c0d841c sp 00007ffe49f61b70 error 4 in libc.so.6
* Tue Jan 25 2022 Paul Wouters <paul.wouters@aiven.io> - 5.9.5-2
- Use newly published/cleaned strongswan gpg key
* Mon Jan 24 2022 Paul Wouters <paul.wouters@aiven.io> - 5.9.5-1
- Resolves rhbz#2044361 strongswan-5.9.5 is available (CVE-2021-45079)
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 16 2021 Neal Gompa <ngompa@datto.com> - 5.9.4-4
- Disable TPM/TSS 1.2 support for F36+ / RHEL9+
- Resolves: rhbz#2033299 Drop TPM/TSS 1.2 support (trousers)
* Thu Nov 11 2021 Petr Menšík <pemensik@redhat.com> - 5.9.4-3
- Resolves rhbz#1419441 Add python and perl vici bindings
- Adds optional tests run
* Tue Nov 09 2021 Paul Wouters <paul.wouters@aiven.io> - 5.9.4-2
- Resolves rhbz#2018547 'strongswan restart' breaks ipsec started with strongswan-starter
- Return to using tmpfiles, but extend to cover strongswan-starter service too
- Cleanup old patches
* Wed Oct 20 2021 Paul Wouters <paul.wouters@aiven.io> - 5.9.4-1 * Wed Oct 20 2021 Paul Wouters <paul.wouters@aiven.io> - 5.9.4-1
- Resolves: rhbz#2015165 strongswan-5.9.4 is available - Resolves: rhbz#2015165 strongswan-5.9.4 is available
- Resolves: rhbz#2015611 CVE-2021-41990 strongswan: gmp plugin: integer overflow via a crafted certificate with an RSASSA-PSS signature - Resolves: rhbz#2015611 CVE-2021-41990 strongswan: gmp plugin: integer overflow via a crafted certificate with an RSASSA-PSS signature