Programmupdate:

  * Samba 3.0.23a --> 3.0.23b
Geändert:
  * ConnectionScheduler kann jetzt VPNs starten/beenden.

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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9c6a72887bc90369419176b67bf38bef7669526a..3d5b9aad31d24db685889c9dac454296d36f963d 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,12 @@
 ------------------------------------------------------------------------
+r253 | ms | 2006-08-20 22:12:57 +0200 (Sun, 20 Aug 2006) | 5 lines
+
+Fixes:
+  * libPNG12 fehlte für makegraphs
+  * md5sums erhielten den falschen Namen (ohne Unterstrich)
+Geändert:
+  * QoS leicht erweitert.
+------------------------------------------------------------------------
 r252 | ms | 2006-08-19 22:26:47 +0200 (Sat, 19 Aug 2006) | 2 lines
 
 Geaendert:

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 3b536a8e8fc6755f47a94f3b1da7e762d3132970..40f016cfd0fa7d04d3bc2e84e3cfdf6a747ce34a 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -209,6 +209,7 @@
   * rp-pppoe-3.5
   * rrdtool-1.0.49
   * samba-3.0.23a
+  * samba-3.0.23b
   * sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15
   * screen-4.0.2
   * sed-4.0.9

diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi
index 1ad7ff16c9d38c7089b21631e6e62210366660b9..382cefe8ac52911448a443120e7d0961c63068bf 100644 (file)
--- a/html/cgi-bin/connscheduler.cgi
+++ b/html/cgi-bin/connscheduler.cgi
@@ -4,19 +4,24 @@
 #
 # This code is distributed under the terms of the GPL
 #
+#
+# 2006-04-xx created by weizen_42 at ipcop-forum dot de
+# 2006-06-xx added reboot and shutdown
+# 2006-08-20 added ipsecctrl
+#
 
 
 use strict;
 
 # enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
-require '/var/ipfire/connscheduler/lib.pl';
+require '/var/ipcop/connscheduler/lib.pl';
 
 my $buttontext = $Lang::tr{'add'};
 my $hiddenvalue = 'add';
@@ -40,6 +45,8 @@ $selected{'dial'} = '';
 $selected{'hangup'} = '';
 $selected{'reboot'} = '';
 $selected{'shutdown'} = '';
+$selected{'ipsecstart'} = '';
+$selected{'ipsecstop'} = '';
 my $selected_profile = 1;
 my $checked_days = "checked='checked'";
 my $selected_daystart = 1;
@@ -249,13 +256,13 @@ if ( ($cgiparams{'ACTION'} eq 'down') || ($cgiparams{'ACTION'} eq 'up') )
 # Add / Edit Box
 #
 
-&Header::openbox('100%', 'left', $Lang::tr{'add action'});
+&Header::openbox('100%', 'left', $Lang::tr{'ConnSched add action'});
 
 print <<END
 <form method='post' name='addevent' action='$ENV{'SCRIPT_NAME'}'>
 <table width='100%' border='0' cellspacing='6' cellpadding='0'>
 <tr>
-<td width='15%' class='base'>$Lang::tr{'connscheduler time'}</td>
+<td width='15%' class='base'>$Lang::tr{'ConnSched time'}</td>
 <td><select name='ACTION_HOUR'>
 END
 ;
@@ -288,16 +295,18 @@ for ($minute = 0; $minute <= 55; $minute += 5)
 print <<END
 </select></td></tr>
 <tr><td colspan='2'><hr /></td></tr>
-<tr><td width='15%' class='base'>$Lang::tr{'connscheduler action'}</td><td>
+<tr><td width='15%' class='base'>$Lang::tr{'ConnSched action'}</td><td>
 <input type='radio' value='CONNECT' name='ACTION_ACTION' $checked_connect />&nbsp;<select name='ACTION_CONNECT'>
-<option value='reconnect' $selected{'reconnect'}>$Lang::tr{'reconnect'}</option>
+<option value='reconnect' $selected{'reconnect'}>$Lang::tr{'ConnSched reconnect'}</option>
 <option value='dial' $selected{'dial'}>$Lang::tr{'dial'}</option>
 <option value='hangup' $selected{'hangup'}>$Lang::tr{'hangup'}</option>
 <option value='reboot' $selected{'reboot'}>$Lang::tr{'reboot'}</option>
 <option value='shutdown' $selected{'shutdown'}>$Lang::tr{'shutdown'}</option>
+<option value='ipsecstart' $selected{'ipsecstart'}>$Lang::tr{'ConnSched ipsecstart'}</option>
+<option value='ipsecstop' $selected{'ipsecstop'}>$Lang::tr{'ConnSched ipsecstop'}</option>
 </select></td></tr>
 <tr><td width='15%' class='base'>&nbsp;</td>
