From 6b20790e440a94a005c5f425b97ef3f8c1f34dce Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Wed, 11 Aug 2021 10:31:09 +0800
Subject: [PATCH] Fix algparse unknown option -d

(cherry picked from commit 9f54339fa790654616b4649916c6034786fd260f)
---
 fix-algparse-unknown-option-d.patch | 26 ++++++++++++++++++++++++++
 libreswan.spec                      |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 fix-algparse-unknown-option-d.patch

diff --git a/fix-algparse-unknown-option-d.patch b/fix-algparse-unknown-option-d.patch
new file mode 100644
index 0000000..3ec70f7
--- /dev/null
+++ b/fix-algparse-unknown-option-d.patch
@@ -0,0 +1,26 @@
+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 <password> | -nsspw <password> | -password <password>:\n"
+ 		"        <password> to unlock crypto database\n"
+ 		"    -v --verbose: be more verbose\n"
+-		"    -d --debug: enable debug logging\n"
++		"    --debug: enable debug logging\n"
++                /* -d <NSSDB> 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.spec b/libreswan.spec
index 1889349..e8ff7fa 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -26,7 +26,7 @@
 Name: libreswan
 Summary: IKE implementation for IPsec with IKEv1 and IKEv2 support
 Version: 4.1
-Release: 1
+Release: 2
 License: GPLv2
 Url: https://libreswan.org/
 Source0: https://download.libreswan.org/%{name}-%{version}.tar.gz
@@ -35,6 +35,8 @@ 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
@@ -92,6 +94,7 @@ 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
 
@@ -186,6 +189,9 @@ certutil -N -d sql:$tmpdir --empty-password
 %attr(0644,root,root) %doc %{_mandir}/*/*
 
 %changelog
+* Wed Aug 11 2021 caodongxia <caodongxia@huawei.com> - 4.1-2
+- Fix algparse unknown option -d
+
 * Fri Dec 04 2020 lingsheng <lingsheng@huawei.com> - 4.1-1
 - Update to 4.1
 
-- 
Gitee