Changeset 2377

Timestamp:

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

Author:

achernya

Message:

Update to httpd 2.2.23

Location:

trunk/server

Files:

• common/patches/httpd-SSLCompression.patch (modified) (9 diffs)
• fedora/specs/httpd.spec.patch (modified) (5 diffs)

trunk/server/common/patches/httpd-SSLCompression.patch

@@ -2 +2 @@
 Origin: http://svn.apache.org/viewvc?view=revision&revision=1369585
 
-diff -Naur httpd-2.2.22/modules/ssl/mod_ssl.c httpd-2.2.22.patched/modules/ssl/mod_ssl.c
---- httpd-2.2.22/modules/ssl/mod_ssl.c  2010-07-12 14:47:45.000000000 -0400
-+++ httpd-2.2.22.patched/modules/ssl/mod_ssl.c  2012-09-12 17:10:57.417861707 -0400
-@@ -146,6 +146,9 @@
-                 "(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)")
+diff -r -U3 httpd-2.2.23/modules/ssl/mod_ssl.c httpd-2.2.23.patched/modules/ssl/mod_ssl.c
+--- httpd-2.2.23/modules/ssl/mod_ssl.c  2013-02-14 18:32:59.360289681 -0500
++++ httpd-2.2.23.patched/modules/ssl/mod_ssl.c  2013-02-14 18:34:22.670718893 -0500
+@@ -158,6 +158,9 @@
+                 "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
      SSL_CMD_SRV(HonorCipherOrder, FLAG,
                  "Use the server's cipher ordering preference")
@@ -15 +15 @@
                  "Enable support for insecure renegotiation")
      SSL_CMD_ALL(UserName, TAKE1,
-diff -Naur httpd-2.2.22/modules/ssl/ssl_engine_config.c httpd-2.2.22.patched/modules/ssl/ssl_engine_config.c
---- httpd-2.2.22/modules/ssl/ssl_engine_config.c        2011-04-14 09:56:17.000000000 -0400
-+++ httpd-2.2.22.patched/modules/ssl/ssl_engine_config.c        2012-09-12 17:10:57.425862035 -0400
-@@ -178,6 +178,9 @@
+diff -r -U3 httpd-2.2.23/modules/ssl/ssl_engine_config.c httpd-2.2.23.patched/modules/ssl/ssl_engine_config.c
+--- httpd-2.2.23/modules/ssl/ssl_engine_config.c        2013-02-14 18:32:59.358289719 -0500
++++ httpd-2.2.23.patched/modules/ssl/ssl_engine_config.c        2013-02-14 18:34:22.672718856 -0500
+@@ -183,6 +183,9 @@
  #ifdef HAVE_FIPS
      sc->fips                   = UNSET;
@@ -28 +28 @@
      modssl_ctx_init_proxy(sc, p);
  
-@@ -275,6 +278,9 @@
+@@ -281,6 +284,9 @@
  #ifdef HAVE_FIPS
      cfgMergeBool(fips);
@@ -38 +38 @@
      modssl_ctx_cfg_merge_proxy(base->proxy, add->proxy, mrg->proxy);
  
-@@ -708,6 +714,23 @@
+@@ -714,6 +720,23 @@
  
  }
@@ -62 +62 @@
  {
  #ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
-diff -Naur httpd-2.2.22/modules/ssl/ssl_engine_init.c httpd-2.2.22.patched/modules/ssl/ssl_engine_init.c
---- httpd-2.2.22/modules/ssl/ssl_engine_init.c  2011-04-14 09:56:17.000000000 -0400
-+++ httpd-2.2.22.patched/modules/ssl/ssl_engine_init.c  2012-09-12 17:10:57.419861789 -0400
-@@ -503,6 +503,18 @@
+Only in httpd-2.2.23.patched/modules/ssl: ssl_engine_config.c.orig
+diff -r -U3 httpd-2.2.23/modules/ssl/ssl_engine_init.c httpd-2.2.23.patched/modules/ssl/ssl_engine_init.c
+--- httpd-2.2.23/modules/ssl/ssl_engine_init.c  2013-02-14 18:32:59.358289719 -0500
++++ httpd-2.2.23.patched/modules/ssl/ssl_engine_init.c  2013-02-14 18:34:22.672718856 -0500
+@@ -542,6 +542,18 @@
      }
  #endif
@@ -84 +85 @@
      if (sc->insecure_reneg == TRUE) {
          SSL_CTX_set_options(ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
-diff -Naur httpd-2.2.22/modules/ssl/ssl_private.h httpd-2.2.22.patched/modules/ssl/ssl_private.h
---- httpd-2.2.22/modules/ssl/ssl_private.h      2011-04-14 09:56:17.000000000 -0400
-+++ httpd-2.2.22.patched/modules/ssl/ssl_private.h      2012-09-12 18:11:48.762900287 -0400
-@@ -486,6 +486,9 @@
+Only in httpd-2.2.23.patched/modules/ssl: ssl_engine_init.c.orig
+diff -r -U3 httpd-2.2.23/modules/ssl/ssl_private.h httpd-2.2.23.patched/modules/ssl/ssl_private.h
+--- httpd-2.2.23/modules/ssl/ssl_private.h      2013-02-14 18:32:59.357289737 -0500
++++ httpd-2.2.23.patched/modules/ssl/ssl_private.h      2013-02-14 18:34:22.673718837 -0500
+@@ -507,6 +507,9 @@
  #ifdef HAVE_FIPS
      BOOL             fips;
@@ -97 +99 @@
  
  /**
-@@ -542,6 +545,7 @@
+@@ -563,6 +566,7 @@
  const char  *ssl_cmd_SSLCARevocationPath(cmd_parms *, void *, const char *);
  const char  *ssl_cmd_SSLCARevocationFile(cmd_parms *, void *, const char *);
@@ -105 +107 @@
  const char  *ssl_cmd_SSLVerifyDepth(cmd_parms *, void *, const char *);
  const char  *ssl_cmd_SSLSessionCache(cmd_parms *, void *, const char *);
-diff -Naur httpd-2.2.22/modules/ssl/ssl_toolkit_compat.h httpd-2.2.22.patched/modules/ssl/ssl_toolkit_compat.h
---- httpd-2.2.22/modules/ssl/ssl_toolkit_compat.h       2010-07-12 14:47:45.000000000 -0400
-+++ httpd-2.2.22.patched/modules/ssl/ssl_toolkit_compat.h       2012-09-12 18:12:09.982772267 -0400
-@@ -276,6 +276,11 @@
+Only in httpd-2.2.23.patched/modules/ssl: ssl_private.h.orig
+diff -r -U3 httpd-2.2.23/modules/ssl/ssl_toolkit_compat.h httpd-2.2.23.patched/modules/ssl/ssl_toolkit_compat.h
+--- httpd-2.2.23/modules/ssl/ssl_toolkit_compat.h       2012-08-17 13:30:46.000000000 -0400
++++ httpd-2.2.23.patched/modules/ssl/ssl_toolkit_compat.h       2013-02-14 18:34:22.674718818 -0500
+@@ -277,6 +277,11 @@
  #endif
  #endif
@@ -120 +123 @@
  
  /** @} */
+Only in httpd-2.2.23.patched/modules/ssl: ssl_toolkit_compat.h.orig

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 \