IPFire-SCM February 2011

ipfire-scm@lists.ipfire.org

1 participants
67 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 84d2c3089cd95f27bd6acbbe3772d7ab88a923e9
by git＠ipfire.org 10 Feb '11

10 Feb '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 84d2c3089cd95f27bd6acbbe3772d7ab88a923e9 (commit) from 8ee51f4dabc942597314a761801045eb503c3318 (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 84d2c3089cd95f27bd6acbbe3772d7ab88a923e9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 18:04:26 2011 +0100 Don't overwrite ssl/ssh settings. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/46/exclude | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/core/46/exclude index e69de29..01b7a7f 100644 --- a/config/rootfiles/core/46/exclude +++ b/config/rootfiles/core/46/exclude @@ -0,0 +1,3 @@ +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core46, created. 8ee51f4dabc942597314a761801045eb503c3318
by git＠ipfire.org 09 Feb '11

09 Feb '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 tag, v2.9-core46 has been created at 8ee51f4dabc942597314a761801045eb503c3318 (commit) - Log ----------------------------------------------------------------- commit 8ee51f4dabc942597314a761801045eb503c3318 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 13:16:09 2011 +0100 Close core46. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core46, created. 8ee51f4dabc942597314a761801045eb503c3318
by git＠ipfire.org 09 Feb '11

09 Feb '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, core46 has been created at 8ee51f4dabc942597314a761801045eb503c3318 (commit) - Log ----------------------------------------------------------------- commit 8ee51f4dabc942597314a761801045eb503c3318 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 13:16:09 2011 +0100 Close core46. commit 38b6ec334229a4702b7adb08b025df5db172dde0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 10:48:42 2011 +0100 Remove mydyn.de from ddns services. commit 0f27d5de70bef384acb3ca289ca1de7a555e037b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 00:14:13 2011 +0100 Run fireinfo @ core update. commit a8fdfc38ad2014bfa521c8e0208fe7821ca2d149 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:20:34 2011 +0100 Fix openssl rootfile. commit 3fe1243490b163c9db665e577087aa499a9eb292 Merge: bac3bb4 060ae99 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:18:23 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit bac3bb44e6cd3a4b81c5210b780078ac31078917 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:15:53 2011 +0100 Updated openssh (5.8p1). commit 55b4b3c924e1f3e01cb43bf079be884ac0e0d956 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:14:41 2011 +0100 Update openssl (0.9.8r). commit 5cb1931f2520e8e46fd32151ab7101b6e0d470a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:11:51 2011 +0100 Update clamav (0.97). commit 060ae9910d2d75ae382379130586a08e9efbf578 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 22:06:39 2011 +0100 Added recent changes to core46. commit bf7466f5d1069a6b46fe8eb7b8c52dffa656c95e Merge: e1aaecc fc5385b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 22:05:30 2011 +0100 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit e1aaecceb36f23dd3ec821c433ebe3052579f8a3 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 21:40:36 2011 +0100 Change order of the graphs on the system CGI. commit fe23bfb8e9674293a20ec205c22bdd6f60fa12ad Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 21:39:59 2011 +0100 Added translation for missing cpu frequency string. commit b411505d49bd881e44de380f9fc600aa9adf808b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 21:38:13 2011 +0100 Added recent patch supplied by maverick. This adds strato as dyddns provider and closes Bug #0000758 commit fc5385b65486118593131358656c2932211f5873 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 7 23:44:16 2011 +0100 Add backup include to core46. Fixes #0000759 commit e44fb0dc952248d0a8fcea8e59e18117962da633 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 7 23:42:19 2011 +0100 Add ipsec.user.* to backup. commit ccbe39e94aabfc512f689eb74df1915de9298085 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 7 19:56:39 2011 +0100 Change pgp keyserver to pgp.ipfire.org so we can change it in the dns. commit 1c94d079236ec2a9471752dd09bcd084ed6e2c4b Merge: ff305ff 487880c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 6 22:17:03 2011 +0100 Merge commit 'ms/squid-LFS' commit ff305ff7c276789edda0e606dceaa9fd5d715ec6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 6 15:20:44 2011 +0100 Updated compat-wireless (2.6.37-4-sn). Add crda agent. Add python-m2crypto and swig for build crda. commit 487880cb6829ce9ef3a31c8df110c90864e3ec12 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 3 13:00:41 2011 +0100 core 46: Add squid update. commit f19e720dbf75be4b6f8fa42634d6f56176a200e8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 3 12:47:43 2011 +0100 squid: Enable LFS. commit 109a1ec7d488dbb36c236f9d9cd0629764c52e17 Merge: 58d2aa5 beb726d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 23:09:22 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit beb726d82b7705190288b26a743665b50bba99ea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 1 00:03:45 2011 +0100 Updated nmap (5.50). commit 58d2aa5582cdf2c6f99071178be09fd2cee1ff73 Merge: 24c0b6a c7bfbdc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 23:09:04 2011 +0100 Merge branch 'core45' commit 0324cdbd19f1b09b66390823029e11993d40b140 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 20:58:14 2011 +0100 Updated cacti (0.8.7g). commit 72c5e364546485fa8db29197605d4be89d57918c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 20:53:55 2011 +0100 Started core46. commit 24c0b6af6cb65f35068159f1d9bef42f8f7eb5c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 29 20:37:23 2011 +0100 ipfireseeder: update to seed core45. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8ee51f4dabc942597314a761801045eb503c3318
by git＠ipfire.org 09 Feb '11

