IPFire-SCM January 2011

ipfire-scm@lists.ipfire.org

1 participants
93 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f9866a728e33ce8791062f2b449731bec490ab5f
by git＠ipfire.org 26 Jan '11

26 Jan '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 f9866a728e33ce8791062f2b449731bec490ab5f (commit) from bce6a367ded247470b10aa97d1a495cf59795c4d (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 f9866a728e33ce8791062f2b449731bec490ab5f Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 26 21:06:01 2011 +0100 Disabled snort decoder events. ----------------------------------------------------------------------- Summary of changes: config/snort/snort.conf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/snort/snort.conf b/config/snort/snort.conf index bf46406..fd4e8ea 100644 --- a/config/snort/snort.conf +++ b/config/snort/snort.conf @@ -74,7 +74,7 @@ var PREPROC_RULE_PATH /etc/snort/preproc_rules ################################################### # Stop generic decode events: -#config disable_decode_alerts +config disable_decode_alerts # Stop Alerts on experimental TCP options config disable_tcpopt_experimental_alerts @@ -86,7 +86,7 @@ config disable_tcpopt_obsolete_alerts #config disable_tcpopt_ttcp_alerts # Stop Alerts on all other TCPOption type events: -#config disable_tcpopt_alerts +config disable_tcpopt_alerts # Stop Alerts on invalid ip options #config disable_ipopt_alerts hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bce6a367ded247470b10aa97d1a495cf59795c4d
by git＠ipfire.org 26 Jan '11

26 Jan '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 bce6a367ded247470b10aa97d1a495cf59795c4d (commit) from eefb3b95d8fbdbcec93c9eff338cf41650bdb64c (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 bce6a367ded247470b10aa97d1a495cf59795c4d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 26 20:39:31 2011 +0100 Add changes from b18bad8a194459493ccafefa25698168cda553d3 to core update 45. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/filelists/files | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index d996195..0fba2b2 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -6,6 +6,7 @@ srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/fireinfo.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. eefb3b95d8fbdbcec93c9eff338cf41650bdb64c
by git＠ipfire.org 26 Jan '11

26 Jan '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 eefb3b95d8fbdbcec93c9eff338cf41650bdb64c (commit) from 5bc7de500f3d69b416205b5c08f4bbf6ac500003 (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 eefb3b95d8fbdbcec93c9eff338cf41650bdb64c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 26 20:28:52 2011 +0100 fireinfo: Update to version 2.0.4. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 0c55e00..6c502e1 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 2.0.3 +VER = 2.0.4 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f9ce8b96350dd5af1e5c095806128cd0 +$(DL_FILE)_MD5 = 7433e108cce180980189339886621539 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. 5bc7de500f3d69b416205b5c08f4bbf6ac500003
by git＠ipfire.org 26 Jan '11

26 Jan '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 5bc7de500f3d69b416205b5c08f4bbf6ac500003 (commit) from 0cb985d8fc753e7875695f8ac66f9c9db1462636 (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 5bc7de500f3d69b416205b5c08f4bbf6ac500003 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 17:45:02 2011 +0100 Add ssl-global.conf to core45 update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/filelists/files | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index 03e511f..d996195 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/httpd/conf/ssl-global.conf etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/fireinfo.cgi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0cb985d8fc753e7875695f8ac66f9c9db1462636
by git＠ipfire.org 26 Jan '11

26 Jan '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 0cb985d8fc753e7875695f8ac66f9c9db1462636 (commit) via 93dc8835c399eba647112e6d85daf545d8181782 (commit) via 3ae6726a8e15a58a5690ee3a766c68c8d3de67b2 (commit) from 24614d7dfb46bf0ff7fac2f63cfb0d525d82ea95 (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 0cb985d8fc753e7875695f8ac66f9c9db1462636 Merge: 93dc883 24614d7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 17:43:18 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 93dc8835c399eba647112e6d85daf545d8181782 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 17:42:09 2011 +0100 Fix unattended restore of backupiso cd. commit 3ae6726a8e15a58a5690ee3a766c68c8d3de67b2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 17:41:15 2011 +0100 Fix ssl-global.conf (settings was ignored). ----------------------------------------------------------------------- Summary of changes: config/httpd/ssl-global.conf | 9 --------- src/install+setup/install/unattended.c | 2 +- 2 files changed, 1 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf index 458339a..9cf4f81 100644 --- a/config/httpd/ssl-global.conf +++ b/config/httpd/ssl-global.conf @@ -13,10 +13,6 @@ # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned. -# This global SSL configuration is ignored if -# "SSL" is not defined, or if "NOSSL" is defined. -<IfDefine SSL> -<IfDefine !NOSSL> <IfModule mod_ssl.c> # @@ -61,9 +57,4 @@ SSLRandomSeed startup builtin SSLRandomSeed connect builtin - SSLLog /var/log/httpd/ssl_engine_log - SSLLogLevel info - </IfModule> -</IfDefine> -</IfDefine> diff --git a/src/install+setup/install/unattended.c b/src/install+setup/install/unattended.c index 3e2f3f0..77e1eab 100644 --- a/src/install+setup/install/unattended.c +++ b/src/install+setup/install/unattended.c @@ -150,7 +150,7 @@ int unattended_setup(struct keyvalue *unattendedkv) { if (strlen(restore_file) > 0) { fprintf(flog, "unattended: Restoring Backup\n"); snprintf(commandstring, STRING_SIZE, - "cd /harddisk && /bin/tar -xvzp -f /harddisk/var/ipfire/backup/%s", restore_file); + "/usr/sbin/chroot /harddisk /bin/tar -xvzp -f /var/ipfire/backup/%s -C /", restore_file); if (mysystem(commandstring)) { errorbox("unattended: ERROR restoring backup"); } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 24614d7dfb46bf0ff7fac2f63cfb0d525d82ea95
by git＠ipfire.org 26 Jan '11

