- use r1874196 [SLE-7653]

- modified patches
  % apache2-load-private-keys-from-pkcs11.patch (upstream 2.4.x port)
- deleted patches
  - apache2-load-certificates-from-pkcs11.patch (merged to above)

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=600

apache2.spec

@@ -146,10 +146,8 @@ Patch111:       httpd-visibility.patch
 # PATCH-FEATURE-UPSTREAM kstreitova@suse.com -- backport of HttpContentLengthHeadZero and HttpExpectStrict
 Patch115:       httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
 Patch116:       deprecated-scripts-arch.patch
-# load private keys from openssl engine
+# https://svn.apache.org/viewvc?view=revision&revision=1874196
 Patch117:       apache2-load-private-keys-from-pkcs11.patch
-# load certificates from openssl engine
-Patch118:       apache2-load-certificates-from-pkcs11.patch
 BuildRequires:  apache-rpm-macros-control
 BuildRequires:  apr-util-devel
 #Since 2.4.7 the event MPM requires apr 1.5.0 or later.
@@ -343,7 +341,6 @@ to administrators of web servers in general.
 %patch116 -p1
 %endif
 %patch117 -p1
-%patch118 -p1
 cat %{_sourcedir}/SUSE-NOTICE >> NOTICE
 # install READMEs
 a=$(basename %{SOURCE22})