From ea6e8a6af9baf928b9643f08d6803a2c3e10db966c846770713254e752099057 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Tue, 6 Jun 2017 15:17:18 +0000 Subject: [PATCH] Accepting request 501439 from home:ndas:branches:network:vpn - pkcs11-helper-devel >= 1.11 is needed for openvpn-2.4.2 OBS-URL: https://build.opensuse.org/request/show/501439 OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=119 --- ...red-authentication-in-the-background.patch | 20 +++++++++++++------ openvpn.changes | 1 + openvpn.spec | 8 ++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/0001-preform-deferred-authentication-in-the-background.patch b/0001-preform-deferred-authentication-in-the-background.patch index 8187e5d..5fb2e54 100644 --- a/0001-preform-deferred-authentication-in-the-background.patch +++ b/0001-preform-deferred-authentication-in-the-background.patch @@ -1,8 +1,16 @@ diff --git a/src/plugins/auth-pam/auth-pam.c b/src/plugins/auth-pam/auth-pam.c -index 54471a3..1d52035 100644 +index 54471a3..a2d509f 100644 --- a/src/plugins/auth-pam/auth-pam.c +++ b/src/plugins/auth-pam/auth-pam.c -@@ -56,6 +56,7 @@ +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -56,6 +57,7 @@ /* Command codes for foreground -> background communication */ #define COMMAND_VERIFY 0 #define COMMAND_EXIT 1 @@ -10,7 +18,7 @@ index 54471a3..1d52035 100644 /* Response codes for background -> foreground communication */ #define RESPONSE_INIT_SUCCEEDED 10 -@@ -112,6 +113,7 @@ struct user_pass { +@@ -112,6 +114,7 @@ struct user_pass { char username[128]; char password[128]; char common_name[128]; @@ -18,7 +26,7 @@ index 54471a3..1d52035 100644 const struct name_value_list *name_value_list; }; -@@ -708,6 +710,21 @@ pam_auth(const char *service, const struct user_pass *up) +@@ -708,6 +711,21 @@ pam_auth(const char *service, const struct user_pass *up) return ret; } @@ -40,7 +48,7 @@ index 54471a3..1d52035 100644 /* * Background process -- runs with privilege. */ -@@ -807,6 +824,42 @@ pam_server(int fd, const char *service, int verb, const struct name_value_list * +@@ -807,6 +825,42 @@ pam_server(int fd, const char *service, int verb, const struct name_value_list * plugin_secure_memzero(up.password, sizeof(up.password)); break; @@ -83,7 +91,7 @@ index 54471a3..1d52035 100644 case COMMAND_EXIT: goto done; -@@ -833,3 +886,56 @@ done: +@@ -833,3 +887,56 @@ done: return; } diff --git a/openvpn.changes b/openvpn.changes index c2a253d..846ac4a 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -15,6 +15,7 @@ Tue Jun 6 14:59:29 CEST 2017 - ndas@suse.de [*0001-preform-deferred-authentication-in-the-background.patch *openvpn-2.3.x-fixed-multiple-low-severity-issues.patch *openvpn-fips140-2.3.2.patch] +- pkcs11-helper-devel >= 1.11 is needed for openvpn-2.4.2 ------------------------------------------------------------------- Fri Apr 21 14:55:09 CEST 2017 - ndas@suse.de diff --git a/openvpn.spec b/openvpn.spec index e98bcaf..47574ad 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -63,8 +63,8 @@ BuildRequires: pam-devel BuildRequires: systemd %endif BuildRequires: libselinux-devel -BuildRequires: pkcs11-helper-devel -Requires: pkcs11-helper +BuildRequires: pkcs11-helper-devel >= 1.11 +Requires: pkcs11-helper >= 1.11 %if %{with_systemd} BuildRequires: systemd-devel %endif @@ -178,8 +178,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn mkdir -p $RPM_BUILD_ROOT/%{_rundir}/openvpn mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn %if %{with_systemd} -rm %{buildroot}/usr/lib64/systemd/system/openvpn-client@.service -rm %{buildroot}/usr/lib64/systemd/system/openvpn-server@.service +rm %{buildroot}%{_libdir}/systemd/system/openvpn-client@.service +rm %{buildroot}%{_libdir}/systemd/system/openvpn-server@.service install -D -m 644 %{name}.service %{buildroot}/%{_unitdir}/%{name}@.service install -D -m 644 $RPM_SOURCE_DIR/%{name}.target %{buildroot}/%{_unitdir}/%{name}.target install -D -m 755 $RPM_SOURCE_DIR/rc%{name} %{buildroot}%{_sbindir}/rc%{name}