pool/apache2-mod_nss
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 555875 from Apache:Modules

Browse Source 
- drop obsolete mod_nss-dont_disable_SSLV2.patch
  * bump up minimal NSS version to 3.25, which we now have everywhere
- Require iproute2 for ss, which is used by gencert to gather noise

  (bsc#998183) (forwarded request 555075 from vitezslav_cizek)

OBS-URL: https://build.opensuse.org/request/show/555875
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_nss?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2017-12-11 17:57:21 +00:00 committed by Git OBS Bridge
commit d2a92b6514
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache2-mod_nss.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Dec 7 13:19:08 UTC 2017 - vcizek@suse.com
- drop obsolete mod_nss-dont_disable_SSLV2.patch
* bump up minimal NSS version to 3.25, which we now have everywhere
- Require iproute2 for ss, which is used by gencert to gather noise
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 23 12:53:12 UTC 2017 - vcizek@suse.com Mon Oct 23 12:53:12 UTC 2017 - vcizek@suse.com
@ -24,6 +31,7 @@ Thu Sep 15 10:44:06 UTC 2016 - vcizek@suse.com
- use correct configuration path in mod_nss.conf.in (bsc#996282) - use correct configuration path in mod_nss.conf.in (bsc#996282)
- remove %post migration code from the old alias directory - remove %post migration code from the old alias directory
- generate dummy certificates if there aren't any in mod_nss.d - generate dummy certificates if there aren't any in mod_nss.d
(bsc#998183)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 29 18:04:55 UTC 2016 - vcizek@suse.com Fri Jul 29 18:04:55 UTC 2016 - vcizek@suse.com

8
apache2-mod_nss.spec
View File

@ -38,7 +38,6 @@ Source4: README-SUSE.txt
Source5: vhost-nss.template Source5: vhost-nss.template
Patch1: mod_nss-migrate.patch Patch1: mod_nss-migrate.patch
Patch2: mod_nss-gencert-correct-ownership.patch Patch2: mod_nss-gencert-correct-ownership.patch
Patch3: mod_nss-dont_disable_SSLV2.patch
Patch4: mod_nss-gencert_use_ss_instead_of_netstat.patch Patch4: mod_nss-gencert_use_ss_instead_of_netstat.patch
BuildRequires: apache-rpm-macros BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.12 BuildRequires: apache2-devel >= 2.2.12
@ -49,11 +48,12 @@ BuildRequires: findutils
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: iproute2 BuildRequires: iproute2
BuildRequires: iproute2
BuildRequires: libapr-util1-devel BuildRequires: libapr-util1-devel
BuildRequires: libapr1-devel BuildRequires: libapr1-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: mozilla-nspr-devel >= 4.6.3 BuildRequires: mozilla-nspr-devel >= 4.6.3
BuildRequires: mozilla-nss-devel >= 3.15.1 BuildRequires: mozilla-nss-devel >= 3.25
BuildRequires: mozilla-nss-tools BuildRequires: mozilla-nss-tools
BuildRequires: pkgconfig BuildRequires: pkgconfig
Requires: %{apache_mmn} Requires: %{apache_mmn}
@ -61,7 +61,8 @@ Requires: %{apache_suse_maintenance_mmn}
Requires: apache2 >= 2.2.12 Requires: apache2 >= 2.2.12
Requires: findutils Requires: findutils
Requires: iproute2 Requires: iproute2
Requires: mozilla-nss >= 3.15.1 Requires: iproute2
Requires: mozilla-nss >= 3.25
Requires(post): mozilla-nss-tools Requires(post): mozilla-nss-tools
Provides: mod_nss Provides: mod_nss
@ -75,7 +76,6 @@ security library.
%setup -q -n mod_nss-%{version} %setup -q -n mod_nss-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch4 -p1 %patch4 -p1
# Touch expression parser sources to prevent regenerating it # Touch expression parser sources to prevent regenerating it

14
mod_nss-dont_disable_SSLV2.patch
View File

@ -1,14 +0,0 @@
Index: mod_nss-1.0.14/nss_engine_init.c
===================================================================
--- mod_nss-1.0.14.orig/nss_engine_init.c 2016-04-15 20:27:59.000000000 +0200
+++ mod_nss-1.0.14/nss_engine_init.c 2016-09-15 13:34:23.723723904 +0200
@@ -796,7 +796,8 @@ static void nss_init_ctx_protocol(server
}
}
- stat = SSL_OptionSet(mctx->model, SSL_ENABLE_SSL2, PR_FALSE);
+ //stat = SSL_OptionSet(mctx->model, SSL_ENABLE_SSL2, PR_FALSE);
+ stat = SECSuccess;
/* Set protocol version ranges:
*