IPFire-SCM November 2010

ipfire-scm@lists.ipfire.org

1 participants
58 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 228455b361f5750c6700935949029dc51c5e5c3e
by git＠ipfire.org 16 Nov '10

16 Nov '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 228455b361f5750c6700935949029dc51c5e5c3e (commit) from 95d2e1da15dbc99c79fbd34921929fa4ad88c4fe (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 228455b361f5750c6700935949029dc51c5e5c3e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 16 23:04:02 2010 +0100 Start core43. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{38 => 43}/exclude | 0 config/rootfiles/core/43/filelists/files | 1 + config/rootfiles/core/{38 => 43}/meta | 0 config/rootfiles/core/{42 => 43}/update.sh | 0 make.sh | 2 +- 5 files changed, 2 insertions(+), 1 deletions(-) copy config/rootfiles/core/{38 => 43}/exclude (100%) create mode 100644 config/rootfiles/core/43/filelists/files copy config/rootfiles/core/{38 => 43}/meta (100%) copy config/rootfiles/core/{42 => 43}/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/43/exclude b/config/rootfiles/core/43/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/43/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/43/meta b/config/rootfiles/core/43/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/43/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/43/update.sh b/config/rootfiles/core/43/update.sh new file mode 100644 index 0000000..6b54995 --- /dev/null +++ b/config/rootfiles/core/43/update.sh @@ -0,0 +1,48 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.15-ipfire +#depmod 2.6.32.15-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index b8035b6..331479d 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.7" # Version number -CORE="42" # Core Level (Filename) +CORE="43" # Core Level (Filename) PAKFIRE_CORE="42" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a891f3da005dd62fc73e66a13933b76f864cc783
by git＠ipfire.org 16 Nov '10

16 Nov '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 a891f3da005dd62fc73e66a13933b76f864cc783 (commit) via 6a0fb93fdbc94d823a1291d627a4f2ab263058ae (commit) via 08d5192eb1ac55711e9c880096f024d1515bd08b (commit) via 95d2e1da15dbc99c79fbd34921929fa4ad88c4fe (commit) via 1c5719bf847f818e972ea7e47547ac5dfbcf774d (commit) via 99fcb81b45545073b1a8dea005bc8852fffb18ce (commit) via 3d2477d7c76e2f0d798440ac1007c1cab10a1fc0 (commit) via 3640afefc73c6c765395d85e2ca9abb59a8b2237 (commit) from 508b73104f689672260d4f464325c3dc35a32945 (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 a891f3da005dd62fc73e66a13933b76f864cc783 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 17 00:53:38 2010 +0100 Set next for development build string. commit 6a0fb93fdbc94d823a1291d627a4f2ab263058ae Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 17 00:53:06 2010 +0100 Updated compat-wireless (2.6.36-5). commit 08d5192eb1ac55711e9c880096f024d1515bd08b Merge: 508b731 95d2e1d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 17 00:51:39 2010 +0100 Merge commit 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/42/filelists/files | 2 ++ .../{oldcore/36 => core/42}/filelists/openssh | 0 .../{oldcore/28 => core/42}/filelists/openssl | 0 html/cgi-bin/ids.cgi | 2 +- lfs/compat-wireless | 4 ++-- lfs/openssh | 4 ++-- lfs/openssl | 4 ++-- make.sh | 6 +++--- 8 files changed, 12 insertions(+), 10 deletions(-) copy config/rootfiles/{oldcore/36 => core/42}/filelists/openssh (100%) copy config/rootfiles/{oldcore/28 => core/42}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files index 0037af1..ef6c2e7 100644 --- a/config/rootfiles/core/42/filelists/files +++ b/config/rootfiles/core/42/filelists/files @@ -1 +1,3 @@ etc/system-release +srv/web/ipfire/html/images/urlfilter/copy.gif +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/config/rootfiles/core/42/filelists/openssh b/config/rootfiles/core/42/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/42/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/42/filelists/openssl b/config/rootfiles/core/42/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/42/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 1b70ca6..62e6c70 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -271,7 +271,7 @@ if ($snortsettings{'RULES'} eq 'subscripted') { $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861.tar.gz/$snortsettin…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { - $url="http://www.emergingthreats.net/rules/emerging.rules.tar.gz"; + $url="http://rules.emergingthreats.net/open/snort-2.8.6/emerging.rules.tar.gz"; } if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 44a2dcc..79d8dfe 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -34,7 +34,7 @@ else endif endif -VER = 2.6.35-1 +VER = 2.6.36-5-spn THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505 +$(DL_FILE)_MD5 = 095d00646a44100ba979e8f13746ed86 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index ffcf476..c9ce714 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 5.4p1 +VER = 5.6p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e +$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0 install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index 5c8b413..38e2b38 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 63ddc5116488985e820075e65fbe6aa4 +$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39 install : $(TARGET) diff --git a/make.sh b/make.sh index 4bec05b..110d926 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.8test" # Version number -CORE="42" # Core Level (Filename) -PAKFIRE_CORE="41" # Core Level (PAKFIRE) +CORE="43" # Core Level (Filename) +PAKFIRE_CORE="42" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -690,7 +690,7 @@ buildipfire() { echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "master" ]; then + if [ "$GIT_BRANCH" = "next" ]; then echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release else echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 95d2e1da15dbc99c79fbd34921929fa4ad88c4fe
by git＠ipfire.org 16 Nov '10