-<td><input type='radio' value='PROFILE' name='ACTION_ACTION' $checked_profile />&nbsp;$Lang::tr{'change profile title'}&nbsp;<select name='ACTION_PROFILENR'>
+<td><input type='radio' value='PROFILE' name='ACTION_ACTION' $checked_profile />&nbsp;$Lang::tr{'ConnSched change profile title'}&nbsp;<select name='ACTION_PROFILENR'>
 END
 ;
 for ($i = 1; $i <= $CONNSCHED::maxprofiles; $i++)
@@ -314,7 +323,7 @@ for ($i = 1; $i <= $CONNSCHED::maxprofiles; $i++)
 print <<END
 </select></td></tr>
 <tr><td colspan='2'><hr /></td></tr>
-<tr><td width='15%' class='base'>$Lang::tr{'connscheduler days'}</td>
+<tr><td width='15%' class='base'>$Lang::tr{'ConnSched days'}</td>
 <td><input type='radio' value='DAYS' name='ACTION_DAYSTYPE' $checked_days />&nbsp;<select name='ACTION_DAYSTART'>
 END
 ;
@@ -344,7 +353,7 @@ for ($day = 1; $day <= 31; $day++)
 
 print <<END
 </select></td></tr>
-<tr><td width='15%' class='base'>&nbsp;</td><td><input type='radio' value='WEEKDAYS' name='ACTION_DAYSTYPE' $checked_weekdays />&nbsp;$Lang::tr{'connsched weekdays'}<br />
+<tr><td width='15%' class='base'>&nbsp;</td><td><input type='radio' value='WEEKDAYS' name='ACTION_DAYSTYPE' $checked_weekdays />&nbsp;$Lang::tr{'ConnSched weekdays'}<br />
 &nbsp;&nbsp;<input type='checkbox' name='Mon' $checked_mon />$Lang::tr{'monday'}<br />
 &nbsp;&nbsp;<input type='checkbox' name='Tue' $checked_tue />$Lang::tr{'tuesday'}<br />
 &nbsp;&nbsp;<input type='checkbox' name='Wed' $checked_wed />$Lang::tr{'wednesday'}<br />
@@ -375,7 +384,7 @@ END
 # Box with List of events
 #
 
-&Header::openbox('100%', 'left', $Lang::tr{'scheduled actions'});
+&Header::openbox('100%', 'left', $Lang::tr{'ConnSched scheduled actions'});
 print <<END
 <table width='100%' border='0' cellspacing='1' cellpadding='0'>
 <tr>
@@ -407,7 +416,7 @@ for my $id ( 0 .. $#CONNSCHED::config )
 print <<END
 $trcolor
 <td align='center'>$CONNSCHED::config[$id]{'TIME'}</td>
-<td>$Lang::tr{"$CONNSCHED::config[$id]{'ACTION'}"}&nbsp;$CONNSCHED::config[$id]{'PROFILENR'}</td>
+<td>$Lang::tr{"ConnSched $CONNSCHED::config[$id]{'ACTION'}"}&nbsp;$CONNSCHED::config[$id]{'PROFILENR'}</td>
 <td>$CONNSCHED::config[$id]{'COMMENT'}</td>
 <td align='center'>
   <form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
@@ -433,14 +442,14 @@ $trcolor
 <td align='center'>
   <form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
   <input type='hidden' name='ACTION' value='up' />
-  <input type='image' name='$Lang::tr{'up'}' src='/images/up.gif' alt='$Lang::tr{'up'}' title='$Lang::tr{'up'}' />
+  <input type='image' name='$Lang::tr{'up'}' src='/images/up.gif' alt='$Lang::tr{'ConnSched up'}' title='$Lang::tr{'ConnSched up'}' />
   <input type='hidden' name='ID' value='$id' />
   </form>
 </td>
 <td align='center'>
   <form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
   <input type='hidden' name='ACTION' value='down' />
-  <input type='image' name='$Lang::tr{'down'}' src='/images/down.gif' alt='$Lang::tr{'down'}' title='$Lang::tr{'down'}' />
+  <input type='image' name='$Lang::tr{'down'}' src='/images/down.gif' alt='$Lang::tr{'ConnSched down'}' title='$Lang::tr{'ConnSched down'}' />
   <input type='hidden' name='ID' value='$id' />
   </form>
 </td>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 25d258dff93e5595abc3add161565ea5d8db24e3..751cc8ad2fc7be9f862b1751eac794209ce3b504 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1491,24 +1491,26 @@
 'WakeOnLan' => 'Wake On LAN',
 'wol wakeup' => 'WakeUp',
 'magic packet send to:' => 'Sende WOL-Paket an',
-'add action' => 'Aktion hinzufügen',
-'change profile title' => 'Wechsle zu Profil:',
-'connscheduler' => 'Connection Scheduler',
-'connscheduler action' => 'Aktion:',
-'connscheduler days' => 'Tage:',
-'connscheduler time' => 'Zeit:',
-'connsched weekdays' => 'Wochentage:',
-'down' => 'Runter', 
-'reconnect' => 'Neu verbinden',
-'scheduled actions' => 'Geplante Aktionen',
-'scheduler' => 'Scheduler',
-'select profile' => 'Wähle Profil',
-'up' => 'Hoch',
 'hardware graphs' => 'Hardware-Diagramme',
 'net config' => 'Netzwerk-Konfiguration',
 'net config type' => 'Netzwerk-Konfigurations-Typ',
 'net config type help' => 'GREEN ist das lokale Netzwerk, RED ist das Internet, BLUE ist WLAN, ORANGE ist die DMZ.',
 'net address' => 'Netzadresse',
+'connscheduler' => 'Connection Scheduler',
+'ConnSched add action' => 'Aktion hinzufügen',
+'ConnSched change profile title' => 'Wechsle zu Profil:',
+'ConnSched action' => 'Aktion:',
+'ConnSched days' => 'Tage:',
+'ConnSched time' => 'Zeit:',
+'ConnSched weekdays' => 'Wochentage:',
+'ConnSched down' => 'Runter',
+'ConnSched reconnect' => 'Neu verbinden',
+'ConnSched scheduled actions' => 'Geplante Aktionen',
+'ConnSched scheduler' => 'Scheduler',
+'ConnSched select profile' => 'Wähle Profil',
+'ConnSched up' => 'Hoch',
+'ConnSched ipsecstart' => 'VPN (re)start',
+'ConnSched ipsecstop' => 'VPN stop',
 
 ); 
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index adfe6a8a946811771759753f20c676ed485055ed..ea7f88bc15ab687c9b21d8585d6ac0e239ea6192 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1523,24 +1523,26 @@
 'invalid mac address' => 'Invalid MAC address', 
 'WakeOnLan' => 'Wake On LAN',
 'wol wakeup' => 'WakeUp',
-'magic packet send to:' => 'Magic packet send to',
-'add action' => 'Add action',
-'change profile title' => 'Change to profile:',
-'connscheduler' => 'Connection Scheduler',
-'connscheduler action' => 'Action:',
-'connscheduler days' => 'Days:',
-'connscheduler time' => 'Time:',
-'connsched weekdays' => 'Days of the week:',
-'down' => 'Down', 
-'reconnect' => 'Reconnect',
-'scheduled actions' => 'Scheduled actions',
-'scheduler' => 'Scheduler',
-'select profile' => 'Select profile',
-'up' => 'Up',
+'magic packet send to:' => 'Magic packet send to:',
 'hardware graphs' => 'hardware graphs',
 'net config' => 'Network configuration',
 'net config type' => 'kind of network configuration',
 'net config type help' => 'GREEN is the local network, RED is the internet, BLUE is WLAN, ORANGE is the DMZ.',
 'net address' => 'net address',
+'connscheduler' => 'Connection Scheduler',
+'ConnSched add action' => 'Add action',
+'ConnSched change profile title' => 'Change to profile:',
+'ConnSched action' => 'Action:',
+'ConnSched days' => 'Days:',
+'ConnSched time' => 'Time:',
+'ConnSched weekdays' => 'Days of the week:',
+'ConnSched down' => 'Down',
+'ConnSched reconnect' => 'Reconnect',
+'ConnSched scheduled actions' => 'Scheduled actions',
+'ConnSched scheduler' => 'Scheduler',
+'ConnSched select profile' => 'Select profile',
+'ConnSched up' => 'Up',
+'ConnSched ipsecstart' => 'VPN (re)start',
+'ConnSched ipsecstop' => 'VPN stop',
 
 );

diff --git a/lfs/samba b/lfs/samba
index b1a8ddda667b41d008d4563acd82de271680960d..7d5381139cf8a858d517ecb1e8f92d310b0c9804 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 3.0.23a
+VER        = 3.0.23b
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e48f196fa51c22ff67463680ce95a58d
+$(DL_FILE)_MD5 = f2d1a513fd7138fd1515d3bdf702f7c7
 
 install : $(TARGET)
 

diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index 9a4e44fe83f8fdb341594a6ab8533dce21455b51..c4ea8dc1d4f4e0ecb6e91b62aa9ec6d3ab948dd5 100644 (file)
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -210,5 +210,19 @@ sub timer
       &General::log("ConnSched shutdown");
        system ("/usr/local/bin/ipfirereboot", "down");
     }
+    elsif ( $CONNSCHED::config[$i]{'ACTION'} eq 'ipsecstart' )
+    {
+      &General::log("ConnSched ipsecstart");
+       system ("/usr/local/bin/ipsecctrl", "S");
+    }
+    elsif ( $CONNSCHED::config[$i]{'ACTION'} eq 'ipsecstop' )
+    {
+      &General::log("ConnSched ipsecstop");
+       system ("/usr/local/bin/ipsecctrl", "D");
+    }
+    else
+    {
+      # okay ? an event we don't know about
+    }
   }
 }