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 88af830315fbb554192944d47dc4ab6be642e02b (commit) via ca23dbe2faead9baadd28c3f64de3f0d49688b02 (commit) from 714df8de9724e5f1fc8dbbd37802c74bd21fbd8c (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 88af830315fbb554192944d47dc4ab6be642e02b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 12 00:00:27 2011 +0200

Fix core update excludes.

commit ca23dbe2faead9baadd28c3f64de3f0d49688b02 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 12 00:00:05 2011 +0200

apache2: update to 2.2.19.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/apache2 | 75 ++++++++++++++++---- config/rootfiles/core/48/exclude | 2 +- config/rootfiles/core/49/exclude | 2 +- config/rootfiles/core/50/exclude | 3 +- config/rootfiles/core/{44 => 50}/filelists/apache2 | 0 lfs/apache2 | 4 +- 6 files changed, 68 insertions(+), 18 deletions(-) copy config/rootfiles/core/{44 => 50}/filelists/apache2 (100%)

Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index be4648b..b2462e1 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -323,12 +323,14 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/developer/debugging.html.en #srv/web/ipfire/manual/developer/documenting.html #srv/web/ipfire/manual/developer/documenting.html.en +#srv/web/ipfire/manual/developer/documenting.html.zh-cn #srv/web/ipfire/manual/developer/filters.html #srv/web/ipfire/manual/developer/filters.html.en #srv/web/ipfire/manual/developer/hooks.html #srv/web/ipfire/manual/developer/hooks.html.en #srv/web/ipfire/manual/developer/index.html #srv/web/ipfire/manual/developer/index.html.en +#srv/web/ipfire/manual/developer/index.html.zh-cn #srv/web/ipfire/manual/developer/modules.html #srv/web/ipfire/manual/developer/modules.html.en #srv/web/ipfire/manual/developer/modules.html.ja.utf8 @@ -355,6 +357,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/faq/index.html #srv/web/ipfire/manual/faq/index.html.en #srv/web/ipfire/manual/faq/index.html.tr.utf8 +#srv/web/ipfire/manual/faq/index.html.zh-cn #srv/web/ipfire/manual/filter.html #srv/web/ipfire/manual/filter.html.en #srv/web/ipfire/manual/filter.html.es @@ -378,11 +381,13 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/handler.html.ko.euc-kr #srv/web/ipfire/manual/handler.html.ru.koi8-r #srv/web/ipfire/manual/handler.html.tr.utf8 +#srv/web/ipfire/manual/handler.html.zh-cn #srv/web/ipfire/manual/howto #srv/web/ipfire/manual/howto/access.html #srv/web/ipfire/manual/howto/access.html.en #srv/web/ipfire/manual/howto/auth.html #srv/web/ipfire/manual/howto/auth.html.en +#srv/web/ipfire/manual/howto/auth.html.fr #srv/web/ipfire/manual/howto/auth.html.ja.utf8 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr #srv/web/ipfire/manual/howto/auth.html.tr.utf8 @@ -392,6 +397,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html #srv/web/ipfire/manual/howto/htaccess.html.en +#srv/web/ipfire/manual/howto/htaccess.html.fr #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html.pt-br @@ -399,6 +405,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/howto/index.html.en #srv/web/ipfire/manual/howto/index.html.ja.utf8 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr +#srv/web/ipfire/manual/howto/index.html.zh-cn #srv/web/ipfire/manual/howto/public_html.html #srv/web/ipfire/manual/howto/public_html.html.en #srv/web/ipfire/manual/howto/public_html.html.ja.utf8 @@ -432,6 +439,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/images/mod_rewrite_fig2.gif #srv/web/ipfire/manual/images/mod_rewrite_fig2.png #srv/web/ipfire/manual/images/pixel.gif +#srv/web/ipfire/manual/images/rewrite_rule_flow.png #srv/web/ipfire/manual/images/right.gif #srv/web/ipfire/manual/images/ssl_intro_fig1.gif #srv/web/ipfire/manual/images/ssl_intro_fig1.png @@ -440,6 +448,8 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/images/ssl_intro_fig3.gif #srv/web/ipfire/manual/images/ssl_intro_fig3.png #srv/web/ipfire/manual/images/sub.gif +#srv/web/ipfire/manual/images/syntax_rewritecond.png +#srv/web/ipfire/manual/images/syntax_rewriterule.png #srv/web/ipfire/manual/images/up.gif #srv/web/ipfire/manual/index.html #srv/web/ipfire/manual/index.html.de @@ -450,6 +460,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/index.html.ko.euc-kr #srv/web/ipfire/manual/index.html.pt-br #srv/web/ipfire/manual/index.html.tr.utf8 +#srv/web/ipfire/manual/index.html.zh-cn #srv/web/ipfire/manual/install.html #srv/web/ipfire/manual/install.html.de #srv/web/ipfire/manual/install.html.en @@ -479,6 +490,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/misc/index.html.en #srv/web/ipfire/manual/misc/index.html.ko.euc-kr #srv/web/ipfire/manual/misc/index.html.tr.utf8 +#srv/web/ipfire/manual/misc/index.html.zh-cn #srv/web/ipfire/manual/misc/password_encryptions.html #srv/web/ipfire/manual/misc/password_encryptions.html.en #srv/web/ipfire/manual/misc/perf-tuning.html @@ -504,6 +516,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/core.html #srv/web/ipfire/manual/mod/core.html.de #srv/web/ipfire/manual/mod/core.html.en +#srv/web/ipfire/manual/mod/core.html.fr #srv/web/ipfire/manual/mod/core.html.ja.utf8 #srv/web/ipfire/manual/mod/core.html.tr.utf8 #srv/web/ipfire/manual/mod/directive-dict.html @@ -519,6 +532,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/directives.html.ko.euc-kr #srv/web/ipfire/manual/mod/directives.html.ru.koi8-r #srv/web/ipfire/manual/mod/directives.html.tr.utf8 +#srv/web/ipfire/manual/mod/directives.html.zh-cn #srv/web/ipfire/manual/mod/event.html #srv/web/ipfire/manual/mod/event.html.en #srv/web/ipfire/manual/mod/index.html @@ -528,6 +542,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/index.html.ja.utf8 #srv/web/ipfire/manual/mod/index.html.ko.euc-kr #srv/web/ipfire/manual/mod/index.html.tr.utf8 +#srv/web/ipfire/manual/mod/index.html.zh-cn #srv/web/ipfire/manual/mod/mod_actions.html #srv/web/ipfire/manual/mod/mod_actions.html.de #srv/web/ipfire/manual/mod/mod_actions.html.en @@ -544,13 +559,16 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_asis.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_auth_basic.html #srv/web/ipfire/manual/mod/mod_auth_basic.html.en +#srv/web/ipfire/manual/mod/mod_auth_basic.html.fr #srv/web/ipfire/manual/mod/mod_auth_basic.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_auth_basic.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_auth_digest.html #srv/web/ipfire/manual/mod/mod_auth_digest.html.en +#srv/web/ipfire/manual/mod/mod_auth_digest.html.fr #srv/web/ipfire/manual/mod/mod_auth_digest.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_authn_alias.html #srv/web/ipfire/manual/mod/mod_authn_alias.html.en +#srv/web/ipfire/manual/mod/mod_authn_alias.html.fr #srv/web/ipfire/manual/mod/mod_authn_anon.html #srv/web/ipfire/manual/mod/mod_authn_anon.html.en #srv/web/ipfire/manual/mod/mod_authn_anon.html.ja.utf8 @@ -567,10 +585,12 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_authn_default.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_authn_file.html #srv/web/ipfire/manual/mod/mod_authn_file.html.en +#srv/web/ipfire/manual/mod/mod_authn_file.html.fr #srv/web/ipfire/manual/mod/mod_authn_file.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_authn_file.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_authnz_ldap.html #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en +#srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr #srv/web/ipfire/manual/mod/mod_authz_dbm.html #srv/web/ipfire/manual/mod/mod_authz_dbm.html.en #srv/web/ipfire/manual/mod/mod_authz_dbm.html.ko.euc-kr @@ -596,6 +616,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_authz_user.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html #srv/web/ipfire/manual/mod/mod_autoindex.html.en +#srv/web/ipfire/manual/mod/mod_autoindex.html.fr #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8 @@ -724,6 +745,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_nw_ssl.html.en #srv/web/ipfire/manual/mod/mod_proxy.html #srv/web/ipfire/manual/mod/mod_proxy.html.en +#srv/web/ipfire/manual/mod/mod_proxy.html.fr #srv/web/ipfire/manual/mod/mod_proxy.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_ajp.html #srv/web/ipfire/manual/mod/mod_proxy_ajp.html.en @@ -738,12 +760,14 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en #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_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en #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 #srv/web/ipfire/manual/mod/mod_rewrite.html.en +#srv/web/ipfire/manual/mod/mod_rewrite.html.fr #srv/web/ipfire/manual/mod/mod_setenvif.html #srv/web/ipfire/manual/mod/mod_setenvif.html.en #srv/web/ipfire/manual/mod/mod_setenvif.html.ja.utf8 @@ -769,6 +793,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_substitute.html.en #srv/web/ipfire/manual/mod/mod_suexec.html #srv/web/ipfire/manual/mod/mod_suexec.html.en +#srv/web/ipfire/manual/mod/mod_suexec.html.fr #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8 @@ -821,6 +846,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/quickreference.html.ko.euc-kr #srv/web/ipfire/manual/mod/quickreference.html.ru.koi8-r #srv/web/ipfire/manual/mod/quickreference.html.tr.utf8 +#srv/web/ipfire/manual/mod/quickreference.html.zh-cn #srv/web/ipfire/manual/mod/worker.html #srv/web/ipfire/manual/mod/worker.html.de #srv/web/ipfire/manual/mod/worker.html.en @@ -834,6 +860,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mpm.html.ja.utf8 #srv/web/ipfire/manual/mpm.html.ko.euc-kr #srv/web/ipfire/manual/mpm.html.tr.utf8 +#srv/web/ipfire/manual/mpm.html.zh-cn #srv/web/ipfire/manual/new_features_2_0.html #srv/web/ipfire/manual/new_features_2_0.html.de #srv/web/ipfire/manual/new_features_2_0.html.en @@ -856,6 +883,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/platform/index.html #srv/web/ipfire/manual/platform/index.html.en #srv/web/ipfire/manual/platform/index.html.ko.euc-kr +#srv/web/ipfire/manual/platform/index.html.zh-cn #srv/web/ipfire/manual/platform/netware.html #srv/web/ipfire/manual/platform/netware.html.en #srv/web/ipfire/manual/platform/netware.html.ko.euc-kr @@ -917,6 +945,7 @@ etc/httpd/conf/mime.types #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 +#srv/web/ipfire/manual/programs/index.html.zh-cn #srv/web/ipfire/manual/programs/logresolve.html #srv/web/ipfire/manual/programs/logresolve.html.en #srv/web/ipfire/manual/programs/logresolve.html.ko.euc-kr @@ -934,19 +963,36 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr #srv/web/ipfire/manual/programs/suexec.html.tr.utf8 #srv/web/ipfire/manual/rewrite +#srv/web/ipfire/manual/rewrite/access.html +#srv/web/ipfire/manual/rewrite/access.html.en +#srv/web/ipfire/manual/rewrite/advanced.html +#srv/web/ipfire/manual/rewrite/advanced.html.en +#srv/web/ipfire/manual/rewrite/avoid.html +#srv/web/ipfire/manual/rewrite/avoid.html.en +#srv/web/ipfire/manual/rewrite/flags.html +#srv/web/ipfire/manual/rewrite/flags.html.en +#srv/web/ipfire/manual/rewrite/flags.html.fr +#srv/web/ipfire/manual/rewrite/htaccess.html +#srv/web/ipfire/manual/rewrite/htaccess.html.en #srv/web/ipfire/manual/rewrite/index.html #srv/web/ipfire/manual/rewrite/index.html.en +#srv/web/ipfire/manual/rewrite/index.html.fr #srv/web/ipfire/manual/rewrite/index.html.tr.utf8 -#srv/web/ipfire/manual/rewrite/rewrite_flags.html -#srv/web/ipfire/manual/rewrite/rewrite_flags.html.en -#srv/web/ipfire/manual/rewrite/rewrite_guide.html -#srv/web/ipfire/manual/rewrite/rewrite_guide.html.en -#srv/web/ipfire/manual/rewrite/rewrite_guide_advanced.html -#srv/web/ipfire/manual/rewrite/rewrite_guide_advanced.html.en -#srv/web/ipfire/manual/rewrite/rewrite_intro.html -#srv/web/ipfire/manual/rewrite/rewrite_intro.html.en -#srv/web/ipfire/manual/rewrite/rewrite_tech.html -#srv/web/ipfire/manual/rewrite/rewrite_tech.html.en +#srv/web/ipfire/manual/rewrite/index.html.zh-cn +#srv/web/ipfire/manual/rewrite/intro.html +#srv/web/ipfire/manual/rewrite/intro.html.en +#srv/web/ipfire/manual/rewrite/intro.html.fr +#srv/web/ipfire/manual/rewrite/proxy.html +#srv/web/ipfire/manual/rewrite/proxy.html.en +#srv/web/ipfire/manual/rewrite/remapping.html +#srv/web/ipfire/manual/rewrite/remapping.html.en +#srv/web/ipfire/manual/rewrite/rewritemap.html +#srv/web/ipfire/manual/rewrite/rewritemap.html.en +#srv/web/ipfire/manual/rewrite/tech.html +#srv/web/ipfire/manual/rewrite/tech.html.en +#srv/web/ipfire/manual/rewrite/tech.html.fr +#srv/web/ipfire/manual/rewrite/vhosts.html +#srv/web/ipfire/manual/rewrite/vhosts.html.en #srv/web/ipfire/manual/sections.html #srv/web/ipfire/manual/sections.html.en #srv/web/ipfire/manual/sections.html.fr @@ -965,11 +1011,13 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/sitemap.html.ja.utf8 #srv/web/ipfire/manual/sitemap.html.ko.euc-kr #srv/web/ipfire/manual/sitemap.html.tr.utf8 +#srv/web/ipfire/manual/sitemap.html.zh-cn #srv/web/ipfire/manual/ssl #srv/web/ipfire/manual/ssl/index.html #srv/web/ipfire/manual/ssl/index.html.en #srv/web/ipfire/manual/ssl/index.html.ja.utf8 #srv/web/ipfire/manual/ssl/index.html.tr.utf8 +#srv/web/ipfire/manual/ssl/index.html.zh-cn #srv/web/ipfire/manual/ssl/ssl_compat.html #srv/web/ipfire/manual/ssl/ssl_compat.html.en #srv/web/ipfire/manual/ssl/ssl_faq.html @@ -1010,6 +1058,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/style/xsl/util #srv/web/ipfire/manual/suexec.html #srv/web/ipfire/manual/suexec.html.en +#srv/web/ipfire/manual/suexec.html.fr #srv/web/ipfire/manual/suexec.html.ja.utf8 #srv/web/ipfire/manual/suexec.html.ko.euc-kr #srv/web/ipfire/manual/suexec.html.tr.utf8 @@ -1048,6 +1097,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/vhosts/index.html.ko.euc-kr #srv/web/ipfire/manual/vhosts/index.html.ru.koi8-r #srv/web/ipfire/manual/vhosts/index.html.tr.utf8 +#srv/web/ipfire/manual/vhosts/index.html.zh-cn #srv/web/ipfire/manual/vhosts/ip-based.html #srv/web/ipfire/manual/vhosts/ip-based.html.en #srv/web/ipfire/manual/vhosts/ip-based.html.fr @@ -1262,12 +1312,12 @@ usr/lib/apache/mod_vhost_alias.so #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.4.2 +usr/lib/libapr-1.so.0.4.5 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.3.10 +usr/lib/libaprutil-1.so.0.3.12 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab @@ -1333,7 +1383,6 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi srv/web/ipfire/cgi-bin/iptables.cgi srv/web/ipfire/cgi-bin/logs.cgi srv/web/ipfire/cgi-bin/mac.cgi -#srv/web/ipfire/cgi-bin/mdstat.cgi srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/memory.cgi srv/web/ipfire/cgi-bin/modem.cgi diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude index 6fe46b4..ce199d8 100644 --- a/config/rootfiles/core/48/exclude +++ b/config/rootfiles/core/48/exclude @@ -1 +1 @@ -/srv/web/ipfire/html/proxy.pac +srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude index 6fe46b4..ce199d8 100644 --- a/config/rootfiles/core/49/exclude +++ b/config/rootfiles/core/49/exclude @@ -1 +1 @@ -/srv/web/ipfire/html/proxy.pac +srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude index 6fe46b4..bb0d8c8 100644 --- a/config/rootfiles/core/50/exclude +++ b/config/rootfiles/core/50/exclude @@ -1 +1,2 @@ -/srv/web/ipfire/html/proxy.pac +srv/web/ipfire/html/proxy.pac +var/updatecache diff --git a/config/rootfiles/core/50/filelists/apache2 b/config/rootfiles/core/50/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/50/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/lfs/apache2 b/lfs/apache2 index 7b5b791..80e96b7 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@

include Config

-VER = 2.2.17 +VER = 2.2.19

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 = 16eadc59ea6b38af33874d300973202e +$(DL_FILE)_MD5 = 832f96a6ec4b8fc7cf49b9efd4e89060 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822

install : $(TARGET)

hooks/post-receive -- IPFire 2.x development tree