|
@@ -1,14 +1,14 @@
|
|
|
%define contentdir %{_datadir}/apache2
|
|
|
%define docroot /var/www/apache2
|
|
|
%define suexec_caller www-data
|
|
|
-%define mmn 20051115
|
|
|
+%define mmn 20120211
|
|
|
%define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
|
|
|
%define pkgname apache2
|
|
|
%define vstring Vine
|
|
|
|
|
|
Summary: Apache HTTP Server
|
|
|
Name: %{pkgname}
|
|
|
-Version: 2.4.25
|
|
|
+Version: 2.4.28
|
|
|
Release: 1%{_dist_release}
|
|
|
URL: http://httpd.apache.org/
|
|
|
|
|
@@ -37,30 +37,43 @@ Source21: ssl.conf
|
|
|
Source22: welcome.conf
|
|
|
Source23: manual.conf
|
|
|
Source25: 01-session.conf
|
|
|
+Source28: 00-optional.conf
|
|
|
# Documentation
|
|
|
Source30: README.confd
|
|
|
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.1-apxs.patch
|
|
|
+Patch2: httpd-2.4.9-apxs.patch
|
|
|
Patch3: httpd-2.4.1-deplibs.patch
|
|
|
+Patch5: httpd-2.4.3-layout.patch
|
|
|
+#Patch6: httpd-2.4.3-apctl-systemd.patch
|
|
|
+# Needed for socket activation and mod_systemd patch
|
|
|
+#Patch19: httpd-2.4.25-detect-systemd.patch
|
|
|
# Features/functional changes
|
|
|
Patch23: httpd-2.4.4-export.patch
|
|
|
Patch24: httpd-2.4.1-corelimit.patch
|
|
|
+#Patch25: httpd-2.4.25-selinux.patch
|
|
|
Patch26: httpd-2.4.4-r1337344+.patch
|
|
|
Patch27: httpd-2.4.2-icons.patch
|
|
|
+Patch29: httpd-2.4.27-systemd.patch
|
|
|
Patch30: httpd-2.4.4-cachehardmax.patch
|
|
|
Patch31: httpd-2.4.18-sslmultiproxy.patch
|
|
|
+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
|
|
|
-Patch57: httpd-2.4.10-sigint.patch
|
|
|
-Patch58: httpd-2.4.20-debug-crash.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
|
|
|
+
|
|
|
+
|
|
|
License: Apache Software License
|
|
|
Group: System Environment/Daemons
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
@@ -130,18 +143,27 @@ Security (TLS) protocols.
|
|
|
%patch1 -p1 -b .apctl
|
|
|
%patch2 -p1 -b .apxs
|
|
|
%patch3 -p1 -b .deplibs
|
|
|
+%patch5 -p1 -b .layout
|
|
|
+#%patch6 -p1 -b .apctlsystemd
|
|
|
+
|
|
|
+#%patch19 -p1 -b .detectsystemd
|
|
|
|
|
|
%patch23 -p1 -b .export
|
|
|
%patch24 -p1 -b .corelimit
|
|
|
+#%patch25 -p1 -b .selinux
|
|
|
%patch26 -p1 -b .r1337344+
|
|
|
%patch27 -p1 -b .icons
|
|
|
+%patch29 -p1 -b .systemd
|
|
|
%patch30 -p1 -b .cachehardmax
|
|
|
%patch31 -p1 -b .sslmultiproxy
|
|
|
+%patch34 -p1 -b .socketactivation
|
|
|
+%patch35 -p1 -b .sslciphdefault
|
|
|
|
|
|
%patch56 -p1 -b .uniqueid
|
|
|
+%patch58 -p1 -b .r1738878
|
|
|
+%patch60 -p1 -b .r1808230
|
|
|
|
|
|
-%patch57 -p1 -b .sigint
|
|
|
-%patch58 -p1 -b .debug-crash
|
|
|
+%patch61 -p1 -b .ticketkeys
|
|
|
|
|
|
# Patch in the vendor string
|
|
|
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
|
|
@@ -228,7 +250,7 @@ install -m 644 $RPM_SOURCE_DIR/README.confmod \
|
|
|
|
|
|
for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
|
|
|
00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \
|
|
|
- 01-ldap.conf 01-session.conf; do
|
|
|
+ 01-ldap.conf 01-session.conf 00-optional.conf; do
|
|
|
install -m 644 -p $RPM_SOURCE_DIR/$f \
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d/$f
|
|
|
done
|
|
@@ -519,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Oct 15 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.28-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Fri Mar 17 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.25-1
|
|
|
- new upstream release.
|
|
|
- dropped Patch55: fixed in upstream.
|