- up to 2.4.3; fixes CVE-2012-3502 CVE-2012-2687 (sent by shadzik)

diff --git a/apache-layout.patch b/apache-layout.patch
index 2a434dcc7e62870a1cc4d4a414f410a96448edc6..1f6d92b53a09f3bb8232e0e29a180156ce841914 100644 (file)
--- a/apache-layout.patch
+++ b/apache-layout.patch
@@ -1,10 +1,10 @@
-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
-@@ -347,3 +347,27 @@
-     proxycachedir: ${localstatedir}/proxy
+--- httpd-2.4.3/config.layout.orig     2012-04-17 16:01:41.000000000 +0200
++++ httpd-2.4.3/config.layout  2012-08-23 13:01:27.879147377 +0200
+@@ -370,3 +370,29 @@
+     logfiledir:      ${localstatedir}/log/httpd
+     proxycachedir:   ${localstatedir}/cache/httpd
  </Layout>
- 
++
 +# PLD layout
 +<Layout PLD>
 +    prefix:        /usr
@@ -29,4 +29,4 @@ diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
 +    proxycachedir: /var/cache/httpd
 +    installbuilddir: ${libexecdir}/build
 +</Layout>
-
++

diff --git a/apache.spec b/apache.spec
index eca15710bf7ef5ce8637b0edf16b844722fc9e47..9e9b2e5879b7b655c71a6cc34e485315bb3ffe00 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -38,12 +38,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.4.2
+Version:       2.4.3
 Release:       0.1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 02d674020d5eda33267861d4a09bf3d4
+# Source0-md5: 538dccd22dd18466fff3ec7948495417
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig