use writable .rnd

3 files changed, 11 insertions, 75 deletions

diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf b/package/openvpn/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf
new file mode 100644
index 000000000..9dd542d8a
--- /dev/null
+++ b/package/openvpn/patches/patch-easy-rsa_2_0_openssl-1_0_0_cnf
@@ -0,0 +1,11 @@
+--- openvpn-2.2.1.orig/easy-rsa/2.0/openssl-1.0.0.cnf	2011-07-01 10:31:26.000000000 +0200
++++ openvpn-2.2.1/easy-rsa/2.0/openssl-1.0.0.cnf	2011-12-03 11:36:46.000000000 +0100
+@@ -3,7 +3,7 @@
+ # This definition stops the following lines choking if HOME isn't
+ # defined.
+ HOME			= .
+-RANDFILE		= $ENV::HOME/.rnd
++RANDFILE		= /etc/easy-rsa/.rnd
+ openssl_conf		= openssl_init
+ 
+ [ openssl_init ]
diff --git a/package/openvpn/patches/patch-easy-rsa_2_0_vars.orig b/package/openvpn/patches/patch-easy-rsa_2_0_vars.orig
deleted file mode 100644
index d0cac2069..000000000
--- a/package/openvpn/patches/patch-easy-rsa_2_0_vars.orig
+++ /dev/null
@@ -1,20 +0,0 @@
---- openvpn-2.2.1.orig/easy-rsa/2.0/vars	2011-07-01 10:31:26.000000000 +0200
-+++ openvpn-2.2.1/easy-rsa/2.0/vars	2011-12-01 19:12:55.000000000 +0100
-@@ -12,7 +12,7 @@
- # This variable should point to
- # the top level of the easy-rsa
- # tree.
--export EASY_RSA="`pwd`"
-+export EASY_RSA="/etc/easy-rsa"
- 
- #
- # This variable should point to
-@@ -26,7 +26,7 @@ export GREP="grep"
- # This variable should point to
- # the openssl.cnf file included
- # with easy-rsa.
--export KEY_CONFIG=`$EASY_RSA/whichopensslcnf $EASY_RSA`
-+export KEY_CONFIG=/etc/easy-rsa/openssl.cnf
- 
- # Edit this variable to point to
- # your soon-to-be-created key
diff --git a/package/openvpn/patches/patch-t_client_sh.orig b/package/openvpn/patches/patch-t_client_sh.orig
deleted file mode 100644
index 8e3c470ac..000000000
--- a/package/openvpn/patches/patch-t_client_sh.orig
+++ /dev/null
@@ -1,55 +0,0 @@
---- openvpn-2.2.1.orig/t_client.sh	2011-07-01 11:27:01.000000000 +0200
-+++ openvpn-2.2.1/t_client.sh	2011-12-02 18:18:44.000000000 +0100
-@@ -80,12 +80,12 @@ fail()
- get_ifconfig_route()
- {
-     # linux / iproute2? (-> if configure got a path)
--    if [ "/sbin/ip" != "ip" ]
-+    if [ "ip" != "ip" ]
-     then
- 	echo "-- linux iproute2 --"
--	/sbin/ip addr show     | grep -v valid_lft
--	/sbin/ip route show
--	/sbin/ip -6 route show | sed -e 's/expires [0-9]*sec //'
-+	ip addr show     | grep -v valid_lft
-+	ip route show
-+	ip -6 route show | sed -e 's/expires [0-9]*sec //'
- 	return
-     fi
- 
-@@ -93,27 +93,27 @@ get_ifconfig_route()
-     case `uname -s` in
- 	Linux)
- 	   echo "-- linux / ifconfig --"
--	   LANG=C /sbin/ifconfig -a |egrep  "( addr:|encap:)"
--	   LANG=C /bin/netstat -rn -4 -6
-+	   LANG=C no -a |egrep  "( addr:|encap:)"
-+	   LANG=C /usr/sbin/netstat -rn -4 -6
- 	   return
- 	   ;;
- 	FreeBSD|NetBSD|Darwin)
- 	   echo "-- FreeBSD/NetBSD/Darwin [MacOS X] --"
--	   /sbin/ifconfig -a | egrep "(flags=|inet)"
--	   /bin/netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
-+	   no -a | egrep "(flags=|inet)"
-+	   /usr/sbin/netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
- 	   return
- 	   ;;
- 	OpenBSD)
- 	   echo "-- OpenBSD --"
--	   /sbin/ifconfig -a | egrep "(flags=|inet)" | \
-+	   no -a | egrep "(flags=|inet)" | \
- 		sed -e 's/pltime [0-9]*//' -e 's/vltime [0-9]*//'
--	   /bin/netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
-+	   /usr/sbin/netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
- 	   return
- 	   ;;
- 	SunOS)
- 	   echo "-- Solaris --"
--	   /sbin/ifconfig -a | egrep "(flags=|inet)"
--	   /bin/netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$6 }'
-+	   no -a | egrep "(flags=|inet)"
-+	   /usr/sbin/netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$6 }'
- 	   return
- 	   ;;
-     esac