|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
|
Summary: Apache HTTP Server
|
|
|
Name: %{pkgname}
|
|
|
-Version: 2.4.28
|
|
|
+Version: 2.4.29
|
|
|
Release: 1%{_dist_release}
|
|
|
URL: http://httpd.apache.org/
|
|
|
|
|
|
@@ -44,6 +44,7 @@ Source31: README.confmod
|
|
|
# add vine entry to config.layout
|
|
|
Source100: vine-config.layout
|
|
|
|
|
|
+# build/scripts patches
|
|
|
Patch1: httpd-2.4.1-apctl.patch
|
|
|
Patch2: httpd-2.4.9-apxs.patch
|
|
|
Patch3: httpd-2.4.1-deplibs.patch
|
|
|
@@ -64,14 +65,10 @@ Patch34: httpd-2.4.17-socket-activation.patch
|
|
|
Patch35: httpd-2.4.17-sslciphdefault.patch
|
|
|
|
|
|
# Bug fixes
|
|
|
-Patch56: httpd-2.4.4-mod_unique_id.patch
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
|
|
Patch58: httpd-2.4.25-r1738878.patch
|
|
|
-Patch60: httpd-2.4.27-r1808230.patch
|
|
|
-# Security fixes
|
|
|
|
|
|
-# https://github.com/apache/httpd/commit/4171fbfcb249e63f934471054d7a0752272fb8ee
|
|
|
-Patch61: httpd-2.4.27-fixticketkeys.patch
|
|
|
+# Security fixes
|
|
|
|
|
|
|
|
|
License: Apache Software License
|
|
|
@@ -159,11 +156,9 @@ Security (TLS) protocols.
|
|
|
%patch34 -p1 -b .socketactivation
|
|
|
%patch35 -p1 -b .sslciphdefault
|
|
|
|
|
|
-%patch56 -p1 -b .uniqueid
|
|
|
%patch58 -p1 -b .r1738878
|
|
|
-%patch60 -p1 -b .r1808230
|
|
|
|
|
|
-%patch61 -p1 -b .ticketkeys
|
|
|
+perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
|
|
|
|
|
|
# Patch in the vendor string
|
|
|
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
|
|
|
@@ -541,6 +536,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.29-1
|
|
|
+- new upstream release.
|
|
|
+- fixed apxs.
|
|
|
+- dropped Patch56,60 and 61: fixed in upstream.
|
|
|
+
|
|
|
* Sun Oct 15 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.28-1
|
|
|
- new upstream release.
|
|
|
|
tomop