- start playing with 2.4.1

diff --git a/apache-layout.patch b/apache-layout.patch
index 91d96dff2c4851e676c96802007676112a348f27..4e28a31034689e1e3115039b8af655fd2a673ff5 100644 (file)
--- a/apache-layout.patch
+++ b/apache-layout.patch
@@ -1,13 +1,11 @@
-diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
---- httpd-2.0.45.org/config.layout     Thu Apr  3 09:27:42 2003
-+++ httpd-2.0.45/config.layout Thu Apr  3 09:27:59 2003
-@@ -298,3 +298,28 @@
-     installbuilddir: ${prefix}/etc/apache2/build
-     errordir:      ${datadir}/error
+--- httpd-2.4.1/config.layout.orig     2012-02-02 13:05:28.000000000 +0100
++++ httpd-2.4.1/config.layout  2012-02-21 23:00:30.919692557 +0100
+@@ -347,3 +347,27 @@
+     proxycachedir: ${localstatedir}/proxy
  </Layout>
-+
-+# PLD layout
-+<Layout PLD>
+ 
++# TLD layout
++<Layout TLD>
 +    prefix:        /usr
 +    exec_prefix:   ${prefix}
 +    bindir:        ${exec_prefix}/bin

diff --git a/apache-syslibs.patch b/apache-syslibs.patch
index 21aa0309e95a53bc818cc2bd6219cbf79735f359..0f78f198d817b59e4b5cd412e75474930fda4f79 100644 (file)
--- a/apache-syslibs.patch
+++ b/apache-syslibs.patch
@@ -1,17 +1,3 @@
---- httpd-2.2.0/configure.in~  2005-12-18 02:38:31.000000000 +0200
-+++ httpd-2.2.0/configure.in   2005-12-18 02:40:04.000000000 +0200
-@@ -584,9 +584,9 @@
-               [Listening sockets are non-blocking when there are more than 1])
- fi
- 
--APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
-+APACHE_FAST_OUTPUT(Makefile modules/Makefile)
- APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
--APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
-+APACHE_FAST_OUTPUT(support/Makefile)
- 
- if test -d ./test; then
-     APACHE_FAST_OUTPUT(test/Makefile)
 --- httpd-2.2.0/Makefile.in    2005-12-18 02:41:25.000000000 +0200
 +++ httpd-2.2.0/Makefile.in    2005-12-18 02:38:31.000000000 +0200
 @@ -1,5 +1,5 @@
@@ -21,3 +7,14 @@
  CLEAN_SUBDIRS = test
  
  PROGRAM_NAME         = $(progname)
+--- httpd-2.4.1/configure.in.orig      2012-02-21 23:01:57.000000000 +0100
++++ httpd-2.4.1/configure.in   2012-02-21 23:04:58.222953514 +0100
+@@ -751,7 +751,7 @@
+               [Allow IPv4 connections on IPv6 listening sockets])
+ fi
+ 
+-APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
++APACHE_FAST_OUTPUT(Makefile modules/Makefile) 
+ APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
+ APACHE_FAST_OUTPUT(support/Makefile)
+ 

diff --git a/apache.spec b/apache.spec
index 109acff926d7483d7d24b01e529f5794b1c6133b..05c15cbeb900c488b4edb4c026091a66c0453d26 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -37,12 +37,12 @@ Summary(pt_BR.UTF-8):       Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):     Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
-Version:       2.2.22
-Release:       1
+Version:       2.4.1
+Release:       0.1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: d77fa5af23df96a8af68ea8114fa6ce1
+# Source0-md5: 4366afbea8149ca125af01fd59a2f8a2
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -1797,7 +1797,7 @@ if [ "$MODULES_API" != "%_apache_modules_api" ]; then
        exit 1
 fi
 
-# fix libdir (at least in PLD layout; no need to care about other ones)
+# fix libdir (at least in TLD layout; no need to care about other ones)
 sed -i -e 's,/lib$,/%{_lib},' config.layout
 
 %build
@@ -1822,7 +1822,7 @@ CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
 for mpm in prefork worker %{?with_event:event} %{?with_itk:itk}; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
-       --enable-layout=PLD \
+       --enable-layout=TLD \
        --disable-v4-mapped \
        $( [ "${mpm}" = "prefork" -o "${mpm}" = "worker" -o "${mpm}" = "event" -o "${mpm}" = "itk" ] && echo "--enable-exception-hook" ) \
        --enable-modules=all \