IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7824 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ad5b43907892ab30fe600e1b630b0b4f5fc0f323
by git＠ipfire.org 20 Jan '10

20 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2ad19f2b437c4373c0bfd688dee9ef85fe0ea480
by git＠ipfire.org 20 Jan '10

20 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fed6d789e8d94e7145ba258f0f39f692ee87182f
by git＠ipfire.org 20 Jan '10

20 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1bafa730906d270cf848026699001fbe59e2202e
by git＠ipfire.org 20 Jan '10

20 Jan '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 1bafa730906d270cf848026699001fbe59e2202e (commit) via 05e86e80c6d64d26b7be2f3597bea629365dfa21 (commit) from 831a579e39c62a254d2b6f5f540011e2d22e836e (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 1bafa730906d270cf848026699001fbe59e2202e Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 20 07:35:32 2010 +0100 Applied the latest patches to squidGuard to prevent buffter overflows. commit 05e86e80c6d64d26b7be2f3597bea629365dfa21 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 20 07:34:21 2010 +0100 Updated samba to current stable. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/35/filelists/files | 1 + doc/packages-list.txt | 4 ++-- lfs/samba | 6 +++--- lfs/squidguard | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files index 15fca78..c9d1fa6 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -13,3 +13,4 @@ lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off srv/web/ipfire/cgi-bin/outgoingfw.cgi var/ipfire/outgoing/bin/outgoingfw.pl +usr/bin/squidGuard diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 91c833b..29c1f90 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -295,7 +295,7 @@ * rssdler-0.4.0a * rsync-3.0.6 * rtorrent-0.8.6 -* samba-3.3.9 +* samba-3.3.10 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 @@ -312,7 +312,7 @@ * sqlite-3.6.10 * squashfs3.4 * squid-2.7.STABLE7 -* squidGuard-1.4 +* squidGuard-1.4.1 * squidclamav-4.1 * sshfs-fuse-2.2 * sslh-1.6i diff --git a/lfs/samba b/lfs/samba index e856747..b09d67b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.3.9 +VER = 3.3.10 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 21 +PAK_VER = 22 DEPS = "cups cyrus-sasl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d99c3ccc3066d1c6a0dba4de02aad24b +$(DL_FILE)_MD5 = 84645ff5f0fb213e2371e629507dc8bb install : $(TARGET) diff --git a/lfs/squidguard b/lfs/squidguard index 97e0fc2..5b2656c 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -24,7 +24,7 @@ include Config -VER = 1.4 +VER = 1.4.1 THISAPP = squidGuard-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = de834150998c1386c30feae196f16b06 +$(DL_FILE)_MD5 = 9ae7b62a63631bb2dd1f474cf2bbe4dc 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. 831a579e39c62a254d2b6f5f540011e2d22e836e
by git＠ipfire.org 18 Jan '10

18 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2229c89ea8df40e8ad610fce7d144d0554b3430a
by git＠ipfire.org 17 Jan '10

