diff --git a/Makefile b/Makefile
index f11de34..a402af0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
## ############################################################################
## common targets:
-## make apache2-fe (worker, mod_proxy, mod_rewrite)
-## make apache2-be (prefork, mod_rpaf, php4)
+## make apache-fe (worker, mod_proxy, mod_rewrite)
+## make apache-be (prefork, mod_rpaf, php4)
+##
+## build-requirements:
+## build-essential, bzip2
+## libz-dev, libxml2-dev, libpng-dev, libjpeg-dev, libmysqlclient-dev
-DESTDIR=/opt/
+DESTDIR=/opt
+
+MAKE_FLAGS=-j2
## ############################################################################
@@ -15,54 +21,58 @@ _SOURCES=$(_SRCBASE)/source
## ############################################################################
-PACKAGE_APACHE2=httpd-2.0.59.tar.bz2
-DOWNLOAD_APACHE2=http://apache.speedbone.de/httpd/$(PACKAGE_APACHE2)
-SOURCE_APACHE2=$(_SOURCES)/httpd-2.0.59
+VERSION_APACHE=2.2.10
+PACKAGE_APACHE=httpd-$(VERSION_APACHE).tar.bz2
+DOWNLOAD_APACHE=http://apache.speedbone.de/httpd/$(PACKAGE_APACHE)
+SOURCE_APACHE=$(_SOURCES)/httpd-$(VERSION_APACHE)
-PACKAGE_RPAF=mod_rpaf-0.5.tar.gz
+VERSION_RPAF=0.5
+PACKAGE_RPAF=mod_rpaf-$(VERSION_RPAF).tar.gz
DOWNLOAD_RPAF=http://stderr.net/apache/rpaf/download/$(PACKAGE_RPAF)
-SOURCE_RPAF=$(_SOURCES)/mod_rpaf-0.5
+SOURCE_RPAF=$(_SOURCES)/mod_rpaf-$(VERSION_RPAF)
-PACKAGE_PHP4=php-4.4.4.tar.bz2
-DOWNLOAD_PHP4=http://de3.php.net/get/$(PACKAGE_PHP4)/from/this/mirror
-SOURCE_PHP4=$(_SOURCES)/php-4.4.4
+VERSION_PHP=5.2.6
+PACKAGE_PHP=php-$(VERSION_PHP).tar.bz2
+DOWNLOAD_PHP=http://de3.php.net/get/$(PACKAGE_PHP)/from/this/mirror
+SOURCE_PHP=$(_SOURCES)/php-$(VERSION_PHP)
-PACKAGE_EACCELERATOR=eaccelerator-0.9.5.tar.bz2
-DOWNLOAD_EACCELERATOR=http://surfnet.dl.sourceforge.net/sourceforge/eaccelerator/$(PACKAGE_EACCELERATOR)
-SOURCE_EACCELERATOR=$(_SOURCES)/eaccelerator-0.9.5
+VERSION_EACCELERATOR=0.9.5.3
+PACKAGE_EACCELERATOR=eaccelerator-$(VERSION_EACCELERATOR).tar.bz2
+DOWNLOAD_EACCELERATOR=http://bart.eaccelerator.net/source/$(VERSION_EACCELERATOR)/$(PACKAGE_EACCELERATOR)
+SOURCE_EACCELERATOR=$(_SOURCES)/eaccelerator-$(VERSION_EACCELERATOR)
## ############################################################################
-all: apache2-fe apache2-be
+all: apache-fe apache-be
-fetch: $(_DOWNLOADS)/$(PACKAGE_APACHE2) \
+fetch: $(_DOWNLOADS)/$(PACKAGE_APACHE) \
$(_DOWNLOADS)/$(PACKAGE_RPAF) \
- $(_DOWNLOADS)/$(PACKAGE_PHP4) \
+ $(_DOWNLOADS)/$(PACKAGE_PHP) \
$(_DOWNLOADS)/$(PACKAGE_EACCELERATOR)
-
-$(_DOWNLOADS)/$(PACKAGE_APACHE2):
- $(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_APACHE2)
-$(SOURCE_APACHE2)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_APACHE2)
- mkdir -p $(SOURCE_APACHE2)
- tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_APACHE2)
- cat apache2-layouts >> $(SOURCE_APACHE2)/config.layout
+$(_DOWNLOADS)/$(PACKAGE_APACHE):
+ $(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_APACHE)
+
+$(SOURCE_APACHE)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_APACHE)
+ mkdir -p $(SOURCE_APACHE)
+ tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_APACHE)
+ cat apache-layouts >> $(SOURCE_APACHE)/config.layout
touch $@
$(_DOWNLOADS)/$(PACKAGE_RPAF):
- $(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_RPAF)
+ $(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_RPAF)
$(SOURCE_RPAF)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_RPAF)
mkdir -p $(SOURCE_RPAF)
tar -C $(_SOURCES) -xzf $(_DOWNLOADS)/$(PACKAGE_RPAF)
touch $@
-$(_DOWNLOADS)/$(PACKAGE_PHP4):
- $(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_PHP4)
+$(_DOWNLOADS)/$(PACKAGE_PHP):
+ $(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_PHP)
-$(SOURCE_PHP4)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_PHP4)
- mkdir -p $(SOURCE_PHP4)
- tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_PHP4)
+$(SOURCE_PHP)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_PHP)
+ mkdir -p $(SOURCE_PHP)
+ tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_PHP)
touch $@
$(_DOWNLOADS)/$(PACKAGE_EACCELERATOR):
@@ -75,80 +85,79 @@ $(SOURCE_EACCELERATOR)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_EACCELERATOR)
## ############################################################################
-_BUILD_APACHE2_FRONTEND=$(_SOURCES)/apache2-frontend
+_BUILD_APACHE_FRONTEND=$(_SOURCES)/apache-frontend
-apache2-fe: $(_BUILD_APACHE2_FRONTEND)/.installed
+apache-fe: $(_BUILD_APACHE_FRONTEND)/.installed
-$(_BUILD_APACHE2_FRONTEND)/.configured: $(SOURCE_APACHE2)/.unpacked
- mkdir -p $(_BUILD_APACHE2_FRONTEND)
- ( cd $(_BUILD_APACHE2_FRONTEND); \
- $(SOURCE_APACHE2)/configure \
+$(_BUILD_APACHE_FRONTEND)/.configured: $(SOURCE_APACHE)/.unpacked
+ mkdir -p $(_BUILD_APACHE_FRONTEND)
+ ( cd $(_BUILD_APACHE_FRONTEND); \
+ $(SOURCE_APACHE)/configure \
--enable-layout=Frontend \
--with-mpm=worker \
--enable-proxy \
--enable-proxy-http \
+ --enable-proxy-balancer \
--enable-rewrite \
);
touch $@
-$(_BUILD_APACHE2_FRONTEND)/.compiled: $(_BUILD_APACHE2_FRONTEND)/.configured
- make -j2 -C $(_BUILD_APACHE2_FRONTEND) all
+$(_BUILD_APACHE_FRONTEND)/.compiled: $(_BUILD_APACHE_FRONTEND)/.configured
+ make $(MAKE_FLAGS) -C $(_BUILD_APACHE_FRONTEND) all
touch $@
-$(_BUILD_APACHE2_FRONTEND)/.installed: $(_BUILD_APACHE2_FRONTEND)/.compiled
- make -C $(_BUILD_APACHE2_FRONTEND) install
- rm -f /etc/apache2-fe/highperformance*
- rm -f /etc/apache2-fe/ssl*
+$(_BUILD_APACHE_FRONTEND)/.installed: $(_BUILD_APACHE_FRONTEND)/.compiled
+ make -C $(_BUILD_APACHE_FRONTEND) install
+ rm -rf /etc/apache-fe/original
touch $@
-apache2-fe-clean:
- rm -rf $(_BUILD_APACHE2_FRONTEND)
+apache-fe-clean:
+ rm -rf $(_BUILD_APACHE_FRONTEND)
## ############################################################################
-_BUILD_APACHE2_BACKEND=$(_SOURCES)/apache2-backend
-_BUILD_APACHE2_BACKEND_PHP=$(_SOURCES)/apache2-backend-php
+_BUILD_APACHE_BACKEND=$(_SOURCES)/apache-backend
+_BUILD_APACHE_BACKEND_PHP=$(_SOURCES)/apache-backend-php
-apache2-be: $(_BUILD_APACHE2_BACKEND)/.installed \
+apache-be: $(_BUILD_APACHE_BACKEND)/.installed \
$(SOURCE_RPAF)/.installed \
- $(_BUILD_APACHE2_BACKEND_PHP)/.installed \
+ $(_BUILD_APACHE_BACKEND_PHP)/.installed \
$(SOURCE_EACCELERATOR)/.installed
-$(_BUILD_APACHE2_BACKEND)/.configured: $(SOURCE_APACHE2)/.unpacked
- mkdir -p $(_BUILD_APACHE2_BACKEND)
- ( cd $(_BUILD_APACHE2_BACKEND); \
- $(SOURCE_APACHE2)/configure \
+$(_BUILD_APACHE_BACKEND)/.configured: $(SOURCE_APACHE)/.unpacked
+ mkdir -p $(_BUILD_APACHE_BACKEND)
+ ( cd $(_BUILD_APACHE_BACKEND); \
+ $(SOURCE_APACHE)/configure \
--enable-layout=Backend \
--with-mpm=prefork \
--enable-so \
);
touch $@
-$(_BUILD_APACHE2_BACKEND)/.compiled: $(_BUILD_APACHE2_BACKEND)/.configured
- make -j2 -C $(_BUILD_APACHE2_BACKEND) all
+$(_BUILD_APACHE_BACKEND)/.compiled: $(_BUILD_APACHE_BACKEND)/.configured
+ make $(MAKE_FLAGS) -C $(_BUILD_APACHE_BACKEND) all
touch $@
-$(_BUILD_APACHE2_BACKEND)/.installed: $(_BUILD_APACHE2_BACKEND)/.compiled
- make -C $(_BUILD_APACHE2_BACKEND) install
- rm -f /etc/apache2-be/highperformance*
- rm -f /etc/apache2-be/ssl*
+$(_BUILD_APACHE_BACKEND)/.installed: $(_BUILD_APACHE_BACKEND)/.compiled
+ make -C $(_BUILD_APACHE_BACKEND) install
+ rm -rf /etc/apache-be/original
touch $@
-$(SOURCE_RPAF)/.compiled: $(SOURCE_RPAF)/.unpacked $(_BUILD_APACHE2_BACKEND)/.installed
- make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache2-backend/bin/apxs rpaf-2.0
+$(SOURCE_RPAF)/.compiled: $(SOURCE_RPAF)/.unpacked $(_BUILD_APACHE_BACKEND)/.installed
+ make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache-backend/bin/apxs rpaf-2.0
touch $@
$(SOURCE_RPAF)/.installed: $(SOURCE_RPAF)/.compiled
- make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache2-backend/bin/apxs install-2.0
+ make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache-backend/bin/apxs install-2.0
touch $@
-$(_BUILD_APACHE2_BACKEND_PHP)/.configured: $(SOURCE_PHP4)/.unpacked $(_BUILD_APACHE2_BACKEND)/.installed
- mkdir -p $(_BUILD_APACHE2_BACKEND_PHP)
- ( cd $(_BUILD_APACHE2_BACKEND_PHP); \
- $(SOURCE_PHP4)/configure \
- --prefix=$(DESTDIR)/apache2-backend-php \
- --with-apxs2=$(DESTDIR)/apache2-backend/bin/apxs \
- --with-config-file-path=/etc/apache2-be \
+$(_BUILD_APACHE_BACKEND_PHP)/.configured: $(SOURCE_PHP)/.unpacked $(_BUILD_APACHE_BACKEND)/.installed
+ mkdir -p $(_BUILD_APACHE_BACKEND_PHP)
+ ( cd $(_BUILD_APACHE_BACKEND_PHP); \
+ $(SOURCE_PHP)/configure \
+ --prefix=$(DESTDIR)/apache-backend-php \
+ --with-apxs2=$(DESTDIR)/apache-backend/bin/apxs \
+ --with-config-file-path=/etc/apache-be \
--disable-cgi \
--with-layout=GNU \
--disable-rpath \
@@ -159,50 +168,52 @@ $(_BUILD_APACHE2_BACKEND_PHP)/.configured: $(SOURCE_PHP4)/.unpacked $(_BUILD_APA
--with-zlib \
--with-regex=system \
--with-gd \
+ --with-png-dir=/usr \
+ --with-jpeg-dir=/usr \
--with-mysql=/usr \
);
touch $@
-$(_BUILD_APACHE2_BACKEND_PHP)/.compiled: $(_BUILD_APACHE2_BACKEND_PHP)/.configured
- make -j2 -C $(_BUILD_APACHE2_BACKEND_PHP) all
+$(_BUILD_APACHE_BACKEND_PHP)/.compiled: $(_BUILD_APACHE_BACKEND_PHP)/.configured
+ make $(MAKE_FLAGS) -C $(_BUILD_APACHE_BACKEND_PHP) all
touch $@
-$(_BUILD_APACHE2_BACKEND_PHP)/.installed: $(_BUILD_APACHE2_BACKEND_PHP)/.compiled
- make -C $(_BUILD_APACHE2_BACKEND_PHP) install
+$(_BUILD_APACHE_BACKEND_PHP)/.installed: $(_BUILD_APACHE_BACKEND_PHP)/.compiled
+ make -C $(_BUILD_APACHE_BACKEND_PHP) install
# copy default php.ini
- cp $(SOURCE_PHP4)/php.ini-dist /etc/apache2-be/php.ini
+ cp $(SOURCE_PHP)/php.ini-dist /etc/apache-be/php.ini
# set extension-dir
- sed -i /etc/apache2-be/php.ini \
- -e 's:^extension_dir.*$$:extension_dir = $(shell $(DESTDIR)/apache2-backend-php/bin/php-config --extension-dir):'
+ sed -i /etc/apache-be/php.ini \
+ -e 's:^extension_dir.*$$:extension_dir = $(shell $(DESTDIR)/apache-backend-php/bin/php-config --extension-dir):'
touch $@
-$(SOURCE_EACCELERATOR)/.configured: $(SOURCE_EACCELERATOR)/.unpacked $(_BUILD_APACHE2_BACKEND_PHP)/.installed
+$(SOURCE_EACCELERATOR)/.configured: $(SOURCE_EACCELERATOR)/.unpacked $(_BUILD_APACHE_BACKEND_PHP)/.installed
( cd $(SOURCE_EACCELERATOR); \
- $(DESTDIR)/apache2-backend-php/bin/phpize; \
- ./configure \
+ $(DESTDIR)/apache-backend-php/bin/phpize; \
+ ./configure \
--with-eaccelerator=shared \
- --with-php-config=$(DESTDIR)/apache2-backend-php/bin/php-config \
+ --with-php-config=$(DESTDIR)/apache-backend-php/bin/php-config \
);
touch $@
$(SOURCE_EACCELERATOR)/.compiled: $(SOURCE_EACCELERATOR)/.configured
- make -j2 -C $(SOURCE_EACCELERATOR) all
+ make $(MAKE_FLAGS) -C $(SOURCE_EACCELERATOR) all
touch $@
$(SOURCE_EACCELERATOR)/.installed: $(SOURCE_EACCELERATOR)/.compiled
make -C $(SOURCE_EACCELERATOR) install
# enable eaccelerator
sed $(SOURCE_EACCELERATOR)/eaccelerator.ini \
- -e 's:^zend_extension:;zend_extension:' \
- -e 's:;extension="eaccelerator.so":extension="eaccelerator.so":' \
- -e 's:^eaccelerator.log_file.*$$:eaccelerator.log_file = "/var/log/apache2-be/eaccelerator.log":' \
- >> /etc/apache2-be/php.ini
+ -e 's:^zend_extension:;zend_extension:' \
+ -e 's:;extension="eaccelerator.so":extension="eaccelerator.so":' \
+ -e 's:^eaccelerator.log_file.*$$:eaccelerator.log_file = "/var/log/apache-be/eaccelerator.log":' \
+ >> /etc/apache-be/php.ini
touch $@
-apache2-be-clean:
- rm -rf $(_BUILD_APACHE2_BACKEND)
+apache-be-clean:
+ rm -rf $(_BUILD_APACHE_BACKEND)
rm -rf $(SOURCE_RPAF)
- rm -rf $(_BUILD_APACHE2_BACKEND_PHP)
+ rm -rf $(_BUILD_APACHE_BACKEND_PHP)
rm -rf $(SOURCE_EACCELERATOR)
## ############################################################################
diff --git a/apache2-layouts b/apache2-layouts
deleted file mode 100644
index a7913ad..0000000
--- a/apache2-layouts
+++ /dev/null
@@ -1,45 +0,0 @@
-
- prefix: /opt/apache2-frontend
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/modules
- mandir: ${prefix}/man
- sysconfdir: /etc/apache2-fe
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- errordir: ${datadir}/error
- iconsdir: ${datadir}/icons
- htdocsdir: ${datadir}/htdocs
- manualdir: ${datadir}/manual
- cgidir: ${datadir}/cgi-bin
- includedir: ${prefix}/include
- localstatedir: ${prefix}
- runtimedir: ${localstatedir}/run
- logfiledir: /var/log/apache2-fe
- proxycachedir: ${localstatedir}/proxy
-
-
-
- prefix: /opt/apache2-backend
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/bin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/modules
- mandir: ${prefix}/man
- sysconfdir: /etc/apache2-be
- datadir: ${prefix}
- installbuilddir: ${datadir}/build
- errordir: ${datadir}/error
- iconsdir: ${datadir}/icons
- htdocsdir: ${datadir}/htdocs
- manualdir: ${datadir}/manual
- cgidir: ${datadir}/cgi-bin
- includedir: ${prefix}/include
- localstatedir: ${prefix}
- runtimedir: ${localstatedir}/run
- logfiledir: /var/log/apache2-be
- proxycachedir: ${localstatedir}/proxy
-