09 Feb '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 8ee51f4dabc942597314a761801045eb503c3318 (commit) from 38b6ec334229a4702b7adb08b025df5db172dde0 (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 8ee51f4dabc942597314a761801045eb503c3318 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 13:16:09 2011 +0100 Close core46. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 389c825..8ca428e 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="46" # Core Level (Filename) -PAKFIRE_CORE="45" # Core Level (PAKFIRE) +PAKFIRE_CORE="46" # 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. 38b6ec334229a4702b7adb08b025df5db172dde0
by git＠ipfire.org 09 Feb '11

09 Feb '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 38b6ec334229a4702b7adb08b025df5db172dde0 (commit) from 0f27d5de70bef384acb3ca289ca1de7a555e037b (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 38b6ec334229a4702b7adb08b025df5db172dde0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 10:48:42 2011 +0100 Remove mydyn.de from ddns services. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ddns.cgi | 4 +--- src/scripts/setddns.pl | 27 --------------------------- 2 files changed, 1 insertions(+), 30 deletions(-) Difference in files: diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 2912b44..f7ae568 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -243,7 +243,6 @@ $checked{'SERVICE'}{'easydns.com'} = ''; $checked{'SERVICE'}{'enom.com'} = ''; $checked{'SERVICE'}{'freedns.afraid.org'} = ''; $checked{'SERVICE'}{'hn.org'} = ''; -$checked{'SERVICE'}{'mydyn.de'} = ''; $checked{'SERVICE'}{'no-ip.com'} = ''; $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; @@ -337,7 +336,6 @@ print <<END <option $checked{'SERVICE'}{'enom.com'}>enom.com</option> <option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option> <option $checked{'SERVICE'}{'hn.org'}>hn.org</option> - <option $checked{'SERVICE'}{'mydyn.de'}>mydyn.de</option> <option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option> <option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option> <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option> diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index a715904..2c7c947 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -174,33 +174,6 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for cjb.net ($settings{'LOGIN'}) : failure (could not connect to server)"); } } - elsif ($settings{'SERVICE'} eq 'mydyn') { - # use proxy ? - my %proxysettings; - &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); - if ($_=$proxysettings{'UPSTREAM_PROXY'}) { - my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); - Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); - } - - my ($out, $response) = Net::SSLeay::get_http( 'www.mydyn.de', - 80, - "/cgi-bin/update.pl?$settings{'LOGIN'}-$settings{'PASSWORD'}", - Net::SSLeay::make_headers('User-Agent' => 'IPFire' ) - ); - - if ($response =~ m%HTTP/1\.. 200 OK%) { - if ( $out !~ m/The IP address of the subdomain/ ) { - &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (bad password or login)"); - } else { - &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : success"); - $success++; - } - } else { - &General::log("Dynamic DNS ip-update for mydyn.de ($settings{'LOGIN'}) : failure (could not connect to server)"); - } - - } elsif ($settings{'SERVICE'} eq 'selfhost') { # use proxy ? my %proxysettings; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0f27d5de70bef384acb3ca289ca1de7a555e037b
by git＠ipfire.org 08 Feb '11

