IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7851 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. 1129c37a95009f8f4ee3222a09c12c3f9d374d9d
by git＠ipfire.org 05 Jul '11

05 Jul '11

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, openvpn-n2n has been updated via 1129c37a95009f8f4ee3222a09c12c3f9d374d9d (commit) from 7d653d51f8ed7aa6198aa724d6e68750642b588f (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 1129c37a95009f8f4ee3222a09c12c3f9d374d9d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 5 12:45:51 2011 +0200 openvpnctrl: Fix SEGV in sprintf() call. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 6191fde..00b35e1 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -360,7 +360,7 @@ void setFirewallRules(void) { setChainRules(OVPNORANGE, orangeif, protocol, dport); // set firewall rules for n2n connections - char *port; + char port[STRING_SIZE]; while (conn != NULL) { sprintf(port, "%d", conn->port); setChainRules(OVPNRED, redif, conn->proto, port); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 85cbc0a08f8f0125602244b91beb1b8e45a36e3f
by git＠ipfire.org 04 Jul '11

04 Jul '11

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 85cbc0a08f8f0125602244b91beb1b8e45a36e3f (commit) from 264c0195fbd8a897d37c81d5d74e6502ab7212a8 (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 85cbc0a08f8f0125602244b91beb1b8e45a36e3f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 23:09:05 2011 +0200 ipsec: fix ike firewall rule to support nat traversal. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/ipsecctrl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index c500e58..a018289 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -59,9 +59,9 @@ void open_physical (char *interface, int nat_traversal_port) { // safe_system(str); // IKE - sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT >/dev/null 2>&1", interface); + sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface); safe_system(str); - sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface); + sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface); safe_system(str); if (! nat_traversal_port) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 264c0195fbd8a897d37c81d5d74e6502ab7212a8
by git＠ipfire.org 04 Jul '11

04 Jul '11

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 264c0195fbd8a897d37c81d5d74e6502ab7212a8 (commit) from ec238128df8a41644501c9620c03103e93c89afd (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 264c0195fbd8a897d37c81d5d74e6502ab7212a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:41:31 2011 +0200 ipsec: change grep for ikev2 status display. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index eec3f9b..b325250 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -370,7 +370,7 @@ END } else { foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~/ $confighash{$key}[1]\{.*INSTALLED/ )) + ($line =~/$confighash{$key}[1]\{.*INSTALLED/ )) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 1fa40a8..177cdf4 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2540,7 +2540,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~ / $confighash{$key}[1]\{.*INSTALLED/)) + ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec238128df8a41644501c9620c03103e93c89afd
by git＠ipfire.org 04 Jul '11

04 Jul '11

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 ec238128df8a41644501c9620c03103e93c89afd (commit) via 10ad048deccf8a42b5850e9197619a91756d3906 (commit) via 7180ae3897fecf7366f1e465f90048cd8174ca78 (commit) via e8bae96337cc79c86388f805bfc637d67cd0c362 (commit) via b651a44dba1874126f43da03b33e46cea55b2895 (commit) via 61e1585f054ee47cf78d21abed09769c9482efc4 (commit) from 4912df2ff60c3bf0d8dff3093bac58c892801c6b (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 ec238128df8a41644501c9620c03103e93c89afd Merge: 7180ae3 10ad048 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:09:54 2011 +0200 Merge branch 'master' into next commit 7180ae3897fecf7366f1e465f90048cd8174ca78 Merge: e8bae96 4912df2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:05:46 2011 +0200 Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next commit e8bae96337cc79c86388f805bfc637d67cd0c362 Merge: 641baa8 b651a44 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 12:53:27 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/50/filelists/files | 1 + .../{oldcore/32 => core/50}/filelists/squid | 0 html/cgi-bin/portfw.cgi | 2 +- lfs/squid | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/32 => core/50}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index 9d39707..034310c 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -3,6 +3,7 @@ var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup var/ipfire/graphs.pl +srv/web/ipfire/cgi-bin/portfw.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat usr/local/share/GeoIP/GeoIP.dat usr/share/hwdata/pci.ids diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/50/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi index 5583fb8..199682f 100644 --- a/html/cgi-bin/portfw.cgi +++ b/html/cgi-bin/portfw.cgi @@ -1038,7 +1038,7 @@ sub disallowreserved { # port 67 and 68 same for tcp and udp, don't bother putting in an array my $msg = ""; - my @tcp_reserved = (81,222,444); + my @tcp_reserved = (); my $prt = $_[0]; # the port or range my $ryn = $_[1]; # tells us whether or not it is a port range my $prot = $_[2]; # protocol diff --git a/lfs/squid b/lfs/squid index bdc1646..ef676a2 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.11 +VER = 3.1.13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 +$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 10ad048deccf8a42b5850e9197619a91756d3906
by git＠ipfire.org 04 Jul '11

04 Jul '11

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 10ad048deccf8a42b5850e9197619a91756d3906 (commit) via b651a44dba1874126f43da03b33e46cea55b2895 (commit) from 61e1585f054ee47cf78d21abed09769c9482efc4 (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 10ad048deccf8a42b5850e9197619a91756d3906 Merge: b651a44 61e1585 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:06:10 2011 +0200 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit b651a44dba1874126f43da03b33e46cea55b2895 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 12:52:43 2011 +0200 squid: update to 3.1.13. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{44 => 50}/filelists/squid | 0 lfs/squid | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/core/{44 => 50}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/50/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index bdc1646..ef676a2 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.11 +VER = 3.1.13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 +$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934 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. 4912df2ff60c3bf0d8dff3093bac58c892801c6b
by git＠ipfire.org 04 Jul '11

04 Jul '11

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 4912df2ff60c3bf0d8dff3093bac58c892801c6b (commit) from 641baa86e04b6c5e8d6275f62c2b933585087b5a (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 4912df2ff60c3bf0d8dff3093bac58c892801c6b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Jul 4 19:36:53 2011 +0200 OutgoingFW Groups added syntax checks. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/outgoinggrp.cgi | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi index e757ca0..1c3d695 100644 --- a/html/cgi-bin/outgoinggrp.cgi +++ b/html/cgi-bin/outgoinggrp.cgi @@ -87,6 +87,8 @@ if ($outgrpsettings{'ACTION'} eq 'newipgroup') if ( -e "$configpath/macgroups/$outgrpsettings{'ipgroup'}" ){ $errormessage = "$Lang::tr{'outgoing firewall group error'}"; + } elsif ( $outgrpsettings{'ipgroup'} =~ /\W/ ){ + $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'ipgroup'}; } elsif ( $outgrpsettings{'ipgroup'} eq "all" || $outgrpsettings{'ipgroup'} eq "red" || $outgrpsettings{'ipgroup'} eq "blue" || $outgrpsettings{'ipgroup'} eq "green" || $outgrpsettings{'ipgroup'} eq "orange" || $outgrpsettings{'ipgroup'} eq "ip" || $outgrpsettings{'ipgroup'} eq "mac" || $outgrpsettings{'ipgroup'} eq "ovpn" || $outgrpsettings{'ipgroup'} eq "ipsec" ) { @@ -112,6 +114,8 @@ if ($outgrpsettings{'ACTION'} eq 'newmacgroup') if ( -e "$configpath/ipgroups/$outgrpsettings{'macgroup'}" ){ $errormessage = "$Lang::tr{'outgoing firewall group error'}"; + } elsif ( $outgrpsettings{'macgroup'} =~ /\W/ ){ + $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'macgroup'}; } elsif ( $outgrpsettings{'macgroup'} eq "all" || $outgrpsettings{'macgroup'} eq "red" || $outgrpsettings{'macgroup'} eq "blue" || $outgrpsettings{'macgroup'} eq "green" || $outgrpsettings{'macgroup'} eq "orange" || $outgrpsettings{'macgroup'} eq "ip" || $outgrpsettings{'macgroup'} eq "mac" || $outgrpsettings{'macgroup'} eq "ovpn" || $outgrpsettings{'macgroup'} eq "ipsec" ) { hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 063749e48c928aae1fa3d40ea3fe952f9e212d1a
by git＠ipfire.org 03 Jul '11

03 Jul '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. adaf32b016b5af9bd8475bd553ec767fa4c96498
by git＠ipfire.org 03 Jul '11

03 Jul '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 04c03d11e8ba46c65f01e014d6044cb746a9e42c
by git＠ipfire.org 03 Jul '11

03 Jul '11

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 3.x development tree". The branch, master has been updated via 04c03d11e8ba46c65f01e014d6044cb746a9e42c (commit) from 1def4e795bb4b84cd06fc2ea7dd04975055e4414 (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 04c03d11e8ba46c65f01e014d6044cb746a9e42c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 3 19:22:43 2011 +0200 gawk: Update to 4.0.0. ----------------------------------------------------------------------- Summary of changes: pkgs/gawk/gawk.nm | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) Difference in files: diff --git a/pkgs/gawk/gawk.nm b/pkgs/gawk/gawk.nm index 9f96da5..29b52b1 100644 --- a/pkgs/gawk/gawk.nm +++ b/pkgs/gawk/gawk.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = gawk -PKG_VER = 3.1.8 -PKG_REL = 0 +PKG_VER = 4.0.0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Base System/Tools @@ -34,31 +34,33 @@ PKG_URL = http://www.gnu.org/software/gawk/gawk.html PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU version of the awk text processing utility. +# Needed for testsuite. +PKG_BUILD_DEPS+= util-linux + define PKG_DESCRIPTION The gawk package contains the GNU version of awk, a text processing \ utility. Awk interprets a special-purpose programming language to do \ quick and easy text pattern matching and reformatting jobs. endef -PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.xz -############################################################################### -# Installation Details -############################################################################### +CONFIGURE_OPTIONS += \ + --bindir=/bin \ + --libexecdir=/usr/lib \ + --with-libsigsegv-prefix=no -define STAGE_BUILD - cd $(DIR_APP) && \ - ac_cv_func_working_mktime=yes \ - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib +define STAGE_TEST + cd $(DIR_APP) && make check diffout +endef - cd $(DIR_APP) && echo "#define HAVE_LANGINFO_CODESET 1" >> config.h - cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1" >> config.h +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/usr/bin + ln -svf ../../bin/awk $(BUILDROOT)/usr/bin/awk + ln -svf ../../bin/gawk $(BUILDROOT)/usr/bin/gawk - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef + mv -v $(BUILDROOT)/bin/{p,i}gawk $(BUILDROOT)/usr/bin/ -define STAGE_TEST - cd $(DIR_APP) && make check + # Remove versioned binary. + rm -rfv $(BUILDROOT)/bin/{,p}gawk-* endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 61e1585f054ee47cf78d21abed09769c9482efc4
by git＠ipfire.org 03 Jul '11

03 Jul '11

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 61e1585f054ee47cf78d21abed09769c9482efc4 (commit) from edc2f9c4fddaa9b40f07d41e203c74486e36b879 (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 61e1585f054ee47cf78d21abed09769c9482efc4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 3 17:49:21 2011 +0200 Drop reserved ports from the web GUI. Recently, TCP/UDP ports 222 and 444 among others could not be forwareded (DNAT) to another machine on the network. This is unneccessary and now removed. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/50/filelists/files | 1 + html/cgi-bin/portfw.cgi | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index 9d39707..034310c 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -3,6 +3,7 @@ var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup var/ipfire/graphs.pl +srv/web/ipfire/cgi-bin/portfw.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat usr/local/share/GeoIP/GeoIP.dat usr/share/hwdata/pci.ids diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi index 5583fb8..199682f 100644 --- a/html/cgi-bin/portfw.cgi +++ b/html/cgi-bin/portfw.cgi @@ -1038,7 +1038,7 @@ sub disallowreserved { # port 67 and 68 same for tcp and udp, don't bother putting in an array my $msg = ""; - my @tcp_reserved = (81,222,444); + my @tcp_reserved = (); my $prt = $_[0]; # the port or range my $ryn = $_[1]; # tells us whether or not it is a port range my $prot = $_[2]; # protocol hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM