include Config
-VER = 2.2.6
+VER = 2.2.11
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(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 = 9c759a9744436de6a6aa2ddbc49d6e81
+$(DL_FILE)_MD5 = 3e98bcb14a7122c274d62419566431bb
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)
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/updatecache/{download,metadata}}
+ 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 \
chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*}
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
### Add IPFire's layout, too
echo "# IPFire layout" >> $(DIR_APP)/config.layout
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 \