From 4bd89ca6faaac2307fa97a8b46d3b232dd8defafe0663c427350590e2caa441d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 13 Jan 2016 13:48:19 +0000 Subject: [PATCH] Accepting request 353204 from home:pgajdos - %check: access syntax depends on %{apache_branch} OBS-URL: https://build.opensuse.org/request/show/353204 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_nss?expand=0&rev=20 --- apache2-mod_nss.changes | 5 +++++ apache2-mod_nss.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apache2-mod_nss.changes b/apache2-mod_nss.changes index a2a6dd7..fea0289 100644 --- a/apache2-mod_nss.changes +++ b/apache2-mod_nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 12 08:31:19 UTC 2016 - pgajdos@suse.com + +- %check: access syntax depends on %{apache_branch} + ------------------------------------------------------------------- Fri Dec 11 12:08:09 UTC 2015 - pgajdos@suse.com diff --git a/apache2-mod_nss.spec b/apache2-mod_nss.spec index 2c1b266..f7ec498 100644 --- a/apache2-mod_nss.spec +++ b/apache2-mod_nss.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_nss # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -202,7 +202,11 @@ NSSPassPhraseHelper %{buildroot}/usr/sbin/nss_pcache NSSCipherSuite +ecdhe_ecdsa_aes_128_gcm_sha,+ecdh_ecdsa_aes_128_gcm_sha,+ecdhe_rsa_aes_256_sha,+ecdh_rsa_aes_256_sha,+ecdhe_rsa_aes_128_gcm_sha,+ecdh_rsa_aes_128_gcm_sha,+ecdhe_rsa_aes_128_sha,+ecdh_rsa_aes_128_sha,+rsa_aes_128_gcm_sha,+rsa_aes_256_sha,+rsa_aes_128_sha,+rsa_aes_128_sha256,+rsa_aes_256_sha256 NSSProtocol TLSv1.0,TLSv1.1,TLSv1.2 +%if 0%{?apache_branch} >= 204 Require local +%else + Allow from localhost +%endif EOF # create test certificate