16 Nov '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 95d2e1da15dbc99c79fbd34921929fa4ad88c4fe (commit) via 1c5719bf847f818e972ea7e47547ac5dfbcf774d (commit) via 99fcb81b45545073b1a8dea005bc8852fffb18ce (commit) from 3d2477d7c76e2f0d798440ac1007c1cab10a1fc0 (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 95d2e1da15dbc99c79fbd34921929fa4ad88c4fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 16 22:45:36 2010 +0100 Finished core42. commit 1c5719bf847f818e972ea7e47547ac5dfbcf774d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 16 22:44:22 2010 +0100 Add changes to core43 updater. commit 99fcb81b45545073b1a8dea005bc8852fffb18ce Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 16 22:42:59 2010 +0100 Updated openssh (5.6p1). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/42/filelists/files | 2 ++ config/rootfiles/core/{38 => 42}/filelists/openssh | 0 config/rootfiles/core/{38 => 42}/filelists/openssl | 0 lfs/openssh | 4 ++-- make.sh | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) copy config/rootfiles/core/{38 => 42}/filelists/openssh (100%) copy config/rootfiles/core/{38 => 42}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files index 0037af1..ef6c2e7 100644 --- a/config/rootfiles/core/42/filelists/files +++ b/config/rootfiles/core/42/filelists/files @@ -1 +1,3 @@ etc/system-release +srv/web/ipfire/html/images/urlfilter/copy.gif +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/config/rootfiles/core/42/filelists/openssh b/config/rootfiles/core/42/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/42/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/42/filelists/openssl b/config/rootfiles/core/42/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/42/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssh b/lfs/openssh index ffcf476..c9ce714 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 5.4p1 +VER = 5.6p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e +$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0 install : $(TARGET) diff --git a/make.sh b/make.sh index 03cf937..b8035b6 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.7" # Version number CORE="42" # Core Level (Filename) -PAKFIRE_CORE="41" # Core Level (PAKFIRE) +PAKFIRE_CORE="42" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3d2477d7c76e2f0d798440ac1007c1cab10a1fc0
by git＠ipfire.org 16 Nov '10

