From f852739d6d399efe822370ea494d8a2304a4d158 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 1 Mar 2018 13:03:41 +0100 Subject: [PATCH] Remove no long er needed patches These have not been in use for a long time. No need to carry them here any longer. And if needed, they're in the git history. Signed-off-by: David Sommerseth --- openvpn-2.1.1-init.patch | 5 ----- openvpn-2.1.1-initinfo.patch | 16 ---------------- openvpn-init.patch | 23 ----------------------- openvpn-script-security.patch | 16 ---------------- 4 files changed, 60 deletions(-) delete mode 100644 openvpn-2.1.1-init.patch delete mode 100644 openvpn-2.1.1-initinfo.patch delete mode 100644 openvpn-init.patch delete mode 100644 openvpn-script-security.patch diff --git a/openvpn-2.1.1-init.patch b/openvpn-2.1.1-init.patch deleted file mode 100644 index 598a009..0000000 --- a/openvpn-2.1.1-init.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- sample-scripts/openvpn.init~ 2010-01-04 08:30:35.000000000 -0600 -+++ sample-scripts/openvpn.init 2010-01-04 15:53:29.503900367 -0600 -@@ -153 +153 @@ -- . $bn.sh -+ . ./$bn.sh diff --git a/openvpn-2.1.1-initinfo.patch b/openvpn-2.1.1-initinfo.patch deleted file mode 100644 index 19a382d..0000000 --- a/openvpn-2.1.1-initinfo.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- sample-scripts/openvpn.init~ 2010-01-04 16:52:25.000000000 -0600 -+++ sample-scripts/openvpn.init 2010-01-05 05:48:24.043085950 -0600 -@@ -15,0 +16,13 @@ -+### BEGIN INIT INFO -+# Provides: openvpn -+# Required-Start: $network -+# Required-Stop: $network -+# Short-Description: start and stop openvpn -+# Description: OpenVPN is a robust and highly flexible tunneling \ -+# application that uses all of the encryption, \ -+# authentication, and certification features of the OpenSSL \ -+# library to securely tunnel IP networks over a single UDP \ -+# port. -+### END INIT INFO -+ -+ diff --git a/openvpn-init.patch b/openvpn-init.patch deleted file mode 100644 index fc751c6..0000000 --- a/openvpn-init.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- sample-scripts/openvpn.init~ 2011-04-06 11:05:52.000000000 -0500 -+++ sample-scripts/openvpn.init 2011-05-19 13:06:51.049143974 -0500 -@@ -3,13 +3,14 @@ - # openvpn This shell script takes care of starting and stopping - # openvpn on RedHat or other chkconfig-based system. - # --# chkconfig: 345 24 76 --# --# description: OpenVPN is a robust and highly flexible tunneling application \ --# that uses all of the encryption, authentication, and \ --# certification features of the OpenSSL library to securely \ --# tunnel IP networks over a single UDP port. -+# chkconfig: - 24 76 - # -+# processname: openvpn -+# description: OpenVPN is a robust and highly flexible tunneling \ -+# application that uses all of the encryption, \ -+# authentication, and certification features of the OpenSSL \ -+# library to securely tunnel IP networks over a single UDP \ -+# port. - - # Contributed to the OpenVPN project by - # Douglas Keller diff --git a/openvpn-script-security.patch b/openvpn-script-security.patch deleted file mode 100644 index 6d5e15b..0000000 --- a/openvpn-script-security.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- openvpn-2.1_rc9/sample-scripts/openvpn.init.orig 2008-06-13 02:54:58.000000000 -0500 -+++ openvpn-2.1_rc9/sample-scripts/openvpn.init 2008-08-13 13:51:46.000000000 -0500 -@@ -151,7 +151,12 @@ - . $bn.sh - fi - rm -f $piddir/$bn.pid -- $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work -+ # Handle backward compatibility, see Red Hat Bugzilla ID #458594 -+ script_security='' -+ if [ -z "$( grep '^[[:space:]]*script-security[[:space:]]' $c )" ]; then -+ script_security="--script-security 2" -+ fi -+ $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work $script_security - if [ $? = 0 ]; then - successes=1 - else