26 Jan '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 24614d7dfb46bf0ff7fac2f63cfb0d525d82ea95 (commit) from cf997605e529e895e90c4691c3b418e279dcfbb1 (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 24614d7dfb46bf0ff7fac2f63cfb0d525d82ea95 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 26 08:06:26 2011 +0100 Fixed a typo in firewalllog.dat. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/logs.cgi/firewalllog.dat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index c2888c3..466a3ce 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -333,7 +333,7 @@ foreach $_ (@log) my $comment = $3; my $packet = $4; - $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 $1 =~ /2./ ){ $iface="";} + $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";} $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1; $packet =~ /DST=([\d\.]+)/; my $dstaddr=$1; $packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. cf997605e529e895e90c4691c3b418e279dcfbb1
by git＠ipfire.org 25 Jan '11

25 Jan '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 cf997605e529e895e90c4691c3b418e279dcfbb1 (commit) via caab8fb9e332702bd36f66d91f8342ff260a64e6 (commit) from 843f29e9b9ff647ecdcb5d7bc512bb12f630a712 (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 cf997605e529e895e90c4691c3b418e279dcfbb1 Merge: caab8fb 843f29e Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 26 00:32:12 2011 +0100 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit caab8fb9e332702bd36f66d91f8342ff260a64e6 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jan 26 00:31:42 2011 +0100 Fixed typo for update script. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/update.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 3229f74..b7af7c9 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -54,7 +54,7 @@ echo Starting Proxy /etc/init.d/squid start 2>/dev/null echo Rewriting Outgoing FW Rules /var/ipfire/outgoing/bin/outgoingfw.pl -if [ `grep "ENABLED=on" /var/ipfire/vpn/setting` ]; then +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then echo Starting vpn-watch /usr/local/bin/vpn-watch & fi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 843f29e9b9ff647ecdcb5d7bc512bb12f630a712
by git＠ipfire.org 25 Jan '11

25 Jan '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 843f29e9b9ff647ecdcb5d7bc512bb12f630a712 (commit) from 9011399a1ba2482cb2062e7b4754ea8939e1bd71 (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 843f29e9b9ff647ecdcb5d7bc512bb12f630a712 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 25 22:06:19 2011 +0100 Add some checks to vpn-watch and set the restart timer to 60min. ----------------------------------------------------------------------- Summary of changes: src/scripts/vpn-watch | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index 466aaa6..af646ad 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -1,6 +1,6 @@ #!/usr/bin/perl ################################################## -##### VPN-Watch.pl Version 0.6 ##### +##### VPN-Watch.pl Version 0.6a ##### ################################################## # # # VPN-Watch is part of the IPFire Firewall # @@ -31,8 +31,8 @@ while ( $i == 0){ $round++; - # Reset roundcounter after 10 min. To do established check. - if ($round > 9) { $round=0; } + # Reset roundcounter after 60 min. To do established check. + if ($round > 59) { $round=0; } if (open(FILE, "<${General::swroot}/vpn/config")) { @vpnsettings = <FILE>; close(FILE); @@ -56,8 +56,9 @@ foreach (@vpnsettings){ if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}} my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`; my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`; - - if ( $round == 0 && $ipmatch eq '' && $status ne ''){ + my $known= `echo "$status" | grep '$settings[2]'`; + + if ( $ipmatch eq '' && $known ne '' ){ logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec."); system("/usr/local/bin/ipsecctrl S $settings[0]"); $round=0; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9011399a1ba2482cb2062e7b4754ea8939e1bd71
by git＠ipfire.org 25 Jan '11

25 Jan '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 9011399a1ba2482cb2062e7b4754ea8939e1bd71 (commit) from e7d2f07094a3cd74293a10123184489b1c916c57 (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 9011399a1ba2482cb2062e7b4754ea8939e1bd71 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 25 15:38:44 2011 +0100 Updated memtest86+ (4.20). ----------------------------------------------------------------------- Summary of changes: lfs/memtest | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/memtest b/lfs/memtest index 5d27047..a6179ed 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 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 # @@ -24,7 +24,7 @@ include Config -VER = 4.10 +VER = 4.20 THISAPP = memtest86+-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2144f21d4489a04149b1891b8d97e8fc +$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c5d1d6b94a4543244d8183bc391af2c378a79102
by git＠ipfire.org 25 Jan '11

25 Jan '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 c5d1d6b94a4543244d8183bc391af2c378a79102 (commit) from d949f3369aa6ef63ea92c07ecfc657d11614624f (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 c5d1d6b94a4543244d8183bc391af2c378a79102 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 25 16:15:51 2011 +0100 hdparm: Update to 9.37. Closes #132. ----------------------------------------------------------------------- Summary of changes: pkgs/core/hdparm/hdparm.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/core/hdparm/hdparm.nm b/pkgs/core/hdparm/hdparm.nm index fdd6ca0..29b9868 100644 --- a/pkgs/core/hdparm/hdparm.nm +++ b/pkgs/core/hdparm/hdparm.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = hdparm -PKG_VER = 9.36 +PKG_VER = 9.37 PKG_REL = 0 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2011