16 Nov '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 3d2477d7c76e2f0d798440ac1007c1cab10a1fc0 (commit) via 3640afefc73c6c765395d85e2ca9abb59a8b2237 (commit) from 7107b3042cc5aad129ddaddc01b7975e5717334e (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 3d2477d7c76e2f0d798440ac1007c1cab10a1fc0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 16 22:26:36 2010 +0100 Updated openssl (0.9.8p). commit 3640afefc73c6c765395d85e2ca9abb59a8b2237 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 16 22:25:26 2010 +0100 Fix emergingthreats rules download. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ids.cgi | 2 +- lfs/openssl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 1b70ca6..62e6c70 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -271,7 +271,7 @@ if ($snortsettings{'RULES'} eq 'subscripted') { $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2861.tar.gz/$snortsettin…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { - $url="http://www.emergingthreats.net/rules/emerging.rules.tar.gz"; + $url="http://rules.emergingthreats.net/open/snort-2.8.6/emerging.rules.tar.gz"; } if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) diff --git a/lfs/openssl b/lfs/openssl index 5c8b413..38e2b38 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 63ddc5116488985e820075e65fbe6aa4 +$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39 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. 508b73104f689672260d4f464325c3dc35a32945
by git＠ipfire.org 15 Nov '10

15 Nov '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 508b73104f689672260d4f464325c3dc35a32945 (commit) via f09a0af571c03ef5222e0587e940a6df3926da07 (commit) via e897bfebe73bb147056f93d120daabe5c09af95d (commit) via 45762fc662cd8e869af561d6856a909a7dfe6082 (commit) from 126246a8caba9de88c85603dda188fbb35cfc917 (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 508b73104f689672260d4f464325c3dc35a32945 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 15 21:44:09 2010 +0100 Add changes to updater. commit f09a0af571c03ef5222e0587e940a6df3926da07 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 15 19:39:48 2010 +0100 proxy.cgi: write networks in cidr notation. commit e897bfebe73bb147056f93d120daabe5c09af95d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 15 19:37:59 2010 +0100 ipsec: write networks in ipsec.conf in cidr notation. commit 45762fc662cd8e869af561d6856a909a7dfe6082 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 15 19:35:22 2010 +0100 general-functions: add function to convert ip/mask to ip/cidr. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 7 +++++ config/rootfiles/core/test/filelists/files | 1 + html/cgi-bin/proxy.cgi | 34 ++++++++++++++++----------- html/cgi-bin/vpnmain.cgi | 23 ++++++++++++++---- 4 files changed, 46 insertions(+), 19 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 84aa8aa..cd4bfd5 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -18,6 +18,7 @@ use strict; use Socket; use IO::Socket; use Net::SSLeay; +use Net::IPv4Addr; $|=1; # line buffering @@ -407,6 +408,12 @@ sub NextIP ); } +sub ipcidr +{ + my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift); + return "$ip\/$cidr"; +} + sub validemail { my $mail = shift; return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\(a)[0-9a-zA-Z\.\-]+$/ ); diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files index 5e17384..369dd01 100644 --- a/config/rootfiles/core/test/filelists/files +++ b/config/rootfiles/core/test/filelists/files @@ -5,5 +5,6 @@ srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/speed.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/images/urlfilter/copy.gif +var/ipfire/general-functions.pl usr/local/bin/rebuild-initrd usr/bin/ldd diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index aaaec87..55d7ec9 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -180,6 +180,12 @@ close(FILE); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); +my $green_cidr = &General::ipcidr("$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}"); +my $blue_cidr = "# Blue not defined"; +if ($netsettings{'BLUE_DEV'}) { + $blue_cidr = &General::ipcidr("$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}"); +} + &Header::showhttpheaders(); $proxysettings{'ACTION'} = ''; @@ -1193,10 +1199,10 @@ END if (!$proxysettings{'SRC_SUBNETS'}) { - print "$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}\n"; + print "$green_cidr\n"; if ($netsettings{'BLUE_DEV'}) { - print "$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}\n"; + print "$blue_cidr\n"; } } else { print $proxysettings{'SRC_SUBNETS'}; } @@ -1785,9 +1791,9 @@ print <<END END ; if (!$proxysettings{'IDENT_HOSTS'}) { - print "$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}\n"; + print "$green_cidr\n"; if ($netsettings{'BLUE_DEV'}) { - print "$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}\n"; + print "$blue_cidr\n"; } } else { print $proxysettings{'IDENT_HOSTS'}; @@ -2692,10 +2698,10 @@ sub write_acls flock(FILE, 2); if (!$proxysettings{'SRC_SUBNETS'}) { - print FILE "$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}\n"; + print FILE "$green_cidr\n"; if ($netsettings{'BLUE_DEV'}) { - print FILE "$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}\n"; + print FILE "$blue_cidr\n"; } } else { print FILE $proxysettings{'SRC_SUBNETS'}; } close(FILE); @@ -3319,8 +3325,8 @@ END } print FILE <<END -acl all src all -acl localhost src 127.0.0.1/255.255.255.255 +#acl all src all +acl localhost src 127.0.0.1/32 END ; open (PORTS,"$acl_ports_ssl"); @@ -3344,12 +3350,12 @@ acl IPFire_https port $https_port acl IPFire_ips dst $netsettings{'GREEN_ADDRESS'} acl IPFire_networks src "$acl_src_subnets" acl IPFire_servers dst "$acl_src_subnets" -acl IPFire_green_network src $netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'} -acl IPFire_green_servers dst $netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'} +acl IPFire_green_network src $green_cidr +acl IPFire_green_servers dst $green_cidr END ; - if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_network src $netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}\n"; } - if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_servers dst $netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}\n"; } + if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_network src $blue_cidr\n"; } + if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_servers dst $blue_cidr\n"; } if (!-z $acl_src_banned_ip) { print FILE "acl IPFire_banned_ips src \"$acl_src_banned_ip\"\n"; } if (!-z $acl_src_banned_mac) { print FILE "acl IPFire_banned_mac arp \"$acl_src_banned_mac\"\n"; } if (!-z $acl_src_unrestricted_ip) { print FILE "acl IPFire_unrestricted_ips src \"$acl_src_unrestricted_ip\"\n"; } @@ -3397,7 +3403,7 @@ END my $blue_net = ''; #BLUE empty by default my $blue_ip = ''; if ($netsettings{'BLUE_DEV'} && $proxysettings{'ENABLE_BLUE'} eq 'on') { - $blue_net = "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"; + $blue_net = "$blue_cidr"; $blue_ip = "$netsettings{'BLUE_ADDRESS'}"; } if (!-z $acl_include) @@ -3406,7 +3412,7 @@ END print FILE "\n#Start of custom includes\n\n"; while (<ACL>) { $_ =~ s/__GREEN_IP__/$netsettings{'GREEN_ADDRESS'}/; - $_ =~ s/__GREEN_NET__/$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}/; + $_ =~ s/__GREEN_NET__/$green_cidr/; $_ =~ s/__BLUE_IP__/$blue_ip/; $_ =~ s/__BLUE_NET__/$blue_net/; $_ =~ s/__PROXY_PORT__/$proxysettings{'PROXY_PORT'}/; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 5fb6055..e60a8ba 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -58,6 +58,17 @@ my %mainsettings = (); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); + +my $green_cidr = &General::ipcidr("$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}"); +my $blue_cidr = "# Blue not defined"; +if ($netsettings{'BLUE_DEV'}) { + $blue_cidr = &General::ipcidr("$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"); +} +my $orange_cidr = "# Orange not defined"; +if ($netsettings{'ORANGE_DEV'}) { + $orange_cidr = &General::ipcidr("$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}"); +} + $cgiparams{'ENABLED'} = 'off'; $cgiparams{'EDIT_ADVANCED'} = 'off'; $cgiparams{'ACTION'} = ''; @@ -270,12 +281,12 @@ sub writeipsecfiles { print CONF "\tnat_traversal=yes\n"; print CONF "\toverridemtu=$lvpnsettings{'VPN_OVERRIDE_MTU'}\n" if ($lvpnsettings{'VPN_OVERRIDE_MTU'} ne ''); print CONF "\tvirtual_private=%v4:10.0.0.0/8,%v4:172.16.0.0/12,%v4:192.168.0.0/16"; - print CONF ",%v4:!$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}"; + print CONF ",%v4:!$green_cidr"; if (length($netsettings{'ORANGE_DEV'}) > 2) { - print CONF ",%v4:!$netsettings{'ORANGE_NETADDRESS'}/$netsettings{'ORANGE_NETMASK'}"; + print CONF ",%v4:!$orange_cidr"; } if (length($netsettings{'BLUE_DEV'}) > 2) { - print CONF ",%v4:!$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"; + print CONF ",%v4:!$blue_cidr"; } foreach my $key (keys %lconfighash) { if ($lconfighash{$key}[3] eq 'net') { @@ -320,13 +331,15 @@ sub writeipsecfiles { print CONF "conn $lconfighash{$key}[1]\n"; print CONF "\tleft=$localside\n"; print CONF "\tleftnexthop=%defaultroute\n" if ($lconfighash{$key}[26] eq 'RED' && $lvpnsettings{'VPN_IP'} ne '%defaultroute'); - print CONF "\tleftsubnet=$lconfighash{$key}[8]\n"; + my $cidr_net=&General::ipcidr($lconfighash{$key}[8]); + print CONF "\tleftsubnet=$cidr_net\n"; print CONF "\tleftfirewall=yes\n"; print CONF "\tlefthostaccess=yes\n"; print CONF "\tright=$lconfighash{$key}[10]\n"; if ($lconfighash{$key}[3] eq 'net') { - print CONF "\trightsubnet=$lconfighash{$key}[11]\n"; + my $cidr_net=&General::ipcidr($lconfighash{$key}[11]); + print CONF "\trightsubnet=$cidr_net\n"; print CONF "\trightnexthop=%defaultroute\n"; } elsif ($lconfighash{$key}[10] eq '%any' && $lconfighash{$key}[14] eq 'on') { #vhost allowed for roadwarriors? print CONF "\trightsubnet=vhost:%no,%priv\n"; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 126246a8caba9de88c85603dda188fbb35cfc917
by git＠ipfire.org 14 Nov '10

14 Nov '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 126246a8caba9de88c85603dda188fbb35cfc917 (commit) from 846571ac8455c663fc75b0970eb76c4a92eea3be (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 126246a8caba9de88c85603dda188fbb35cfc917 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Nov 14 18:28:10 2010 +0100 Fix ipsec.conf for strongswan 4.5 (ikev2 was now default). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/test/filelists/files | 2 ++ html/cgi-bin/vpnmain.cgi | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files index 2a6d23b..5e17384 100644 --- a/config/rootfiles/core/test/filelists/files +++ b/config/rootfiles/core/test/filelists/files @@ -3,5 +3,7 @@ etc/rc.d/init.d/checkfstab etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/images/urlfilter/copy.gif usr/local/bin/rebuild-initrd usr/bin/ldd diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f303cfb..5fb6055 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -384,6 +384,9 @@ sub writeipsecfiles { print CONF "\tpfsgroup=$lconfighash{$key}[23]\n"; } + # IKE V1 + print CONF "\tkeyexchange=ikev1\n"; + # Lifetimes print CONF "\tikelifetime=$lconfighash{$key}[16]h\n" if ($lconfighash{$key}[16]); print CONF "\tkeylife=$lconfighash{$key}[17]h\n" if ($lconfighash{$key}[17]); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 846571ac8455c663fc75b0970eb76c4a92eea3be
by git＠ipfire.org 13 Nov '10

13 Nov '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 846571ac8455c663fc75b0970eb76c4a92eea3be (commit) via 7107b3042cc5aad129ddaddc01b7975e5717334e (commit) from f55596ee38abe00753d06482f0616500be20cd87 (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 846571ac8455c663fc75b0970eb76c4a92eea3be Merge: f55596e 7107b30 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 13 19:17:17 2010 +0100 Merge commit 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: html/html/images/urlfilter/copy.gif | Bin 0 -> 153 bytes 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 html/html/images/urlfilter/copy.gif Difference in files: diff --git a/html/html/images/urlfilter/copy.gif b/html/html/images/urlfilter/copy.gif new file mode 100644 index 0000000..a91100a Binary files /dev/null and b/html/html/images/urlfilter/copy.gif differ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f55596ee38abe00753d06482f0616500be20cd87
by git＠ipfire.org 13 Nov '10

13 Nov '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 f55596ee38abe00753d06482f0616500be20cd87 (commit) from fd2d8776d3d7913bcd7eead045edc10064a7b240 (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 f55596ee38abe00753d06482f0616500be20cd87 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 13 16:03:36 2010 +0100 cdrtools: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/cdrtools | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/common/cdrtools b/config/rootfiles/common/cdrtools index 806fb75..5a1a476 100644 --- a/config/rootfiles/common/cdrtools +++ b/config/rootfiles/common/cdrtools @@ -73,6 +73,10 @@ usr/bin/mkisofs #usr/include/schily/i586-linux-cc/align.h #usr/include/schily/i586-linux-cc/avoffset.h #usr/include/schily/i586-linux-cc/xconfig.h +#usr/include/schily/pentium2-linux-cc +#usr/include/schily/pentium2-linux-cc/align.h +#usr/include/schily/pentium2-linux-cc/avoffset.h +#usr/include/schily/pentium2-linux-cc/xconfig.h #usr/include/schily/pentium3-linux-cc #usr/include/schily/pentium3-linux-cc/align.h #usr/include/schily/pentium3-linux-cc/avoffset.h hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fd2d8776d3d7913bcd7eead045edc10064a7b240
by git＠ipfire.org 13 Nov '10

