Revision: 2808
http://ipcop.svn.sourceforge.net/ipcop/?rev=2808&view=rev
Author: riddles
Date: 2009-05-07 17:26:34 +0000 (Thu, 07 May 2009)
Log Message:
-----------
Merged /ipcop/trunk:r2788-r2807
Modified Paths:
--------------
ipcop/branches/template-branch/config/rootfiles/arch_i486/syslinux
ipcop/branches/template-branch/config/rootfiles/common/module-init-tools
ipcop/branches/template-branch/config/rootfiles/common/usbutils
ipcop/branches/template-branch/html/cgi-bin/fwrules.cgi
ipcop/branches/template-branch/html/html/pages/modem.tpl
ipcop/branches/template-branch/lfs/module-init-tools
ipcop/branches/template-branch/lfs/syslinux
ipcop/branches/template-branch/lfs/usbutils
ipcop/branches/template-branch/src/installer/partition.c
ipcop/branches/template-branch/src/misc-progs/restartntpd.c
ipcop/branches/template-branch/src/rc.d/rc.firewall
ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl
Property Changed:
----------------
ipcop/branches/template-branch/
ipcop/branches/template-branch/config/rootfiles/arch_i486/mtools
Property changes on: ipcop/branches/template-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk:2760-2787
+ /ipcop/trunk:2760-2807
Property changes on:
ipcop/branches/template-branch/config/rootfiles/arch_i486/mtools
___________________________________________________________________
Modified: svn:mergeinfo
- /ipcop/trunk/config/rootfiles/arch_i486/mtools:2760-2787
+ /ipcop/trunk/config/rootfiles/arch_i486/mtools:2760-2807
Modified: ipcop/branches/template-branch/config/rootfiles/arch_i486/syslinux
===================================================================
--- ipcop/branches/template-branch/config/rootfiles/arch_i486/syslinux
2009-05-07 07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/config/rootfiles/arch_i486/syslinux
2009-05-07 17:26:34 UTC (rev 2808)
@@ -60,6 +60,8 @@
#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h
#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h
#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h
+#usr/share/syslinux/com32/include/gplinclude/vpd
+#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
#usr/share/syslinux/com32/include/inttypes.h
#usr/share/syslinux/com32/include/klibc
#usr/share/syslinux/com32/include/klibc/archsetjmp.h
@@ -156,6 +158,7 @@
#usr/share/syslinux/menu.c32
#usr/share/syslinux/pcitest.c32
#usr/share/syslinux/pmload.c32
+#usr/share/syslinux/poweroff.com
#usr/share/syslinux/pxechain.com
#usr/share/syslinux/pxelinux.0
#usr/share/syslinux/reboot.c32
@@ -166,3 +169,4 @@
#usr/share/syslinux/syslinux.exe
#usr/share/syslinux/vesainfo.c32
#usr/share/syslinux/vesamenu.c32
+#usr/share/syslinux/vpdtest.c32
Modified:
ipcop/branches/template-branch/config/rootfiles/common/module-init-tools
===================================================================
--- ipcop/branches/template-branch/config/rootfiles/common/module-init-tools
2009-05-07 07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/config/rootfiles/common/module-init-tools
2009-05-07 17:26:34 UTC (rev 2808)
@@ -1,13 +1,11 @@
-## module-init-tools-3.4
-##
bin/lsmod
sbin/depmod
#sbin/generate-modprobe.conf
sbin/insmod
+#sbin/insmod.static
sbin/modinfo
sbin/modprobe
sbin/rmmod
-sbin/insmod.static
#usr/share/man/man5/depmod.conf.5
#usr/share/man/man5/modprobe.conf.5
#usr/share/man/man5/modules.dep.5
Modified: ipcop/branches/template-branch/config/rootfiles/common/usbutils
===================================================================
--- ipcop/branches/template-branch/config/rootfiles/common/usbutils
2009-05-07 07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/config/rootfiles/common/usbutils
2009-05-07 17:26:34 UTC (rev 2808)
@@ -1,5 +1,5 @@
-## usbutils-0.73
-##
+#usr/lib/pkgconfig/usbutils.pc
usr/sbin/lsusb
+#usr/sbin/update-usbids.sh
#usr/share/man/man8/lsusb.8
usr/share/usb.ids.gz
Modified: ipcop/branches/template-branch/html/cgi-bin/fwrules.cgi
===================================================================
--- ipcop/branches/template-branch/html/cgi-bin/fwrules.cgi 2009-05-07
07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/html/cgi-bin/fwrules.cgi 2009-05-07
17:26:34 UTC (rev 2808)
@@ -470,7 +470,7 @@
print <<END;
<table>
<tr>
- <td class='boldbase'> <b>$Lang::tr{'legend'}:</b></td>
+ <td class='boldbase'> $Lang::tr{'legend'}:</td>
<td align='right'> <img src='/images/logging.gif'
alt='$Lang::tr{'logging'} $Lang::tr{'click to disable'}' /></td>
<td class='base' align='left'>$Lang::tr{'logging'} $Lang::tr{'click to
disable'}</td>
<td align='right'> <img src='/images/loggingoff.gif'
alt='$Lang::tr{'logging'} $Lang::tr{'click to enable'}' /></td>
@@ -562,35 +562,35 @@
</td>
</tr>
<tr>
- <td width='1%' class='boldbase' align='center'><b>#</b></td>
- <td width='4%' class='boldbase' align='center'><b>$Lang::tr{'net br
iface'}</b></td>
- <td width='$widthAdr%' class='boldbase'
align='center'><b>$Lang::tr{'source'}</b></td>
+ <td width='1%' class='boldbase' align='center'>#</td>
+ <td width='4%' class='boldbase' align='center'>$Lang::tr{'net br
iface'}</td>
+ <td width='$widthAdr%' class='boldbase'
align='center'>$Lang::tr{'source'}</td>
END
if($type eq 'PORTFW') {
print <<END;
- <td width='2%' class='boldbase' align='center'><b></b> </td>
- <td width='$widthAdr%' class='boldbase'
align='center'><b>$Lang::tr{'pfw ipcop destination'}</b></td>
+ <td width='2%' class='boldbase' align='center'> </td>
+ <td width='$widthAdr%' class='boldbase'
align='center'>$Lang::tr{'pfw ipcop destination'}</td>
END
}
print <<END;
- <td width='2%' class='boldbase'
align='center'><b>$Lang::tr{'log'}:</b></td>
- <td width='2%' class='boldbase' align='center'><b></b> </td>
+ <td width='2%' class='boldbase' align='center'>$Lang::tr{'log'}:</td>
+ <td width='2%' class='boldbase' align='center'> </td>
END
if (($type ne 'INPUT' && $type ne 'EXTERNAL'))
{
print <<END;
- <td width='5%' class='boldbase' align='center'><b>$Lang::tr{'net br
iface'}</b></td>
+ <td width='5%' class='boldbase' align='center'>$Lang::tr{'net br
iface'}</td>
END
}
print <<END;
- <td width='$widthAdr%' class='boldbase'
align='center'><b>$dst_text</b></td>
- <td width='$widthRemark%' class='boldbase'
align='center'><b>$Lang::tr{'remark'}</b></td>
+ <td width='$widthAdr%' class='boldbase' align='center'>$dst_text</td>
+ <td width='$widthRemark%' class='boldbase'
align='center'>$Lang::tr{'remark'}</td>
END
- my $actionTitle = "<b>$Lang::tr{'action'}</b>";
+ my $actionTitle = "$Lang::tr{'action'}";
$actionTitle = '' if ($printMode ne 'all');
print <<END;
@@ -915,7 +915,7 @@
print "<tr bgcolor='${Header::table2colour}'>\n";
}
}
- my $options = "<b>$Lang::tr{'adv options'} :</b> ";
+ my $options = "$Lang::tr{'adv options'} : ";
if ($rule->{'MATCH_STRING_ON'} eq 'on') {
if ($rule->{'INV_MATCH_STRING'} eq 'on') {
$options .=
@@ -987,7 +987,7 @@
print <<END;
<td colspan='2' class='boldbase'></td>
<td colspan='13' class='boldbase' align='left'>
- <b>$Lang::tr{'rule active'}:</b>
+ $Lang::tr{'rule active'}:
$dayText
$startHour:$startMinute
@@ -1924,9 +1924,7 @@
END
&printHiddenFormParams('addNewRule');
- if (&FW::haveBlueNet() && &FW::haveGreenNet()
- || (&FW::haveBlueNet()))
- {
+ if (&FW::haveBlueNet() || &FW::haveOrangeNet()) {
print <<END;
</form>
</td>
@@ -1963,13 +1961,13 @@
</form>
</td>
<td align='left' width='90%'></td>
+ <td width='5%' align='right'>
+ <a href='${General::adminmanualurl}/firewall.html#section-fwrules'
target='_blank'><img src='/images/web-support.png' alt='$Lang::tr{'online help
en'}' title='$Lang::tr{'online help en'}' /></a>
+ </td>
</tr>
</table>
-</form>
END
- &printHiddenFormParams('addNewRule');
- print "</form>";
&Header::closebox();
}
@@ -2072,9 +2070,7 @@
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
- <td class='base' >
- <b>$Lang::tr{'source'}</b>
- </td>
+ <td class='boldbase'>$Lang::tr{'source'}</td>
</tr>
</table>
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
@@ -2448,9 +2444,7 @@
print <<END;
<table width='100%'>
<tr>
- <td class='base' >
- <b>$Lang::tr{'pfw ipcop destination'}</b>
- </td>
+ <td class='boldbase'>$Lang::tr{'pfw ipcop destination'}</td>
</tr>
</table>
@@ -2627,8 +2621,7 @@
print <<END;
<table width='100%'>
<tr>
- <td class='base' >
- <b>$destination_text</b>
+ <td class='boldbase' >$destination_text
</td>
</tr>
</table>
@@ -3129,7 +3122,7 @@
print <<END;
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr>
- <td class='base' ><b>$Lang::tr{'additional'}</b></td>
+ <td class='boldbase' >$Lang::tr{'additional'}</td>
</tr>
</table>
@@ -3207,7 +3200,7 @@
</tr>
<tr>
<td width='4%' class='base' ></td>
- <td class='base' ><b>$Lang::tr{'adv options'}</b></td>
+ <td class='boldbase' >$Lang::tr{'adv options'}</td>
</tr>
<tr>
<td width='4%' class='base' ></td>
@@ -3307,7 +3300,7 @@
<td bgcolor='#000000' colspan='2'><img src='/images/null.gif'
width='1' height='2' border='0' alt='--------' /></td>
</tr>
<tr>
- <td class='base' ><b>$Lang::tr{'add timeframe'}</b></td>
+ <td class='boldbase' >$Lang::tr{'add timeframe'}</td>
</tr>
</table>
@@ -3708,11 +3701,11 @@
$cgiparams{'PORTFW_SERVICE_TYPE'} = $rule->{'PORTFW_SERVICE_TYPE'}; # [13]
if($rule->{'PORTFW_SERVICE_TYPE'} eq 'custom') {
- $cgiparams{'PORTFW_SERVICE'} = $rule->{'PORTFW_CUST_SERVICE'}; # [14]
+ $cgiparams{'PORTFW_CUST_SERVICE'} = $rule->{'PORTFW_SERVICE'}; # [14]
}
else {
# 'default'
- $cgiparams{'PORTFW_SERVICE'} = $rule->{'PORTFW_DEFAULT_SERVICE'}; #
[14]
+ $cgiparams{'PORTFW_DEFAULT_SERVICE'} = $rule->{'PORTFW_SERVICE'}; #
[14]
}
$cgiparams{'DST_NET_TYPE'} = $rule->{'DST_NET_TYPE'}; # [15]
@@ -3976,9 +3969,9 @@
<table width='100%' cellpadding='0' cellspacing='5' border='0'>
<tr>
<td colspan='2' class='base'>
- <font class='boldbase'><b>$Lang::tr{'source'}:</b></font>
+ <font class='boldbase'>$Lang::tr{'source'}:</font>
</td>
- <td class='base' ><b></b></td>
+ <td class='boldbase' > </td>
</tr>
<tr>
<td width='2%' class='base' ></td>
@@ -4026,7 +4019,7 @@
</tr>
<tr>
<td colspan='3' class='base'>
- <font class='boldbase'><b>$Lang::tr{'pfw ipcop
destination'}:</b></font>
+ <font class='boldbase'>$Lang::tr{'pfw ipcop destination'}:</font>
</td>
</tr>
<tr>
@@ -4034,14 +4027,14 @@
<td class='base' >
<font class='boldbase'>$Lang::tr{'alias ip'}:</font>
</td>
- <td class='base' ><b>$cgiparams{'PORTFW_EXT_ADR'}</b></td>
+ <td class='boldbase' >$cgiparams{'PORTFW_EXT_ADR'}</td>
</tr>
<tr>
<td class='base' ></td>
<td class='base' >
<font class='boldbase'>$Lang::tr{'service'}:</font>
</td>
- <td class='base' ><b>$ext_service</b></td>
+ <td class='boldbase'>$ext_service</td>
</tr>
END
@@ -4052,10 +4045,8 @@
<td colspan='3' class='base'> </td>
</tr>
<tr>
- <td colspan='2' class='base'>
- <font class='boldbase'><b>$destination_text: </b></font>
- </td>
- <td class='base' ><b>$ruleTypeTxt</b></td>
+ <td colspan='2' class='boldbase'>$destination_text: </td>
+ <td class='boldbase'>$ruleTypeTxt</td>
</tr>
END
if ($cgiparams{'RULETYPE'} eq 'FORWARD' || $cgiparams{'RULETYPE'} eq
'DMZHOLES' || $cgiparams{'RULETYPE'} eq 'PORTFW') {
@@ -4125,7 +4116,7 @@
<td class='base' >
<font class='boldbase'>$Lang::tr{'service'}:</font>
</td>
- <td class='base' ><b>$dst_service</b></td>
+ <td class='boldbase'>$dst_service</td>
</tr>
END
}
@@ -4158,7 +4149,7 @@
<td colspan='2' class='base'>
<font class='boldbase'>$Lang::tr{'rule action'}:</font>
</td>
- <td class='base' ><b>$ruleAction</b></td>
+ <td class='boldbase'>$ruleAction</td>
</tr>
<tr>
<td colspan='2' class='base'>
@@ -4180,7 +4171,7 @@
<td colspan='2' class='base'>
<font class='boldbase'>$Lang::tr{'remark title'}: </font>
</td>
- <td class='base' ><b>$cgiparams{'REMARK'}</b></td>
+ <td class='boldbase'>$cgiparams{'REMARK'}</td>
</tr>
<tr>
<td colspan='2' class='base'>
@@ -4260,28 +4251,20 @@
</tr>
<tr>
<td class='base'></td>
- <td class='base'>
- <font class='boldbase'>$Lang::tr{'days'}:</font>
- </td>
- <td class='base' >
- <b>
- $dayText
- </b>
- </td>
+ <td class='boldbase'>$Lang::tr{'days'}:</td>
+ <td class='boldbase'>$dayText</td>
</tr>
<tr>
<td class='base'></td>
<td class='base'>
<font class='boldbase'>$Lang::tr{'daytime'}:</font>
</td>
- <td class='base' >
- <b>
- $startHour:$startMinute
-
- $Lang::tr{'days to'}
-
- $endHour:$endMinute
- </b>
+ <td class='boldbase'>
+ $startHour:$startMinute
+
+ $Lang::tr{'days to'}
+
+ $endHour:$endMinute
</td>
</tr>
<tr>
@@ -4333,18 +4316,14 @@
<td colspan='2' class='base'>
<font class='boldbase'>Match limit:</font>
</td>
- <td class='base' >
- <b>$limitFor</b>
- </td>
+ <td class='boldbase'>$limitFor</td>
</tr>
<tr>
<td class='base'></td>
<td class='base'>
<font class='boldbase'>$limitOption</font>
</td>
- <td class='base' >
- <b>$limitValue</b>
- </td>
+ <td class='boldbase'>$limitValue</td>
</tr>
END
}
Modified: ipcop/branches/template-branch/html/html/pages/modem.tpl
===================================================================
--- ipcop/branches/template-branch/html/html/pages/modem.tpl 2009-05-07
07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/html/html/pages/modem.tpl 2009-05-07
17:26:34 UTC (rev 2808)
@@ -1,5 +1,5 @@
-[% location = 'alt system' | loc %]
-[% sublocation = 'alt home' | loc %]
+[% location = 'network' | loc %]
+[% sublocation = 'modem' | loc %]
[% title = 'modem configuration' | loc %]
[% PROCESS "$page.theme/vars.tpl" %]
Modified: ipcop/branches/template-branch/lfs/module-init-tools
===================================================================
--- ipcop/branches/template-branch/lfs/module-init-tools 2009-05-07
07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/lfs/module-init-tools 2009-05-07
17:26:34 UTC (rev 2808)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = module-init-tools
-VER = 3.4.1
+VER = 3.8
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,7 +43,6 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PATCH1 = $(THISAPP)-manpages-1.patch
###############################################################################
# Top-level Rules
@@ -53,10 +52,8 @@
$(PATCH1)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = e253b066a1bab1d727ca0d54f001b49c
-$(PATCH1)_MD5 = 2271047586981ae23adf01cc13d97791
+$(DL_FILE)_MD5 = 470d7830fd263d29a92149da6ae9f122
install : $(TARGET)
@@ -87,10 +84,9 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
cd $(DIR_APP) && ./configure --prefix=/usr \
--exec-prefix=/ \
- --enable-zlib
+ --enable-zlib-dynamic
cd $(DIR_APP) && make
cd $(DIR_APP) && make INSTALL=install install
Modified: ipcop/branches/template-branch/lfs/syslinux
===================================================================
--- ipcop/branches/template-branch/lfs/syslinux 2009-05-07 07:15:50 UTC (rev
2807)
+++ ipcop/branches/template-branch/lfs/syslinux 2009-05-07 17:26:34 UTC (rev
2808)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = syslinux
-VER = 3.75
+VER = 3.80
HOST_ARCH = i486
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = daddab10857b73c08d7278da4fdb0781
+$(DL_FILE)_MD5 = b909ea282a408dfb5dd95c5e0fa3d5b5
install : $(TARGET)
Modified: ipcop/branches/template-branch/lfs/usbutils
===================================================================
--- ipcop/branches/template-branch/lfs/usbutils 2009-05-07 07:15:50 UTC (rev
2807)
+++ ipcop/branches/template-branch/lfs/usbutils 2009-05-07 17:26:34 UTC (rev
2808)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = usbutils
-VER = 0.81
+VER = 0.82
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_SFNET)/linux-usb
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ba5e44d49ebf382015e96f43ce982abb
+$(DL_FILE)_MD5 = b5d02041648bcd6e2070fe5c4647b2d0
install : $(TARGET)
@@ -80,13 +80,13 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && ./configure
cd $(DIR_APP) && make && make install
# Compressing the ids file saves ~ 300 KByte
- gzip -f /usr/share/usb.ids
+ gzip -fn9 /usr/share/usb.ids
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/branches/template-branch/src/installer/partition.c
===================================================================
--- ipcop/branches/template-branch/src/installer/partition.c 2009-05-07
07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/src/installer/partition.c 2009-05-07
17:26:34 UTC (rev 2808)
@@ -576,6 +576,14 @@
statuswindow(72, 5, ipcop_gettext("TR_TITLE_DISK"),
ipcop_gettext("TR_BUILDING_INITRD"));
+ // run depmod to have complete modules.* files on target system
+ snprintf(bigstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/depmod -a
%s", utsbuf.release);
+ if (mysystem(bigstring)) {
+ errorbox(ipcop_gettext("TR_UNABLE_TO_BUILD_INITRD"));
+ newtPopWindow();
+ return FAILURE;
+ }
+
//pivot_root for initrd
mkdir("/harddisk/initrd", S_IRWXU | S_IRWXG | S_IRWXO);
Modified: ipcop/branches/template-branch/src/misc-progs/restartntpd.c
===================================================================
--- ipcop/branches/template-branch/src/misc-progs/restartntpd.c 2009-05-07
07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/src/misc-progs/restartntpd.c 2009-05-07
17:26:34 UTC (rev 2808)
@@ -20,7 +20,7 @@
* along with IPCop. If not, see <http://www.gnu.org/licenses/>.
*
* (c) Darren Critchley 2003
- * (c) 2006-2008, the IPCop team
+ * (c) 2006-2009, the IPCop team
*
* $Id$
*
@@ -44,6 +44,7 @@
printf("Usage: %s [OPTION]\n\n", prg);
printf("Options:\n");
printf(" -b, --boot after booting\n");
+ printf(" -f, --force force a quick NTP sync\n");
printf(" -v, --verbose be verbose\n");
printf(" --help display this help and exit\n");
exit(exit_code);
@@ -54,11 +55,13 @@
{
NODEKV *kv = NULL;
int flag_boot = 0;
+ int flag_quick = 0;
int enabled = 0;
static struct option long_options[] =
{
{ "boot", no_argument, 0, 'b' },
+ { "force", no_argument, 0, 'f' },
{ "verbose", no_argument, 0, 'v' },
{ "help", no_argument, 0, 'h' },
{ 0, 0, 0, 0}
@@ -69,11 +72,14 @@
if (!(initsetuid()))
exit(1);
- while ((c = getopt_long(argc, argv, "bv", long_options, &option_index)) !=
-1) {
+ while ((c = getopt_long(argc, argv, "bfv", long_options, &option_index))
!= -1) {
switch (c) {
case 'b': /* booting */
flag_boot = 1;
break;
+ case 'f': /* force quick sync */
+ flag_quick = 1;
+ break;
case 'v': /* verbose */
flag_verbose++;
break;
@@ -120,6 +126,20 @@
}
}
+ /* Synchronise clock now! */
+ if (enabled && (flag_boot || flag_quick)) {
+ /* ntpd -q produces some output which we may want to know about */
+ if (flag_verbose) {
+ verbose_printf(1, "Starting NTPd quick sync ... \n");
+ safe_system("/usr/bin/ntpd -q");
+ }
+ else {
+ if (safe_system("/usr/bin/ntpd -q >/dev/null 2>/dev/null")) {
+ verbose_printf(1, "ntpd -q failed\n");
+ }
+ }
+ }
+
/* Start ntpd if enabled */
if (enabled) {
verbose_printf(1, "Starting NTPd ... \n");
Modified: ipcop/branches/template-branch/src/rc.d/rc.firewall
===================================================================
--- ipcop/branches/template-branch/src/rc.d/rc.firewall 2009-05-07 07:15:50 UTC
(rev 2807)
+++ ipcop/branches/template-branch/src/rc.d/rc.firewall 2009-05-07 17:26:34 UTC
(rev 2808)
@@ -73,7 +73,6 @@
iptables_red() {
/sbin/iptables -F REDINPUT
- /sbin/iptables -F REDFORWARD
/sbin/iptables -t nat -F REDNAT
# PPPoE / PPTP Device
@@ -96,16 +95,6 @@
/sbin/iptables -A REDINPUT -p udp --source-port 67 --destination-port
68 -i $DEVICE -j ACCEPT
fi
- # Orange pinholes
- if [ 0$ORANGE_COUNT -gt 0 ]; then
- # This rule enables a host on ORANGE network to connect to the outside
- # (only if we have a red connection)
- if [ "$IFACE" != "" ]; then
- /sbin/iptables -A REDFORWARD -i $ORANGE_1_DEV -p tcp -o $IFACE -j
ACCEPT
- /sbin/iptables -A REDFORWARD -i $ORANGE_1_DEV -p udp -o $IFACE -j
ACCEPT
- fi
- fi
-
if [ "$IFACE" != "" -a -f /var/ipcop/red/active ]; then
# DHCP
if [ 0$RED_COUNT -gt 0 -a "$RED_1_TYPE" == "DHCP" ]; then
@@ -195,19 +184,13 @@
# RED chain, used for the red interface
/sbin/iptables -N REDINPUT
/sbin/iptables -A INPUT -j REDINPUT
- /sbin/iptables -N REDFORWARD
- /sbin/iptables -A FORWARD -j REDFORWARD
/sbin/iptables -t nat -N REDNAT
/sbin/iptables -t nat -A POSTROUTING -j REDNAT
iptables_red
- # DMZ pinhole chain. setdmzholes setuid prog adds rules here to allow
- # ORANGE to talk to GREEN / BLUE.
+ # FW_DMZHOLES pinhole chain, used for holes from ORANGE/BLUE to BLUE/GREEN
/sbin/iptables -N FW_DMZHOLES
- if [ 0$ORANGE_COUNT -gt 0 ]; then
- /sbin/iptables -A FORWARD -i $ORANGE_1_DEV -m state --state NEW -j
FW_DMZHOLES
- fi
# FW_XTACCESS chain, used for external access
/sbin/iptables -N FW_XTACCESS
Modified: ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl
===================================================================
--- ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl 2009-05-07
07:15:50 UTC (rev 2807)
+++ ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl 2009-05-07
17:26:34 UTC (rev 2808)
@@ -813,19 +813,18 @@
$tmpDestAdr =~ s/\/255.255.255.255//;
foreach my $service (@extPfwServices) {
-
-
- # create DNAT rule string
- $rulebody = " -t nat -A PORTFW -d $extPfwAdr $service
-j DNAT --to $tmpDestAdr";
- my $destService = $services[0];
- my $destPort = '';
- if($service =~ /-p (tcp|udp)/ && $destService =~
/--dport\s+(\d+:\d+|\d+)/) {
- $destPort = $1;
- $destPort =~ s/:/-/;
- $rulebody .= ":$destPort ";
- }
- &prepareRule("$rulebody");
-
+ foreach my $tmpSrcAdr (@srcAdres) {
+ # create DNAT rule string
+ $rulebody = " -t nat -A PORTFW $tmpSrcAdr -d
$extPfwAdr $service -j DNAT --to $tmpDestAdr";
+ my $destService = $services[0];
+ my $destPort = '';
+ if($service =~ /-p (tcp|udp)/ && $destService =~
/--dport\s+(\d+:\d+|\d+)/) {
+ $destPort = $1;
+ $destPort =~ s/:/-/;
+ $rulebody .= ":$destPort ";
+ }
+ &prepareRule("$rulebody");
+ } # foreach my $tmpSrcAdr (@srcAdres)
} # foreach $service (@extPfwServices)
#######
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
