IPFire-SCM September 2010

ipfire-scm@lists.ipfire.org

1 participants
43 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4527e3eb7dce9104cffa99fb4c67dce0368a39a2
by git＠ipfire.org 10 Sep '10

10 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 4527e3eb7dce9104cffa99fb4c67dce0368a39a2 (commit) via b7515822bda83729a79acf3693179d048d21ad95 (commit) from 88d701e278ae3aa9fa4d101d192628056380bad7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4527e3eb7dce9104cffa99fb4c67dce0368a39a2 Merge: b751582 88d701e Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Fri Sep 10 21:46:18 2010 +0200 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit b7515822bda83729a79acf3693179d048d21ad95 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Fri Sep 10 21:45:40 2010 +0200 Added openvpn pam.so. d ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openvpn | 1 + lfs/openvpn | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 47b42f9..23742b3 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -1,3 +1,4 @@ +lib/openvpn-auth-pam.so usr/sbin/openvpn #usr/share/doc/openvpn #usr/share/man/man8/openvpn.8 diff --git a/lfs/openvpn b/lfs/openvpn index 8c8ad71..792de60 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -75,6 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire + cd $(DIR_APP)/plugin/auth-pam && make + cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/ -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/crls touch /var/ipfire/ovpn/ovpn-leases.db hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 88d701e278ae3aa9fa4d101d192628056380bad7
by git＠ipfire.org 09 Sep '10

09 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 88d701e278ae3aa9fa4d101d192628056380bad7 (commit) from 2ab07f7ef331663a44757e82d6d16c325da6e092 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88d701e278ae3aa9fa4d101d192628056380bad7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 9 21:04:18 2010 +0200 Fix type /etc/init.d/ntp (booot). ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/ntp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp index ef94de1..92f174d 100644 --- a/src/initscripts/init.d/ntp +++ b/src/initscripts/init.d/ntp @@ -9,7 +9,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings) case "$1" in start) if [ "$ENABLESETONBOOT" == "on" ]; then - boot_mesg "Setting time on booot..." + boot_mesg "Setting time on boot..." loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf) fi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core40, updated. e8ec0259aa1d5bc9159461bce95c2104833a2617
by git＠ipfire.org 07 Sep '10

07 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core40 has been updated via e8ec0259aa1d5bc9159461bce95c2104833a2617 (commit) from 7f5b009ad57926e217df66988513a81f05fb539b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e8ec0259aa1d5bc9159461bce95c2104833a2617 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 7 19:09:38 2010 +0200 Don't overwrite snort.conf at core40 update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/40/exclude | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/40/exclude b/config/rootfiles/core/40/exclude index 086e445..3ec221e 100644 --- a/config/rootfiles/core/40/exclude +++ b/config/rootfiles/core/40/exclude @@ -2,3 +2,4 @@ etc/ipsec.conf etc/ipsec.secrets etc/ipsec.user.conf etc/ipsec.user.secrets +etc/snort/snort.conf hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2ab07f7ef331663a44757e82d6d16c325da6e092
by git＠ipfire.org 06 Sep '10

06 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 2ab07f7ef331663a44757e82d6d16c325da6e092 (commit) via 7f5b009ad57926e217df66988513a81f05fb539b (commit) via 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd (commit) via aa8245cbd54e3ba68903580381de4d60816606c5 (commit) via bdc84c9f9221a31d11e364bdf28013ffc30d31a6 (commit) via 51dcdbc3b94ea73fddd77c73f1a54dded06db7c0 (commit) via f2d2ce590242a64baff8343c6707944fef4dd7bb (commit) via 4262c16b36f8d13a80cddff9b4c49a6bf0ab153f (commit) from d003cffe573eb68ca3a82de35605e75f84023636 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2ab07f7ef331663a44757e82d6d16c325da6e092 Merge: d003cff 7f5b009 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 6 22:37:13 2010 +0200 Merge branch 'core40' ----------------------------------------------------------------------- Summary of changes: config/etc/fstab | 2 +- config/rootfiles/core/40/update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index c0f98b3..4860d6f 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -10,5 +10,5 @@ sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 #none /tmp tmpfs defaults 0 0 none /var/log/rrd tmpfs defaults,size=64M 0 0 -none /var/lock tmpfs defaults,size=2M 0 0 +none /var/lock tmpfs defaults,size=8M 0 0 none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 88c067d..fa420c1 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -45,7 +45,7 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Change var lock size to 8MB grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp mv /tmp/fstab.tmp /etc/fstab -echo non /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab +echo none /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab #Rebuild module dep's hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core40, updated. 7f5b009ad57926e217df66988513a81f05fb539b
by git＠ipfire.org 06 Sep '10

