diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-06-23 06:52:18 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-06-23 06:52:18 +0200 |
| commit | 8e2174061450e549d62fe0314b69b0229afaa13f (patch) | |
| tree | 5719c0154ba9a81285a885652f49e00e7625d363 | |
| parent | 5879c56a69ef5e81291533bf396a9a6f59ce5596 (diff) | |
mod_nss: backport latest changes in rawhide
| -rw-r--r-- | mod_nss.spec | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mod_nss.spec b/mod_nss.spec index 83544a3..4ffd6b8 100644 --- a/mod_nss.spec +++ b/mod_nss.spec @@ -7,7 +7,7 @@ Name: mod_nss Version: 1.0.8 -Release: 17%{?dist} +Release: 18%{?dist} Summary: SSL/TLS module for the Apache HTTP server Group: System Environment/Daemons License: ASL 2.0 @@ -30,6 +30,7 @@ Patch6: mod_nss-pcachesignal.h Patch7: mod_nss-reseterror.patch Patch8: mod_nss-lockpcache.patch Patch9: mod_nss-httpd24.patch +Patch10: mod_nss-overlapping_memcpy.patch %description The mod_nss module provides strong cryptography for the Apache Web @@ -47,9 +48,10 @@ security library. %patch6 -p1 -b .pcachesignal.h %patch7 -p1 -b .reseterror %patch8 -p1 -b .lockpcache -#if 0%{?fedora} >= 18 +%if "%{_httpd_confdir}" == "%{_httpd_modconfdir}" %patch9 -p1 -b .httpd24 -#endif +%endif +%patch10 -p1 -b .overlap # Touch expression parser sources to prevent regenerating it touch nss_expr_*.[chyl] @@ -148,6 +150,13 @@ fi %{_sbindir}/gencert %changelog +* Sat Jun 23 2012 Remi Collet <RPMS@FamilleCollet.com> 1.0.8-18 +- backport for remi repo and http 2.4 + +* Fri Jun 15 2012 Rob Crittenden <rcritten@redhat.com> - 1.0.8-18 +- Actually apply the patch to use memmove in place of memcpy since the + buffers can overlap (#669118) + * Wed Jun 12 2012 Remi Collet <RPMS@FamilleCollet.com> 1.0.8-17 - rebuild for remi repo and http 2.4 |