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 2b5d1d8f703ae2bb0a5b11c254c0890242c3259d (commit) via da997327ad98ff64c1c5e9f765946713970887e1 (commit) via 5971e9a1aa61b76c523111f6c972c531dcd4def4 (commit) via 7e4506e9c7cc5e2dd2cd5e617ec190c89cd12dca (commit) from 7d5fdf795458fde3a2778577445b879e2f1d51af (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 2b5d1d8f703ae2bb0a5b11c254c0890242c3259d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 8 07:50:17 2012 +0100
cups: update to 1.4.8.
commit da997327ad98ff64c1c5e9f765946713970887e1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 8 07:49:48 2012 +0100
core57: add apache and squid to updater.
commit 5971e9a1aa61b76c523111f6c972c531dcd4def4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 8 07:48:52 2012 +0100
squid: update to 3.19.
commit 7e4506e9c7cc5e2dd2cd5e617ec190c89cd12dca Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 8 07:43:48 2012 +0100
apache: security update to 2.2.22.
Fix six low and moderate security flaws. Most of them are not important for ipfire. low: mod_setenvif .htaccess privilege escalation CVE-2011-3607 low: mod_log_config crash CVE-2012-0021 low: scoreboard parent DoS CVE-2012-0031 moderate: mod_proxy reverse proxy exposure CVE-2011-4317 moderate: error responses can expose cookies CVE-2012-0053 moderate: mod_proxy reverse proxy exposure CVE-2011-3368
For details check: http://httpd.apache.org/security/vulnerabilities_22.html
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/apache2 | 18 ++++++++++++++---- config/rootfiles/core/{52 => 57}/filelists/apache2 | 0 config/rootfiles/core/{52 => 57}/filelists/squid | 0 config/rootfiles/core/57/update.sh | 4 ++++ config/rootfiles/packages/cups | 2 ++ lfs/apache2 | 13 +++++++------ lfs/cups | 8 ++++---- lfs/squid | 6 +++--- 8 files changed, 34 insertions(+), 17 deletions(-) copy config/rootfiles/core/{52 => 57}/filelists/apache2 (100%) copy config/rootfiles/core/{52 => 57}/filelists/squid (100%)
Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 2eab3b5..01e9bbe 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -482,6 +482,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/license.html.en #srv/web/ipfire/manual/logs.html #srv/web/ipfire/manual/logs.html.en +#srv/web/ipfire/manual/logs.html.fr #srv/web/ipfire/manual/logs.html.ja.utf8 #srv/web/ipfire/manual/logs.html.ko.euc-kr #srv/web/ipfire/manual/logs.html.tr.utf8 @@ -758,11 +759,14 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_proxy_connect.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en +#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_http.html #srv/web/ipfire/manual/mod/mod_proxy_http.html.en #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr +#srv/web/ipfire/manual/mod/mod_proxy_http.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en +#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_reqtimeout.html #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en #srv/web/ipfire/manual/mod/mod_rewrite.html @@ -873,6 +877,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/new_features_2_2.html #srv/web/ipfire/manual/new_features_2_2.html.en #srv/web/ipfire/manual/new_features_2_2.html.fr +#srv/web/ipfire/manual/new_features_2_2.html.ja.utf8 #srv/web/ipfire/manual/new_features_2_2.html.ko.euc-kr #srv/web/ipfire/manual/new_features_2_2.html.pt-br #srv/web/ipfire/manual/new_features_2_2.html.tr.utf8 @@ -942,6 +947,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/programs/index.html #srv/web/ipfire/manual/programs/index.html.en #srv/web/ipfire/manual/programs/index.html.es +#srv/web/ipfire/manual/programs/index.html.ja.utf8 #srv/web/ipfire/manual/programs/index.html.ko.euc-kr #srv/web/ipfire/manual/programs/index.html.ru.koi8-r #srv/web/ipfire/manual/programs/index.html.tr.utf8 @@ -1066,6 +1072,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/upgrading.html.de #srv/web/ipfire/manual/upgrading.html.en #srv/web/ipfire/manual/upgrading.html.fr +#srv/web/ipfire/manual/upgrading.html.ja.utf8 #srv/web/ipfire/manual/urlmapping.html #srv/web/ipfire/manual/urlmapping.html.en #srv/web/ipfire/manual/urlmapping.html.ja.utf8 @@ -1135,6 +1142,7 @@ etc/httpd/conf/mime.types #usr/include/apache/apr_atomic.h #usr/include/apache/apr_base64.h #usr/include/apache/apr_buckets.h +#usr/include/apache/apr_crypto.h #usr/include/apache/apr_date.h #usr/include/apache/apr_dbd.h #usr/include/apache/apr_dbm.h @@ -1194,6 +1202,7 @@ etc/httpd/conf/mime.types #usr/include/apache/apr_xlate.h #usr/include/apache/apr_xml.h #usr/include/apache/apu.h +#usr/include/apache/apu_errno.h #usr/include/apache/apu_version.h #usr/include/apache/apu_want.h #usr/include/apache/http_config.h @@ -1322,7 +1331,7 @@ usr/lib/libapr-1.so.0.4.5 #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.3.12 +usr/lib/libaprutil-1.so.0.4.1 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab @@ -1340,16 +1349,17 @@ usr/sbin/httpd #usr/sbin/httxt2dbm #usr/sbin/logresolve #usr/sbin/rotatelogs +#usr/share/man/man1/ab.1 +#usr/share/man/man1/apxs.1 #usr/share/man/man1/dbmmanage.1 #usr/share/man/man1/htdbm.1 #usr/share/man/man1/htdigest.1 #usr/share/man/man1/htpasswd.1 -#usr/share/man/man8/ab.8 +#usr/share/man/man1/httxt2dbm.1 +#usr/share/man/man1/logresolve.1 #usr/share/man/man8/apachectl.8 -#usr/share/man/man8/apxs.8 #usr/share/man/man8/htcacheclean.8 #usr/share/man/man8/httpd.8 -#usr/share/man/man8/logresolve.8 #usr/share/man/man8/rotatelogs.8 #usr/share/man/man8/suexec.8 var/log/httpd diff --git a/config/rootfiles/core/57/filelists/apache2 b/config/rootfiles/core/57/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/57/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/57/filelists/squid b/config/rootfiles/core/57/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/57/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh index 2f78a25..6668c8f 100644 --- a/config/rootfiles/core/57/update.sh +++ b/config/rootfiles/core/57/update.sh @@ -34,6 +34,8 @@ done
# #Stop services +/etc/init.d/squid stop +/etc/init.d/apache stop
# #Extract files @@ -42,6 +44,8 @@ extract_files
# #Start services +/etc/init.d/squid start +/etc/init.d/apache start
# #Update Language cache diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 6bf7e69..5f90047 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -949,8 +949,10 @@ usr/share/doc/cups/images #usr/share/doc/cups/images/cups.png #usr/share/doc/cups/images/generic.png #usr/share/doc/cups/images/left.gif +#usr/share/doc/cups/images/raster-organization.png #usr/share/doc/cups/images/raster.png #usr/share/doc/cups/images/right.gif +#usr/share/doc/cups/images/sample-image.png #usr/share/doc/cups/images/sel.gif #usr/share/doc/cups/images/smiley.jpg #usr/share/doc/cups/images/unsel.gif diff --git a/lfs/apache2 b/lfs/apache2 index f548271..f849fc0 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 IPFire Team info@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 # @@ -25,7 +25,7 @@
include Config
-VER = 2.2.21 +VER = 2.2.22
THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
-$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2 +$(DL_FILE)_MD5 = 9fe3093194c8a57f085ff7c3fc43715f httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET) @@ -133,9 +133,10 @@ else cd $(DIR_APP) && make install chown -v root:root /usr/lib/apache/httpd.exp \ /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \ - /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd}}.1 \ - /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \ - /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 + /usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \ + /usr/share/man/man1/{logresolve}.1 \ + /usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \ + /usr/share/man/man8/{rotatelogs,suexec}.8 @rm -rf $(DIR_APP) endif @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index e7fd085..f182538 100644 --- a/lfs/cups +++ b/lfs/cups @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 IPFire Team info@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 = 1.4.6 +VER = 1.4.8
THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 7 +PAK_VER = 8
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = de8fb5a29c36554925c0c6a6e2c0dae1 +$(DL_FILE)_MD5 = 0ec52d3f3c69bc2ab5ed70c594edbce6
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid index 610154b..814985c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 IPFire Team info@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 = 3.1.18 +VER = 3.1.19
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 +$(DL_FILE)_MD5 = 9b6ffaf96bee8f05f0085bc6361d7c94
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree