|
|
@@ -1,12 +1,12 @@
|
|
|
%define contentdir /var/www
|
|
|
%define suexec_caller apache
|
|
|
-%define mmn 20020903
|
|
|
+%define mmn 20051115
|
|
|
%define pkgname apache2
|
|
|
|
|
|
Summary: Apache HTTP Server
|
|
|
Name: %{pkgname}
|
|
|
-Version: 2.2.14
|
|
|
-Release: 9%{_dist_release}
|
|
|
+Version: 2.2.19
|
|
|
+Release: 1%{_dist_release}
|
|
|
URL: http://httpd.apache.org/
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -46,9 +46,6 @@ Patch54: httpd-2.2.0-authnoprov.patch
|
|
|
Patch60: httpd-2.2.3-sslusername.patch
|
|
|
|
|
|
# Security fixes
|
|
|
-Patch100: apache2-2.2.14-CVE-2010-0408.patch
|
|
|
-Patch110: httpd-2.2.x-CVE-2010-0434.diff
|
|
|
-Patch120: httpd-2.2.x-CVE-2010-1452.diff
|
|
|
|
|
|
License: Apache Software License
|
|
|
Group: System Environment/Daemons
|
|
|
@@ -123,9 +120,6 @@ Security (TLS) protocols.
|
|
|
%patch54 -p1 -b .authnoprov
|
|
|
%patch60 -p1 -b .sslusername
|
|
|
|
|
|
-%patch100 -p4 -b .CVE-2010-0408
|
|
|
-%patch110 -p0 -b .CVE-2010-0434
|
|
|
-%patch120 -p0 -b .CVE-2010-1452
|
|
|
|
|
|
# copy across the migration guide and sed it's location into apachectl
|
|
|
cp $RPM_SOURCE_DIR/migration.{html,css} .
|
|
|
@@ -493,6 +487,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/apache2/build/*.sh
|
|
|
|
|
|
%changelog
|
|
|
+* Mon May 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.19-1
|
|
|
+- update to 2.2.19
|
|
|
+
|
|
|
* Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.14-9
|
|
|
- remove old Obsoletes/Conflicts
|
|
|
|
daisuke