13 Nov '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 fd2d8776d3d7913bcd7eead045edc10064a7b240 (commit) via 2b4cacd26fc82e93c0578a0cb556f674e9d97858 (commit) from 50f696157ff447b332b92588588dbfa5cf98fef3 (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 fd2d8776d3d7913bcd7eead045edc10064a7b240 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 13 12:02:29 2010 +0100 Kernel-config: Disabled xfs-filesystem debug. commit 2b4cacd26fc82e93c0578a0cb556f674e9d97858 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 13 12:02:01 2010 +0100 Add a message that the toolchain can't build on ipfire. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.i586-ipfire-xen | 2 +- make.sh | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 3be9bc6..4600b29 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -3568,7 +3568,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set -CONFIG_XFS_DEBUG=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 741b73a..4e53f4f 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -3585,7 +3585,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set -CONFIG_XFS_DEBUG=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 7110200..29987a5 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -3367,7 +3367,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set -CONFIG_XFS_DEBUG=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set diff --git a/make.sh b/make.sh index 4c7be21..4bec05b 100755 --- a/make.sh +++ b/make.sh @@ -234,9 +234,12 @@ prepareenv() { } buildtoolchain() { - if [ "$MACHINE" = "x86_64" ]; then + if [ "$(uname -m)" = "x86_64" ]; then exiterror "Cannot build toolchain on x86_64. Please use the download." fi + if [ "$(uname -r | grep ipfire)" ]; then + exiterror "Cannot build toolchain on ipfire. Please use the download." + fi LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7107b3042cc5aad129ddaddc01b7975e5717334e
by git＠ipfire.org 13 Nov '10

13 Nov '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 7107b3042cc5aad129ddaddc01b7975e5717334e (commit) from 499bc000ffd5e65325d1fa9bbf7e1085b62eaea3 (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 7107b3042cc5aad129ddaddc01b7975e5717334e Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Sat Nov 13 10:13:43 2010 +0100 Added missing gif. ----------------------------------------------------------------------- Summary of changes: html/html/images/urlfilter/copy.gif | Bin 0 -> 153 bytes 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 html/html/images/urlfilter/copy.gif Difference in files: diff --git a/html/html/images/urlfilter/copy.gif b/html/html/images/urlfilter/copy.gif new file mode 100644 index 0000000..a91100a Binary files /dev/null and b/html/html/images/urlfilter/copy.gif differ 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 November 2010