- updated to 3.13.3

- removed obsolete gnuc-minor-def-fix patch
- removed obsolete LOWHASH_EXPORTS hack (no longer needed)
- removed obsolete FREEBL_NO_DEPEND export (now it blocked default correct behaviour, thus breakign build)

Changed files:
    nss-gnuc-minor-def-fix.patch -> 1.2
    nss.spec -> 1.115

diff --git a/nss-gnuc-minor-def-fix.patch b/nss-gnuc-minor-def-fix.patch
deleted file mode 100644 (file)
index f210af2..0000000
--- a/nss-gnuc-minor-def-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h
---- nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo      2011-11-10 12:44:17.683967574 -0600
-+++ nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h 2011-11-10 12:44:24.146886778 -0600
-@@ -362,7 +362,7 @@ typedef CK_ULONG          CK_TRUST;
-  *  cast the resulting value to the deprecated type in the #define, thus
-  *  producting the warning when the #define is used.
-  */
--#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
-+#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
- /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
-  * is a gcc version issue rather than mac or ppc specific */
- typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));

diff --git a/nss.spec b/nss.spec
index e2ce7acc747810a5cab7f26a66cbca917f5b8c62..552906370f495a6635698e4d3095efcceca8aa1a 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -2,8 +2,8 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.13.1
-Release:       2
+Version:       3.13.3
+Release:       1
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
@@ -13,13 +13,12 @@ Group:              Libraries
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/nss -r NSS_3_9_4_RTM
 #Source0:      %{name}-%{version}.tar.bz2
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: c500f96d33ba1390c8a35c667e05e542
+# Source0-md5: 006cb82fa900e9e664b4b14a9b7810ca
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Patch0:                %{name}-Makefile.patch
-Patch1:                %{name}-gnuc-minor-def-fix.patch
 URL:           http://www.mozilla.org/projects/security/pki/nss/
 BuildRequires: nspr-devel >= 1:4.8.9
 BuildRequires: nss-tools
@@ -101,7 +100,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
@@ -119,8 +117,6 @@ addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> lib/ckfw/builtins/certda
 export USE_64=1
 %endif
 
-export FREEBL_NO_DEPEND=1
-
 %{__make} -j1 build_coreconf \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
@@ -142,10 +138,6 @@ export FREEBL_NO_DEPEND=1
        OPTIMIZER="%{rpmcflags}" \
        PLATFORM="pld"
 
-# NOTE: LOWHASH_EXPORTS is a hack for lib/freebl brokeness:
-# - LOWHASH_EXPORTS is defined in config.mk
-# - it's used in manifest.mn, which can use only variables passed by make, not in config or Makefile
-# remove this hack when problem is fixed in sources
 %{__make} -j1 all \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
@@ -157,8 +149,7 @@ export FREEBL_NO_DEPEND=1
        BUILD_OPT=1 \
        CC="%{__cc}" \
        OPTIMIZER="%{rpmcflags}" \
-       PLATFORM="pld" \
-       LOWHASH_EXPORTS=nsslowhash.h
+       PLATFORM="pld"
 
 %install
 rm -rf $RPM_BUILD_ROOT