###############################################################################
-# This file is part of the IPCop Firewall. #
# #
-# IPCop is free software; you can redistribute it and/or modify #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# 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 #
-# the Free Software Foundation; either version 2 of the License, or #
+# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
-# IPCop is distributed in the hope that it will be useful, #
+# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
+
###############################################################################
# Definitions
###############################################################################
include Config
-VER = 2.2.2
+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 /home/httpd/{cgi-bin,html}
- cp -aR $(DIR_SRC)/html/* /home/httpd
- -find /home/httpd -name .svn -exec rm -rf {} \;
- cp $(DIR_DL)/sflogo.png /home/httpd/html/images/
+ mkdir -p /srv/web/ipfire/{cgi-bin,html}
+ mkdir -p /var/updatecache/{download,metadata}
+ cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
# Change CONFIG_ROOT in cgi-scripts
- for i in /home/httpd/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
+ for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \
if [ -f $$i ]; then \
sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \
fi; \
done
- chown -R root:root /home/httpd
- chmod -R 755 /home/httpd/cgi-bin
- chmod -R 644 /home/httpd/html
- chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,redirect.cgi,dial.cgi,images,include}
+ chown -R root:root /srv/web/ipfire
+ 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/*/*}
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
echo " libexecdir: /usr/lib/apache" >> $(DIR_APP)/config.layout
echo " mandir: /usr/share/man" >> $(DIR_APP)/config.layout
echo " sysconfdir: /etc/httpd/conf" >> $(DIR_APP)/config.layout
- echo " datadir: /home/httpd" >> $(DIR_APP)/config.layout
+ echo " datadir: /srv/web/ipfire" >> $(DIR_APP)/config.layout
echo " installbuilddir: /usr/lib/apache/build" >> $(DIR_APP)/config.layout
- echo " errordir: /home/httpd/error" >> $(DIR_APP)/config.layout
- echo " iconsdir: /home/httpd/icons" >> $(DIR_APP)/config.layout
- echo " htdocsdir: /home/httpd/htdocs" >> $(DIR_APP)/config.layout
- echo " manualdir: /home/httpd/manual" >> $(DIR_APP)/config.layout
- echo " cgidir: /home/httpd/cgi-bin" >> $(DIR_APP)/config.layout
+ echo " errordir: /srv/web/ipfire/error" >> $(DIR_APP)/config.layout
+ echo " iconsdir: /srv/web/ipfire/icons" >> $(DIR_APP)/config.layout
+ echo " htdocsdir: /srv/web/ipfire/htdocs" >> $(DIR_APP)/config.layout
+ echo " manualdir: /srv/web/ipfire/manual" >> $(DIR_APP)/config.layout
+ echo " cgidir: /srv/web/ipfire/cgi-bin" >> $(DIR_APP)/config.layout
echo " includedir: /usr/include/apache" >> $(DIR_APP)/config.layout
- echo " localstatedir: /home/httpd" >> $(DIR_APP)/config.layout
+ echo " localstatedir: /srv/web/ipfire" >> $(DIR_APP)/config.layout
echo " runtimedir: /var/run" >> $(DIR_APP)/config.layout
echo " logfiledir: /var/log/httpd" >> $(DIR_APP)/config.layout
echo " proxycachedir: /var/cache/apache/proxy" >> $(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 \