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, thirteen has been updated via 7778e4da40e18c786333bdc28aba1752af3c87b8 (commit) via 102d54873b6089cf6ff40d55dcd8e620f426c4a3 (commit) via 5bf93aaf1ed38f0a89353a7728c2ddfd13c27c14 (commit) from 2cb35915849558b46ecc492a2c646057643b9945 (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 7778e4da40e18c786333bdc28aba1752af3c87b8 Merge: 2cb3591 102d548 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Mon Oct 1 08:22:34 2012 +0200

Merge branch 'next' into thirteen

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

Summary of changes: config/rootfiles/common/apache2 | 12 ++++++++---- .../{oldcore/44 => core/63}/filelists/apache2 | 0 config/rootfiles/core/63/update.sh | 4 +++- lfs/apache2 | 11 +++++------ lfs/samba | 6 +++--- 5 files changed, 19 insertions(+), 14 deletions(-) copy config/rootfiles/{oldcore/44 => core/63}/filelists/apache2 (100%)

Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 01e9bbe..802ddcb 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -439,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_backreferences.png #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 @@ -1051,6 +1052,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/style/css/manual-zip-100pc.css #srv/web/ipfire/manual/style/css/manual-zip.css #srv/web/ipfire/manual/style/css/manual.css +#srv/web/ipfire/manual/style/css/prettify.css #srv/web/ipfire/manual/style/faq.dtd #srv/web/ipfire/manual/style/lang #srv/web/ipfire/manual/style/lang.dtd @@ -1058,6 +1060,8 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/style/latex/atbeginend.sty #srv/web/ipfire/manual/style/manualpage.dtd #srv/web/ipfire/manual/style/modulesynopsis.dtd +#srv/web/ipfire/manual/style/scripts +#srv/web/ipfire/manual/style/scripts/prettify.js #srv/web/ipfire/manual/style/sitemap.dtd #srv/web/ipfire/manual/style/version.ent #srv/web/ipfire/manual/style/xsl @@ -1326,7 +1330,7 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.4.5 +usr/lib/libapr-1.so.0.4.6 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so @@ -1349,17 +1353,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/man1/httxt2dbm.1 -#usr/share/man/man1/logresolve.1 +#usr/share/man/man8/ab.8 #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/63/filelists/apache2 b/config/rootfiles/core/63/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/63/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/63/update.sh b/config/rootfiles/core/63/update.sh index 9b3fec5..f0764ae 100644 --- a/config/rootfiles/core/63/update.sh +++ b/config/rootfiles/core/63/update.sh @@ -26,7 +26,7 @@

# # Remove old core updates from pakfire cache to save space... -core=62 +core=63 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -37,6 +37,7 @@ rm -f /etc/dhcpd.conf

# #Stop services +/etc/init.d/apache stop

# #Extract files @@ -44,6 +45,7 @@ extract_files

# #Start services +/etc/init.d/apache start

# #Update Language cache diff --git a/lfs/apache2 b/lfs/apache2 index bcc9155..c3d9156 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@

include Config

-VER = 2.2.22 +VER = 2.2.23

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 = 9fe3093194c8a57f085ff7c3fc43715f +$(DL_FILE)_MD5 = ca133de0e4b4b15316990a97186b9993 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822

install : $(TARGET) @@ -133,10 +133,9 @@ 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/{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 + /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \ + /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \ + /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 @rm -rf $(DIR_APP) endif @$(POSTBUILD) diff --git a/lfs/samba b/lfs/samba index 9c6a3b6..4741754 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@

include Config

-VER = 3.5.16 +VER = 3.5.18

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 = 41 +PAK_VER = 42

DEPS = "cups"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 260cf49b683e86f4cc316c1e6fddbdc5 +$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a

install : $(TARGET)

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