core197: Ship OpenVPN changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/197/filelists/files b/config/rootfiles/core/197/filelists/files
index 05a3215267d2bdba7c81979ad12f9e8c8a819dc7..b197f3f2ae5fbf166ccae16bb6d1b1f7d0cd00a3 100644 (file)
--- a/config/rootfiles/core/197/filelists/files
+++ b/config/rootfiles/core/197/filelists/files
@@ -1,4 +1,21 @@
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/openvpn-n2n
+etc/rc.d/init.d/openvpn-rw
+etc/rc.d/rc0.d/K10openvpn-rw
+etc/rc.d/rc0.d/K11openvpn-n2n
+etc/rc.d/rc3.d/S50openvpn-rw
+etc/rc.d/rc3.d/S51openvpn-n2n
+etc/rc.d/rc6.d/K10openvpn-rw
+etc/rc.d/rc6.d/K11openvpn-n2n
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/vulnerabilities.cgi
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
+usr/local/bin/openvpnctrl
+var/ipfire/general-functions.pl
+var/ipfire/header.pl
 var/ipfire/langs/list
 var/ipfire/menu.d/20-status.menu
 var/ipfire/menu.d/40-services.menu

diff --git a/config/rootfiles/core/197/filelists/openvpn b/config/rootfiles/core/197/filelists/openvpn
new file mode 120000 (symlink)
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/197/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file

diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh
index 311bddb859344dc388bc84a37570591fa6fa025a..30d618b0e4d7234d5107444b920cf2d55bfcc5e6 100644 (file)
--- a/config/rootfiles/core/197/update.sh
+++ b/config/rootfiles/core/197/update.sh
@@ -32,9 +32,13 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 # Remove files
 rm -vf \
+       /etc/rc.d/init.d/networking/red.down/10-ovpn \
+       /etc/rc.d/init.d/networking/red.up/50-ovpn \
        /usr/lib/libbtrfs.so.0.? \
        /usr/lib/libbtrfsutil.so.1.?
 
@@ -53,6 +57,10 @@ ldconfig
 # Apply SSH configuration
 /usr/local/bin/sshctrl
 
+# Start services
+/etc/init.d/openvpn-n2n start
+/etc/init.d/openvpn-rw start
+
 # Reload Apache2
 /etc/init.d/apache reload
 

diff --git a/lfs/tor b/lfs/tor
index 980c1a8f5ad287b99bfa25b5c229a65bb89ceda7..0d57f5fed9907f9f0a1eae351595bbf1a7608752 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 88
+PAK_VER    = 89
 
 DEPS       = libseccomp