Changeset 2377 for trunk/server/fedora/specs

Timestamp:

Feb 27, 2013, 3:56:23 AM (11 years ago)

Author:

achernya

Message:

Update to httpd 2.2.23

File:

• trunk/server/fedora/specs/httpd.spec.patch (modified) (5 diffs)

trunk/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.~1~      2012-04-30 05:52:31.000000000 -0400
-+++ httpd.spec  2012-05-22 23:31:12.397142763 -0400
+--- /tmp/httpd/httpd.spec.orig  2013-02-14 17:53:29.967176396 -0500
++++ /tmp/httpd/httpd.spec       2013-02-14 17:54:57.172521444 -0500
 @@ -9,7 +9,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.22
--Release: 4%{?dist}
-+Release: 4%{?dist}.scripts.%{scriptsversion}
+ Version: 2.2.23
+-Release: 1%{?dist}
++Release: 1%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -58,6 +58,15 @@
+@@ -57,6 +57,15 @@
  Requires(postun): systemd-units
  Requires(post): systemd-units
@@ -26 +26 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -68,6 +78,7 @@
+@@ -67,6 +76,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -34 +34 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -106,6 +117,7 @@
+@@ -105,6 +115,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42 +42 @@
  
  %description -n mod_ssl
-@@ -133,6 +150,14 @@
+@@ -131,6 +142,14 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -57 +57 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -193,10 +219,12 @@
+@@ -191,10 +210,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \