Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Commit

Permalink
Updating to use upstream source 2.4.48 (#42)
Browse files Browse the repository at this point in the history
Co-authored-by: Steve Simpson <[email protected]>
  • Loading branch information
SteveSimpson and Steve Simpson authored Aug 8, 2021
1 parent 69061b4 commit 882ec33
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 196 deletions.
1 change: 0 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ task:
only_if: $CIRRUS_TAG == ''
env:
matrix:
- RELEASEVER: 6
- RELEASEVER: 7
name: el$RELEASEVER
container:
Expand Down
192 changes: 0 additions & 192 deletions httpd-2.4.43-sslcoalesce.patch

This file was deleted.

7 changes: 4 additions & 3 deletions httpd24u.spec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

Summary: Apache HTTP Server
Name: httpd24u
Version: 2.4.46
Version: 2.4.48
Release: 1%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Expand Down Expand Up @@ -81,7 +81,6 @@ Patch27: httpd-2.4.2-icons.patch
Patch30: httpd-2.4.4-cachehardmax.patch
Patch34: httpd-2.4.17-socket-activation.patch
Patch41: httpd-2.4.43-r1861793+.patch
Patch43: httpd-2.4.43-sslcoalesce.patch

# Security fixes

Expand Down Expand Up @@ -294,7 +293,6 @@ interface for storing and accessing per-user session data.
%patch30 -p1 -b .cachehardmax
%{?with_systemd:%patch34 -p1 -b .socketactivation}
%patch41 -p1 -b .r1861793+
%patch43 -p1 -b .sslcoalesce

# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
Expand Down Expand Up @@ -826,6 +824,9 @@ exit $rv


%changelog
* Fri Jun 04 2021 Steve Simpson <[email protected]> - 2.4.48-1
- Latest upstream

* Tue Sep 01 2020 Steve Simpson <[email protected]> - 2.4.46-1
- Latest upstream
- Synced with Fedora patches
Expand Down

0 comments on commit 882ec33

Please sign in to comment.