|
@@ -10,8 +10,8 @@
|
|
|
|
|
|
Name: %{pkgname}
|
|
Name: %{pkgname}
|
|
Summary: Apache HTTP Server
|
|
Summary: Apache HTTP Server
|
|
-Version: 2.4.48
|
|
|
|
-Release: 2%{_dist_release}%{?with_systemd:.systemd}
|
|
|
|
|
|
+Version: 2.4.49
|
|
|
|
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
|
|
Group: servers
|
|
Group: servers
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
@@ -88,7 +88,6 @@ Patch61: httpd-2.4.48-r1878890.patch
|
|
Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
|
|
Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
|
|
|
|
|
|
# Security fixes
|
|
# Security fixes
|
|
-Patch1000: CVE-2021-33193.patch
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRequires: db4-devel, expat-devel, xmlto
|
|
BuildRequires: db4-devel, expat-devel, xmlto
|
|
@@ -197,8 +196,6 @@ Security (TLS) protocols.
|
|
%patch61 -p1 -b .r1878890
|
|
%patch61 -p1 -b .r1878890
|
|
%patch63 -p1 -b .htcacheclean-dont-break
|
|
%patch63 -p1 -b .htcacheclean-dont-break
|
|
|
|
|
|
-%patch1000 -p1 -b .CVE-2021-33193
|
|
|
|
-
|
|
|
|
perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
|
|
perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
|
|
|
|
|
|
# Patch in the vendor string
|
|
# Patch in the vendor string
|
|
@@ -639,6 +636,10 @@ EOF
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Tue Sep 28 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.49-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- dropped Patch1000: fixed in upstream.
|
|
|
|
+
|
|
* Thu Aug 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.48-2
|
|
* Thu Aug 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.48-2
|
|
- imported Patch1000 from upstream to fix CVE-2021-33193.
|
|
- imported Patch1000 from upstream to fix CVE-2021-33193.
|
|
|
|
|