Revision: 2827
http://ipcop.svn.sourceforge.net/ipcop/?rev=2827&view=rev
Author: riddles
Date: 2009-05-10 09:22:23 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Merged /ipcop/trunk:r2817-2826
Modified Paths:
--------------
ipcop/branches/template-branch/config/rootfiles/common/glib
ipcop/branches/template-branch/lfs/glib
ipcop/branches/template-branch/lfs/ipcop
ipcop/branches/template-branch/make.sh
ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl
Added Paths:
-----------
ipcop/branches/template-branch/config/cfgroot/openvpn
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-2816
+ /ipcop/trunk:2760-2826
Copied: ipcop/branches/template-branch/config/cfgroot/openvpn (from rev 2826,
ipcop/trunk/config/cfgroot/openvpn)
===================================================================
--- ipcop/branches/template-branch/config/cfgroot/openvpn
(rev 0)
+++ ipcop/branches/template-branch/config/cfgroot/openvpn 2009-05-10
09:22:23 UTC (rev 2827)
@@ -0,0 +1,5 @@
+DCIPHER=BF-CBC
+DPROTOCOL=udp
+DDEST_PORT=1194
+KEEPALIVE_1=10
+KEEPALIVE_2=60
Property changes on:
ipcop/branches/template-branch/config/rootfiles/arch_i486/mtools
___________________________________________________________________
Deleted: svn:mergeinfo
- /ipcop/trunk/config/rootfiles/arch_i486/mtools:2760-2816
Modified: ipcop/branches/template-branch/config/rootfiles/common/glib
===================================================================
--- ipcop/branches/template-branch/config/rootfiles/common/glib 2009-05-10
08:44:19 UTC (rev 2826)
+++ ipcop/branches/template-branch/config/rootfiles/common/glib 2009-05-10
09:22:23 UTC (rev 2827)
@@ -1,4 +1,5 @@
-## glib2-
+## glib-2.21.0
+##
#usr/bin/glib-genmarshal
#usr/bin/glib-gettextize
#usr/bin/glib-mkenums
@@ -11,6 +12,7 @@
#usr/include/gio-unix-2.0/gio/gunixinputstream.h
#usr/include/gio-unix-2.0/gio/gunixmounts.h
#usr/include/gio-unix-2.0/gio/gunixoutputstream.h
+#usr/include/gio-unix-2.0/gio/gunixsocketaddress.h
#usr/include/glib-2.0
#usr/include/glib-2.0/gio
#usr/include/glib-2.0/gio/gappinfo.h
@@ -36,6 +38,8 @@
#usr/include/glib-2.0/gio/gfilterinputstream.h
#usr/include/glib-2.0/gio/gfilteroutputstream.h
#usr/include/glib-2.0/gio/gicon.h
+#usr/include/glib-2.0/gio/ginetaddress.h
+#usr/include/glib-2.0/gio/ginetsocketaddress.h
#usr/include/glib-2.0/gio/ginputstream.h
#usr/include/glib-2.0/gio/gio.h
#usr/include/glib-2.0/gio/gioenums.h
@@ -50,9 +54,16 @@
#usr/include/glib-2.0/gio/gmount.h
#usr/include/glib-2.0/gio/gmountoperation.h
#usr/include/glib-2.0/gio/gnativevolumemonitor.h
+#usr/include/glib-2.0/gio/gnetworkaddress.h
+#usr/include/glib-2.0/gio/gnetworkservice.h
#usr/include/glib-2.0/gio/goutputstream.h
+#usr/include/glib-2.0/gio/gresolver.h
#usr/include/glib-2.0/gio/gseekable.h
#usr/include/glib-2.0/gio/gsimpleasyncresult.h
+#usr/include/glib-2.0/gio/gsocketaddress.h
+#usr/include/glib-2.0/gio/gsocketaddressenumerator.h
+#usr/include/glib-2.0/gio/gsocketconnectable.h
+#usr/include/glib-2.0/gio/gsrvtarget.h
#usr/include/glib-2.0/gio/gthemedicon.h
#usr/include/glib-2.0/gio/gvfs.h
#usr/include/glib-2.0/gio/gvolume.h
@@ -78,6 +89,7 @@
#usr/include/glib-2.0/glib/gfileutils.h
#usr/include/glib-2.0/glib/ghash.h
#usr/include/glib-2.0/glib/ghook.h
+#usr/include/glib-2.0/glib/ghostutils.h
#usr/include/glib-2.0/glib/gi18n-lib.h
#usr/include/glib-2.0/glib/gi18n.h
#usr/include/glib-2.0/glib/giochannel.h
@@ -147,23 +159,23 @@
#usr/lib/libgio-2.0.la
#usr/lib/libgio-2.0.so
#usr/lib/libgio-2.0.so.0
-#usr/lib/libgio-2.0.so.0.2000.0
+#usr/lib/libgio-2.0.so.0.2100.0
#usr/lib/libglib-2.0.la
usr/lib/libglib-2.0.so
usr/lib/libglib-2.0.so.0
-usr/lib/libglib-2.0.so.0.2000.0
+usr/lib/libglib-2.0.so.0.2100.0
#usr/lib/libgmodule-2.0.la
usr/lib/libgmodule-2.0.so
usr/lib/libgmodule-2.0.so.0
-usr/lib/libgmodule-2.0.so.0.2000.0
+usr/lib/libgmodule-2.0.so.0.2100.0
#usr/lib/libgobject-2.0.la
usr/lib/libgobject-2.0.so
usr/lib/libgobject-2.0.so.0
-usr/lib/libgobject-2.0.so.0.2000.0
+usr/lib/libgobject-2.0.so.0.2100.0
#usr/lib/libgthread-2.0.la
#usr/lib/libgthread-2.0.so
#usr/lib/libgthread-2.0.so.0
-#usr/lib/libgthread-2.0.so.0.2000.0
+#usr/lib/libgthread-2.0.so.0.2100.0
#usr/lib/pkgconfig/gio-2.0.pc
#usr/lib/pkgconfig/gio-unix-2.0.pc
#usr/lib/pkgconfig/glib-2.0.pc
@@ -202,18 +214,26 @@
#usr/share/gtk-doc/html/gio/GFilterOutputStream.html
#usr/share/gtk-doc/html/gio/GIOModule.html
#usr/share/gtk-doc/html/gio/GIcon.html
+#usr/share/gtk-doc/html/gio/GInetAddress.html
+#usr/share/gtk-doc/html/gio/GInetSocketAddress.html
#usr/share/gtk-doc/html/gio/GInputStream.html
#usr/share/gtk-doc/html/gio/GLoadableIcon.html
#usr/share/gtk-doc/html/gio/GMemoryInputStream.html
#usr/share/gtk-doc/html/gio/GMemoryOutputStream.html
#usr/share/gtk-doc/html/gio/GMount.html
#usr/share/gtk-doc/html/gio/GMountOperation.html
+#usr/share/gtk-doc/html/gio/GNetworkAddress.html
+#usr/share/gtk-doc/html/gio/GNetworkService.html
#usr/share/gtk-doc/html/gio/GOutputStream.html
+#usr/share/gtk-doc/html/gio/GResolver.html
#usr/share/gtk-doc/html/gio/GSeekable.html
#usr/share/gtk-doc/html/gio/GSimpleAsyncResult.html
+#usr/share/gtk-doc/html/gio/GSocketAddress.html
+#usr/share/gtk-doc/html/gio/GSocketConnectable.html
#usr/share/gtk-doc/html/gio/GThemedIcon.html
#usr/share/gtk-doc/html/gio/GUnixInputStream.html
#usr/share/gtk-doc/html/gio/GUnixOutputStream.html
+#usr/share/gtk-doc/html/gio/GUnixSocketAddress.html
#usr/share/gtk-doc/html/gio/GVfs.html
#usr/share/gtk-doc/html/gio/GVolume.html
#usr/share/gtk-doc/html/gio/GVolumeMonitor.html
@@ -223,8 +243,9 @@
#usr/share/gtk-doc/html/gio/ch03.html
#usr/share/gtk-doc/html/gio/ch14.html
#usr/share/gtk-doc/html/gio/ch15.html
-#usr/share/gtk-doc/html/gio/ch15s02.html
-#usr/share/gtk-doc/html/gio/ch15s03.html
+#usr/share/gtk-doc/html/gio/ch16.html
+#usr/share/gtk-doc/html/gio/ch16s02.html
+#usr/share/gtk-doc/html/gio/ch16s03.html
#usr/share/gtk-doc/html/gio/extending-gio.html
#usr/share/gtk-doc/html/gio/extending.html
#usr/share/gtk-doc/html/gio/file_mon.html
@@ -235,6 +256,7 @@
#usr/share/gtk-doc/html/gio/gio-GFileAttribute.html
#usr/share/gtk-doc/html/gio/gio-GIOError.html
#usr/share/gtk-doc/html/gio/gio-GIOScheduler.html
+#usr/share/gtk-doc/html/gio/gio-GSrvTarget.html
#usr/share/gtk-doc/html/gio/gio-Unix-Mounts.html
#usr/share/gtk-doc/html/gio/gio-hierarchy.html
#usr/share/gtk-doc/html/gio/gio.devhelp
@@ -249,6 +271,7 @@
#usr/share/gtk-doc/html/gio/ix03.html
#usr/share/gtk-doc/html/gio/left.png
#usr/share/gtk-doc/html/gio/migrating.html
+#usr/share/gtk-doc/html/gio/networking.html
#usr/share/gtk-doc/html/gio/pt01.html
#usr/share/gtk-doc/html/gio/pt02.html
#usr/share/gtk-doc/html/gio/right.png
@@ -284,6 +307,7 @@
#usr/share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
#usr/share/gtk-doc/html/glib/glib-Hash-Tables.html
#usr/share/gtk-doc/html/glib/glib-Hook-Functions.html
+#usr/share/gtk-doc/html/glib/glib-Hostname-Utilities.html
#usr/share/gtk-doc/html/glib/glib-I18N.html
#usr/share/gtk-doc/html/glib/glib-IO-Channels.html
#usr/share/gtk-doc/html/glib/glib-Key-value-file-parser.html
Modified: ipcop/branches/template-branch/lfs/glib
===================================================================
--- ipcop/branches/template-branch/lfs/glib 2009-05-10 08:44:19 UTC (rev
2826)
+++ ipcop/branches/template-branch/lfs/glib 2009-05-10 09:22:23 UTC (rev
2827)
@@ -33,13 +33,13 @@
include Config
PKG_NAME = glib
-VER = 2.20.0
+VER = 2.21.0
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(PKG_NAME)-$(VER).tar.bz2
-DL_FROM = http://ftp.gnome.org/pub/gnome/sources/glib/2.20
+DL_FROM = http://ftp.gnome.org/pub/gnome/sources/glib/2.21
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -54,7 +54,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 =
05188e560dbd8bddd568e24ce10dd003
+$(DL_FILE)_MD5 =
c16fa4b14816c83eaccca87528895481
install : $(TARGET)
Modified: ipcop/branches/template-branch/lfs/ipcop
===================================================================
--- ipcop/branches/template-branch/lfs/ipcop 2009-05-10 08:44:19 UTC (rev
2826)
+++ ipcop/branches/template-branch/lfs/ipcop 2009-05-10 09:22:23 UTC (rev
2827)
@@ -75,11 +75,10 @@
firewall/addressGroups firewall/config
firewall/custominterfaces firewall/customnetworks \
firewall/customservices firewall/policy firewall/serviceGroups
firewall/settings firewall/wireless \
isdn/settings main/hosts main/flashsettings main/scheduler
patches/available patches/installed \
- ovpn/caconfig ovpn/ovpnconfig ovpn/settings \
- ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
- ppp/settings-5 ppp/settings proxy/settings remote/settings
shaping/settings \
- shaping/config traffic/settings vpn/config vpn/settings
vpn/ipsec.conf \
- vpn/ipsec.secrets vpn/caconfig; do \
+ ovpn/caconfig ovpn/ovpnconfig \
+ ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4
ppp/settings-5 ppp/settings \
+ proxy/settings remote/settings shaping/settings shaping/config
traffic/settings \
+ vpn/config vpn/settings vpn/ipsec.conf vpn/ipsec.secrets
vpn/caconfig; do \
touch $(CONFIG_ROOT)/$$i; \
done
# Touch empty timeframe log for firewall rules
Modified: ipcop/branches/template-branch/make.sh
===================================================================
--- ipcop/branches/template-branch/make.sh 2009-05-10 08:44:19 UTC (rev
2826)
+++ ipcop/branches/template-branch/make.sh 2009-05-10 09:22:23 UTC (rev
2827)
@@ -1013,8 +1013,8 @@
${MKDIR} ${BASEDIR}/test_${MACHINE}/${BUILDDATE}
fi
- if [ x"${DISTCC_HOSTS}" == x"yes" -a ! -z "${DISTCC_HOSTS}" ]; then
- ${MKDIR} ${BASEDIR}/distcc
+ if [ x"${USE_DISTCC}" == x"yes" -a ! -z "${DISTCC_HOSTS}" ]; then
+ ${MKDIR} ${DISTCC_DIR}
${SUDO} ${MKDIR} ${LFS}/usr/src/distcc
fi
@@ -1061,9 +1061,9 @@
#################################################################################
# Write the distcc hosts only if we're using distcc and we've specified
the hosts
#################################################################################
- if [ x"${DISTCC_HOSTS}" == x"yes" -a ! -z "${DISTCC_HOSTS}" ]; then
+ if [ x"${USE_DISTCC}" == x"yes" -a ! -z "${DISTCC_HOSTS}" ]; then
echo "${DISTCC_HOSTS}" > ${DISTCC_DIR}/hosts
- ${SUDO} ${BIND} ${BASEDIR}/distcc
${LFS}/usr/src/distcc
+ ${SUDO} ${BIND} ${DISTCC_DIR}
${LFS}/usr/src/distcc
fi
echo -n "Running compilation tests : "
@@ -1617,7 +1617,7 @@
fi
# make distcc first so that CCACHE_PREFIX works immediately
- if [ x"${DISTCC_HOSTS}" == x"yes" -a ! -z "${DISTCC_HOSTS}" ]; then
+ if [ x"${USE_DISTCC}" == x"yes" -a ! -z "${DISTCC_HOSTS}" ]; then
toolchain_make distcc
fi
Modified: ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl
===================================================================
--- ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl 2009-05-10
08:44:19 UTC (rev 2826)
+++ ipcop/branches/template-branch/src/scripts/puzzleFwRules.pl 2009-05-10
09:22:23 UTC (rev 2827)
@@ -45,7 +45,7 @@
# 0 - create rules, no print
# 1 - create rules, print
# 2 - only print rules
-my $debugLevel = 1;
+my $debugLevel = 0;
#&General::log("BlockOutTraffic: Renew rules");
# Debug
@@ -80,8 +80,17 @@
&General::readhash($FW::timeframeLogfile, \%timeframeSettings) if (-e
$FW::timeframeLogfile);
-# Check if the iptables rules need an update because of timeframe settings
-if (defined($ARGV[0]) && $ARGV[0] eq '-c') {
+
+if ($#ARGV == -1) {
+ # call without arguments (maybe testing on commandline), run all types
+ @runRuleTypes = @allRuleTypes;
+}
+
+while (@ARGV) {
+my $argument = shift;
+
+if ($argument eq '-c') {
+ # Check if the iptables rules need an update because of timeframe settings
foreach my $type (@allRuleTypes) {
print "Should we re-create the $type rules?\n" if ($debugLevel > 0);
my $noUpdate = 0;
@@ -119,10 +128,10 @@
}
}
}
-elsif (defined($ARGV[0]) && $ARGV[0] eq '-f' && defined($ARGV[1])) {
+elsif (($argument eq '-f') && ($#ARGV >= 0)) {
# force update of one rule type
- my $type = $ARGV[1];
+ my $type = shift;
push(@runRuleTypes, grep(/^$type$/, @allRuleTypes));
@@ -131,7 +140,7 @@
&General::log("Force update of '$type' rules");
}
}
-elsif (defined($ARGV[0]) && $ARGV[0] eq '-a') {
+elsif ($argument eq '-a') {
# force update of all (user & IPCop services) rules
@runRuleTypes = @allRuleTypes;
@@ -143,7 +152,7 @@
&General::log("Force update of all rules");
}
}
-elsif (defined($ARGV[0]) && $ARGV[0] eq '-u') {
+elsif ($argument eq '-u') {
# force update of user rules
@runRuleTypes = @allRuleTypes;
@@ -153,7 +162,7 @@
&General::log("Force update of user rules");
}
}
-elsif (defined($ARGV[0]) && $ARGV[0] eq '-i') {
+elsif ($argument eq '-i') {
$doUpdateIpcopRules = 1;
@@ -162,7 +171,7 @@
&General::log("Force update of services rules");
}
}
-elsif (defined($ARGV[0]) && $ARGV[0] eq '-w') {
+elsif ($argument eq '-w') {
$doUpdateWirelessRules = 1;
@@ -171,7 +180,10 @@
&General::log("Force update of BLUE access rules");
}
}
-elsif (defined($ARGV[0])) {
+elsif ($argument eq '-d') {
+ $debugLevel++;
+}
+else {
# If we are here, a parameter was given to us that we do not know about.
@@ -179,11 +191,9 @@
# rm -rf /
# something else ?
}
-else {
+} # while (@ARGV)
- # call without arguments (maybe testing on commandline), run all types
- @runRuleTypes = @allRuleTypes;
-}
+
print "\n--> count: $#runRuleTypes \n\n" if ($debugLevel > 0);
if ($#runRuleTypes < 0 && $doUpdateIpcopRules == 0 && $doUpdateWirelessRules
== 0) {
if ($debugLevel > 0) {
@@ -929,6 +939,11 @@
my %ovpnSettings = ();
if (-e "/var/ipcop/ovpn/settings") {
&General::readhash("/var/ipcop/ovpn/settings", \%ovpnSettings);
+
+ # Avoid some "Use of initialized value in string eq at line xxx"
messages
+ $ovpnSettings{'ENABLED_RED_1'} = 'off' if
(!defined($ovpnSettings{'ENABLED_RED_1'}));
+ $ovpnSettings{'ENABLED_BLUE_1'} = 'off' if
(!defined($ovpnSettings{'ENABLED_BLUE_1'}));
+ $ovpnSettings{'ENABLED_ORANGE_1'} = 'off' if
(!defined($ovpnSettings{'ENABLED_ORANGE_1'}));
}
# Deny only those traffic which is open in vanila IPCop.
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
