Merge branch 'next' into thirteen

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 01e9bbe4c06cccd9c95d907941adbd7b32f2275a..802ddcb72a447be5a85936ca1e4cc95f99ed9734 100644 (file)
--- 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 (symlink)
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 9b3fec5c98547d2de65c7459a1dab700897e95a3..f0764aebd3a445b831b1c95cb3b9ab29dc17ca0d 100644 (file)
--- 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 bcc9155aee3f67c1533b4915c72c98b9b47bc4fa..c3d91560290eb02afdf3272d37899dbe0a63600f 100644 (file)
--- 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 9c6a3b65d44c77c4d55d3bc1adea154fe90f4d21..4741754167d636ab47ec05ec321e9825f20a47e2 100644 (file)
--- 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)