08 Feb '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 0f27d5de70bef384acb3ca289ca1de7a555e037b (commit) from a8fdfc38ad2014bfa521c8e0208fe7821ca2d149 (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 0f27d5de70bef384acb3ca289ca1de7a555e037b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 9 00:14:13 2011 +0100 Run fireinfo @ core update. ----------------------------------------------------------------------- Summary of changes: .../{oldcore/36 => core/46}/filelists/openssh | 0 config/rootfiles/core/46/update.sh | 2 ++ 2 files changed, 2 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/36 => core/46}/filelists/openssh (100%) Difference in files: diff --git a/config/rootfiles/core/46/filelists/openssh b/config/rootfiles/core/46/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/46/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index 7416512..6d2a75d 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -54,5 +54,7 @@ depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 # #Finish +/etc/init.d/fireinfo start +sendprofile #Don't report the exitcode last command exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a8fdfc38ad2014bfa521c8e0208fe7821ca2d149
by git＠ipfire.org 08 Feb '11

08 Feb '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 a8fdfc38ad2014bfa521c8e0208fe7821ca2d149 (commit) from 3fe1243490b163c9db665e577087aa499a9eb292 (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 a8fdfc38ad2014bfa521c8e0208fe7821ca2d149 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:20:34 2011 +0100 Fix openssl rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index b813c5b..bc1ac49 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -1116,7 +1116,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/dsa.3 #usr/share/man/man3/ecdsa.3 #usr/share/man/man3/engine.3 -+usr/share/man/man3/err.3 +#usr/share/man/man3/err.3 #usr/share/man/man3/evp.3 #usr/share/man/man3/hmac.3 #usr/share/man/man3/i2d_ASN1_OBJECT.3 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3fe1243490b163c9db665e577087aa499a9eb292
by git＠ipfire.org 08 Feb '11

08 Feb '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 3fe1243490b163c9db665e577087aa499a9eb292 (commit) via bac3bb44e6cd3a4b81c5210b780078ac31078917 (commit) via 55b4b3c924e1f3e01cb43bf079be884ac0e0d956 (commit) via 5cb1931f2520e8e46fd32151ab7101b6e0d470a4 (commit) from 060ae9910d2d75ae382379130586a08e9efbf578 (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 3fe1243490b163c9db665e577087aa499a9eb292 Merge: bac3bb4 060ae99 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:18:23 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit bac3bb44e6cd3a4b81c5210b780078ac31078917 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:15:53 2011 +0100 Updated openssh (5.8p1). commit 55b4b3c924e1f3e01cb43bf079be884ac0e0d956 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:14:41 2011 +0100 Update openssl (0.9.8r). commit 5cb1931f2520e8e46fd32151ab7101b6e0d470a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 8 22:11:51 2011 +0100 Update clamav (0.97). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssh | 2 ++ config/rootfiles/common/openssl | 1 + .../{oldcore/28 => core/46}/filelists/openssl | 0 config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 8 ++++---- lfs/openssh | 6 +++--- lfs/openssl | 6 +++--- src/paks/clamav/install.sh | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-) copy config/rootfiles/{oldcore/28 => core/46}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index faae918..6737b6c 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -3,6 +3,8 @@ etc/ssh/moduli etc/ssh/ssh_config #etc/ssh/ssh_host_dsa_key #etc/ssh/ssh_host_dsa_key.pub +#etc/ssh/ssh_host_ecdsa_key +#etc/ssh/ssh_host_ecdsa_key.pub #etc/ssh/ssh_host_key #etc/ssh/ssh_host_key.pub #etc/ssh/ssh_host_rsa_key diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index c075845..b813c5b 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -1116,6 +1116,7 @@ usr/lib/libssl.so.0.9.8 #usr/share/man/man3/dsa.3 #usr/share/man/man3/ecdsa.3 #usr/share/man/man3/engine.3 ++usr/share/man/man3/err.3 #usr/share/man/man3/evp.3 #usr/share/man/man3/hmac.3 #usr/share/man/man3/i2d_ASN1_OBJECT.3 diff --git a/config/rootfiles/core/46/filelists/openssl b/config/rootfiles/core/46/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/46/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 17b99fd..fae43b8 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.7 +usr/lib/libclamav.so.6.1.9 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.7 +usr/lib/libclamunrar.so.6.1.9 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.7 +usr/lib/libclamunrar_iface.so.6.1.9 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index e5a0512..a9d9709 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# 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 = 0.96.5 +VER = 0.97 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 14 +PAK_VER = 15 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a +$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index c9ce714..9f1c280 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -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 = 5.6p1 +VER = 5.8p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0 +$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index dc65ef5..285cae3 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# 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 = 0.9.8q +VER = 0.9.8r THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998 +$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79 install : $(TARGET) diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh index 5e4b7b9..3b7610c 100644 --- a/src/paks/clamav/install.sh +++ b/src/paks/clamav/install.sh @@ -23,4 +23,4 @@ # . /opt/pakfire/lib/functions.sh extract_files -/usr/local/bin/clamavctrl enable +/usr/local/bin/clamavctrl enable & hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 060ae9910d2d75ae382379130586a08e9efbf578
by git＠ipfire.org 08 Feb '11

08 Feb '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 060ae9910d2d75ae382379130586a08e9efbf578 (commit) via bf7466f5d1069a6b46fe8eb7b8c52dffa656c95e (commit) via e1aaecceb36f23dd3ec821c433ebe3052579f8a3 (commit) via fe23bfb8e9674293a20ec205c22bdd6f60fa12ad (commit) via b411505d49bd881e44de380f9fc600aa9adf808b (commit) from fc5385b65486118593131358656c2932211f5873 (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 060ae9910d2d75ae382379130586a08e9efbf578 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 22:06:39 2011 +0100 Added recent changes to core46. commit bf7466f5d1069a6b46fe8eb7b8c52dffa656c95e Merge: e1aaecc fc5385b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 22:05:30 2011 +0100 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit e1aaecceb36f23dd3ec821c433ebe3052579f8a3 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 21:40:36 2011 +0100 Change order of the graphs on the system CGI. commit fe23bfb8e9674293a20ec205c22bdd6f60fa12ad Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 21:39:59 2011 +0100 Added translation for missing cpu frequency string. commit b411505d49bd881e44de380f9fc600aa9adf808b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Feb 8 21:38:13 2011 +0100 Added recent patch supplied by maverick. This adds strato as dyddns provider and closes Bug #0000758 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/46/filelists/files | 7 +++ config/rootfiles/core/46/update.sh | 2 +- html/cgi-bin/ddns.cgi | 4 +- html/cgi-bin/system.cgi | 8 ++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/es/cgi-bin/es.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + src/scripts/setddns.pl | 63 +++++++++++++++++++++++------ 9 files changed, 69 insertions(+), 19 deletions(-) Difference in files: diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files index cdf4b3e..956e06e 100644 --- a/config/rootfiles/core/46/filelists/files +++ b/config/rootfiles/core/46/filelists/files @@ -2,3 +2,10 @@ etc/system-release boot/ipfirerd-2.6.32.28.img opt/pakfire/lib/functions.pl var/ipfire/backup/include +srv/web/ipfire/cgi-bin/system.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +usr/local/bin/setddns.pl +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index fd52ac7..7416512 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -40,7 +40,7 @@ extract_files # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Rebuild initrd of optional pae and xen kernel KVER=2.6.32.28 diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 4dba22f..2912b44 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 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 # @@ -249,6 +249,7 @@ $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; $checked{'SERVICE'}{'regfish.com'} = ''; $checked{'SERVICE'}{'selfhost.de'} = ''; +$checked{'SERVICE'}{'strato.com'} = ''; $checked{'SERVICE'}{'tzo.com'} = ''; $checked{'SERVICE'}{'zoneedit.com'} = ''; $checked{'SERVICE'}{$settings{'SERVICE'}} = "selected='selected'"; @@ -342,6 +343,7 @@ print <<END <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option> <option $checked{'SERVICE'}{'regfish.com'}>regfish.com</option> <option $checked{'SERVICE'}{'selfhost.de'}>selfhost.de</option> + <option $checked{'SERVICE'}{'strato.com'}>strato.com</option>  <option $checked{'SERVICE'}{'zoneedit.com'}>zoneedit.com</option> </select></td> diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 4b8ee47..a0e7655 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -56,16 +56,16 @@ if ( $querry[0] =~ "cpufreq"){ &Header::openpage($Lang::tr{'status information'}, 1, ''); &Header::openbigbox('100%', 'left'); + &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); + &Graphs::makegraphbox("system.cgi","cpu","day","325"); + &Header::closebox(); + if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){ &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","cpufreq","day","325"); &Header::closebox(); } - &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); - &Graphs::makegraphbox("system.cgi","cpu","day","325"); - &Header::closebox(); - &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}"); &Graphs::makegraphbox("system.cgi","load","day"); &Header::closebox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b4db1fe..808092e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -18,6 +18,7 @@ 'ConnSched ipsecstart' => 'IPSec (neu)starten', 'ConnSched ipsecstop' => 'IPSec stop', 'ConnSched reconnect' => 'Neu verbinden', +'cpu frequency per' => 'CPU Frequenz pro', 'ConnSched scheduled actions' => 'Geplante Aktionen', 'ConnSched scheduler' => 'Scheduler', 'ConnSched select profile' => 'Wähle Profil', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a1d687d..26349e1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -17,6 +17,7 @@ 'ConnSched down' => 'Down', 'ConnSched ipsecstart' => 'IPSec (re)start', 'ConnSched ipsecstop' => 'IPSec stop', +'cpu frequency per' => 'CPU frequency per', 'ConnSched reconnect' => 'Reconnect', 'ConnSched scheduled actions' => 'Scheduled actions', 'ConnSched scheduler' => 'Scheduler', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index f5640cf..cad4406 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -535,6 +535,7 @@ 'cpu idle usage' => 'Uso de CPU inactivo', 'cpu interrupt usage' => 'Uso de interrupción de CPU', 'cpu iowait usage' => 'CPU esperando IO', +'cpu frequency per' => 'CPU frecuencia por', 'cpu irq usage' => 'Uso de IRQ del CPU', 'cpu nice usage' => 'Buen uso de CPU', 'cpu steal usage' => 'uso de CPU steal', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 6ccb4d5..eb81c52 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -16,6 +16,7 @@ 'ConnSched days' => 'Jours :', 'ConnSched down' => 'Arrêt', 'ConnSched ipsecstart' => 'IPSec (re)démarrage', +'cpu frequency per' => 'CPU fréquence par', 'ConnSched ipsecstop' => 'IPSec arrêt', 'ConnSched reconnect' => 'Reconnecter', 'ConnSched scheduled actions' => 'Actions planifiées', diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index beb9af8..a715904 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -390,7 +390,7 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); } } - elsif ($settings{'SERVICE'} eq 'regfish') { + elsif ($settings{'SERVICE'} eq 'strato') { # use proxy ? my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); @@ -398,25 +398,62 @@ if ($ip ne $ipcache) { my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); } - my ($out, $response) = Net::SSLeay::get_https( 'dyndns.regfish.de', - 443, - "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}", - Net::SSLeay::make_headers('User-Agent' => 'Ipfire' ) - ); - #Valid responses from service are: - # success|100|update succeeded! - # success|101|no update needed at this time.. + + if ($settings{'HOSTNAME'} eq '') { + $settings{'HOSTDOMAIN'} = $settings{'DOMAIN'}; + } else { + $settings{'HOSTDOMAIN'} = "$settings{'HOSTNAME'}.$settings{'DOMAIN'}"; + } + + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.strato.com', + 443, + "/nic/update?hostname=$settings{'HOSTDOMAIN'}&myip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire', + 'Authorization' => 'Basic ' . encode_base64("$settings{'LOGIN'}:$settings{'PASSWORD'}") ) + ); + if ($response =~ m%HTTP/1\.. 200 OK%) { - if ( $out !~ m/(success\|(100|101)\|)/ig ) { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)"); + #Valid responses from update => ErrCount=0 + if ( $out =~ m/good |nochg /ig) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success"); + $success++; } else { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success"); + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure1 ($out)"); $success++; } + } elsif ( $out =~ m/<title>(.*)<\/title>/ig ) { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure2 ($1)"); } else { - &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)"); + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure3 ($response)"); } } + elsif ($settings{'SERVICE'} eq 'regfish') { + # use proxy ? + my %proxysettings; + &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); + if ($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/); + Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); + } + my ($out, $response) = Net::SSLeay::get_https( 'dyndns.regfish.de', + 443, + "/?fqdn=$settings{'DOMAIN'}&ipv4=$ip&forcehost=1&authtype=secure&token=$settings{'LOGIN'}", + Net::SSLeay::make_headers('User-Agent' => 'Ipfire' ) + ); + #Valid responses from service are: + #success|100|update succeeded! + #success|101|no update needed at this time.. + if ($response =~ m%HTTP/1\.. 200 OK%) { + if ( $out !~ m/(success\|(100|101)\|)/ig ) { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure ($out)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'DOMAIN'} : failure (could not connect to server)"); + } + } elsif ($settings{'SERVICE'} eq 'ovh') { my %proxysettings; &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fc5385b65486118593131358656c2932211f5873
by git＠ipfire.org 07 Feb '11

07 Feb '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 fc5385b65486118593131358656c2932211f5873 (commit) via e44fb0dc952248d0a8fcea8e59e18117962da633 (commit) from ccbe39e94aabfc512f689eb74df1915de9298085 (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 fc5385b65486118593131358656c2932211f5873 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 7 23:44:16 2011 +0100 Add backup include to core46. Fixes #0000759 commit e44fb0dc952248d0a8fcea8e59e18117962da633 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 7 23:42:19 2011 +0100 Add ipsec.user.* to backup. ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/core/46/filelists/files | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/backup/include b/config/backup/include index 87abb07..a5097a9 100644 --- a/config/backup/include +++ b/config/backup/include @@ -7,6 +7,7 @@ /etc/passwd /etc/shadow /etc/group +/etc/ipsec.user.* /etc/sysconfig/* /etc/hosts* /etc/httpd/* diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files index 4996397..cdf4b3e 100644 --- a/config/rootfiles/core/46/filelists/files +++ b/config/rootfiles/core/46/filelists/files @@ -1,3 +1,4 @@ etc/system-release boot/ipfirerd-2.6.32.28.img opt/pakfire/lib/functions.pl +var/ipfire/backup/include 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 February 2011