17 Jan '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 2229c89ea8df40e8ad610fce7d144d0554b3430a (commit) from 3363f5572d3a63271547ee94662a485f998d8604 (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 2229c89ea8df40e8ad610fce7d144d0554b3430a Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Jan 17 13:12:40 2010 +0100 Parse pre Core34 rules correct and enable change logging. This fixes bug #0000546 and older rules should be parseable by webgui the values are filled up with default when missing. As user requested the ability to enable logging for mode1 rules was added, earlier we were defaulting to logging false. It is recommended to check all outgoing rule if working correct or just reset rules and generate a new set of rules based on core34 features. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/outgoingfw.cgi | 99 +++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 27 deletions(-) Difference in files: diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 1632f90..ed87e0d 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -79,6 +79,19 @@ $outfwsettings{'TIME_TO'} = '00:00'; &General::readhash("${General::swroot}/outgoing/settings", \%outfwsettings); &Header::getcgihash(\%outfwsettings); +############### +# DEBUG DEBUG +#&Header::openbox('100%', 'left', 'DEBUG'); +#my $debugCount = 0; +#foreach my $line (sort keys %outfwsettings) { +#print "$line = $outfwsettings{$line}<br />\n"; +# $debugCount++; +#} +#print " Count: $debugCount\n"; +#&Header::closebox(); +# DEBUG DEBUG +############### + $selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'"; $selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'"; @@ -111,6 +124,10 @@ if ($outfwsettings{'POLICY'} eq 'MODE0'){ $selected{'POLICY'}{'MODE0'} = 'select if ($outfwsettings{'POLICY'} eq 'MODE1'){ $selected{'POLICY'}{'MODE1'} = 'selected'; } else { $selected{'POLICY'}{'MODE1'} = ''; } if ($outfwsettings{'POLICY'} eq 'MODE2'){ $selected{'POLICY'}{'MODE2'} = 'selected'; } else { $selected{'POLICY'}{'MODE2'} = ''; } +# This is a little hack if poeple donŽt mark any date then all will be selected, because they might have forgotten to select +# a valid day. A Rule without any matching day will never work, because the timeranges are new feature people might not notice +# that they have to select a day for the rule. + if ( $outfwsettings{'TIME_MON'} eq "" && $outfwsettings{'TIME_TUE'} eq "" && $outfwsettings{'TIME_WED'} eq "" && @@ -199,6 +216,17 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'}) foreach $configentry (sort @configs) { @configline = split( /\;/, $configentry ); + + $configline[10] = "on" if not exists $configline[11]; + $configline[11] = "on" if not exists $configline[11]; + $configline[12] = "on" if not exists $configline[12]; + $configline[13] = "on" if not exists $configline[13]; + $configline[14] = "on" if not exists $configline[14]; + $configline[15] = "on" if not exists $configline[15]; + $configline[16] = "on" if not exists $configline[16]; + $configline[17] = "00:00" if not exists $configline[17]; + $configline[18] = "00:00" if not exists $configline[18]; + unless (($configline[0] eq $outfwsettings{'STATE'}) && ($configline[1] eq $outfwsettings{'ENABLED'}) && ($configline[2] eq $outfwsettings{'SNET'}) && @@ -241,6 +269,17 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'}) foreach $configentry (sort @configs) { @configline = split( /\;/, $configentry ); + + $configline[10] = "on" if not exists $configline[11]; + $configline[11] = "on" if not exists $configline[11]; + $configline[12] = "on" if not exists $configline[12]; + $configline[13] = "on" if not exists $configline[13]; + $configline[14] = "on" if not exists $configline[14]; + $configline[15] = "on" if not exists $configline[15]; + $configline[16] = "on" if not exists $configline[16]; + $configline[17] = "00:00" if not exists $configline[17]; + $configline[18] = "00:00" if not exists $configline[18]; + unless (($configline[0] eq $outfwsettings{'STATE'}) && ($configline[1] eq $outfwsettings{'ENABLED'}) && ($configline[2] eq $outfwsettings{'SNET'}) && @@ -337,15 +376,26 @@ END $outfwsettings{'DIP'} = $configline[7]; $outfwsettings{'DPORT'} = $configline[8]; $outfwsettings{'LOG'} = $configline[9]; - $outfwsettings{'TIME_MON'} = $configline[10]; - $outfwsettings{'TIME_TUE'} = $configline[11]; - $outfwsettings{'TIME_WED'} = $configline[12]; - $outfwsettings{'TIME_THU'} = $configline[13]; - $outfwsettings{'TIME_FRI'} = $configline[14]; - $outfwsettings{'TIME_SAT'} = $configline[15]; - $outfwsettings{'TIME_SUN'} = $configline[16]; - $outfwsettings{'TIME_FROM'} = $configline[17]; - $outfwsettings{'TIME_TO'} = $configline[18]; + + $configline[10] = "on" if not exists $configline[11]; + $configline[11] = "on" if not exists $configline[11]; + $configline[12] = "on" if not exists $configline[12]; + $configline[13] = "on" if not exists $configline[13]; + $configline[14] = "on" if not exists $configline[14]; + $configline[15] = "on" if not exists $configline[15]; + $configline[16] = "on" if not exists $configline[16]; + $configline[17] = "00:00" if not exists $configline[17]; + $configline[18] = "00:00" if not exists $configline[18]; + + $outfwsettings{'TIME_MON'} = $configline[10]; + $outfwsettings{'TIME_TUE'} = $configline[11]; + $outfwsettings{'TIME_WED'} = $configline[12]; + $outfwsettings{'TIME_THU'} = $configline[13]; + $outfwsettings{'TIME_FRI'} = $configline[14]; + $outfwsettings{'TIME_SAT'} = $configline[15]; + $outfwsettings{'TIME_SUN'} = $configline[16]; + $outfwsettings{'TIME_FROM'} = $configline[17]; + $outfwsettings{'TIME_TO'} = $configline[18]; if ($outfwsettings{'DIP'} eq ''){ $outfwsettings{'DISPLAY_DIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DIP'} = $outfwsettings{'DIP'}; } if ($outfwsettings{'DPORT'} eq ''){ $outfwsettings{'DISPLAY_DPORT'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DPORT'} = $outfwsettings{'DPORT'}; } @@ -577,15 +627,15 @@ sub addrule <td width='20%' align='right' colspan='2'>$Lang::tr{'active'}: <td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} /> <tr><td width='20%' align='right'>$Lang::tr{'protocol'}: - <td width='30%' align='left'> - <select name='PROT'> - <option value='all' $selected{'PROT'}{'all'}>All</option> - <option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option> - <option value='udp' $selected{'PROT'}{'udp'}>UDP</option> - <option value='gre' $selected{'PROT'}{'gre'}>GRE</option> - <option value='esp' $selected{'PROT'}{'esp'}>ESP</option> - <option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option> - </select> + <td width='30%' align='left'> + <select name='PROT'> + <option value='all' $selected{'PROT'}{'all'}>All</option> + <option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option> + <option value='udp' $selected{'PROT'}{'udp'}>UDP</option> + <option value='gre' $selected{'PROT'}{'gre'}>GRE</option> + <option value='esp' $selected{'PROT'}{'esp'}>ESP</option> + <option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option> + </select> <td width='20%' align='right' colspan='2'>$Lang::tr{'policy'}: <td width='30%' align='left' colspan='2'> END @@ -615,15 +665,10 @@ END <td width='20%' align='right' colspan='2'>$Lang::tr{'source ip'}: <img src='/blob.gif' /> <td width='30%' align='left' colspan='2'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}' /> <tr><td width='20%' align='right'>$Lang::tr{'logging'}: -END -; -if ($outfwsettings{'POLICY'} eq 'MODE1'){ - print "<td width='30%' align='left'><input type='text' name='LOG' maxlength='10' value='$Lang::tr{'inactive'}' readonly='true' /></td>"; -} -else{ - print "<td width='30%' align='left'><select name='LOG'><option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option><option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option></select></td>"; -} -print <<END + <td width='30%' align='left'><select name='LOG'> + <option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option> + <option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option> + </select></td>"; <td width='20%' align='right' colspan='2' /> <td width='30%' align='left' colspan='2' /> <tr><td width='20%' align='right'>$Lang::tr{'destination ip'}: <img src='/blob.gif' /> hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3363f5572d3a63271547ee94662a485f998d8604
by git＠ipfire.org 16 Jan '10

