rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 179374 from home:elvigia:branches:Apache

Browse Source 
- remove After=mysql.service php-fpm.service postgresql.service 
  which were added in the previous change, those must be added
  as Before=apache2.service in the respective services.

- Include mod_systemd for more complete integration with 
  systemd, turn the service to Typé=notify as required
- Disable SSL NPN patch for now, it is required for mod_spdy
  but mod_spdy does not support apache 2.4

- apache 2.4.4 
* fix for CVE-2012-3499
* fix for the CRIME attack (disable ssl compression by default)
* many other bugfies
* build access_compat amd unixd as static modules and solve
 some other upgrade quirks (bnc#813705)

OBS-URL: https://build.opensuse.org/request/show/179374
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=379
This commit is contained in:
Cristian Rodríguez
2013-06-18 05:57:29 +00:00
committed by Git OBS Bridge
parent 86ea9c10f2
commit c386f992ca
9 changed files with 297 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apache2.spec
View File

@@ -33,7 +33,8 @@ BuildRequires: libcap
BuildRequires: libcap-devel
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(libsystemd-daemon)
%endif
%if %{?suse_version:1}0
@@ -80,11 +81,11 @@ BuildRequires: expat-devel
# "Server:" header
%define VENDOR SUSE
%define platform_string Linux/%VENDOR
%define realver 2.4.3
Version: 2.4.3
%define realver 2.4.4
Version: 2.4.4
Release: 0
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
Source0: httpd-%{realver}.tar.xz
Source0: httpd-%{realver}.tar.bz2
# Add file to take mtime from it in prep section
Source1: apache2.changes
Source6: 60C5442D.key
@@ -144,11 +145,14 @@ Patch66: httpd-2.0.54-envvars.dif
Patch67: httpd-2.2.0-apxs-a2enmod.dif
Patch68: httpd-2.x.x-logresolve.patch
Patch69: httpd-2.2.x-bnc690734.patch
Patch70: apache2-implicit-pointer-decl.patch
Patch100: apache2.4-mpm-itk-2.4.2-01.patch
Patch101: httpd-2.2.19-linux3.patch
# PATCH-FEATURE-UPSTREAM apache2-mod_ssl_npn.patch dimstar@opensuse.org -- Add npn support to mod_ssl (needed for spdy)
Patch108: apache2-mod_ssl_npn.patch
Provides: apache2(mod_ssl+npn)
#Patch108: apache2-mod_ssl_npn.patch
#Provides: apache2(mod_ssl+npn)
# PATCH-FEATURE-UPSTREAM httpd-2.4.3-mod_systemd.patch crrodriguez@opensuse.org simple module provides systemd integration.
Patch109: httpd-2.4.3-mod_systemd.patch
Url: http://httpd.apache.org/
Icon: Apache.xpm
Summary: The Apache Web Server Version 2.2
@@ -367,9 +371,11 @@ to administrators of web servers in general.
%patch67 -p1
%patch68 -p1
#%patch69
%patch70 -p1
%patch100 -p1
%patch101
%patch108 -p1
#%patch108 -p1
%patch109 -p1
#
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
@@ -429,6 +435,7 @@ function configure {
--enable-pie \
%endif
--enable-mods-shared=all \
--enable-mods-static="access_compat unixd" \
--enable-ssl=shared \
\
--disable-isapi \
@@ -723,7 +730,7 @@ EOF
#
ln -sf ../mime.types $RPM_BUILD_ROOT/%{sysconfdir}/mime.types
mv $RPM_BUILD_ROOT/%{cgidir}/printenv .
mv $RPM_BUILD_ROOT/%{cgidir}/printenv* .
mv $RPM_BUILD_ROOT/%{cgidir}/test-cgi .
pushd $RPM_BUILD_ROOT/%{_mandir}
for i in $(find . -type f); do