diff --git a/Makefile b/Makefile
index a402af0..f45253e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
##
## build-requirements:
## build-essential, bzip2
-## libz-dev, libxml2-dev, libpng-dev, libjpeg-dev, libmysqlclient-dev
+## libz-dev, libxml2-dev, libpng-dev, libjpeg-dev, libmysqlclient-dev, libfreetype6-dev
DESTDIR=/opt
@@ -21,7 +21,7 @@ _SOURCES=$(_SRCBASE)/source
## ############################################################################
-VERSION_APACHE=2.2.10
+VERSION_APACHE=2.2.11
PACKAGE_APACHE=httpd-$(VERSION_APACHE).tar.bz2
DOWNLOAD_APACHE=http://apache.speedbone.de/httpd/$(PACKAGE_APACHE)
SOURCE_APACHE=$(_SOURCES)/httpd-$(VERSION_APACHE)
@@ -31,7 +31,7 @@ PACKAGE_RPAF=mod_rpaf-$(VERSION_RPAF).tar.gz
DOWNLOAD_RPAF=http://stderr.net/apache/rpaf/download/$(PACKAGE_RPAF)
SOURCE_RPAF=$(_SOURCES)/mod_rpaf-$(VERSION_RPAF)
-VERSION_PHP=5.2.6
+VERSION_PHP=5.2.9
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)
@@ -85,13 +85,15 @@ $(SOURCE_EACCELERATOR)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_EACCELERATOR)
## ############################################################################
-_BUILD_APACHE_FRONTEND=$(_SOURCES)/apache-frontend
+_APACHE_FE_BUILD=$(_SOURCES)/apache22-frontend
+_APACHE_FE_DEST=$(DESTDIR)/apache22-frontend
+_APACHE_FE_CONF=/etc/apache22-fe
-apache-fe: $(_BUILD_APACHE_FRONTEND)/.installed
+apache-fe: $(_APACHE_FE_BUILD)/.installed
-$(_BUILD_APACHE_FRONTEND)/.configured: $(SOURCE_APACHE)/.unpacked
- mkdir -p $(_BUILD_APACHE_FRONTEND)
- ( cd $(_BUILD_APACHE_FRONTEND); \
+$(_APACHE_FE_BUILD)/.configured: $(SOURCE_APACHE)/.unpacked
+ mkdir -p $(_APACHE_FE_BUILD)
+ ( cd $(_APACHE_FE_BUILD); \
$(SOURCE_APACHE)/configure \
--enable-layout=Frontend \
--with-mpm=worker \
@@ -102,31 +104,37 @@ $(_BUILD_APACHE_FRONTEND)/.configured: $(SOURCE_APACHE)/.unpacked
);
touch $@
-$(_BUILD_APACHE_FRONTEND)/.compiled: $(_BUILD_APACHE_FRONTEND)/.configured
- make $(MAKE_FLAGS) -C $(_BUILD_APACHE_FRONTEND) all
+$(_APACHE_FE_BUILD)/.compiled: $(_APACHE_FE_BUILD)/.configured
+ make $(MAKE_FLAGS) -C $(_APACHE_FE_BUILD) all
touch $@
-$(_BUILD_APACHE_FRONTEND)/.installed: $(_BUILD_APACHE_FRONTEND)/.compiled
- make -C $(_BUILD_APACHE_FRONTEND) install
- rm -rf /etc/apache-fe/original
+$(_APACHE_FE_BUILD)/.installed: $(_APACHE_FE_BUILD)/.compiled
+ make -C $(_APACHE_FE_BUILD) install
+ rm -rf $(_APACHE_FE_CONF)/original
touch $@
apache-fe-clean:
- rm -rf $(_BUILD_APACHE_FRONTEND)
+ rm -rf $(_APACHE_FE_BUILD)
## ############################################################################
-_BUILD_APACHE_BACKEND=$(_SOURCES)/apache-backend
-_BUILD_APACHE_BACKEND_PHP=$(_SOURCES)/apache-backend-php
+_APACHE_BE_BUILD=$(_SOURCES)/apache22-backend
+_APACHE_BE_DEST=$(DESTDIR)/apache22-backend
+_APACHE_BE_CONF=/etc/apache22-be
+_APACHE_BE_LOG=/var/log/apache22-be
-apache-be: $(_BUILD_APACHE_BACKEND)/.installed \
+_PHP_BE_BUILD=$(_SOURCES)/apache22-backend-php
+_PHP_BE_DEST=$(DESTDIR)/apache22-backend-php
+_PHP_BE_CONF=/etc/apache22-be
+
+apache-be: $(_APACHE_BE_BUILD)/.installed \
$(SOURCE_RPAF)/.installed \
- $(_BUILD_APACHE_BACKEND_PHP)/.installed \
+ $(_PHP_BE_BUILD)/.installed \
$(SOURCE_EACCELERATOR)/.installed
-$(_BUILD_APACHE_BACKEND)/.configured: $(SOURCE_APACHE)/.unpacked
- mkdir -p $(_BUILD_APACHE_BACKEND)
- ( cd $(_BUILD_APACHE_BACKEND); \
+$(_APACHE_BE_BUILD)/.configured: $(SOURCE_APACHE)/.unpacked
+ mkdir -p $(_APACHE_BE_BUILD)
+ ( cd $(_APACHE_BE_BUILD); \
$(SOURCE_APACHE)/configure \
--enable-layout=Backend \
--with-mpm=prefork \
@@ -134,30 +142,30 @@ $(_BUILD_APACHE_BACKEND)/.configured: $(SOURCE_APACHE)/.unpacked
);
touch $@
-$(_BUILD_APACHE_BACKEND)/.compiled: $(_BUILD_APACHE_BACKEND)/.configured
- make $(MAKE_FLAGS) -C $(_BUILD_APACHE_BACKEND) all
+$(_APACHE_BE_BUILD)/.compiled: $(_APACHE_BE_BUILD)/.configured
+ make $(MAKE_FLAGS) -C $(_APACHE_BE_BUILD) all
touch $@
-$(_BUILD_APACHE_BACKEND)/.installed: $(_BUILD_APACHE_BACKEND)/.compiled
- make -C $(_BUILD_APACHE_BACKEND) install
- rm -rf /etc/apache-be/original
+$(_APACHE_BE_BUILD)/.installed: $(_APACHE_BE_BUILD)/.compiled
+ make -C $(_APACHE_BE_BUILD) install
+ rm -rf $(_APACHE_BE_CONF)/original
touch $@
-$(SOURCE_RPAF)/.compiled: $(SOURCE_RPAF)/.unpacked $(_BUILD_APACHE_BACKEND)/.installed
- make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache-backend/bin/apxs rpaf-2.0
+$(SOURCE_RPAF)/.compiled: $(SOURCE_RPAF)/.unpacked $(_APACHE_BE_BUILD)/.installed
+ make -C $(SOURCE_RPAF) APXS=$(_APACHE_BE_DEST)/bin/apxs rpaf-2.0
touch $@
$(SOURCE_RPAF)/.installed: $(SOURCE_RPAF)/.compiled
- make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache-backend/bin/apxs install-2.0
+ make -C $(SOURCE_RPAF) APXS=$(_APACHE_BE_DEST)/bin/apxs install-2.0
touch $@
-$(_BUILD_APACHE_BACKEND_PHP)/.configured: $(SOURCE_PHP)/.unpacked $(_BUILD_APACHE_BACKEND)/.installed
- mkdir -p $(_BUILD_APACHE_BACKEND_PHP)
- ( cd $(_BUILD_APACHE_BACKEND_PHP); \
+$(_PHP_BE_BUILD)/.configured: $(SOURCE_PHP)/.unpacked $(_APACHE_BE_BUILD)/.installed
+ mkdir -p $(_PHP_BE_BUILD)
+ ( cd $(_PHP_BE_BUILD); \
$(SOURCE_PHP)/configure \
- --prefix=$(DESTDIR)/apache-backend-php \
- --with-apxs2=$(DESTDIR)/apache-backend/bin/apxs \
- --with-config-file-path=/etc/apache-be \
+ --prefix=$(_PHP_BE_DEST) \
+ --with-apxs2=$(_APACHE_BE_DEST)/bin/apxs \
+ --with-config-file-path=$(_PHP_BE_CONF) \
--disable-cgi \
--with-layout=GNU \
--disable-rpath \
@@ -170,29 +178,30 @@ $(_BUILD_APACHE_BACKEND_PHP)/.configured: $(SOURCE_PHP)/.unpacked $(_BUILD_APACH
--with-gd \
--with-png-dir=/usr \
--with-jpeg-dir=/usr \
+ --with-freetype-dir=/usr/include/freetype2 \
--with-mysql=/usr \
);
touch $@
-$(_BUILD_APACHE_BACKEND_PHP)/.compiled: $(_BUILD_APACHE_BACKEND_PHP)/.configured
- make $(MAKE_FLAGS) -C $(_BUILD_APACHE_BACKEND_PHP) all
+$(_PHP_BE_BUILD)/.compiled: $(_PHP_BE_BUILD)/.configured
+ make $(MAKE_FLAGS) -C $(_PHP_BE_BUILD) all
touch $@
-$(_BUILD_APACHE_BACKEND_PHP)/.installed: $(_BUILD_APACHE_BACKEND_PHP)/.compiled
- make -C $(_BUILD_APACHE_BACKEND_PHP) install
+$(_PHP_BE_BUILD)/.installed: $(_PHP_BE_BUILD)/.compiled
+ make -C $(_PHP_BE_BUILD) install
# copy default php.ini
- cp $(SOURCE_PHP)/php.ini-dist /etc/apache-be/php.ini
+ cp $(SOURCE_PHP)/php.ini-dist $(_PHP_BE_CONF)/php.ini.dist
# set 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):'
+ sed -i $(_PHP_BE_CONF)/php.ini.dist \
+ -e 's:^extension_dir.*$$:extension_dir = $(shell $(_PHP_BE_DEST)/bin/php-config --extension-dir):'
touch $@
-$(SOURCE_EACCELERATOR)/.configured: $(SOURCE_EACCELERATOR)/.unpacked $(_BUILD_APACHE_BACKEND_PHP)/.installed
+$(SOURCE_EACCELERATOR)/.configured: $(SOURCE_EACCELERATOR)/.unpacked $(_PHP_BE_BUILD)/.installed
( cd $(SOURCE_EACCELERATOR); \
- $(DESTDIR)/apache-backend-php/bin/phpize; \
+ $(_PHP_BE_DEST)/bin/phpize; \
./configure \
--with-eaccelerator=shared \
- --with-php-config=$(DESTDIR)/apache-backend-php/bin/php-config \
+ --with-php-config=$(_PHP_BE_DEST)/bin/php-config \
);
touch $@
@@ -206,14 +215,14 @@ $(SOURCE_EACCELERATOR)/.installed: $(SOURCE_EACCELERATOR)/.compiled
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/apache-be/eaccelerator.log":' \
- >> /etc/apache-be/php.ini
+ -e 's:^eaccelerator.log_file.*$$:eaccelerator.log_file = "$(_APACHE_BE_LOG)/eaccelerator.log":' \
+ >> $(_PHP_BE_CONF)/php.ini.dist
touch $@
apache-be-clean:
- rm -rf $(_BUILD_APACHE_BACKEND)
+ rm -rf $(_APACHE_BE_BUILD)
rm -rf $(SOURCE_RPAF)
- rm -rf $(_BUILD_APACHE_BACKEND_PHP)
+ rm -rf $(_PHP_BE_BUILD)
rm -rf $(SOURCE_EACCELERATOR)
## ############################################################################
diff --git a/apache-layouts b/apache-layouts
new file mode 100644
index 0000000..8d4e34c
--- /dev/null
+++ b/apache-layouts
@@ -0,0 +1,45 @@
+
+ prefix: /opt/apache22-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/apache22-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/apache22-fe
+ proxycachedir: ${localstatedir}/proxy
+
+
+
+ prefix: /opt/apache22-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/apache22-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/apache22-be
+ proxycachedir: ${localstatedir}/proxy
+