rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

require mod_http2, now packaged separately

Browse Source
This commit is contained in:
Joe Orton 2017-05-16 10:00:54 +01:00
parent 55508e1530
commit dbcbdf8a73
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
00-base.conf
View File

@ -37,7 +37,6 @@ LoadModule expires_module modules/mod_expires.so
LoadModule ext_filter_module modules/mod_ext_filter.so LoadModule ext_filter_module modules/mod_ext_filter.so
LoadModule filter_module modules/mod_filter.so LoadModule filter_module modules/mod_filter.so
LoadModule headers_module modules/mod_headers.so LoadModule headers_module modules/mod_headers.so
LoadModule http2_module modules/mod_http2.so
LoadModule include_module modules/mod_include.so LoadModule include_module modules/mod_include.so
LoadModule info_module modules/mod_info.so LoadModule info_module modules/mod_info.so
LoadModule log_config_module modules/mod_log_config.so LoadModule log_config_module modules/mod_log_config.so

12
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.25 Version: 2.4.25
Release: 7%{?dist} Release: 8%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -78,7 +78,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, perl, perl-generators, pkgconfig, findutils, xmlto BuildRequires: autoconf, perl, perl-generators, pkgconfig, findutils, xmlto
BuildRequires: zlib-devel, libselinux-devel, lua-devel BuildRequires: zlib-devel, libselinux-devel, lua-devel
BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0 BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0
BuildRequires: systemd-devel, libnghttp2-devel BuildRequires: systemd-devel
Requires: /etc/mime.types, system-logos-httpd Requires: /etc/mime.types, system-logos-httpd
Obsoletes: httpd-suexec Obsoletes: httpd-suexec
Provides: webserver Provides: webserver
@ -86,7 +86,7 @@ Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
Requires: httpd-tools = %{version}-%{release} Requires: httpd-tools = %{version}-%{release}
Requires: httpd-filesystem = %{version}-%{release} Requires: httpd-filesystem = %{version}-%{release}
Requires: nghttp2 >= 1.5.0 Requires: mod_http2
Requires(pre): httpd-filesystem Requires(pre): httpd-filesystem
Requires(preun): systemd-units Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
@ -287,7 +287,8 @@ export LYNX_PATH=/usr/bin/links
--enable-ldap --enable-authnz-ldap \ --enable-ldap --enable-authnz-ldap \
--enable-cgid --enable-cgi \ --enable-cgid --enable-cgi \
--enable-authn-anon --enable-authn-alias \ --enable-authn-anon --enable-authn-alias \
--disable-imagemap --disable-file-cache --disable-imagemap --disable-file-cache \
--disable-http2 \
$* $*
make %{?_smp_mflags} make %{?_smp_mflags}
@ -690,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Tue May 16 2017 Joe Orton <jorton@redhat.com> - 2.4.25-8
- require mod_http2, now packaged separately
* Wed Mar 29 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-7 * Wed Mar 29 2017 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-7
- Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp: - Resolves: #1397243 - Backport Apache Bug 53098 - mod_proxy_ajp:
patch to set worker secret passed to tomcat patch to set worker secret passed to tomcat

2
pullrev.sh
View File

@ -6,7 +6,7 @@ if [ $# -lt 1 ]; then
fi fi
repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk" repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
#repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x" repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
ver=2.4.25 ver=2.4.25
prefix="httpd-${ver}" prefix="httpd-${ver}"
suffix="r$1${2:++}" suffix="r$1${2:++}"