16 Jan '10

1 0

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

16 Jan '10

1 0

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

16 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4ae473ec803f797098302e46cc947e245516c2b3
by git＠ipfire.org 15 Jan '10

15 Jan '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 3.x development tree". The branch, master has been updated via 4ae473ec803f797098302e46cc947e245516c2b3 (commit) from 8e92a315635689a814d6927fa113a3dba3ebcc72 (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 4ae473ec803f797098302e46cc947e245516c2b3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jan 15 21:49:28 2010 +0100 Add .mailmap. ----------------------------------------------------------------------- Summary of changes: .mailmap | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 .mailmap Difference in files: diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..c57afe4 --- /dev/null +++ b/.mailmap @@ -0,0 +1,14 @@ +Arne Fitzenreiter <arne_f@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Arne Fitzenreiter <root(a)build.warriors.homedns.org> +Christian Schmidt <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Christian Schmidt <maniacikarus(a)ipfire.org> +Heiner Schmeling <casemaster@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Michael Tremer ms +Michael Tremer root +Michael Tremer <michael.tremer.info> +Michael Tremer <root@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Michael Tremer <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Michael Tremer <delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Michael Tremer <ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> +Michael Tremer <root(a)ipfire.tremer.info> +Rene Zingel <linuxadmin@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8> hooks/post-receive -- IPFire 3.x development tree

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM