Hinzugefügt:

  * Morningreconnect - Danke an Benedikt
Geändert:
  * Stop-Bug im OpenVPN behoben - wieder Danke an Benedikt
  * CA nach IPFire umbenannt.
  * Sprachdateien bearbeitet
  * Snort aktualisiert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@167 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf
index 092923fca5a9d433dc269e4d5e5db60ed1b9cfcc..e1689e26155a3312499ece6ccb90068ea396329c 100644 (file)
--- a/config/ssl/openssl.cnf
+++ b/config/ssl/openssl.cnf
@@ -7,7 +7,7 @@ oid_section     = new_oids
 [ ca ]
 default_ca     = IPFire
 
 [ ca ]
 default_ca     = IPFire
 

-[ IPCop ]
+[ IPFire ]

 dir            = /var/ipfire
 certs          = $dir/certs
 crl_dir                = $dir/crls
 dir            = /var/ipfire
 certs          = $dir/certs
 crl_dir                = $dir/crls

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6ff9e485e1d43c1466a5786e4a6fc4c5fc2aae79..544dc611a22b9c82c1ffe533c803ee8b6f502321 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -199,6 +199,7 @@
   * shadow-4.0.4.1
   * slang-1.4.5-mini
   * snort-2.3.3
   * shadow-4.0.4.1
   * slang-1.4.5-mini
   * snort-2.3.3

+  * snort-2.4.5

   * spandsp-0.0.2pre25
   * speedtouch-1.2
   * squid-2.5.STABLE14
   * spandsp-0.0.2pre25
   * speedtouch-1.2
   * squid-2.5.STABLE14

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 33e6140b974b30d354182d0a1d948f6f57d9d57d..3418ba8bd643e79de874205b5fcbf538c495156b 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -6,7 +6,7 @@
 # ZERNINA-VERSION:0.9.7a7
 # (c) 2005 Ufuk Altinkaynak
 #
 # ZERNINA-VERSION:0.9.7a7
 # (c) 2005 Ufuk Altinkaynak
 #

-# Ipcop and OpenVPN eas as one two three..
+# Ipcop and OpenVPN easy as one two three..

 #
 
 use CGI;
 #
 
 use CGI;


@@ -73,7 +73,6 @@ $cgiparams{'DCOMPLZO'} = 'off';
 if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} ||
     $cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'} ||
     $cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}) {
 if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} ||
     $cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'} ||
     $cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}) {

-       my $serveractive = `/bin/ps ax|grep server.conf|grep -v grep|awk \'{print \$1}\'`;

     #start openvpn server
     if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}){
        &Ovpnfunc::emptyserverlog();
     #start openvpn server
     if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}){
        &Ovpnfunc::emptyserverlog();


@@ -81,24 +80,19 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} ||
     }   
     #stop openvpn server
     if ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}){
     }   
     #stop openvpn server
     if ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}){

-               if ($serveractive ne ''){
-                       system('/usr/local/bin/openvpnctrl', '-kn2n', $serveractive);
-               }

        system('/usr/local/bin/openvpnctrl', '-k');
        system('/usr/local/bin/openvpnctrl', '-k');

-               &Ovpnfunc::emptyserverlog();    
+       &Ovpnfunc::emptyserverlog();    

     }   
 #    #restart openvpn server
     if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){
 #workarund, till SIGHUP also works when running as nobody    
     }   
 #    #restart openvpn server
     if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){
 #workarund, till SIGHUP also works when running as nobody    

-               if ($serveractive ne ''){
-                       system('/usr/local/bin/openvpnctrl', '-kn2n', $serveractive);
-               }
-               system('/usr/local/bin/openvpnctrl', '-k');     
-               &Ovpnfunc::emptyserverlog();
-               system('/usr/local/bin/openvpnctrl', '-s');
+       system('/usr/local/bin/openvpnctrl', '-r');     
+       &Ovpnfunc::emptyserverlog();    

     }       
 }
 
     }       
 }
 

+
+

 ###
 ### Save Advanced options
 ###
 ###
 ### Save Advanced options
 ###


@@ -1789,7 +1783,8 @@ END
                if ($cgiparams{'ZERINA_CLIENT'} eq ''){
                        $cgiparams{'ZERINA_CLIENT'} = 'no';
                }
                if ($cgiparams{'ZERINA_CLIENT'} eq ''){
                        $cgiparams{'ZERINA_CLIENT'} = 'no';
                }

-    } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {#ab hiere error uebernehmen
+#ab hiere error uebernehmen
+    } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {

                $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
                # n2n error
                if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {
                $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
                # n2n error
                if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 93098add92c34598d71cbbfd9a99b776ee3164d9..3e60865185e55ad16e3a1b487fa87e5b65c96457 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -6,12 +6,6 @@
 #
 # (c) The SmoothWall Team
 #
 #
 # (c) The SmoothWall Team
 #

-# Copyright (C) 03-Apr-2002 Guy Ellis <guy@traverse.com.au>
-#              - ISDN DOV support
-#              - ibod now an option
-#             - PCI ADSL support added
-#
-# $Id: pppsetup.cgi,v 1.17.2.49 2005/12/01 16:20:35 franck78 Exp $

 
 use strict;
 
 
 use strict;
 


@@ -61,6 +55,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
 }
 elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
 {
 }
 elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
 {

+       if ($pppsettings{'MORNINGRECONNECT'} eq 'on')
+               { system("/bin/touch /var/ipfire/ppp/morningreconnect"); }
+               else { unlink "/var/ipfire/ppp/morningreconnect"; }

        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) {
                $errormessage = $Lang::tr{'invalid input'};
                goto ERROR; }
        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) {
                $errormessage = $Lang::tr{'invalid input'};
                goto ERROR; }


@@ -401,6 +398,10 @@ $checked{'DIALONDEMANDDNS'}{'off'} = '';
 $checked{'DIALONDEMANDDNS'}{'on'} = '';
 $checked{'DIALONDEMANDDNS'}{$pppsettings{'DIALONDEMANDDNS'}} = "checked='checked'";
 
 $checked{'DIALONDEMANDDNS'}{'on'} = '';
 $checked{'DIALONDEMANDDNS'}{$pppsettings{'DIALONDEMANDDNS'}} = "checked='checked'";
 

+$checked{'MORNINGRECONNECT'}{'off'} = '';
+$checked{'MORNINGRECONNECT'}{'on'} = '';
+$checked{'MORNINGRECONNECT'}{$pppsettings{'MORNINGRECONNECT'}} = "checked='checked'";
+

 $checked{'AUTOCONNECT'}{'off'} = '';
 $checked{'AUTOCONNECT'}{'on'} = ''; 
 $checked{'AUTOCONNECT'}{$pppsettings{'AUTOCONNECT'}} = "checked='checked'";
 $checked{'AUTOCONNECT'}{'off'} = '';
 $checked{'AUTOCONNECT'}{'on'} = ''; 
 $checked{'AUTOCONNECT'}{$pppsettings{'AUTOCONNECT'}} = "checked='checked'";


@@ -691,6 +692,12 @@ print <<END
        <td align='right'>$Lang::tr{'maximum retries'}</td>
        <td><input type='text' size='5' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
 </tr>
        <td align='right'>$Lang::tr{'maximum retries'}</td>
        <td><input type='text' size='5' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
 </tr>

+<tr>
+       <td align='right'>Morning Reconnect:</td>
+       <td><input type='checkbox' name='MORNINGRECONNECT' $checked{'MORNINGRECONNECT'}{'on'} /></td>
+       <td>&nbsp;</td>
+       <td>&nbsp;</td>
+</tr>

 END
 ;
 
 END
 ;
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4e5ec8eed3b42ceeb89ca6b7320cbbfa7ce5c83e..cae935bcf938f859dd86f9c68730ae615c50feda 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1046,7 +1046,7 @@
 'invalid input for max clients' => 'Ungültige Eingabe für Max Clients',
 'invalid input for keepalive 1' => 'Ungültige Eingabe für Keepalive ping',
 'invalid input for keepalive 2' => 'Ungültige Eingabe für Keepalive ping-restart',
 'invalid input for max clients' => 'Ungültige Eingabe für Max Clients',
 'invalid input for keepalive 1' => 'Ungültige Eingabe für Keepalive ping',
 'invalid input for keepalive 2' => 'Ungültige Eingabe für Keepalive ping-restart',

-'valid till' => 'Güig bis',
+'valid till' => 'Gültig bis',

 'ovpn_processprio' => 'Prozesspriorität',
 'ovpn_fastio' => 'Fast-IO',
 'ovpn_mtudisc' => 'MTU-Discovery',
 'ovpn_processprio' => 'Prozesspriorität',
 'ovpn_fastio' => 'Fast-IO',
 'ovpn_mtudisc' => 'MTU-Discovery',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7022f234b6304d1828156c673ebef5db2c93b584..d9d958d04a8cc141db82e07e2c04b1f1f0ddf273 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -176,6 +176,7 @@
 'current rules' => 'Current rules:', 
 'custom networks' => 'Custom networks', 
 'custom services' => 'Custom services', 
 'current rules' => 'Current rules:', 
 'custom networks' => 'Custom networks', 
 'custom services' => 'Custom services', 

+'daily firewallhits' => 'daily firewallhits', 

 'dat without key' => 'An encrypted archive cannot be restored without the key.', 
 'date' => 'Date', 
 'date not in logs' => 'No (or only partial) logs exist for the day queried', 
 'dat without key' => 'An encrypted archive cannot be restored without the key.', 
 'date' => 'Date', 
 'date not in logs' => 'No (or only partial) logs exist for the day queried', 


@@ -332,6 +333,7 @@
 'filename' => 'Filename', 
 'filesystem full' => 'Filesystem full', 
 'firewall' => 'Firewall', 
 'filename' => 'Filename', 
 'filesystem full' => 'Filesystem full', 
 'firewall' => 'Firewall', 

+'firewall graphs' => 'Firewall Graphs', 

 'firewall hits' => 'Total number of firewall hits for', 
 'firewall log' => 'Firewall log', 
 'firewall log viewer' => 'Firewall Log Viewer', 
 'firewall hits' => 'Total number of firewall hits for', 
 'firewall log' => 'Firewall log', 
 'firewall log viewer' => 'Firewall Log Viewer', 


@@ -568,6 +570,7 @@
 'modulation' => 'Modulation', 
 'monday' => 'Monday', 
 'month' => 'Month', 
 'modulation' => 'Modulation', 
 'monday' => 'Monday', 
 'month' => 'Month', 

+'monthly firewallhits' => 'monthly firewallhits', 

 'months' => 'months', 
 'mounted on' => 'Mounted on', 
 'name' => 'Name', 
 'months' => 'months', 
 'mounted on' => 'Mounted on', 
 'name' => 'Name', 


@@ -756,9 +759,11 @@
 'shaping list options' => 'Traffic shaping services', 
 'shared' => 'shared', 
 'shared memory' => 'Shared Memory', 
 'shaping list options' => 'Traffic shaping services', 
 'shared' => 'shared', 
 'shared memory' => 'Shared Memory', 

+'show areas' => 'show areas', 

 'show ca certificate' => 'Show CA Certificate', 
 'show certificate' => 'Show Certificate', 
 'show host certificate' => 'Show Host Certificate', 
 'show ca certificate' => 'Show CA Certificate', 
 'show certificate' => 'Show Certificate', 
 'show host certificate' => 'Show Host Certificate', 

+'show lines' => 'show lines', 

 'show root certificate' => 'Show Root Certificate', 
 'shutdown' => 'Shutdown', 
 'shutdown control' => 'Shutdown control', 
 'show root certificate' => 'Show Root Certificate', 
 'shutdown' => 'Shutdown', 
 'shutdown control' => 'Shutdown control', 


@@ -923,6 +928,7 @@
 'web server' => 'Web server', 
 'website' => 'Website', 
 'wednesday' => 'Wednesday', 
 'web server' => 'Web server', 
 'website' => 'Website', 
 'wednesday' => 'Wednesday', 

+'weekly firewallhits' => 'weekly firewallhits', 

 'week' => 'Week', 
 'weeks' => 'weeks', 
 'wildcards' => 'Wildcards', 
 'week' => 'Week', 
 'weeks' => 'weeks', 
 'wildcards' => 'Wildcards', 


@@ -933,6 +939,7 @@
 'written sectors' => 'Written Sectors', 
 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 
 'year' => 'Year', 
 'written sectors' => 'Written Sectors', 
 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.', 
 'year' => 'Year', 

+'yearly firewallhits' => 'yearly firewallhits', 

 'yes' => 'Yes', 
 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', 
 'your department' => 'Your Department', 
 'yes' => 'Yes', 
 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.', 
 'your department' => 'Your Department', 


@@ -977,7 +984,7 @@
 'quick control' => 'Quick Control',
 'allmsg' => 'show all',
 'selecttraffic' => 'Select utilization-overview:',
 'quick control' => 'Quick Control',
 'allmsg' => 'show all',
 'selecttraffic' => 'Select utilization-overview:',

-'sstraffic' => 'net-traffic',
+'sstraffic' => 'Net-Traffic',

 'trafficblue' => 'WLAN',
 'trafficdate' => 'Date',
 'trafficfrom' => 'From',
 'trafficblue' => 'WLAN',
 'trafficdate' => 'Date',
 'trafficfrom' => 'From',

diff --git a/lfs/linux b/lfs/linux
index 847c11972416b49bc14987d17636bc7c31fb472b..c1d4fb10b4fc5801b8be3b7eff8c041e69bcc4d2 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -38,15 +38,15 @@ CXXFLAGS   =
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""

-ifeq "$(LFS_PASS)" "ipcop"
+ifeq "$(LFS_PASS)" "ipfire"

 ifeq "$(SMP)" ""
 ifeq "$(SMP)" ""

-  TARGET = $(DIR_INFO)/$(THISAPP)-ipcop
+  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire

 endif
 ifeq "$(SMP)" "1"
 endif
 ifeq "$(SMP)" "1"

-  TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-smp
+  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-smp

 endif
 ifeq "$(SMP)" "installer"
 endif
 ifeq "$(SMP)" "installer"

-  TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-installer
+  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-installer

 endif
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
 endif
 else
   TARGET = $(DIR_INFO)/$(THISAPP)

diff --git a/lfs/snort b/lfs/snort
index 88f0c2d35b7e409c16e514c1a3fb084d89b59ef8..e576f82e9420aeac8efb70f1e73566a549238fe2 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #

-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: snort,v 1.6.2.11 2005/11/05 19:53:45 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -32,11 +26,11 @@
 
 include Config
 
 
 include Config
 

-VER        = 2.3.3
+VER        = 2.4.5

 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

-DL_FROM    = http://www.snort.org/dl/old
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 


@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 06bf140893e7cb120aaa9372d10a0100
+$(DL_FILE)_MD5 = 108b3c20dcbaf3cdb17ea9203342eaaa

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -85,8 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        mv /usr/bin/snort /usr/sbin/
        -mkdir /etc/snort
        cd $(DIR_APP) && make install
        mv /usr/bin/snort /usr/sbin/
        -mkdir /etc/snort

-       cd $(DIR_APP) && install -m 0644 rules/*.rules \
-           etc/unicode.map etc/reference.config etc/classification.config /etc/snort
+       # Keine Rules zum Kopieren vorhanden. Müssen über das Webinterface geladen werden.
+       #cd $(DIR_APP) && install -m 0644 rules/*.rules \
+       #    etc/unicode.map etc/reference.config etc/classification.config /etc/snort

        install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort
        chown -R nobody:nobody /etc/snort
        -mkdir -p /var/log/snort
        install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort
        chown -R nobody:nobody /etc/snort
        -mkdir -p /var/log/snort

diff --git a/src/scripts/morningreconnect b/src/scripts/morningreconnect
index 82dfc92acd396149382353558e63111d70fc345e..0dcfa0b6bef274e72bd81d916a6152c1ce4b8571 100644 (file)
--- a/src/scripts/morningreconnect
+++ b/src/scripts/morningreconnect
@@ -8,7 +8,7 @@
 
 # begin
 
 
 # begin
 

-if [ -e "/var/ipfire/morningreconnect/enable" ]; then
+if [ -e "/var/ipfire/ppp/morningreconnect" ]; then

                logger -t ipfire MorningReconnect executed!
                /etc/rc.d/rc.red stop
                /bin/sleep 10
                logger -t ipfire MorningReconnect executed!
                /etc/rc.d/rc.red stop
                /bin/sleep 10