rpm/openvpn
SHA256
1
0
Fork 0
forked from pool/openvpn
Code Pull Requests Activity

Accepting request 322617 from network:vpn

Browse Source 
Add revert-daemonize.patch, looks like under systemd the stdin
and stdout are not TTYs by default. This reverts to previous
behaviour fixing bsc#941569

OBS-URL: https://build.opensuse.org/request/show/322617
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvpn?expand=0&rev=65
This commit is contained in:
Dominique Leuenberger 2015-08-17 13:35:10 +00:00 committed by Git OBS Bridge
commit baed75c436
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openvpn.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 13 08:29:35 UTC 2015 - idonmez@suse.com
- Add revert-daemonize.patch, looks like under systemd the stdin
and stdout are not TTYs by default. This reverts to previous
behaviour fixing bsc#941569
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 5 12:03:33 UTC 2015 - idonmez@suse.com Wed Aug 5 12:03:33 UTC 2015 - idonmez@suse.com

2
openvpn.spec
View File

@ -52,6 +52,7 @@ Source11: rc%{name}
Patch1: %{name}-2.3-plugin-man.dif Patch1: %{name}-2.3-plugin-man.dif
Patch5: %{name}-2.3.0-man-dot.diff Patch5: %{name}-2.3.0-man-dot.diff
Patch6: %{name}-fips140-2.3.2.patch Patch6: %{name}-fips140-2.3.2.patch
Patch7: revert-daemonize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gpg-offline BuildRequires: gpg-offline
BuildRequires: iproute2 BuildRequires: iproute2
@ -129,6 +130,7 @@ chroot directives.
%patch1 -p0 %patch1 -p0
%patch5 -p0 %patch5 -p0
%patch6 -p1 %patch6 -p1
%patch7 -p1
sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" \ sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" \
-i src/openvpn/options.c -i src/openvpn/options.c
sed -e "s|@PLUGIN_LIBDIR@|%{_libdir}/openvpn/plugins|g" \ sed -e "s|@PLUGIN_LIBDIR@|%{_libdir}/openvpn/plugins|g" \

17
revert-daemonize.patch Normal file
View File

@ -0,0 +1,17 @@
Index: openvpn-2.3.8/src/openvpn/misc.c
===================================================================
--- openvpn-2.3.8.orig/src/openvpn/misc.c
+++ openvpn-2.3.8/src/openvpn/misc.c
@@ -1088,12 +1088,6 @@ get_user_pass_cr (struct user_pass *up,
*/
else if (from_stdin)
{
-#ifndef WIN32
- /* did we --daemon'ize before asking for passwords? */
- if ( !isatty(0) && !isatty(2) )
- { msg(M_FATAL, "neither stdin nor stderr are a tty device, can't ask for %s password. If you used --daemon, you need to use --askpass to make passphrase-protected keys work, and you can not use --auth-nocache.", prefix ); }
-#endif
-
#ifdef ENABLE_CLIENT_CR
if (auth_challenge && (flags & GET_USER_PASS_DYNAMIC_CHALLENGE))
{