diff --git a/fix-algparse-unknown-option-d.patch b/fix-algparse-unknown-option-d.patch deleted file mode 100644 index 3ec70f7c56431ae6b4e88a320abbc531b2d2ad4d..0000000000000000000000000000000000000000 --- a/fix-algparse-unknown-option-d.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 55e0f262c77a5f9f2d2d6b833a58b9293efcdc4b Mon Sep 17 00:00:00 2001 -From: caodongxia <315816521@qq.com> -Date: Wed, 11 Aug 2021 10:43:22 +0800 -Subject: [PATCH] fix algparse unknown option -d - ---- - programs/algparse/algparse.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/programs/algparse/algparse.c b/programs/algparse/algparse.c -index 3820d63..afd5702 100644 ---- a/programs/algparse/algparse.c -+++ b/programs/algparse/algparse.c -@@ -566,7 +566,8 @@ static void usage(void) - " -P | -nsspw | -password :\n" - " to unlock crypto database\n" - " -v --verbose: be more verbose\n" -- " -d --debug: enable debug logging\n" -+ " --debug: enable debug logging\n" -+ /* -d is reserved */ - " --impair: disable all algorithm parser checks\n" - " --ignore: ignore parser errors (or at least some)\n" - " -p1: simple parser\n" --- -2.27.0 - diff --git a/libreswan-4.1.tar.gz b/libreswan-4.5.tar.gz similarity index 32% rename from libreswan-4.1.tar.gz rename to libreswan-4.5.tar.gz index 45b3509154c862e77e2a9d0a70a08c6ed3c7c66e..9201095512940a6bab816fdd94f822fbde23383e 100644 Binary files a/libreswan-4.1.tar.gz and b/libreswan-4.5.tar.gz differ diff --git a/libreswan.spec b/libreswan.spec index cde2bcd75c02a87498474149e0b21c3d2ca2a771..cfa22e55aa633a62df8a71952aa3b1a5d4f4e07a 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -18,15 +18,15 @@ USE_LINUX_AUDIT=true \\\ USE_NM=true \\\ USE_SECCOMP=true \\\ - USE_XAUTHPAM=true \\\ + USE_AUTHPAM=true \\\ USE_NSS_KDF=true \\\ %{nil} Name: libreswan Summary: IKE implementation for IPsec with IKEv1 and IKEv2 support -Version: 4.1 -Release: 2 +Version: 4.5 +Release: 1 License: GPLv2 Url: https://libreswan.org/ Source0: https://download.libreswan.org/%{name}-%{version}.tar.gz @@ -35,8 +35,6 @@ Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2 Source4: openeuler-libreswan-sysctl.conf -Patch0: fix-algparse-unknown-option-d.patch - BuildRequires: audit-libs-devel BuildRequires: bison BuildRequires: curl-devel @@ -94,7 +92,6 @@ Man pages and other related help documents for libreswan. %prep %setup -q -n libreswan-%{version}%{?prever} -%patch0 -p1 sed -i "s/-lfreebl //" mk/config.mk @@ -180,6 +177,7 @@ certutil -N -d sql:$tmpdir --empty-password %attr(0644,root,root) %{_unitdir}/ipsec.service %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/pluto %attr(0700,root,root) %dir %{_sharedstatedir}/ipsec/nss +%config(noreplace) %{_sysconfdir}/logrotate.d/libreswan %{_sbindir}/ipsec %{_libexecdir}/ipsec @@ -189,6 +187,9 @@ certutil -N -d sql:$tmpdir --empty-password %attr(0644,root,root) %doc %{_mandir}/*/* %changelog +* Mon Apr 18 2022 yangping - 4.5-1 +- Update to 4.5 + * Wed Aug 11 2021 caodongxia - 4.1-2 - Fix algparse unknown option -d