Update translations

[ipfire-2.x.git] / lfs / apache2

diff --git a/lfs/apache2 b/lfs/apache2
index 4ffe1216d9cb535fd22e963e39564e4a44e6b981..5e886254694793fb355db4612de48d8b208d7430 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014   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.6
+VER        = 2.2.27
 
 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 = 203bea91715064f0c787f6499d33a377
+$(DL_FILE)_MD5 = 8faef0decf3fa7e69b2568eb2105a3d8
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)
@@ -82,13 +82,11 @@ ifeq "$(PASS)" "C"
 
        cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
        ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
-       -find /etc/httpd/conf -name .svn -exec rm -rf {} \;
 
        # Copy all html/cgi-bin files
        mkdir -p /srv/web/ipfire/{cgi-bin,html}
        mkdir -p /var/updatecache/{download,metadata}
        cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
-       -find /srv/web/ipfire -name .svn -exec rm -rf {} \;
 
        # Change CONFIG_ROOT in cgi-scripts
        for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
@@ -100,6 +98,10 @@ ifeq "$(PASS)" "C"
        chmod -R 755 /srv/web/ipfire/cgi-bin
        chmod -R 644 /srv/web/ipfire/html
        chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*}
+       ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded
+
+       # Reset permissions of redirect templates and theme directories
+       find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755
 else
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch
@@ -130,12 +132,12 @@ else
        echo "</Layout>" >> $(DIR_APP)/config.layout
 
        cd $(DIR_APP) && ./configure --enable-layout=IPFire \
-                               --enable-ssl --enable-mods-shared=all
+                               --enable-ssl --enable-mods-shared=all --enable-proxy
        cd $(DIR_APP) && make $(MAKETUNING)
        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/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)