Accepting request 149979 from home:elvigia:branches:Apache

-  Apache 2.4.3 
* SECURITY: CVE-2012-3502
* SECURITY: CVE-2012-2687
* mod_cache: Set content type in case we return stale content.
* lots of bugfixes see http://www.apache.org/dist/httpd/CHANGES_2.4.3

- Improve systemd unit file (tested for months)

OBS-URL: https://build.opensuse.org/request/show/149979
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=376

apache2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Jan 26 05:06:07 UTC 2013 - crrodriguez@opensuse.org
+
+-  Apache 2.4.3 
+* SECURITY: CVE-2012-3502
+* SECURITY: CVE-2012-2687
+* mod_cache: Set content type in case we return stale content.
+* lots of bugfixes see http://www.apache.org/dist/httpd/CHANGES_2.4.3
+
+-------------------------------------------------------------------
+Sat Jan 26 05:00:00 UTC 2013 - crrodriguez@opensuse.org
+
+- Improve systemd unit file (tested for months)
+
 -------------------------------------------------------------------
 Fri Jan 18 11:52:30 CET 2013 - mhrusecky@suse.cz
 

apache2.service

@@ -1,16 +1,14 @@
 [Unit]
-Description=apache
-After=syslog.target network.target
+Description=The Apache Webserver
+After=network.target remote-fs.target nss-lookup.target
 Before=getty@tty1.service
 
 [Service]
-Type=forking
-PIDFile=/var/run/httpd2.pid
+PrivateTmp=true
 EnvironmentFile=/etc/sysconfig/apache2
-ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -k start
-ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -t
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=/usr/sbin/httpd2 -D SYSTEMD -k stop
+ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k start
+ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -t -k graceful
+ExecStop=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k graceful-stop
 
 [Install]
 WantedBy=multi-user.target

apache2.spec

@@ -75,8 +75,8 @@ BuildRequires:  expat-devel
 # "Server:" header
 %define VENDOR SUSE
 %define platform_string	Linux/%VENDOR
-%define realver 2.4.2
-Version:        2.4.2
+%define realver 2.4.3
+Version:        2.4.3
 Release:        0
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        httpd-%{realver}.tar.xz
@@ -134,7 +134,7 @@ Source143:      apache2-systemd-ask-pass
 Source144:      apache2.service
 Patch2:         httpd-2.1.3alpha-layout.dif
 Patch23:        httpd-2.1.9-apachectl.dif
-Patch65:        httpd-2.0.49-log_server_status.dif
+#Patch65:        httpd-2.0.49-log_server_status.dif
 Patch66:        httpd-2.0.54-envvars.dif
 Patch67:        httpd-2.2.0-apxs-a2enmod.dif
 Patch68:        httpd-2.x.x-logresolve.patch
@@ -357,11 +357,11 @@ to administrators of web servers in general.
 %setup -q -n httpd-%{realver}
 %patch2 -p1
 %patch23
-%patch65 -p1
+#%patch65 -p1
 %patch66
 %patch67 -p1
 %patch68 -p1
-%patch69
+#%patch69
 %patch100 -p1
 %patch101
 %patch108 -p1

httpd-2.4.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:932c695ff1ff7c907f67bed7462faf567d99744306b8491ba9db6bb0e8135905
-size 3645528

httpd-2.4.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89ba3db446faa929206ed3f5a1bef7133e034ad8f8abfc5e8f8eb41f3cc61074
+size 4032716