[httpd] mod_unique_id: replace use of hostname + pid with PRNG output (#976666)
jorton
jorton at fedoraproject.org
Mon Jul 22 16:39:30 UTC 2013
commit 3b5640856d221f4833b16a067f7c90e4f8f4d14e
Author: Joe Orton <jorton at redhat.com>
Date: Mon Jul 22 17:03:38 2013 +0100
mod_unique_id: replace use of hostname + pid with PRNG output (#976666)
- apxs: mention -p option in manpage
httpd-2.4.2-r1374214+.patch | 45 ----
httpd-2.4.4-aarch64.patch | 486 -----------------------------------
httpd-2.4.4-apxs-man-p.patch | 21 --
httpd-2.4.4-mod_cache-tmppath.patch | 11 -
httpd-2.4.4-r1476674.patch | 110 --------
httpd.spec | 14 +-
6 files changed, 2 insertions(+), 685 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index c15c6b9..9976c09 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,8 +13,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.4
-Release: 12%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -51,7 +51,6 @@ Patch2: httpd-2.4.3-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch
Patch5: httpd-2.4.3-layout.patch
Patch6: httpd-2.4.3-apctl-systemd.patch
-Patch7: httpd-2.4.4-aarch64.patch
# Features/functional changes
Patch23: httpd-2.4.4-export.patch
Patch24: httpd-2.4.1-corelimit.patch
@@ -63,14 +62,10 @@ Patch29: httpd-2.4.3-mod_systemd.patch
Patch30: httpd-2.4.4-cachehardmax.patch
Patch31: httpd-2.4.4-sslmultiproxy.patch
# Bug fixes
-Patch50: httpd-2.4.2-r1374214+.patch
Patch51: httpd-2.4.3-sslsninotreq.patch
-Patch52: httpd-2.4.4-r1476674.patch
-Patch53: httpd-2.4.4-mod_cache-tmppath.patch
Patch54: httpd-2.4.4-dump-vhost-twice.patch
Patch55: httpd-2.4.4-malformed-host.patch
Patch56: httpd-2.4.4-mod_unique_id.patch
-Patch57: httpd-2.4.4-apxs-man-p.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -182,7 +177,6 @@ interface for storing and accessing per-user session data.
%patch3 -p1 -b .deplibs
%patch5 -p1 -b .layout
%patch6 -p1 -b .apctlsystemd
-%patch7 -p1 -b .aarch64
%patch23 -p1 -b .export
%patch24 -p1 -b .corelimit
@@ -194,14 +188,10 @@ interface for storing and accessing per-user session data.
%patch30 -p1 -b .cachehardmax
%patch31 -p1 -b .sslmulti
-%patch50 -p1 -b .r1374214+
%patch51 -p1 -b .sninotreq
-%patch52 -p1 -b .r1476674
-%patch53 -p1 -b .tmppath
%patch54 -p1 -b .vhosttwice
%patch55 -p1 -b .malformedhost
%patch56 -p1 -b .uniqueid
-%patch57 -p1 -b .apxsman
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
More information about the scm-commits
mailing list