Compare commits
47 Commits
strongswan
...
199f1d8708
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
199f1d8708 | ||
|
|
243ac7aa4a | ||
|
|
d8e91f4aa4 | ||
|
|
27a4aa8167 | ||
|
|
ea8baece11 | ||
|
|
de70bbe3c5 | ||
|
|
271d4eca54 | ||
|
|
9f5e4942d3 | ||
|
|
15e47bc297 | ||
|
|
c164f65462 | ||
|
|
29f8c752f8 | ||
|
|
e2ccbbed7e | ||
|
|
3f12242eea | ||
|
|
3067ecdcc7 | ||
|
|
2f04e6389f | ||
|
|
b7c6e022d4 | ||
|
|
0e9ffbc66d | ||
|
|
f751d41f23 | ||
|
|
3d925e79dd | ||
|
|
b097119cff | ||
|
|
a894518822 | ||
|
|
8d04445d34 | ||
|
|
28ee63eed5 | ||
|
|
23b5b73cd8 | ||
|
|
48629b5950 | ||
|
|
8ce4072e4d | ||
|
|
6ccc325c15 | ||
|
|
4d2f255b10 | ||
|
|
12be37ab1b | ||
|
|
dafd128e1f | ||
|
|
7e67e8cca6 | ||
|
|
04aee4b450 | ||
|
|
8f80a71a01 | ||
|
|
5449a7c2dc | ||
|
|
0bc1b9e952 | ||
|
|
d2bf10503b | ||
|
|
206f1fff39 | ||
|
|
c671c8eddf | ||
|
|
2054770361 | ||
|
|
1bd38c323e | ||
|
|
6c46f34786 | ||
|
|
66c97839f3 | ||
|
|
20b5f4d7fd | ||
|
|
d2e288f585 | ||
|
|
0ab6394034 | ||
|
|
a7360fff44 | ||
|
|
ad83060f5e |
16
.gitignore
vendored
16
.gitignore
vendored
@@ -1,3 +1,13 @@
|
|||||||
/strongswan-5.7.2.tar.bz2
|
/strongswan-5.8.4.tar.bz2
|
||||||
/strongswan-5.8.1.tar.bz2
|
/strongswan-5.9.0.tar.bz2
|
||||||
/strongswan-5.8.2.tar.bz2
|
/strongswan-5.9.1.tar.bz2
|
||||||
|
/strongswan-5.9.2.tar.bz2
|
||||||
|
/strongswan-5.9.3.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
|
||||||
|
|||||||
48
STRONGSWAN-RELEASE-PGP-KEY
Normal file
48
STRONGSWAN-RELEASE-PGP-KEY
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
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
|
||||||
|
=ze82
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
3
sources
3
sources
@@ -1 +1,2 @@
|
|||||||
SHA512 (strongswan-5.8.2.tar.bz2) = 423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d
|
SHA512 (strongswan-5.9.8.tar.bz2.sig) = bf5c5fbcb6d14381260d1e79f6164170c3d568fbe2f623afb42b59bfa7e085551e26c43e4a41f4d8271d5f46601366f34fb52067bdd4c25a7633fa2fda83d5ae
|
||||||
|
SHA512 (strongswan-5.9.8.tar.bz2) = 16d3afc80704f896f3f97addf452b4bb29fc1911c54e980f76ac48bdbe2340ce3bd4e79024848cb7961bbe9ad5458d93389343878ca042af658d51b11219666b
|
||||||
|
|||||||
@@ -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;
|
|
||||||
12
strongswan-5.9.7-error-no-format.patch
Normal file
12
strongswan-5.9.7-error-no-format.patch
Normal 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"
|
||||||
314
strongswan.spec
314
strongswan.spec
@@ -1,34 +1,68 @@
|
|||||||
%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
|
||||||
|
|
||||||
Name: strongswan
|
Name: strongswan
|
||||||
Version: 5.8.2
|
Version: 5.9.8
|
||||||
Release: 2%{?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: http://www.strongswan.org/
|
||||||
Source0: http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
|
Source0: http://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2
|
||||||
Patch1: strongswan-5.6.0-uintptr_t.patch
|
Source1: http://download.strongswan.org/strongswan-%{version}%{?prerelease}.tar.bz2.sig
|
||||||
Patch3: strongswan-5.6.2-CVE-2018-5388.patch
|
Source2: https://download.strongswan.org/STRONGSWAN-RELEASE-PGP-KEY
|
||||||
|
Source3: tmpfiles-strongswan.conf
|
||||||
# only needed for pre-release versions
|
Patch0: strongswan-5.6.0-uintptr_t.patch
|
||||||
#BuildRequires: autoconf automake
|
# https://github.com/strongswan/strongswan/issues/1198
|
||||||
|
Patch1: strongswan-5.9.7-error-no-format.patch
|
||||||
|
|
||||||
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: automake
|
||||||
|
BuildRequires: gnupg2
|
||||||
|
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: tpm2-tss-devel
|
||||||
|
Recommends: tpm2-tools
|
||||||
|
|
||||||
|
%if %{with python3}
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
BuildRequires: python3-pytest
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with perl}
|
||||||
|
BuildRequires: perl-devel perl-macros
|
||||||
|
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
|
||||||
@@ -49,8 +83,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
|
||||||
@@ -58,14 +92,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
|
||||||
@@ -76,10 +110,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}'
|
||||||
%patch1 -p1
|
%autosetup -n %{name}-%{version}%{?prerelease} -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# only for snapshots
|
# only for snapshots
|
||||||
@@ -96,9 +159,9 @@ PT-TLS to support TNC over TLS.
|
|||||||
--bindir=%{_libexecdir}/strongswan \
|
--bindir=%{_libexecdir}/strongswan \
|
||||||
--with-ipseclibdir=%{_libdir}/strongswan \
|
--with-ipseclibdir=%{_libdir}/strongswan \
|
||||||
--with-piddir=%{_rundir}/strongswan \
|
--with-piddir=%{_rundir}/strongswan \
|
||||||
--with-fips-mode=2 \
|
--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 \
|
||||||
@@ -153,8 +216,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 \
|
||||||
@@ -162,24 +223,74 @@ 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
|
%endif
|
||||||
--enable-kernel-libipsec
|
%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
|
||||||
|
--enable-kernel-libipsec \
|
||||||
|
--with-capabilities=libcap \
|
||||||
|
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}
|
%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
|
||||||
@@ -198,20 +309,36 @@ 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 %{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
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%dir %attr(0700,root,root) %{_sysconfdir}/strongswan
|
%dir %attr(0755,root,root) %{_sysconfdir}/strongswan
|
||||||
%config(noreplace) %{_sysconfdir}/strongswan/*
|
%config(noreplace) %{_sysconfdir}/strongswan/*
|
||||||
%dir %{_libdir}/strongswan
|
%dir %{_libdir}/strongswan
|
||||||
%exclude %{_libdir}/strongswan/imcvs
|
%exclude %{_libdir}/strongswan/imcvs
|
||||||
@@ -240,6 +367,8 @@ install -d -m 0700 %{buildroot}%{_rundir}/strongswan
|
|||||||
%{_datadir}/strongswan/templates/config/
|
%{_datadir}/strongswan/templates/config/
|
||||||
%{_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-starter.conf
|
||||||
|
|
||||||
%files sqlite
|
%files sqlite
|
||||||
%{_libdir}/strongswan/plugins/libstrongswan-sqlite.so
|
%{_libdir}/strongswan/plugins/libstrongswan-sqlite.so
|
||||||
@@ -266,7 +395,132 @@ install -d -m 0700 %{buildroot}%{_rundir}/strongswan
|
|||||||
%{_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
|
||||||
|
* 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
|
||||||
|
- 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#2015614 CVE-2021-41991 strongswan: integer overflow when replacing certificates in cache
|
||||||
|
- Add BuildRequire for tpm2-tss-devel and weak dependency for tpm2-tools
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 5.9.3-4
|
||||||
|
- Rebuilt with OpenSSL 3.0.0
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 5.9.3-2
|
||||||
|
- Rebuild for versioned symbols in json-c
|
||||||
|
|
||||||
|
* Tue Jul 06 2021 Paul Wouters <paul.wouters@aiven.io> - 5.9.3-1
|
||||||
|
- Resolves: rhbz#1979574 strongswan-5.9.3 is available
|
||||||
|
- Make strongswan main dir world readable so apps can find strongswan.conf
|
||||||
|
|
||||||
|
* Thu Jun 03 2021 Paul Wouters <paul.wouters@aiven.io> - 5.9.2-1
|
||||||
|
- Resolves: rhbz#1896545 strongswan-5.9.2 is available
|
||||||
|
|
||||||
|
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.9.1-2
|
||||||
|
- Rebuilt for updated systemd-rpm-macros
|
||||||
|
See https://pagure.io/fesco/issue/2583.
|
||||||
|
|
||||||
|
* Fri Feb 12 2021 Paul Wouters <pwouters@redhat.com> - 5.9.1-1
|
||||||
|
- Resolves: rhbz#1896545 strongswan-5.9.1 is available
|
||||||
|
|
||||||
|
* Thu Feb 11 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 5.9.0-4
|
||||||
|
- Build with with capabilities support
|
||||||
|
- Resolves: rhbz#1911572 StrongSwan not configured with libcap support
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Oct 22 12:43:48 EDT 2020 Paul Wouters <pwouters@redhat.com> - 5.9.0-2
|
||||||
|
- Resolves: rhbz#1886759 charon looking for certificates in the wrong place
|
||||||
|
|
||||||
|
* Mon Sep 28 12:36:45 EDT 2020 Paul Wouters <pwouters@redhat.com> - 5.9.0-1
|
||||||
|
- Resolves: rhbz#1861747 strongswan-5.9.0 is available
|
||||||
|
- Remove --enable-fips-mode=2, which defaults strongswan to FIPS only.
|
||||||
|
(use fips_mode = 2 in plugins {} openssl {} in strongswan.conf to enable FIPS)
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.4-5
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 5.8.4-3
|
||||||
|
- Rebuild (json-c)
|
||||||
|
|
||||||
|
* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-2
|
||||||
|
- Patch0: Add RuntimeDirectory options to service files (#1789263)
|
||||||
|
|
||||||
|
* Sun Apr 12 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.4-1
|
||||||
|
- Updated to 5.8.4
|
||||||
|
- Patch4 has been applied upstream
|
||||||
|
|
||||||
|
* Sat Feb 22 2020 Mikhail Zabaluev <mikhail.zabaluev@gmail.com> - 5.8.2-5
|
||||||
|
- Patch to declare a global variable with extern (#1800117)
|
||||||
|
|
||||||
|
* Mon Feb 10 2020 Paul Wouters <pwouters@redhat.com> - 5.8.2-4
|
||||||
|
- use tmpfile to ensure rundir is present
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Sat Dec 28 2019 Paul Wouters <pwouters@redhat.com> - 5.8.2-2
|
* Sat Dec 28 2019 Paul Wouters <pwouters@redhat.com> - 5.8.2-2
|
||||||
- Use /run/strongswan as rundir to support strongswans in namespaces
|
- Use /run/strongswan as rundir to support strongswans in namespaces
|
||||||
|
|
||||||
|
|||||||
1
tmpfiles-strongswan.conf
Normal file
1
tmpfiles-strongswan.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
D /run/strongswan 0755 root root -
|
||||||
Reference in New Issue
Block a user