06 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core40 has been updated via 7f5b009ad57926e217df66988513a81f05fb539b (commit) from 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f5b009ad57926e217df66988513a81f05fb539b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 6 22:35:44 2010 +0200 Increased /var/lock to 8MB. Fix typo at core uptater. ----------------------------------------------------------------------- Summary of changes: config/etc/fstab | 2 +- config/rootfiles/core/40/update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index c0f98b3..4860d6f 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -10,5 +10,5 @@ sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts gid=4,mode=620 0 0 #none /tmp tmpfs defaults 0 0 none /var/log/rrd tmpfs defaults,size=64M 0 0 -none /var/lock tmpfs defaults,size=2M 0 0 +none /var/lock tmpfs defaults,size=8M 0 0 none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh index 88c067d..fa420c1 100644 --- a/config/rootfiles/core/40/update.sh +++ b/config/rootfiles/core/40/update.sh @@ -45,7 +45,7 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Change var lock size to 8MB grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp mv /tmp/fstab.tmp /etc/fstab -echo non /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab +echo none /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab #Rebuild module dep's hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 925038e35d5f8a5f9dd5874deb22184d6d56fe1e
by git＠ipfire.org 06 Sep '10

06 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 925038e35d5f8a5f9dd5874deb22184d6d56fe1e (commit) via 0108e6eeebe3a89455792f2faa93b90e3fab370c (commit) from d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 925038e35d5f8a5f9dd5874deb22184d6d56fe1e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 7 00:11:19 2010 +0200 Updater: Fix grub entry if root has no UUID. commit 0108e6eeebe3a89455792f2faa93b90e3fab370c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 6 23:55:17 2010 +0200 Updated compat-wireless (2.6.36-rc3-1). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/test/update.sh | 6 +++++- doc/packages-list.txt | 4 ++-- lfs/compat-wireless | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index a531e91..e4fef10 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -140,7 +140,11 @@ fi # echo echo Update grub configuration ... -sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +fi sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 74e427d..c0bfddb 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -67,8 +67,8 @@ * clamav-0.96.2 * cmake-2.4.8 * collectd-4.9.1 -* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire -* compat-wireless-2.6.35-1-kmod-2.6.32.21-ipfire-xen +* compat-wireless-2.6.36-rc3-1-kmod-2.6.32.21-ipfire +* compat-wireless-2.6.36-rc3-1-kmod-2.6.32.21-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpufrequtils-007 diff --git a/lfs/compat-wireless b/lfs/compat-wireless index f793098..3b08dda 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.35-1 +VER = 2.6.36-rc3-1 THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505 +$(DL_FILE)_MD5 = c800a7d8063adc420dc6756ca92275e4 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e
by git＠ipfire.org 06 Sep '10

06 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e (commit) via d003cffe573eb68ca3a82de35605e75f84023636 (commit) via 70248550e242e15d9668d4af42bbb03e438e744a (commit) from bd8618f6aa2a3e251d29732c7871243c17e8bdcf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e Merge: bd8618f d003cff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 6 21:50:49 2010 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 8 ++++---- html/cgi-bin/outgoingfw.cgi | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index e2f9093..8d4d27d 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -153,12 +153,12 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } elsif ($configline[2] eq 'all') { - @SOURCE = ("0/0"); - $DEV = ""; } elsif ($configline[2] eq 'mac') { @SOURCE = ("$configline[6]"); $DEV = ""; + } elsif ($configline[2] eq 'all') { + @SOURCE = ("0/0"); + $DEV = ""; } else { if ( -e "/var/ipfire/outgoing/groups/ipgroups/$configline[2]" ) { @SOURCE = `cat /var/ipfire/outgoing/groups/ipgroups/$configline[2]`; @@ -189,7 +189,7 @@ foreach $configentry (sort @configs) if ( $SOURCE eq "" ){next;} - if ( $configline[6] ne "" || $configline[2] eq 'mac' ){ + if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; } else { diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 07fcb39..27a8927 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -310,6 +310,11 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'}) if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'}) { if ( $outfwsettings{'VALID'} eq 'yes' ) { + + if ( $outfwsettings{'SNET'} eq "all" ) { + $outfwsettings{'SIP'} =""; + $outfwsettings{'SMAC'}=""; + } open( FILE, ">> $configfile" ) or die "Unable to write $configfile"; print FILE <<END $outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON'};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$outfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'}; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core40, updated. 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd
by git＠ipfire.org 06 Sep '10

06 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core40 has been updated via 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd (commit) via aa8245cbd54e3ba68903580381de4d60816606c5 (commit) from bdc84c9f9221a31d11e364bdf28013ffc30d31a6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7e5a976c9de73e5af2a29ec6bfae5d084f511fcd Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Sep 6 08:46:59 2010 +0200 Remove SIP und SMAC if SNET is set to all, this avoids some false rules. commit aa8245cbd54e3ba68903580381de4d60816606c5 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Sun Sep 5 17:18:43 2010 +0200 Be a little more robust. ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 8 ++++---- html/cgi-bin/outgoingfw.cgi | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index e2f9093..8d4d27d 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -153,12 +153,12 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } elsif ($configline[2] eq 'all') { - @SOURCE = ("0/0"); - $DEV = ""; } elsif ($configline[2] eq 'mac') { @SOURCE = ("$configline[6]"); $DEV = ""; + } elsif ($configline[2] eq 'all') { + @SOURCE = ("0/0"); + $DEV = ""; } else { if ( -e "/var/ipfire/outgoing/groups/ipgroups/$configline[2]" ) { @SOURCE = `cat /var/ipfire/outgoing/groups/ipgroups/$configline[2]`; @@ -189,7 +189,7 @@ foreach $configentry (sort @configs) if ( $SOURCE eq "" ){next;} - if ( $configline[6] ne "" || $configline[2] eq 'mac' ){ + if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; } else { diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 07fcb39..27a8927 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -310,6 +310,11 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'}) if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'}) { if ( $outfwsettings{'VALID'} eq 'yes' ) { + + if ( $outfwsettings{'SNET'} eq "all" ) { + $outfwsettings{'SIP'} =""; + $outfwsettings{'SMAC'}=""; + } open( FILE, ">> $configfile" ) or die "Unable to write $configfile"; print FILE <<END $outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON'};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$outfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'}; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d003cffe573eb68ca3a82de35605e75f84023636
by git＠ipfire.org 06 Sep '10

06 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via d003cffe573eb68ca3a82de35605e75f84023636 (commit) from 70248550e242e15d9668d4af42bbb03e438e744a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d003cffe573eb68ca3a82de35605e75f84023636 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Sep 6 08:46:59 2010 +0200 Remove SIP und SMAC if SNET is set to all, this avoids some false rules. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/outgoingfw.cgi | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) Difference in files: diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 07fcb39..27a8927 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -310,6 +310,11 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'}) if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'}) { if ( $outfwsettings{'VALID'} eq 'yes' ) { + + if ( $outfwsettings{'SNET'} eq "all" ) { + $outfwsettings{'SIP'} =""; + $outfwsettings{'SMAC'}=""; + } open( FILE, ">> $configfile" ) or die "Unable to write $configfile"; print FILE <<END $outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON'};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$outfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'}; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 70248550e242e15d9668d4af42bbb03e438e744a
by git＠ipfire.org 05 Sep '10

05 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 70248550e242e15d9668d4af42bbb03e438e744a (commit) from d482af1005aa3ed1b81d85798229866459f3f9d0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 70248550e242e15d9668d4af42bbb03e438e744a Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Sun Sep 5 17:18:43 2010 +0200 Be a little more robust. ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index e2f9093..8d4d27d 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -153,12 +153,12 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } elsif ($configline[2] eq 'all') { - @SOURCE = ("0/0"); - $DEV = ""; } elsif ($configline[2] eq 'mac') { @SOURCE = ("$configline[6]"); $DEV = ""; + } elsif ($configline[2] eq 'all') { + @SOURCE = ("0/0"); + $DEV = ""; } else { if ( -e "/var/ipfire/outgoing/groups/ipgroups/$configline[2]" ) { @SOURCE = `cat /var/ipfire/outgoing/groups/ipgroups/$configline[2]`; @@ -189,7 +189,7 @@ foreach $configentry (sort @configs) if ( $SOURCE eq "" ){next;} - if ( $configline[6] ne "" || $configline[2] eq 'mac' ){ + if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; } else { hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2010