From 6fc9ee89c54d49eb13bb85be230f945091769e65 Mon Sep 17 00:00:00 2001
From: zhuchengliang <zhuchengliang4@huawei.com>
Date: Mon, 17 Feb 2020 15:59:56 +0800
Subject: [PATCH] del unused patch

---
 httpd-2.4.34-sslciphdefault.patch | 34 -------------------------------
 httpd.spec                        |  7 ++++++-
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 httpd-2.4.34-sslciphdefault.patch

diff --git a/httpd-2.4.34-sslciphdefault.patch b/httpd-2.4.34-sslciphdefault.patch
deleted file mode 100644
index 6060f24..0000000
--- a/httpd-2.4.34-sslciphdefault.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1109119
-
-Don't prepend !aNULL etc if PROFILE= is used with SSLCipherSuite.
-
---- httpd-2.4.34/modules/ssl/ssl_engine_config.c.sslciphdefault
-+++ httpd-2.4.34/modules/ssl/ssl_engine_config.c
-@@ -774,9 +774,11 @@
-     }
-     
-     if (!strcmp("SSL", arg1)) {
--        /* always disable null and export ciphers */
--        arg2 = apr_pstrcat(cmd->pool, arg2, ":!aNULL:!eNULL:!EXP", NULL);
-         if (cmd->path) {
-+            /* Disable null and export ciphers by default, except for PROFILE=
-+             * configs where the parser doesn't cope. */
-+            if (strncmp(arg2, "PROFILE=", 8) != 0)
-+                arg2 = apr_pstrcat(cmd->pool, arg2, ":!aNULL:!eNULL:!EXP", NULL);
-             dc->szCipherSuite = arg2;
-         }
-         else {
-@@ -1540,8 +1542,10 @@
-     }
-     
-     if (!strcmp("SSL", arg1)) {
--        /* always disable null and export ciphers */
--        arg2 = apr_pstrcat(cmd->pool, arg2, ":!aNULL:!eNULL:!EXP", NULL);
-+        /* Disable null and export ciphers by default, except for PROFILE=
-+         * configs where the parser doesn't cope. */
-+        if (strncmp(arg2, "PROFILE=", 8) != 0)
-+            arg2 = apr_pstrcat(cmd->pool, arg2, ":!aNULL:!eNULL:!EXP", NULL);
-         dc->proxy->auth.cipher_suite = arg2;
-         return NULL;
-     }
diff --git a/httpd.spec b/httpd.spec
index 19eecd5..d95349c 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -65,7 +65,6 @@ Patch0030:        httpd-2.4.4-cachehardmax.patch
 Patch0034:        httpd-2.4.17-socket-activation.patch
 Patch0036:        httpd-2.4.33-r1830819+.patch
 Patch0037:        httpd-2.4.34-r1827912+.patch
-Patch0038:        httpd-2.4.34-sslciphdefault.patch
 Patch0039:        httpd-2.4.34-sslprotdefault.patch
 Patch0058:        httpd-2.4.34-r1738878.patch
 Patch0059:        httpd-2.4.34-r1555631.patch
@@ -536,6 +535,12 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Mon Feb 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.34-16
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:del unused patch
+
 * Mon Feb 03 2020 yanzhihua <yanzhihua4@huawei.com> - 2.4.34-15
 - Type:cves
 - ID:CVE-2018-17199
-- 
Gitee