Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package NetworkManager-openvpn for
openSUSE:Factory checked in at 2021-06-18 10:13:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-openvpn (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-openvpn.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-openvpn"
Fri Jun 18 10:13:33 2021 rev:85 rq:900448 version:1.8.14
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-openvpn/NetworkManager-openvpn.changes
2021-06-09 21:51:37.354402070 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-openvpn.new.2625/NetworkManager-openvpn.changes
2021-06-18 10:13:43.781989758 +0200
@@ -1,0 +2,7 @@
+Wed Jun 16 07:25:20 UTC 2021 - Jonathan Kang <songchuan.k...@suse.com>
+
+- Add nm-openvpn-bsc#1186091.patch: service: Don't add cert and key
+ when they are not set
+ (glgo#GNOME/NetworkManager-openvpn!38, bsc#1186091).
+
+-------------------------------------------------------------------
New:
----
nm-openvpn-bsc#1186091.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-openvpn.spec ++++++
--- /var/tmp/diff_new_pack.T6PQSD/_old 2021-06-18 10:13:44.237990361 +0200
+++ /var/tmp/diff_new_pack.T6PQSD/_new 2021-06-18 10:13:44.241990366 +0200
@@ -27,6 +27,8 @@
Source1: system-user-nm-openvpn.conf
# PATCH-FIX-OPENSUSE fix-for-missing-whirlpool-hmac-authentication.patch
boo#1132946
Patch0: fix-for-missing-whirlpool-hmac-authentication.patch
+# PATCH-FIX-UPSTREAM nm-openvpn-bsc#1186091.patch
glgo#GNOME/NetworkManager-openvpn!38, bsc#1186091 sck...@suse.com -- service:
Don't add cert and key when they are not set
+Patch1: nm-openvpn-bsc#1186091.patch
BuildRequires: intltool
BuildRequires: pkgconfig
BuildRequires: translation-update-upstream
++++++ nm-openvpn-bsc#1186091.patch ++++++
>From 9765e43a86304196b28a561588074976d946405b Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathank...@gnome.org>
Date: Tue, 15 Jun 2021 15:55:41 +0800
Subject: [PATCH] service: Don't add cert and key when they are not set
fixes 34a0c9257aac9ed6e3ac7cdad6f6cc7d8107eef1.
---
src/nm-openvpn-service.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 8cdbbd4..af57227 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -364,8 +364,10 @@ args_add_vpn_certs (GPtrArray *args, NMSettingVpn *s_vpn)
if (nmovpn_arg_is_set (cert) && is_pkcs12 (cert))
args_add_strv (args, "--pkcs12", cert);
else {
- args_add_strv (args, "--cert", cert);
- args_add_strv (args, "--key", key);
+ if (nmovpn_arg_is_set (cert))
+ args_add_strv (args, "--cert", cert);
+ if (nmovpn_arg_is_set (key))
+ args_add_strv (args, "--key", key);
}
}
--
2.31.1
