Menu
▾
▴
ipcop-svn — IPCop Subversion mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(330) |
May
(46) |
Jun
(52) |
Jul
(39) |
Aug
(26) |
Sep
(12) |
Oct
(110) |
Nov
(178) |
Dec
(161) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(99) |
Feb
(106) |
Mar
(97) |
Apr
(93) |
May
(81) |
Jun
(112) |
Jul
(84) |
Aug
(142) |
Sep
(165) |
Oct
(89) |
Nov
(120) |
Dec
(117) |
| 2009 |
Jan
(141) |
Feb
(137) |
Mar
(121) |
Apr
(96) |
May
(207) |
Jun
(194) |
Jul
(210) |
Aug
(155) |
Sep
(91) |
Oct
(159) |
Nov
(123) |
Dec
(166) |
| 2010 |
Jan
(142) |
Feb
(79) |
Mar
(137) |
Apr
(126) |
May
(78) |
Jun
(69) |
Jul
(54) |
Aug
(161) |
Sep
(76) |
Oct
(98) |
Nov
(113) |
Dec
(95) |
| 2011 |
Jan
(101) |
Feb
(118) |
Mar
(74) |
Apr
(75) |
May
(32) |
Jun
(32) |
Jul
(39) |
Aug
(74) |
Sep
(48) |
Oct
(134) |
Nov
(133) |
Dec
(55) |
| 2012 |
Jan
(94) |
Feb
(143) |
Mar
(80) |
Apr
(75) |
May
(36) |
Jun
(46) |
Jul
(47) |
Aug
(51) |
Sep
(10) |
Oct
(36) |
Nov
(38) |
Dec
(19) |
| 2013 |
Jan
(26) |
Feb
(40) |
Mar
(48) |
Apr
(26) |
May
(34) |
Jun
(20) |
Jul
(18) |
Aug
(10) |
Sep
(8) |
Oct
(6) |
Nov
(64) |
Dec
(18) |
| 2014 |
Jan
(26) |
Feb
(42) |
Mar
(126) |
Apr
(122) |
May
(73) |
Jun
(33) |
Jul
(14) |
Aug
(20) |
Sep
(12) |
Oct
(33) |
Nov
(20) |
Dec
(49) |
| 2015 |
Jan
(79) |
Feb
(64) |
Mar
(49) |
Apr
(6) |
May
(9) |
Jun
(2) |
Jul
(27) |
Aug
|
Sep
|
Oct
(4) |
Nov
(1) |
Dec
(12) |
| 2016 |
Jan
(72) |
Feb
(9) |
Mar
(13) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(8) |
2
|
3
(2) |
4
(1) |
5
(6) |
|
6
(6) |
7
(5) |
8
|
9
(4) |
10
(4) |
11
(4) |
12
(17) |
|
13
(8) |
14
(3) |
15
(4) |
16
(6) |
17
(13) |
18
(9) |
19
(1) |
|
20
(1) |
21
(6) |
22
(4) |
23
(2) |
24
|
25
(3) |
26
(1) |
|
27
(5) |
28
(2) |
29
(1) |
30
(7) |
|
|
|
|
From: <ow...@us...> - 2011-11-30 21:39:34
|
Revision: 6148
http://ipcop.svn.sourceforge.net/ipcop/?rev=6148&view=rev
Author: owes
Date: 2011-11-30 21:39:28 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Upgrade iproute2 to 3.1.0
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/iproute2
ipcop/trunk/lfs/iproute2
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/config/rootfiles/common/iproute2
===================================================================
--- ipcop/trunk/config/rootfiles/common/iproute2 2011-11-30 14:44:04 UTC (rev 6147)
+++ ipcop/trunk/config/rootfiles/common/iproute2 2011-11-30 21:39:28 UTC (rev 6148)
@@ -59,6 +59,7 @@
#usr/share/doc/iproute2/rtstat.sgml
#usr/share/doc/iproute2/ss.sgml
#usr/share/man/man3/libnetlink.3
+#usr/share/man/man7/tc-hfsc.7
#usr/share/man/man8/arpd.8
#usr/share/man/man8/ctstat.8
#usr/share/man/man8/ip.8
@@ -73,13 +74,16 @@
#usr/share/man/man8/tc-bfifo.8
#usr/share/man/man8/tc-cbq-details.8
#usr/share/man/man8/tc-cbq.8
+#usr/share/man/man8/tc-choke.8
#usr/share/man/man8/tc-drr.8
+#usr/share/man/man8/tc-hfsc.8
#usr/share/man/man8/tc-htb.8
#usr/share/man/man8/tc-pfifo.8
#usr/share/man/man8/tc-pfifo_fast.8
#usr/share/man/man8/tc-prio.8
#usr/share/man/man8/tc-red.8
#usr/share/man/man8/tc-sfq.8
+#usr/share/man/man8/tc-stab.8
#usr/share/man/man8/tc-tbf.8
#usr/share/man/man8/tc.8
#var/lib/arpd
Modified: ipcop/trunk/lfs/iproute2
===================================================================
--- ipcop/trunk/lfs/iproute2 2011-11-30 14:44:04 UTC (rev 6147)
+++ ipcop/trunk/lfs/iproute2 2011-11-30 21:39:28 UTC (rev 6148)
@@ -33,13 +33,13 @@
include Config
PKG_NAME = iproute2
-VER = 2.6.39
+VER = 3.1.0
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://developer.osdl.org/dev/iproute2/download
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_KERNEL)/linux/utils/net/iproute2
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -50,7 +50,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8a3b6bc77c2ecf752284aa4a6fc630a6
+$(DL_FILE)_MD5 = 810cdc0ddc2409a7af7089588c6c9a68
install : $(TARGET)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 14:44:04 UTC (rev 6147)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 21:39:28 UTC (rev 6148)
@@ -24,6 +24,12 @@
/usr/bin/cmp
/usr/bin/diff
##
+## iproute2-3.1.0
+/sbin/ip
+/sbin/rtmon
+/sbin/ss
+/sbin/tc
+##
## kbd-1.15.3
/usr/bin/chvt
/usr/bin/deallocvt
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 14:44:04 UTC (rev 6147)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 21:39:28 UTC (rev 6148)
@@ -7,7 +7,7 @@
Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
Language updates.<br />
- Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
+ Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2, iproute2 to 3.1.0,
kbd to 1.15.3, kernel to 2.6.32.49, libpcap to 1.2.0,
smartmontools to 5.42, Solos PCI to 1.03, tcpdump to 4.2.0.
</description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-30 14:44:13
|
Revision: 6147
http://ipcop.svn.sourceforge.net/ipcop/?rev=6147&view=rev
Author: owes
Date: 2011-11-30 14:44:04 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Add rc.isdn and rc.red into update package.
Modified Paths:
--------------
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 14:43:36 UTC (rev 6146)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 14:44:04 UTC (rev 6147)
@@ -1,4 +1,6 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/etc/rc.d/rc.isdn
+/etc/rc.d/rc.red
/home/httpd/cgi-bin/fwrules.cgi
/home/httpd/cgi-bin/openvpn.cgi
/home/httpd/cgi-bin/servicegrps.cgi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-30 14:43:46
|
Revision: 6146
http://ipcop.svn.sourceforge.net/ipcop/?rev=6146&view=rev
Author: owes
Date: 2011-11-30 14:43:36 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Textual changes. Need to unload avmfritz to avoid mISDN (?) vs. hisax collision. ISDN probably works now, will need to get some wiring in place to do a real test.
Modified Paths:
--------------
ipcop/trunk/src/rc.d/rc.isdn
Modified: ipcop/trunk/src/rc.d/rc.isdn
===================================================================
--- ipcop/trunk/src/rc.d/rc.isdn 2011-11-30 14:40:20 UTC (rev 6145)
+++ ipcop/trunk/src/rc.d/rc.isdn 2011-11-30 14:43:36 UTC (rev 6146)
@@ -1,14 +1,31 @@
-#!/bin/sh
+#!/bin/bash
#
+# This file is part of the IPCop Firewall.
+#
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (c) 2001-2011 The IPCop Team
+#
# $Id$
#
+# Debugging. May need to eval from ppp/settings to use global DEBUG
+DEBUG="on"
eval $(/usr/local/bin/readhash /var/ipcop/ethernet/isdn)
-# Debugging. Comment it out to stop logging
-DEBUG="yes"
msg() {
- if [ "z$DEBUG" != "z" ] ; then
+ if [ "$DEBUG" = "on" ] ; then
/usr/bin/logger -t red "ISDN: $*"
fi
echo "$*"
@@ -18,10 +35,11 @@
case "$1" in
start)
if [ "$ENABLED" = "on" ]; then
- /sbin/rmmod hisax_st5481 2>/dev/null
- /sbin/rmmod hisax_fcpcipnp 2>/dev/null
- /sbin/rmmod hisax_isac 2>/dev/null
- /sbin/rmmod hisax 2>/dev/null
+ /sbin/modprobe -r hisax_st5481 2>/dev/null
+ /sbin/modprobe -r hisax_fcpcipnp 2>/dev/null
+ /sbin/modprobe -r hisax_isac 2>/dev/null
+ /sbin/modprobe -r hisax 2>/dev/null
+ /sbin/modprobe -r avmfritz 2>/dev/null
# Create ISDN devices in /dev
i=0
@@ -74,10 +92,10 @@
/usr/sbin/isdnctrl delif ippp0 2>/dev/null
/usr/bin/killall ipppd 2>/dev/null
/usr/bin/killall ibod 2>/dev/null
- /sbin/rmmod hisax_st5481 2>/dev/null
- /sbin/rmmod hisax_fcpcipnp 2>/dev/null
- /sbin/rmmod hisax_isac 2>/dev/null
- /sbin/rmmod hisax 2>/dev/null
+ /sbin/modprobe -r hisax_st5481 2>/dev/null
+ /sbin/modprobe -r hisax_fcpcipnp 2>/dev/null
+ /sbin/modprobe -r hisax_isac 2>/dev/null
+ /sbin/modprobe -r hisax 2>/dev/null
# Remove ISDN devices from /dev
i=0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-30 14:40:27
|
Revision: 6145
http://ipcop.svn.sourceforge.net/ipcop/?rev=6145&view=rev
Author: owes
Date: 2011-11-30 14:40:20 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Add exit sub() for some extra logging. Most logging to RED section, admin should look there in case of trouble.
Modified Paths:
--------------
ipcop/trunk/src/rc.d/rc.red
Modified: ipcop/trunk/src/rc.d/rc.red
===================================================================
--- ipcop/trunk/src/rc.d/rc.red 2011-11-30 14:38:13 UTC (rev 6144)
+++ ipcop/trunk/src/rc.d/rc.red 2011-11-30 14:40:20 UTC (rev 6145)
@@ -41,6 +41,18 @@
&General::readhash("/var/ipcop/ethernet/settings", \%netsettings);
&General::readhash("/var/ipcop/dhcp/settings", \%dhcpsettings);
+sub myexit
+{
+ my $retcode = shift;
+
+ unlink('/var/ipcop/red/connecting');
+ unlink('/var/ipcop/red/disconnecting');
+
+ &General::log("ERROR ($retcode) in rc.red") if ($retcode);
+
+ exit $retcode;
+}
+
sub dodhcpdial($;$) {
my ($iface, $dhcp_name) = @_;
@@ -57,8 +69,7 @@
if (system(@dhcpcommand)) {
&General::log('red', 'dhcp client fail');
- unlink('/var/ipcop/red/connecting');
- exit 1;
+ myexit(1);
}
else {
&General::log('red', 'dhcp client success');
@@ -184,9 +195,8 @@
}
}
else {
- &General::log("ERROR: Can't start RED when RED device not set!");
- unlink('/var/ipcop/red/connecting');
- exit 1;
+ &General::log('red', "ERROR: Can't start RED when RED device not set!");
+ myexit(1);
}
}
@@ -195,8 +205,8 @@
}
if ($pppsettings{'VALID'} ne 'yes') {
- &General::log("ERROR: Profile has errors.");
- exit 1;
+ &General::log('red', 'ERROR: Profile has errors.');
+ myexit(1);
}
if (-e "/var/ipcop/ppp/updatesettings") {
@@ -249,7 +259,9 @@
$iface = &General::getredinterface();
my $device = &General::getinterfacefromfile("/var/ipcop/red/device");
- system('/usr/bin/touch /var/ipcop/red/disconnecting');
+ if (-e "/var/ipcop/red/active") {
+ system('/usr/bin/touch /var/ipcop/red/disconnecting');
+ }
unlink "/var/ipcop/red/dial-on-demand";
unlink "/var/ipcop/red/active";
unlink "/var/ipcop/red/connecting";
@@ -490,8 +502,8 @@
my $phone;
if (system('/etc/rc.d/rc.isdn', 'start')) {
- &General::log("ERROR: ISDN module failed to load");
- exit 1;
+ &General::log('red', 'ERROR: ISDN module failed to load');
+ myexit(1);
}
$seconds = $pppsettings{'TIMEOUT'} * 60;
@@ -522,14 +534,13 @@
system('/usr/sbin/isdnctrl', 'dialmode', 'ippp1', 'auto');
my @pppcommand = (
- '/usr/sbin/ipppd', 'ms-get-dns',
- 'noipdefault', '+mp',
- 'defaultroute', 'user',
- $pppsettings{'USERNAME'}, 'name',
- $pppsettings{'USERNAME'}, 'active-filter',
- 'outbound and not icmp[0] == 3 and not tcp[13] & 4 != 0', 'pidfile',
- '/var/run/ppp-ipcop.pid', '/dev/ippp0',
- '/dev/ippp1'
+ '/usr/sbin/ipppd', 'ms-get-dns',
+ 'noipdefault', '+mp', 'defaultroute',
+ 'user', $pppsettings{'USERNAME'},
+ 'name', $pppsettings{'USERNAME'},
+ 'active-filter', 'outbound and not icmp[0] == 3 and not tcp[13] & 4 != 0',
+ 'pidfile', '/var/run/ppp-ipcop.pid',
+ '/dev/ippp0', '/dev/ippp1'
);
if ($pppsettings{'DEBUG'} eq 'on') {
@@ -585,7 +596,6 @@
}
else {
system('/usr/sbin/isdnctrl', 'dial', 'ippp0');
-
}
system('/usr/bin/killall', 'ibod');
@@ -766,8 +776,8 @@
sub doeciadsldial {
if (system('/etc/rc.d/rc.eciadsl', 'start')) {
- &General::log("ERROR: ECI ADSL failed to start");
- exit 1;
+ &General::log('red', 'ERROR: ECI ADSL failed to start');
+ myexit(1);
}
if ($pppsettings{'PROTOCOL'} eq 'RFC1483') {
if ($pppsettings{'ENCAP'} =~ /^(0|1)$/) {
@@ -814,12 +824,12 @@
}
close(MODEMS);
if ($VID2 eq '') {
- &General::log("$pppsettings{'MODEM'} not found in modems.db");
- exit 1;
+ &General::log('red', "$pppsettings{'MODEM'} not found in modems.db");
+ myexit(1);
}
if ($CHIP eq '') {
- &General::log("error in modems.db reading for $pppsettings{'MODEM'}");
- exit 1;
+ &General::log('red', "error in modems.db reading for $pppsettings{'MODEM'}");
+ myexit(1);
}
if ($pppsettings{'ENCAP'} eq '1') {
$ECIMODE = "LLC_RFC2364";
@@ -886,8 +896,8 @@
my $controller;
if (system('/etc/rc.d/rc.fritzdsl', 'start')) {
- &General::log("ERROR: Fritz DSL module failed to load");
- exit 1;
+ &General::log('red', 'ERROR: Fritz DSL module failed to load');
+ myexit(1);
}
# controller number
@@ -984,8 +994,8 @@
sub doeagleusbadsldial {
if (system('/etc/rc.d/rc.eagleusbadsl', 'start')) {
- &General::log("ERROR: EAGLE-USB ADSL MODEM failed to start");
- exit 1;
+ &General::log('red', 'ERROR: EAGLE-USB ADSL MODEM failed to start');
+ myexit(1);
}
# I'm guessing here, but documentation suggests to use br2684ctl etc.
@@ -1069,8 +1079,8 @@
sub dopulsardsldial {
if (system('/etc/rc.d/rc.pulsardsl', 'start')) {
- &General::log("ERROR: PULSAR ADSL modem failed to start");
- exit 1;
+ &General::log('red', 'ERROR: PULSAR ADSL modem failed to start');
+ myexit(1);
}
doatmdial();
}
@@ -1078,16 +1088,16 @@
sub doconexantpciadsldial {
if (system('/etc/rc.d/rc.conexantpciadsl', 'start')) {
- &General::log("ERROR: Conexant PCI ADSL modem failed to start");
- exit 1;
+ &General::log('red', 'ERROR: Conexant PCI ADSL modem failed to start');
+ myexit(1);
}
doatmdial();
}
sub dowanpipeadsldial {
if (system('/etc/rc.d/rc.wanpipe', 'start')) {
- &General::log("ERROR: wanpipe adsl failed to start");
- exit 1;
+ &General::log('red', 'ERROR: wanpipe adsl failed to start');
+ myexit(1);
}
doatmdial();
}
@@ -1178,8 +1188,8 @@
if (open(FILE, ">/var/ipcop/red/iface")) { print FILE $iface; close FILE; }
if (system('/bin/ps -ef | /bin/grep -q [a]tmarpd')) {
if (system('/usr/sbin/atmarpd -b -l syslog')) {
- &General::log('atmarpd fail');
- exit 1;
+ &General::log('red', 'atmarpd fail');
+ myexit(1);
}
# it will fail on all attempt after the first because interface still exist
@@ -1210,8 +1220,8 @@
sub dowanpipeserialdial {
if (system('/etc/rc.d/rc.wanpipe', 'start')) {
- &General::log("ERROR: Sangoma Wanpipe serial interface failed to start");
- exit 1;
+ &General::log('red', 'ERROR: Sangoma Wanpipe serial interface failed to start');
+ myexit(1);
}
my @pppcommand = ('/usr/sbin/pppd');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-30 14:38:22
|
Revision: 6144
http://ipcop.svn.sourceforge.net/ipcop/?rev=6144&view=rev
Author: owes
Date: 2011-11-30 14:38:13 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Add some scripting tricks to 'auto-select' appropriate radiobuttons.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/servicegrps.cgi
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
Modified: ipcop/trunk/html/cgi-bin/servicegrps.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/servicegrps.cgi 2011-11-30 12:52:19 UTC (rev 6143)
+++ ipcop/trunk/html/cgi-bin/servicegrps.cgi 2011-11-30 14:38:13 UTC (rev 6144)
@@ -297,7 +297,7 @@
# DEBUG DEBUG
#&Header::openbox('100%', 'left', 'DEBUG');
-#foreach $line (keys %cgiparams) {
+#foreach my $line (keys %cgiparams) {
# print "<class IP_NAME='base'>$line = $cgiparams{$line}<BR>";
#}
#print "$ENV{'QUERY_STRING'}\n";
@@ -350,7 +350,7 @@
$Lang::tr{'service group name'}:
</td>
<td width='25%'>
- <input type='text' name='GROUP_NEW' value='$cgiparams{'GROUP_NEW'}' size='20' maxlength='18' $disabledNameTxt />
+ <input type='text' name='GROUP_NEW' value='$cgiparams{'GROUP_NEW'}' size='20' maxlength='18' $disabledNameTxt onkeyup='this.form.GROUP_TYP[0].checked=true'/>
$hiddenGroupName
</td>
<td width='25%'> </td>
@@ -366,7 +366,7 @@
$Lang::tr{'service group name'}:
</td>
<td colspan='3'>
- <select name='GROUP_EXISTING' $disabled>
+ <select name='GROUP_EXISTING' $disabled onclick='this.form.GROUP_TYP[1].checked=true'>
END
foreach my $group (@existingGroups) {
@@ -403,7 +403,7 @@
$Lang::tr{'default services'}:
</td>
<td colspan='3'>
- <select name='SERVICE_NAME_DEFAULT' $disabled>
+ <select name='SERVICE_NAME_DEFAULT' $disabled onclick='this.form.SERVICE_TYP[0].checked=true'>
END
my %defaultServices = ();
@@ -441,7 +441,7 @@
$Lang::tr{'custom services'}:
</td>
<td colspan='3'>
- <select name='SERVICE_NAME_CUSTOM' $disabled>
+ <select name='SERVICE_NAME_CUSTOM' $disabled onclick='this.form.SERVICE_TYP[1].checked=true'>
END
print "<option value='BLANK' selected='selected'>N/A</option>" if ($#customServices < 0);
foreach my $service (@customServices) {
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:52:19 UTC (rev 6143)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 14:38:13 UTC (rev 6144)
@@ -1,6 +1,7 @@
## please place IPCop files first, then packages sorted by alphabetical order
/home/httpd/cgi-bin/fwrules.cgi
/home/httpd/cgi-bin/openvpn.cgi
+/home/httpd/cgi-bin/servicegrps.cgi
/home/httpd/cgi-bin/trafficadm.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/home/httpd/vhost81/cgi-bin/redirect.cgi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-30 12:52:25
|
Revision: 6143
http://ipcop.svn.sourceforge.net/ipcop/?rev=6143&view=rev
Author: owes
Date: 2011-11-30 12:52:19 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Upgrade tcpdump to 4.2.0
Modified Paths:
--------------
ipcop/trunk/lfs/tcpdump
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch
Modified: ipcop/trunk/lfs/tcpdump
===================================================================
--- ipcop/trunk/lfs/tcpdump 2011-11-30 12:41:59 UTC (rev 6142)
+++ ipcop/trunk/lfs/tcpdump 2011-11-30 12:52:19 UTC (rev 6143)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = tcpdump
-VER = 4.1.1
+VER = 4.2.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d0dd58bbd6cd36795e05c6f1f74420b0
+$(DL_FILE)_MD5 = 0296d4c487c3a156879783643704bd39
install : $(TARGET)
@@ -83,6 +83,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_add-missing-ppi.h.patch
# force ipv6 as autodetection could fail (at least on centos-5.5 2.6.18 kernel)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-smb --enable-ipv6
cd $(DIR_APP) && make -j $(PARALLELISM)
@@ -91,6 +92,8 @@
#-cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
+ # Probably a fluke in Makefile, but we do not need tcpdump.VERSION
+ rm -f /usr/sbin/tcpdump.$(VER)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Added: ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch
===================================================================
--- ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch (rev 0)
+++ ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch 2011-11-30 12:52:19 UTC (rev 6143)
@@ -0,0 +1,27 @@
+From 3a7f5fb4d0c5e632c439c7ae3e8189a64f77c853 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da...@op...>
+Date: Tue, 29 Nov 2011 13:55:57 +0100
+Subject: [PATCH] Add missing ppi.h from upstream GIT
+
+---
+ ppi.h | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 ppi.h
+
+diff --git a/ppi.h b/ppi.h
+new file mode 100644
+index 0000000..fa3359e
+--- /dev/null
++++ b/ppi.h
+@@ -0,0 +1,8 @@
++typedef struct ppi_header {
++ uint8_t ppi_ver;
++ uint8_t ppi_flags;
++ uint16_t ppi_len;
++ uint32_t ppi_dlt;
++} ppi_header_t;
++
++#define PPI_HDRLEN 8
+--
+1.7.6.1
+
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:41:59 UTC (rev 6142)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:52:19 UTC (rev 6143)
@@ -68,3 +68,6 @@
## squid-langpack
/usr/lib/squid/errors.ipcop
/usr/lib/squid/errors
+##
+## tcpdump-4.2.0
+/usr/sbin/tcpdump
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 12:41:59 UTC (rev 6142)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 12:52:19 UTC (rev 6143)
@@ -9,7 +9,7 @@
Language updates.<br />
Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
kbd to 1.15.3, kernel to 2.6.32.49, libpcap to 1.2.0,
- smartmontools to 5.42, Solos PCI to 1.03.
+ smartmontools to 5.42, Solos PCI to 1.03, tcpdump to 4.2.0.
</description>
<previousversion>2.0.2</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-30 12:42:05
|
Revision: 6142
http://ipcop.svn.sourceforge.net/ipcop/?rev=6142&view=rev
Author: owes
Date: 2011-11-30 12:41:59 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Upgrade libpcap to 1.2.0. Readd the patch that allows to use inbound/outbound in pppd/ipppd 'filter', which we want for non-permanent connections.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libpcap
ipcop/trunk/lfs/libpcap
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Added Paths:
-----------
ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch
Modified: ipcop/trunk/config/rootfiles/common/libpcap
===================================================================
--- ipcop/trunk/config/rootfiles/common/libpcap 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/config/rootfiles/common/libpcap 2011-11-30 12:41:59 UTC (rev 6142)
@@ -14,7 +14,7 @@
#usr/lib/libpcap.a
usr/lib/libpcap.so
usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.1.1
+usr/lib/libpcap.so.1.2.0
#usr/share/man/man1/pcap-config.1
#usr/share/man/man3/pcap.3pcap
#usr/share/man/man3/pcap_activate.3pcap
@@ -40,6 +40,7 @@
#usr/share/man/man3/pcap_findalldevs.3pcap
#usr/share/man/man3/pcap_fopen_offline.3pcap
#usr/share/man/man3/pcap_free_datalinks.3pcap
+#usr/share/man/man3/pcap_free_tstamp_types.3pcap
#usr/share/man/man3/pcap_freealldevs.3pcap
#usr/share/man/man3/pcap_freecode.3pcap
#usr/share/man/man3/pcap_get_selectable_fd.3pcap
@@ -49,6 +50,7 @@
#usr/share/man/man3/pcap_is_swapped.3pcap
#usr/share/man/man3/pcap_lib_version.3pcap
#usr/share/man/man3/pcap_list_datalinks.3pcap
+#usr/share/man/man3/pcap_list_tstamp_types.3pcap
#usr/share/man/man3/pcap_lookupdev.3pcap
#usr/share/man/man3/pcap_lookupnet.3pcap
#usr/share/man/man3/pcap_loop.3pcap
@@ -68,6 +70,7 @@
#usr/share/man/man3/pcap_set_rfmon.3pcap
#usr/share/man/man3/pcap_set_snaplen.3pcap
#usr/share/man/man3/pcap_set_timeout.3pcap
+#usr/share/man/man3/pcap_set_tstamp_type.3pcap
#usr/share/man/man3/pcap_setdirection.3pcap
#usr/share/man/man3/pcap_setfilter.3pcap
#usr/share/man/man3/pcap_setnonblock.3pcap
@@ -75,6 +78,8 @@
#usr/share/man/man3/pcap_stats.3pcap
#usr/share/man/man3/pcap_statustostr.3pcap
#usr/share/man/man3/pcap_strerror.3pcap
+#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap
+#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap
#usr/share/man/man5/pcap-savefile.5
#usr/share/man/man7/pcap-filter.7
#usr/share/man/man7/pcap-linktype.7
Modified: ipcop/trunk/lfs/libpcap
===================================================================
--- ipcop/trunk/lfs/libpcap 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/lfs/libpcap 2011-11-30 12:41:59 UTC (rev 6142)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libpcap
-VER = 1.1.1
+VER = 1.2.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1bca27d206970badae248cfa471bbb47
+$(DL_FILE)_MD5 = dfb8aa690b7a29821bfa183025436569
install : $(TARGET)
@@ -83,6 +83,8 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ # Patch to enable using inbound/outbound filter on pppoe, isdn, etc.
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_ppp.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-can
# compile static and shared version as Makefile does not support
# to install headers without static lib
Added: ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch
===================================================================
--- ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch (rev 0)
+++ ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch 2011-11-30 12:41:59 UTC (rev 6142)
@@ -0,0 +1,12 @@
+fixes: error in active-filter expression
+because inbound/outbound not supported on linktype (pppd, ipppd)
+--- a/gencode.c.old 2004-06-21 19:43:24.611308762 +0100
++++ a/gencode.c 2004-06-21 19:43:34.851140716 +0100
+@@ -7617,6 +7617,7 @@
+ */
+ switch (linktype) {
+ case DLT_SLIP:
++ case DLT_PPP:
+ b0 = gen_relation(BPF_JEQ,
+ gen_load(Q_LINK, gen_loadi(0), 1),
+ gen_loadi(0),
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:41:59 UTC (rev 6142)
@@ -42,6 +42,11 @@
/usr/share/kbd/consolefonts/viscii10-8x16.psfu.gz
/usr/share/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
##
+## libpcap-1.2.0
+/usr/lib/libpcap.so
+/usr/lib/libpcap.so.1
+/usr/lib/libpcap.so.1.2.0
+##
## linux-2.6.32-6 (2.6.32.49)
/boot/vmlinuz
/boot/vmlinuz-2.6.32-6
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 12:41:59 UTC (rev 6142)
@@ -8,7 +8,7 @@
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
Language updates.<br />
Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
- kbd to 1.15.3, kernel to 2.6.32.49,
+ kbd to 1.15.3, kernel to 2.6.32.49, libpcap to 1.2.0,
smartmontools to 5.42, Solos PCI to 1.03.
</description>
<previousversion>2.0.2</previousversion>
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/updates/2.0.3/setup 2011-11-30 12:41:59 UTC (rev 6142)
@@ -62,7 +62,7 @@
/usr/local/bin/upgrade.sh
# Remove old libraries (version specific)
-# /bin/rm -f .....
+/bin/rm -f /usr/lib/libpcap.so.1.2.0
# For new shared libs. May not always be required, but makes sure we do not forget
/sbin/ldconfig
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-29 12:54:56
|
Revision: 6141
http://ipcop.svn.sourceforge.net/ipcop/?rev=6141&view=rev
Author: owes
Date: 2011-11-29 12:54:50 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Upgrade kernel to 2.6.32.49
Modified Paths:
--------------
ipcop/trunk/lfs/linux
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux 2011-11-28 18:24:55 UTC (rev 6140)
+++ ipcop/trunk/lfs/linux 2011-11-29 12:54:50 UTC (rev 6141)
@@ -34,8 +34,8 @@
PKG_NAME = linux
VER = 2.6.32
-PATCHLEVEL = 2.6.32.48
-IPCOPKRELEASE = -5
+PATCHLEVEL = 2.6.32.49
+IPCOPKRELEASE = -6
HOST_ARCH = all
OTHER_SRC = yes
@@ -72,7 +72,7 @@
$(GRSECURITYPATCH) = http://ipcop-addons.ath.cx/misc/IPCop/$(GRSECURITYPATCH)
$(DL_FILE)_MD5 = 260551284ac224c3a43c4adac7df4879
-patch-$(PATCHLEVEL).xz_MD5 = b07e91eeb4da27dd3020592eae8405ef
+patch-$(PATCHLEVEL).xz_MD5 = 13cc6cf3a5d8c7b49278ebe19a8729f5
$(GRSECURITYPATCH)_MD5 = b15bb91a07aa2fb030e18c47c91940bb
install : $(TARGET)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-28 18:24:55 UTC (rev 6140)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-29 12:54:50 UTC (rev 6141)
@@ -42,6 +42,15 @@
/usr/share/kbd/consolefonts/viscii10-8x16.psfu.gz
/usr/share/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
##
+## linux-2.6.32-6 (2.6.32.49)
+/boot/vmlinuz
+/boot/vmlinuz-2.6.32-6
+/boot/System.map-2.6.32-6
+/lib/modules/2.6.32-6/extra/CnxADSL.ko.gz
+/lib/modules/2.6.32-6/extra/pulsar.ko.gz
+/lib/modules/2.6.32-6/extra/solos-pci.ko.gz
+/lib/modules/2.6.32-6/kernel
+##
## usb-modeswitch-1.9.2 fix to 'call to __builtin___strncat_chk might overflow destination buffer'
/usr/sbin/usb_modeswitch_dispatcher
##
@@ -49,7 +58,6 @@
/usr/sbin/smartctl
##
## solos-pci-1.03
-/lib/modules/2.6.32-5/extra/solos-pci.ko.gz
/usr/sbin/soloscli
##
## squid-langpack
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-28 18:24:55 UTC (rev 6140)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-29 12:54:50 UTC (rev 6141)
@@ -7,7 +7,8 @@
Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
Language updates.<br />
- Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2, kbd to 1.15.3,
+ Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
+ kbd to 1.15.3, kernel to 2.6.32.49,
smartmontools to 5.42, Solos PCI to 1.03.
</description>
<previousversion>2.0.2</previousversion>
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2011-11-28 18:24:55 UTC (rev 6140)
+++ ipcop/trunk/updates/2.0.3/setup 2011-11-29 12:54:50 UTC (rev 6141)
@@ -52,11 +52,11 @@
# Modify or remove line below, depending on update
# Update bootloader config
-# /usr/local/sbin/updatekernel.pl --add 2.6.32-2 --keep 2.6.32-1 --remove 2.6.32-0
+/usr/local/sbin/updatekernel.pl --add 2.6.32-6 --keep 2.6.32-5 --remove 2.6.32-4
# Modify or remove line below, depending on update
# Create the new initramfs
-# /sbin/mkinitramfs --with-kernel=2.6.32-2 --with-firmware --many-modules --with-list=/etc/modules.initramfs
+/sbin/mkinitramfs --with-kernel=2.6.32-6 --with-firmware --many-modules --with-list=/etc/modules.initramfs
# Adjust the changed config files
/usr/local/bin/upgrade.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eob...@us...> - 2011-11-28 18:25:01
|
Revision: 6140
http://ipcop.svn.sourceforge.net/ipcop/?rev=6140&view=rev
Author: eoberlander
Date: 2011-11-28 18:24:55 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Updates from Language Database (el_GR)
Modified Paths:
--------------
ipcop/trunk/langs/el_GR/ipcop.po
ipcop/trunk/langs/list_progress
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/langs/el_GR/ipcop.po
===================================================================
--- ipcop/trunk/langs/el_GR/ipcop.po 2011-11-28 09:02:49 UTC (rev 6139)
+++ ipcop/trunk/langs/el_GR/ipcop.po 2011-11-28 18:24:55 UTC (rev 6140)
@@ -359,9 +359,8 @@
msgstr "Επικύρωση "
msgid "automatic"
msgstr "Αύτοματα"
-#### UNTRANSLATED:
msgid "available redirectors"
-msgstr "Available redirectors"
+msgstr "Διαθέσιμοι προωθητές"
msgid "available updates"
msgstr "Διαθέσιμες ενημερώσεις"
msgid "average"
@@ -1026,9 +1025,8 @@
msgstr "Ρυθμίσεις τείχους προστασίας"
msgid "firewall hits"
msgstr "Ολικός αριθμός κτυπημάτων τοίχους προστασίας για"
-#### UNTRANSLATED:
msgid "firewall interface policy changed"
-msgstr "Firewall interface policy changed; restarting blocker"
+msgstr "Η πολιτική υλικού επικοινωνίας τείχους προστασίας άλλαξε. Επανεκκίνηση του ρυθμιστή"
msgid "firewall log"
msgstr "Κατάλογος συμβάντων τείχους προστασίας"
msgid "firewall log viewer"
@@ -1955,15 +1953,12 @@
msgstr "Παράκαμψη του NTP στο IPCop"
msgid "redirect traffic"
msgstr "Παράκαμψη όλης της κυκλοφορίας μέσω του τούνελ"
-#### UNTRANSLATED:
msgid "redirector children"
-msgstr "Number of redirector processes"
-#### UNTRANSLATED:
+msgstr "Αριθμός εργασιών προώθησης"
msgid "redirectors"
-msgstr "Redirectors"
-#### UNTRANSLATED:
+msgstr "Προωθητές"
msgid "redirectors are disabled"
-msgstr "Redirectors are disabled on the Web proxy page"
+msgstr "Οι προωθητές είναι απενεργοποιημένοι στην σελίδα του Web proxy"
msgid "refresh"
msgstr "Ανανέωση"
msgid "refresh index page while connected"
Modified: ipcop/trunk/langs/list_progress
===================================================================
--- ipcop/trunk/langs/list_progress 2011-11-28 09:02:49 UTC (rev 6139)
+++ ipcop/trunk/langs/list_progress 2011-11-28 18:24:55 UTC (rev 6140)
@@ -10,7 +10,7 @@
Finnish,813,55
French,1305,89
German,1323,90
-Greek,1318,90
+Greek,1323,90
Gujarati,121,8
Hungarian,669,45
Italian,1318,90
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-28 09:02:49 UTC (rev 6139)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-28 18:24:55 UTC (rev 6140)
@@ -5,6 +5,7 @@
/home/httpd/cgi-bin/urlfilter.cgi
/home/httpd/vhost81/cgi-bin/redirect.cgi
/usr/local/bin/upgrade.sh
+/usr/share/locale/el_GR/LC_MESSAGES/ipcop.mo
##
## acpid-2.0.13
/usr/sbin/acpid
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-28 09:02:49 UTC (rev 6139)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-28 18:24:55 UTC (rev 6140)
@@ -6,6 +6,7 @@
<description>Add again capi4k-utils plugins.<br />
Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
+ Language updates.<br />
Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2, kbd to 1.15.3,
smartmontools to 5.42, Solos PCI to 1.03.
</description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-28 09:03:00
|
Revision: 6139
http://ipcop.svn.sourceforge.net/ipcop/?rev=6139&view=rev
Author: owes
Date: 2011-11-28 09:02:49 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Upgrade smartmontools to 5.42
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/smartmontools
ipcop/trunk/lfs/smartmontools
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/config/rootfiles/common/smartmontools
===================================================================
--- ipcop/trunk/config/rootfiles/common/smartmontools 2011-11-27 22:00:54 UTC (rev 6138)
+++ ipcop/trunk/config/rootfiles/common/smartmontools 2011-11-28 09:02:49 UTC (rev 6139)
@@ -1,5 +1,4 @@
-#etc/rc.d/init.d
-#etc/rc.d/init.d/smartd
+#etc/rc.d/smartd
#etc/smartd.conf
usr/sbin/smartctl
#usr/sbin/update-smart-drivedb
Modified: ipcop/trunk/lfs/smartmontools
===================================================================
--- ipcop/trunk/lfs/smartmontools 2011-11-27 22:00:54 UTC (rev 6138)
+++ ipcop/trunk/lfs/smartmontools 2011-11-28 09:02:49 UTC (rev 6139)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = smartmontools
-VER = 5.41
+VER = 5.42
HOST_ARCH = all
OTHER_SRC = yes
@@ -52,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692
+$(DL_FILE)_MD5 = 4460bf9a79a1252ff5c00ba52cf76b2a
install : $(TARGET)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-27 22:00:54 UTC (rev 6138)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-28 09:02:49 UTC (rev 6139)
@@ -44,6 +44,9 @@
## usb-modeswitch-1.9.2 fix to 'call to __builtin___strncat_chk might overflow destination buffer'
/usr/sbin/usb_modeswitch_dispatcher
##
+## smartmontools-5.42
+/usr/sbin/smartctl
+##
## solos-pci-1.03
/lib/modules/2.6.32-5/extra/solos-pci.ko.gz
/usr/sbin/soloscli
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-27 22:00:54 UTC (rev 6138)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-28 09:02:49 UTC (rev 6139)
@@ -6,7 +6,8 @@
<description>Add again capi4k-utils plugins.<br />
Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
- Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2, kbd to 1.15.3, Solos PCI to 1.03.
+ Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2, kbd to 1.15.3,
+ smartmontools to 5.42, Solos PCI to 1.03.
</description>
<previousversion>2.0.2</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-27 22:01:01
|
Revision: 6138
http://ipcop.svn.sourceforge.net/ipcop/?rev=6138&view=rev
Author: owes
Date: 2011-11-27 22:00:54 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Textual improvements.
Modified Paths:
--------------
IPCopDoc/trunk/en/install/xml/booting.xml
IPCopDoc/trunk/en/install/xml/preparation.xml
Modified: IPCopDoc/trunk/en/install/xml/booting.xml
===================================================================
--- IPCopDoc/trunk/en/install/xml/booting.xml 2011-11-27 21:13:35 UTC (rev 6137)
+++ IPCopDoc/trunk/en/install/xml/booting.xml 2011-11-27 22:00:54 UTC (rev 6138)
@@ -463,7 +463,8 @@
</screenshot>
<para>
If you chose a flash installation, you will see the next screen,
- inviting you to choose a RAM disk size, in megabytes.
+ inviting you to choose the maximum amount of RAM to reserve for
+ temporary storage, in megabytes.
</para>
<para>
The minimum value is 32 MB, the maximum depends on the available
Modified: IPCopDoc/trunk/en/install/xml/preparation.xml
===================================================================
--- IPCopDoc/trunk/en/install/xml/preparation.xml 2011-11-27 21:13:35 UTC (rev 6137)
+++ IPCopDoc/trunk/en/install/xml/preparation.xml 2011-11-27 22:00:54 UTC (rev 6138)
@@ -282,10 +282,7 @@
<para>
Note any default sub domain addresses specified.
These allow you to specify hosts like mail or
- news without entering the full host name, see
- the discussion in TODO: FIXME
- <!-- <link linkend="anchor-dhcp-setup">DHCP setup</link> -->,
- below.
+ news without entering the full host name.
</para>
</listitem>
</itemizedlist>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-27 21:13:41
|
Revision: 6137
http://ipcop.svn.sourceforge.net/ipcop/?rev=6137&view=rev
Author: gespinasse
Date: 2011-11-27 21:13:35 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Add test suite
Modified Paths:
--------------
ipcop/trunk/lfs/libgpg-error
Modified: ipcop/trunk/lfs/libgpg-error
===================================================================
--- ipcop/trunk/lfs/libgpg-error 2011-11-27 21:12:07 UTC (rev 6136)
+++ ipcop/trunk/lfs/libgpg-error 2011-11-27 21:13:35 UTC (rev 6137)
@@ -88,6 +88,13 @@
--prefix=/usr \
--target=$(MACHINE)
cd $(DIR_APP) && make
+
+ifeq "$(RUNNING_TEST)" "yes"
+ cd $(DIR_APP) && make -j 1 check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # 2 tests passed
+
+endif
+
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-27 21:12:13
|
Revision: 6136
http://ipcop.svn.sourceforge.net/ipcop/?rev=6136&view=rev
Author: gespinasse
Date: 2011-11-27 21:12:07 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Add test suite
Modified Paths:
--------------
ipcop/trunk/lfs/libgcrypt
Modified: ipcop/trunk/lfs/libgcrypt
===================================================================
--- ipcop/trunk/lfs/libgcrypt 2011-11-27 17:56:34 UTC (rev 6135)
+++ ipcop/trunk/lfs/libgcrypt 2011-11-27 21:12:07 UTC (rev 6136)
@@ -87,6 +87,12 @@
--prefix=/usr \
--target=$(MACHINE)
cd $(DIR_APP) && make
+
+ifeq "$(RUNNING_TEST)" "yes"
+ cd $(DIR_APP) && make -j 1 check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # 18 tests passed
+endif
+
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eob...@us...> - 2011-11-27 17:56:40
|
Revision: 6135
http://ipcop.svn.sourceforge.net/ipcop/?rev=6135&view=rev
Author: eoberlander
Date: 2011-11-27 17:56:34 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Move CRE section to later Proxy chapter.
Modified Paths:
--------------
IPCopDoc/trunk/en/admin/xml/proxy.xml
IPCopDoc/trunk/en/admin/xml/services.xml
Modified: IPCopDoc/trunk/en/admin/xml/proxy.xml
===================================================================
--- IPCopDoc/trunk/en/admin/xml/proxy.xml 2011-11-27 15:31:41 UTC (rev 6134)
+++ IPCopDoc/trunk/en/admin/xml/proxy.xml 2011-11-27 17:56:34 UTC (rev 6135)
@@ -39,6 +39,11 @@
<link linkend="proxy-auth-radius"><guimenuitem>RADIUS Authentication</guimenuitem></link>
</para>
</listitem>
+ <listitem>
+ <para>
+ <link linkend="proxy-cre"><guimenuitem>Classroom extensions</guimenuitem></link>
+ </para>
+ </listitem>
</itemizedlist>
</para>
@@ -77,4 +82,221 @@
</para>
</sect2>
+ <sect2 id="proxy-cre">
+ <title>Classroom extensions</title>
+ <para>
+ The ClassRoom Extensions (CRE) to the proxy server
+ give you the ability to delegate administrative tasks to
+ non-administrative users through a separate Web Access
+ Management page.
+ </para>
+ <para>
+ The CRE offers these features:
+ </para>
+ <para>
+ Full web based access management
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Predefined client groups can be turned on or off using a
+ standard web browser.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ All administrative CRE options are accessible and configurable
+ within the web based IPCop GUI.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Different security levels
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Web Access Management rights can be controlled by password
+ and/or by network address.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ No administrative privileges to the IPCop GUI required for the
+ Web Access Management.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The Supervisor cannot override any proxy server based
+ restrictions set by the IPCop Admin.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Flexible configuration
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The IPCop Admin can define client groups with MAC addresses,
+ single IP addresses, IP ranges, subnets or even all of them.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ The CRE creates a new role, between that of Admin and Users:
+ the Supervisor.
+ </para>
+ <para>
+ The Supervisor can turn on and off web access for predefined
+ groups (e.g. specific computers in a classroom)
+ without the need to have administrative access rights,
+ or knowledge of, the IPCop GUI.
+ </para>
+ <para>
+ The Web Access Management Interface can be started from any
+ client computer.
+ Open a web browser and enter the URL
+ <ulink url="https://192.168.1.1:8443/cgi-bin/webaccess.cgi">https://192.168.1.1:8443/cgi-bin/webaccess.cgi</ulink>
+ (replacing the 192.168.1.1 with the IP Address of your IPCop).
+ </para>
+ <para>
+ If the Web Access Management Interface has not yet been enabled
+ by the Admin, you'll see this text:
+ <quote>The management interface has been disabled by the
+ Administrator</quote>.
+ </para>
+ <para>
+ If the Web Access Management Interface has been enabled,
+ but the Admin has not defined any groups, you will see this
+ text: <quote>There are no access groups available</quote>.
+ </para>
+
+ <sect3 id="proxy-cre-configuration">
+ <title>Classroom extensions configuration</title>
+ <para>
+ The classroom extensions are enabled/disabled and configured on the
+ <link linkend="services-webproxy">proxy server</link>
+ web page.
+ </para>
+ <para>
+ After making any changes, remember to press the
+ <guibutton>Save</guibutton> button to apply them.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="&imagepath;proxy-cre.&imageext;"
+ format="PNG"
+ contentwidth="14cm"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="&imagepath;proxy-cre.&imageext;" format="PNG" align="center"/>
+ </imageobject>
+ <textobject>
+ <phrase>Classroom extensions configuration</phrase>
+ </textobject>
+ </mediaobject>
+ </para>
+ <formalpara>
+ <title><guilabel>Enabled</guilabel></title>
+ <para>
+ Check this box to enable the Supervisor Web Access
+ Management Interface.
+ </para>
+ </formalpara>
+ <formalpara>
+ <title><guilabel>Supervisor password</guilabel> (optional)</title>
+ <para>
+ When this password is set, all Supervisor users must enter
+ the password to manage web access.
+ This is optional, but for security reasons, either set a
+ Supervisor password, or define Supervisor IP addresses.
+ </para>
+ </formalpara>
+ <formalpara>
+ <title><guilabel>Supervisor IP addresses (one per line)</guilabel> (optional)</title>
+ <para>
+ This field allows you to define the IP addresses that will
+ be able to manage web access.
+ This is an optional configuration item which can be used to
+ increase security, or to simplify management,
+ if you don't want to configure a Supervisor password.
+ </para>
+ </formalpara>
+ <para>
+ For example, add these IP addresses, if you want to
+ allow them Supervisor access:
+ </para>
+ <screen><computeroutput>192.168.1.20
+192.168.1.30</computeroutput></screen>
+ <para>
+ The highest level of security is achieved when both a Supervisor
+ password is set, and IP restrictions are applied.
+ </para>
+ <formalpara>
+ <title><guilabel>Classroom group definitions</guilabel></title>
+ <para>
+ Your classroom group definitions are entered in this field.
+ A classroom group definition takes this format:
+ </para>
+ </formalpara>
+ <screen><computeroutput>[groupname]
+client MAC address or client IP address or IP range or IP subnet
+client MAC address or client IP address or IP range or IP subnet
+client MAC address or client IP address or IP range or IP subnet</computeroutput></screen>
+ <para>
+ So, for example, you might have a pair of group definitions
+ like this:
+ </para>
+ <screen><computeroutput>[Example group 1]
+192.168.1.11
+192.168.1.12
+192.168.1.13
+[Example group 2]
+192.168.1.21-192.168.1.25</computeroutput></screen>
+ <para>
+ Each group has a 'groupname', which must be unique.
+ The groupname is the part of the group definition between the
+ square brackets.
+ The name will appear in the web access management interface.
+ </para>
+ <para>
+ Each group can have an unlimited number of client definitions.
+ You can use mixed client definitions within a group,
+ but each definition must be in a single line.
+ Here are some examples:
+ </para>
+ <para>
+ Single host - MAC Address
+ </para>
+ <screen><computeroutput>01:23:45:67:89:0A</computeroutput></screen>
+ <para>
+ Single host - IP Address
+ </para>
+ <screen><computeroutput>192.168.1.11</computeroutput></screen>
+ <para>
+ Host range
+ </para>
+ <screen><computeroutput>192.168.1.21-192.168.1.25</computeroutput></screen>
+ <para>
+ Subnet (netmask notation)
+ </para>
+ <screen><computeroutput>192.168.1.32/255.255.255.240</computeroutput></screen>
+ <para>
+ Subnet (CIDR notation)
+ </para>
+ <screen><computeroutput>192.168.1.32/28</computeroutput></screen>
+ </sect3>
+
+ <sect3 id="proxy-cre-security">
+ <title>CRE security levels</title>
+ <para>
+ Content to follow...
+ </para>
+ </sect3>
+
+ </sect2>
+
</sect1>
Modified: IPCopDoc/trunk/en/admin/xml/services.xml
===================================================================
--- IPCopDoc/trunk/en/admin/xml/services.xml 2011-11-27 15:31:41 UTC (rev 6134)
+++ IPCopDoc/trunk/en/admin/xml/services.xml 2011-11-27 17:56:34 UTC (rev 6135)
@@ -504,146 +504,9 @@
</para>
<para>
See the
-<!-- <link linkend="proxy-cre">Classroom extensions</link>
---> Classroom extensions [<emphasis>link to follow...</emphasis>]
+ <link linkend="proxy-cre">Classroom extensions</link>
section for further information.
</para>
-<!-- section to be moved to proxy chapter
- <para>
- The CRE creates a new role, between that of Admin and Users:
- the Supervisor.
- </para>
- <para>
- The Supervisor can turn on and off web access for predefined
- groups (e.g. specific computers in a classroom)
- without the need to have administrative access rights,
- or knowledge of, the IPCop GUI.
- </para>
- <para>
- The Web Access Management Interface can be started from any
- client computer.
- Open a web browser and enter the URL
- <ulink url="https://192.168.1.1:8443/cgi-bin/webaccess.cgi">https://192.168.1.1:8443/cgi-bin/webaccess.cgi</ulink>
- (replacing the 192.168.1.1 with the IP Address of your IPCop).
- </para>
- <para>
- If the Web Access Management Interface has not been yet enabled
- by the Admin, you'll see this text:
- <quote>The management interface has been disabled by the
- Administrator</quote>.
- </para>
- <para>
- If the Web Access Management Interface has been enabled,
- but the Admin has not defined any groups, you will see this
- text: <quote>There are no access groups available</quote>.
- </para>
- <para>
- <figure id="v2.services.013">
- <title>Web proxy - Classroom extensions configuration Section</title>
- <mediaobject>
- <imageobject role="fo">
- <imagedata fileref="&imagepath;proxy-cre.&imageext;"
- format="PNG"
- contentwidth="14cm"/>
- </imageobject>
- <imageobject role="html">
- <imagedata fileref="&imagepath;proxy-cre.&imageext;" format="PNG" align="center"/>
- </imageobject>
- <textobject>
- <phrase>Classroom extensions configuration</phrase>
- </textobject>
- </mediaobject>
- </figure>
- </para>
- <formalpara>
- <title><guilabel>Enabled</guilabel></title>
- <para>
- Check this box to enable the Supervisor management interface.
- </para>
- </formalpara>
- <formalpara>
- <title><guilabel>Supervisor password</guilabel> (optional)</title>
- <para>
- When this password is set, all Supervisor users must enter
- the password to manage web access.
- This is optional, but for security reasons, either set a
- Supervisor password, or define Supervisor IP addresses.
- </para>
- </formalpara>
- <formalpara>
- <title><guilabel>Supervisor IP addresses (one per line)</guilabel> (optional)</title>
- <para>
- This field allows you to define the IP addresses that will
- be able to manage web access.
- This is an optional configuration item which can be used to
- increase security, or to simplify management,
- if you don't want to configure a Supervisor password.
- </para>
- </formalpara>
- <para>
- For example, add these IP addresses, if you want to
- allow them Supervisor access:
- </para>
- <screen><computeroutput>192.168.1.20
-192.168.1.30</computeroutput></screen>
- <para>
- The highest level of security is achieved when both a Supervisor
- password is set, and IP restrictions are applied.
- </para>
- <formalpara>
- <title><guilabel>Classroom group definitions</guilabel></title>
- <para>
- Your classroom group definitions are entered in this field.
- A classroom group definition takes this format:
- </para>
- </formalpara>
- <screen><computeroutput>[groupname]
-client MAC address or client IP address or IP range or IP subnet
-client MAC address or client IP address or IP range or IP subnet
-client MAC address or client IP address or IP range or IP subnet</computeroutput></screen>
- <para>
- So, for example, you might have a pair of group definitions
- like this:
- </para>
- <screen><computeroutput>[Example group 1]
-192.168.1.11
-192.168.1.12
-192.168.1.13
-[Example group 2]
-192.168.1.21-192.168.1.25</computeroutput></screen>
- <para>
- Each group has a 'groupname', which must be unique.
- The groupname is the part of the group definition between the
- square brackets.
- The name will appear in the web access management interface.
- </para>
- <para>
- Each group can have an unlimited number of client definitions.
- You can use mixed client definitions within a group,
- but each definition must be in a single line.
- Here are some examples:
- </para>
- <para>
- Single host - MAC Address
- </para>
- <screen><computeroutput>01:23:45:67:89:0A</computeroutput></screen>
- <para>
- Single host - IP Address
- </para>
- <screen><computeroutput>192.168.1.11</computeroutput></screen>
- <para>
- Host range
- </para>
- <screen><computeroutput>192.168.1.21-192.168.1.25</computeroutput></screen>
- <para>
- Subnet (netmask notation)
- </para>
- <screen><computeroutput>192.168.1.32/255.255.255.240</computeroutput></screen>
- <para>
- Subnet (CIDR notation)
- </para>
- <screen><computeroutput>192.168.1.32/28</computeroutput></screen>
- -->
</sect3>
<sect3 id="services-webproxy-time">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-27 15:31:48
|
Revision: 6134
http://ipcop.svn.sourceforge.net/ipcop/?rev=6134&view=rev
Author: owes
Date: 2011-11-27 15:31:41 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Allow ORANGE and Orange Network when creating 'drop rules' for IPCop Access.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/fwrules.cgi
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
Modified: ipcop/trunk/html/cgi-bin/fwrules.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/fwrules.cgi 2011-11-26 21:49:51 UTC (rev 6133)
+++ ipcop/trunk/html/cgi-bin/fwrules.cgi 2011-11-27 15:31:41 UTC (rev 6134)
@@ -154,7 +154,7 @@
my $position = 0;
foreach my $rule (@{$ruleConfig{$ruletype}}) {
- # we dont habe to check the edited rule
+ # we dont have to check the edited rule
next if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}
&& $cgiparams{'OLD_POSITION'} == $position);
$position++;
@@ -1373,17 +1373,7 @@
if ($FW::fwSettings{'ADV_MODE_ENABLE'} ne 'on') {
# only allow IPCop access from Green, Blue or VPN
- if (
- (
- $cgiparams{'SRC_NET_TYPE'} eq 'defaultSrcNet'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'BLUE_COLOR'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'GREEN_COLOR'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'IPSEC_COLOR'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'OVPN_COLOR'
- )
- || $cgiparams{'SRC_NET_TYPE'} ne 'defaultSrcNet'
- )
- {
+ if (($cgiparams{'SRC_NET_TYPE'} eq 'defaultSrcNet') && ($FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} eq 'ORANGE_COLOR')) {
$errormessage .= "$Lang::tr{'ipcop access only from green blue and vpn'}<br />";
}
}
@@ -1391,12 +1381,8 @@
if ($cgiparams{'SRC_NET_TYPE'} eq 'defaultSrcNet') {
# only allow IPCop access from Green, Blue or VPN
- if ($FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'BLUE_COLOR'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'GREEN_COLOR'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'IPSEC_COLOR'
- && $FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} ne 'OVPN_COLOR')
- {
- $warnOpenFwMessage .= "$Lang::tr{'rule opens your Firewall'}<br />";
+ if ($FW::interfaces{$cgiparams{'DEFAULT_SRC_NET'}}{'COLOR'} eq 'ORANGE_COLOR') {
+ $errormessage .= "$Lang::tr{'ipcop access only from green blue and vpn'}<br />";
}
}
else { # we don't know if the custom source interface opens the Firewall
@@ -2031,7 +2017,6 @@
END
foreach my $network (sort keys %defaultNetworks) {
next if ($defaultNetworks{$network}{'LOCATION'} eq "IPCOP");
- next if (($cgiparams{'RULETYPE'} eq 'INPUT') && ($defaultNetworks{$network}{'COLOR'} eq 'ORANGE_COLOR'));
print "<option value='$network'";
print " selected='selected'" if ($cgiparams{'DEFAULT_SRC_ADR'} eq $network);
print ">$network</option>";
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-26 21:49:51 UTC (rev 6133)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-27 15:31:41 UTC (rev 6134)
@@ -1,4 +1,5 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/fwrules.cgi
/home/httpd/cgi-bin/openvpn.cgi
/home/httpd/cgi-bin/trafficadm.cgi
/home/httpd/cgi-bin/urlfilter.cgi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-26 21:49:57
|
Revision: 6133
http://ipcop.svn.sourceforge.net/ipcop/?rev=6133&view=rev
Author: owes
Date: 2011-11-26 21:49:51 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Certs where uploaded to the wrong place.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/openvpn.cgi
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
Modified: ipcop/trunk/html/cgi-bin/openvpn.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/openvpn.cgi 2011-11-25 19:13:44 UTC (rev 6132)
+++ ipcop/trunk/html/cgi-bin/openvpn.cgi 2011-11-26 21:49:51 UTC (rev 6133)
@@ -1,13 +1,28 @@
#!/usr/bin/perl
-# based on SmoothWall and IPCop CGIs
#
-# This code is distributed under the terms of the GPL
+# This file is part of the IPCop Firewall.
+#
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
# Main idea from zeroconcept
# ZERNINA-VERSION:0.9.5b
# (c) 2007 Ufuk Altinkaynak
#
# Ipcop and OpenVPN eas as one two three..
#
+# (c) 2007-2011 The IPCop Team
+#
# $Id$
#
@@ -1326,7 +1341,7 @@
}
}
- $cgiparams{'CERT_NAME'} = &VPN::getCNfromcert ("/var/ipcop/certs/$cgiparams{'NAME'}cert.pem");
+ $cgiparams{'CERT_NAME'} = &VPN::getCNfromcert ("/var/ipcop/openvpn/certs/$cgiparams{'NAME'}cert.pem");
if ($cgiparams{'CERT_NAME'} eq '') {
unlink ("/var/ipcop/openvpn/certs/$cgiparams{'NAME'}cert.pem");
$errormessage = $Lang::tr{'could not retrieve common name from certificate'};
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-25 19:13:44 UTC (rev 6132)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-26 21:49:51 UTC (rev 6133)
@@ -1,4 +1,5 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/openvpn.cgi
/home/httpd/cgi-bin/trafficadm.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/home/httpd/vhost81/cgi-bin/redirect.cgi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-25 19:13:51
|
Revision: 6132
http://ipcop.svn.sourceforge.net/ipcop/?rev=6132&view=rev
Author: owes
Date: 2011-11-25 19:13:44 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Newer version of e1000e driver. Adds support for Intel 82579LM (among others), which shows up on some motherboards and does not exist in 2.6.32 kernel.
Next patch (.49, to be released soon) to kernel will auto-include.
Modified Paths:
--------------
ipcop/trunk/make.sh
Added Paths:
-----------
ipcop/trunk/lfs/e1000e
Added: ipcop/trunk/lfs/e1000e
===================================================================
--- ipcop/trunk/lfs/e1000e (rev 0)
+++ ipcop/trunk/lfs/e1000e 2011-11-25 19:13:44 UTC (rev 6132)
@@ -0,0 +1,91 @@
+###############################################################################
+# This file is part of the IPCop Firewall. #
+# #
+# IPCop is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPCop is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPCop; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Makefiles are based on LFSMake, which is #
+# Copyright (C) 2002 Rod Roard <ro...@su...> #
+# #
+# Modifications by: #
+# 17-03-2004 Mark Wormgoor < ma...@wo...> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = e1000e
+VER = 1.6.3
+HOST_ARCH = i486
+OTHER_SRC = yes
+KERNEL_MOD = yes
+
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_SFNET)/e1000
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/linux-$(KVER)-$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 9526a6c004f936506a90e10911420bf8
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
+
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER) install
+ gzip -fn9 /lib/modules/$(KVER)/kernel/drivers/net/e1000e/e1000e.ko
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
Property changes on: ipcop/trunk/lfs/e1000e
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-11-25 18:12:11 UTC (rev 6131)
+++ ipcop/trunk/make.sh 2011-11-25 19:13:44 UTC (rev 6132)
@@ -1763,6 +1763,7 @@
chroot_make unzip # only needed to unpack rawwrite in lfs/cdrom
chroot_make linux
chroot_make CnxADSL
+ chroot_make e1000e
if [ x"${SKIP_AVM_DRIVERS}" != x"yes" ]; then
chroot_make fcdsl # DEBUG -- compiles, but functionality is uncertain
chroot_make fcdsl2 # DEBUG -- compiles, but functionality is uncertain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-25 18:12:19
|
Revision: 6131
http://ipcop.svn.sourceforge.net/ipcop/?rev=6131&view=rev
Author: gespinasse
Date: 2011-11-25 18:12:11 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Add patches 11 to 20 to bash-4.2
readline has only 1 patch, mac OS-X related so I will not change that part.
We don't need -N patching bash, so remove that option.
Modified Paths:
--------------
ipcop/trunk/lfs/bash
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/lfs/bash
===================================================================
--- ipcop/trunk/lfs/bash 2011-11-25 18:07:40 UTC (rev 6130)
+++ ipcop/trunk/lfs/bash 2011-11-25 18:12:11 UTC (rev 6131)
@@ -48,6 +48,16 @@
PATCH08 := $(PKG_NAME)42-008
PATCH09 := $(PKG_NAME)42-009
PATCH10 := $(PKG_NAME)42-010
+PATCH11 := $(PKG_NAME)42-011
+PATCH12 := $(PKG_NAME)42-012
+PATCH13 := $(PKG_NAME)42-013
+PATCH14 := $(PKG_NAME)42-014
+PATCH15 := $(PKG_NAME)42-015
+PATCH16 := $(PKG_NAME)42-016
+PATCH17 := $(PKG_NAME)42-017
+PATCH18 := $(PKG_NAME)42-018
+PATCH19 := $(PKG_NAME)42-019
+PATCH20 := $(PKG_NAME)42-020
###############################################################################
# Top-level Rules
@@ -56,21 +66,50 @@
$(PATCH1) \
$(PATCH08).patch \
$(PATCH09).patch \
- $(PATCH10).patch
+ $(PATCH10).patch \
+ $(PATCH11).patch \
+ $(PATCH12).patch \
+ $(PATCH13).patch \
+ $(PATCH14).patch \
+ $(PATCH15).patch \
+ $(PATCH16).patch \
+ $(PATCH17).patch \
+ $(PATCH18).patch \
+ $(PATCH19).patch \
+ $(PATCH20).patch
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
$(PATCH08).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH08)
$(PATCH09).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH09)
$(PATCH10).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH10)
+$(PATCH11).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH11)
+$(PATCH12).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH12)
+$(PATCH13).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH13)
+$(PATCH14).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH14)
+$(PATCH15).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH15)
+$(PATCH16).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH16)
+$(PATCH17).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH17)
+$(PATCH18).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH18)
+$(PATCH19).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH19)
+$(PATCH20).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH20)
$(DL_FILE)_MD5 = 3fb927c7c33022f1c327f14a81c0d4b0
$(PATCH1)_MD5 = abae789c2807cb7c7c4c452fa3986f85
$(PATCH08).patch_MD5 = 24c574bf6d6a581e300823d9c1276af6
$(PATCH09).patch_MD5 = 4c5835f2fbab36c4292bb334977e5b6d
$(PATCH10).patch_MD5 = 0a51602b535ef661ee707be6c8bdb373
+$(PATCH11).patch_MD5 = 58deacf3d57cbd75575444ff6a3b0806
+$(PATCH12).patch_MD5 = 72d5059820015231483bb7415d09e9db
+$(PATCH13).patch_MD5 = 608336ebe215984ef126e3c29d2d3409
+$(PATCH14).patch_MD5 = ed19da878e3f630834c62b9d9dcc6fce
+$(PATCH15).patch_MD5 = 2d07daba0b8ca8f876d2aa052ff594b4
+$(PATCH16).patch_MD5 = 53d246537e1fffd1aaa02ba5c056211c
+$(PATCH17).patch_MD5 = 304fd129a58fee2d8a34f8b4704db0aa
+$(PATCH18).patch_MD5 = 6921a0b4228fe89b6537a5c29f027c89
+$(PATCH19).patch_MD5 = 1195d85447f3d048d2c9bcd075fa765c
+$(PATCH20).patch_MD5 = b09000bba08da6ac753124593850cdf7
-
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -99,10 +138,20 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
- cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/$(PATCH08).patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/$(PATCH09).patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/$(PATCH10).patch
+ cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH08).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH09).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH10).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH11).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH12).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH13).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH14).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH15).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH16).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH17).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH18).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH19).patch
+ cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH20).patch
# In bash-3.2, configure and configure.in are patched in that order
# if they are not in the same second, autoconf is called.
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-25 18:07:40 UTC (rev 6130)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-25 18:12:11 UTC (rev 6131)
@@ -7,6 +7,9 @@
## acpid-2.0.13
/usr/sbin/acpid
##
+## bash-4.2.20
+/bin/bash
+##
## capi4k-utils-2005-07-18
/usr/lib/pppd/2.4.5/capiplugin.so
/usr/lib/pppd/2.4.5/userpass.so
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-25 18:07:40 UTC (rev 6130)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-25 18:12:11 UTC (rev 6131)
@@ -6,7 +6,7 @@
<description>Add again capi4k-utils plugins.<br />
Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
- Upgrade acpid to 2.0.13, diffutils to 3.2, kbd to 1.15.3, Solos PCI to 1.03.
+ Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2, kbd to 1.15.3, Solos PCI to 1.03.
</description>
<previousversion>2.0.2</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-25 18:07:47
|
Revision: 6130
http://ipcop.svn.sourceforge.net/ipcop/?rev=6130&view=rev
Author: gespinasse
Date: 2011-11-25 18:07:40 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
It look I need too to commit the initial file now deleted and replaced by name without _SKIP
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP
Deleted: ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP
===================================================================
--- ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP 2011-11-23 07:12:15 UTC (rev 6129)
+++ ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP 2011-11-25 18:07:40 UTC (rev 6130)
@@ -1,27 +0,0 @@
-## capi4k-utils-2005-07-18
-##
-#etc/drdsl
-#etc/drdsl/adsl.conf
-#etc/ppp/peers
-#etc/ppp/peers/isdn
-#etc/ppp/peers/isdn/arcor
-#etc/ppp/peers/isdn/avm
-#etc/ppp/peers/isdn/avm-ml
-#etc/ppp/peers/isdn/leased
-#etc/ppp/peers/isdn/otelo
-#etc/ppp/peers/isdn/talkline
-#sbin/avmcapictrl
-#sbin/capiinit
-#usr/include/capi20.h
-#usr/include/capicmd.h
-#usr/include/capiutils.h
-#usr/lib/libcapi20.a
-#usr/lib/libcapi20.la
-#usr/lib/libcapi20.so
-#usr/lib/libcapi20.so.3
-#usr/lib/libcapi20.so.3.0.4
-#usr/lib/libcapi20dyn.a
-usr/lib/pppd/2.4.5/capiplugin.so
-usr/lib/pppd/2.4.5/userpass.so
-#usr/share/man/man8/avmcapictrl.8
-#usr/share/man/man8/capiplugin.8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-23 07:12:21
|
Revision: 6129
http://ipcop.svn.sourceforge.net/ipcop/?rev=6129&view=rev
Author: gespinasse
Date: 2011-11-23 07:12:15 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Add a note why 'not ok' is not used on perl package, as that match broken tests with TODO.
Add CRASH for cairo, that could happen even I haven't seen one, may vary "CRASHED", !!!CRASHED!!! or : CRASH!
Modified Paths:
--------------
ipcop/trunk/tools/error-parser
Modified: ipcop/trunk/tools/error-parser
===================================================================
--- ipcop/trunk/tools/error-parser 2011-11-23 06:50:53 UTC (rev 6128)
+++ ipcop/trunk/tools/error-parser 2011-11-23 07:12:15 UTC (rev 6129)
@@ -68,9 +68,10 @@
# FAILED | UNEXPECTED PASS from autoconf lib/general.m4
# ^ERROR:|^FAIL:|^XPASS: from automake and derivated
# ' program timed out' from gcc
- # ': FAIL |: FAIL" from cairo (separated with space in middle, with tab in end of line)
+ # ': FAIL |: FAIL|CRASH" from cairo (separated with space in middle, with tab in end of line)
+ # perl packages (not all) use '^not ok' to fail, but this is too often for broken tests with TODO, trying to match that give false alarm.
$errorstring = "^FAIL:|^ERROR:|^XPASS:| FAILED | UNEXPECTED PASS |^UNSUPPORTED ";
- $errorstring .= "| program timed out|: FAIL |: FAIL";
+ $errorstring .= "| program timed out|: FAIL |: FAIL|CRASH";
# 'generated an error' come from libxml2, try to compile (if that compile) --with-minimum --with-output to trigger error
# DBD-SQLite print twice that same message and should be still ok, so only match for libxml2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-23 06:51:00
|
Revision: 6128
http://ipcop.svn.sourceforge.net/ipcop/?rev=6128&view=rev
Author: gespinasse
Date: 2011-11-23 06:50:53 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Upgrade file to 5.0.9, matter only on toolchain build
Modified Paths:
--------------
ipcop/trunk/lfs/file
Modified: ipcop/trunk/lfs/file
===================================================================
--- ipcop/trunk/lfs/file 2011-11-22 21:09:29 UTC (rev 6127)
+++ ipcop/trunk/lfs/file 2011-11-23 06:50:53 UTC (rev 6128)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = file
-VER = 5.08
+VER = 5.09
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6a2a263c20278f01fe3bb0f720b27d4e
+$(DL_FILE)_MD5 = 6fd7cd6c4281e68fe9ec6644ce0fac6f
install : $(TARGET)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ges...@us...> - 2011-11-22 21:09:36
|
Revision: 6127
http://ipcop.svn.sourceforge.net/ipcop/?rev=6127&view=rev
Author: gespinasse
Date: 2011-11-22 21:09:29 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Upgrade diffutils to 3.2
Modified Paths:
--------------
ipcop/trunk/lfs/diffutils
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Modified: ipcop/trunk/lfs/diffutils
===================================================================
--- ipcop/trunk/lfs/diffutils 2011-11-22 15:51:41 UTC (rev 6126)
+++ ipcop/trunk/lfs/diffutils 2011-11-22 21:09:29 UTC (rev 6127)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = diffutils
-VER = 3.0
+VER = 3.2
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7624eb7e6b53ea3ce38958a092d2216e
+$(DL_FILE)_MD5 = 26ff64c332429c830c154be46b393382
install : $(TARGET)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 15:51:41 UTC (rev 6126)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 21:09:29 UTC (rev 6127)
@@ -11,6 +11,10 @@
/usr/lib/pppd/2.4.5/capiplugin.so
/usr/lib/pppd/2.4.5/userpass.so
##
+## diffutils-3.2
+/usr/bin/cmp
+/usr/bin/diff
+##
## kbd-1.15.3
/usr/bin/chvt
/usr/bin/deallocvt
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-22 15:51:41 UTC (rev 6126)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-22 21:09:29 UTC (rev 6127)
@@ -6,7 +6,7 @@
<description>Add again capi4k-utils plugins.<br />
Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
- Upgrade acpid to 2.0.13, kbd to 1.15.3, Solos PCI to 1.03.
+ Upgrade acpid to 2.0.13, diffutils to 3.2, kbd to 1.15.3, Solos PCI to 1.03.
</description>
<previousversion>2.0.2</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-22 15:51:50
|
Revision: 6126
http://ipcop.svn.sourceforge.net/ipcop/?rev=6126&view=rev
Author: owes
Date: 2011-11-22 15:51:41 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Add comment about detail level high.
Modified Paths:
--------------
IPCopDoc/trunk/de/admin/xml/info.xml
IPCopDoc/trunk/en/admin/xml/info.xml
Modified: IPCopDoc/trunk/de/admin/xml/info.xml
===================================================================
--- IPCopDoc/trunk/de/admin/xml/info.xml 2011-11-22 15:48:53 UTC (rev 6125)
+++ IPCopDoc/trunk/de/admin/xml/info.xml 2011-11-22 15:51:41 UTC (rev 6126)
@@ -648,6 +648,14 @@
Die Traffic-Erfassung zählt, falls sie aktiviert wurde, den
Datenverkehr auf allen konfigurierten Schnittstellen.
</para>
+ <note>
+ <para>
+ Traffic-Erfassung mit <guilabel>Detaillierungsgrad</guilabel>
+ <guimenu>Hoch</guimenu> ist momentan deaktiviert, weil dieser
+ nicht zuverlässig arbeitet.
+ </para>
+ </note>
+<!--
<warning>
<para>
Die Einstellung <guilabel>Detaillierungsgrad</guilabel>
@@ -656,6 +664,7 @@
Bedenken Sie dies, wenn ältere oder leistungsschwache Hardware eingesetzt wird.
</para>
</warning>
+-->
<sect3 id="status-traffic-accounting-select">
<title>Traffic-Erfassung Auswahl</title>
<para>
@@ -766,9 +775,14 @@
<formalpara>
<title><guilabel>Detaillierungsgrad</guilabel></title>
<para>
+ Nur <guimenu>Niedrig</guimenu> kann ausgewählt werden.
+ </para>
+<!--
+ <para>
Wählt zwischen <guimenu>Hoch</guimenu> oder
<guimenu>Niedrig</guimenu> Detaillierungsgrad.
</para>
+-->
</formalpara>
<formalpara>
<title><guilabel>Zeige berechneten Traffic auf der Startseite</guilabel></title>
@@ -807,7 +821,7 @@
<title><guilabel>Überwache Traffic-Volumen (...MByte)</guilabel></title>
<para>
Auswahl der Überwachungsgrenze für das Traffic-Volumen,
- welche die rote Netzwerkschnittstelle von IPCop passiert. Die
+ welches die rote Netzwerkschnittstelle von IPCop passiert. Die
entsprechende Checkbox für eingehenden und/oder ausgehenden
Traffic und/oder den Gesamt-Traffic muss für die Überwachung
aktiviert werden. Das Volumen muss in MByte angegeben werden.
Modified: IPCopDoc/trunk/en/admin/xml/info.xml
===================================================================
--- IPCopDoc/trunk/en/admin/xml/info.xml 2011-11-22 15:48:53 UTC (rev 6125)
+++ IPCopDoc/trunk/en/admin/xml/info.xml 2011-11-22 15:51:41 UTC (rev 6126)
@@ -670,6 +670,14 @@
Traffic accounting, when activated, counts the traffic on all
configured interfaces.
</para>
+ <note>
+ <para>
+ Traffic accounting with <guilabel>Detail level</guilabel>
+ <guimenu>High</guimenu> is currently disabled because it
+ does not work reliably.
+ </para>
+ </note>
+<!--
<warning>
<para>
Traffic accounting with <guilabel>Detail level</guilabel>
@@ -679,6 +687,7 @@
Be wary of activating this feature on older, slower hardware.
</para>
</warning>
+-->
<sect3 id="status-traffic-accounting-select">
<title>Traffic Accounting Selection</title>
<para>
@@ -790,10 +799,15 @@
</formalpara>
<formalpara>
<title><guilabel>Detail level</guilabel></title>
- <para>
+ <para>
+ Only <guimenu>Low</guimenu> can be selected.
+ </para>
+<!--
+ <para>
Select between <guimenu>High</guimenu> or
<guimenu>Low</guimenu> levels of detail.
</para>
+-->
</formalpara>
<formalpara>
<title><guilabel>Display calculated traffic on Homepage</guilabel></title>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-22 15:49:02
|
Revision: 6125
http://ipcop.svn.sourceforge.net/ipcop/?rev=6125&view=rev
Author: owes
Date: 2011-11-22 15:48:53 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Disable high detail for traffic accounting. Does not work reliably at the moment. Maybe things improve when ulogd2 becomes available.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/trafficadm.cgi
ipcop/trunk/src/scripts/upgrade.sh
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Modified: ipcop/trunk/html/cgi-bin/trafficadm.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/trafficadm.cgi 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/html/cgi-bin/trafficadm.cgi 2011-11-22 15:48:53 UTC (rev 6125)
@@ -13,9 +13,10 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
+# (c) 2008-2011, the IPCop team
+#
# $Id$
#
@@ -229,7 +230,7 @@
<td>
<select name='DETAIL_LEVEL'>
<option value='Low' $selected{'DETAIL_LEVEL'}{'Low'}>$Lang::tr{'low'}</option>
- <option value='High' $selected{'DETAIL_LEVEL'}{'High'}>$Lang::tr{'high'}</option>
+ <option value='High' $selected{'DETAIL_LEVEL'}{'High'} disabled='disabled'>$Lang::tr{'high'}</option>
</select>
</td>
<td colspan='2'> </td>
Modified: ipcop/trunk/src/scripts/upgrade.sh
===================================================================
--- ipcop/trunk/src/scripts/upgrade.sh 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/src/scripts/upgrade.sh 2011-11-22 15:48:53 UTC (rev 6125)
@@ -1,6 +1,20 @@
#!/bin/bash
#
# This file is part of the IPCop Firewall.
+#
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
# (c) Gilles Espinasse
#
# Universal upgrade script
@@ -75,3 +89,6 @@
# External access rules no longer possible as INPUT rule, modified in 1.9.18
/bin/sed -i -e "/,INPUT,.*,defaultSrcNet,Red,/{s/,INPUT,/,EXTERNAL,/}" /var/ipcop/firewall/config
+
+# Detail High for traffic accounting disabled in 2.0.3
+/bin/sed -i -e "s/DETAIL_LEVEL=.*/DETAIL_LEVEL=Low/" /var/ipcop/traffic/settings
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 15:48:53 UTC (rev 6125)
@@ -1,6 +1,8 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/trafficadm.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/home/httpd/vhost81/cgi-bin/redirect.cgi
+/usr/local/bin/upgrade.sh
##
## acpid-2.0.13
/usr/sbin/acpid
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-22 15:48:53 UTC (rev 6125)
@@ -4,6 +4,7 @@
<releasedate>2011-mm-dd</releasedate>
<size>0</size>
<description>Add again capi4k-utils plugins.<br />
+ Disable traffic accounting with detail level High, always use Low.<br />
Fix _builtin___strncat_chk might overflow in usb-modemswitch-1.2.0.<br />
Upgrade acpid to 2.0.13, kbd to 1.15.3, Solos PCI to 1.03.
</description>
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/updates/2.0.3/setup 2011-11-22 15:48:53 UTC (rev 6125)
@@ -59,7 +59,7 @@
# /sbin/mkinitramfs --with-kernel=2.6.32-2 --with-firmware --many-modules --with-list=/etc/modules.initramfs
# Adjust the changed config files
-# /usr/local/bin/upgrade.sh
+/usr/local/bin/upgrade.sh
# Remove old libraries (version specific)
# /bin/rm -f .....
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2011-11-22 12:05:47
|
Revision: 6124
http://ipcop.svn.sourceforge.net/ipcop/?rev=6124&view=rev
Author: owes
Date: 2011-11-22 12:05:41 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Add modified CGI files into update package
Modified Paths:
--------------
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-21 15:50:15 UTC (rev 6123)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 12:05:41 UTC (rev 6124)
@@ -1,4 +1,6 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/urlfilter.cgi
+/home/httpd/vhost81/cgi-bin/redirect.cgi
##
## acpid-2.0.13
/usr/sbin/acpid
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|