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

Merged update from upstream sources 

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/httpd.git#29e98b0c619d7a5404b2d11e013cc79d9492ad92
This commit is contained in:
DistroBaker 2021-04-04 23:35:58 +00:00
parent 61d6b6e6bb
commit 66c73bf2eb
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
apache-poweredby.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

12
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.46 Version: 2.4.46
Release: 9%{?dist} Release: 10%{?dist}
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@ -60,6 +60,7 @@ Source44: httpd@.service
Source45: config.layout Source45: config.layout
Source46: apachectl.sh Source46: apachectl.sh
Source47: apachectl.xml Source47: apachectl.xml
Source48: apache-poweredby.png
# build/scripts patches # build/scripts patches
Patch2: httpd-2.4.43-apxs.patch Patch2: httpd-2.4.43-apxs.patch
@ -100,7 +101,7 @@ BuildRequires: perl-interpreter, perl-generators, systemd-devel
BuildRequires: zlib-devel, libselinux-devel, lua-devel, brotli-devel BuildRequires: zlib-devel, libselinux-devel, lua-devel, brotli-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: gnupg2 BuildRequires: gnupg2
Requires: /etc/mime.types, system-logos-httpd Requires: /etc/mime.types, system-logos-httpd >= 34.0.1
Provides: webserver Provides: webserver
Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
@ -268,6 +269,9 @@ if test "x${vmmn}" != "x%{mmn}"; then
exit 1 exit 1
fi fi
# A new logo which comes together with a new test page
cp %{SOURCE48} ./docs/icons/apache_pb3.png
# Provide default layout # Provide default layout
cp $RPM_SOURCE_DIR/config.layout . cp $RPM_SOURCE_DIR/config.layout .
@ -483,6 +487,7 @@ rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \
ln -s ../../pixmaps/poweredby.png \ ln -s ../../pixmaps/poweredby.png \
$RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png
# symlinks for /etc/httpd # symlinks for /etc/httpd
rmdir $RPM_BUILD_ROOT/etc/httpd/{state,run} rmdir $RPM_BUILD_ROOT/etc/httpd/{state,run}
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
@ -779,6 +784,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Wed Mar 31 2021 Lubos Uhliarik <luhliari@redhat.com> - 2.4.46-10
- Resolves: #1934739 - Apache trademark update - new logo
* Mon Feb 01 2021 Lubos Uhliarik <luhliari@redhat.com> - 2.4.46-9 * Mon Feb 01 2021 Lubos Uhliarik <luhliari@redhat.com> - 2.4.46-9
- Resolves: #1914182 - RFE: CustomLog should be able to use journald - Resolves: #1914182 - RFE: CustomLog should be able to use journald

2
welcome.conf
View File

@ -16,4 +16,4 @@
</Directory> </Directory>
Alias /.noindex.html /usr/share/httpd/noindex/index.html Alias /.noindex.html /usr/share/httpd/noindex/index.html
Alias /poweredby.png /usr/share/httpd/icons/apache_pb2.png Alias /poweredby.png /usr/share/httpd/icons/apache_pb3.png