- updated to 3.15

- updated Makefile patch

diff --git a/nss-Makefile.patch b/nss-Makefile.patch
index 6e798c45f223cf636e45f0ae70715d808e9c295c..d04ff07a18f5fa9d9f4b5dfd452fb8acca633cea 100644 (file)
--- a/nss-Makefile.patch
+++ b/nss-Makefile.patch
@@ -1,5 +1,5 @@
---- nss-3.11.1/mozilla/security/coreconf/Linux.mk.orig 2006-04-25 03:32:16.000000000 +0200
-+++ nss-3.11.1/mozilla/security/coreconf/Linux.mk      2006-05-27 21:07:22.101515500 +0200
+--- nss-3.15/nss/coreconf/Linux.mk.orig        2006-04-25 03:32:16.000000000 +0200
++++ nss-3.15/nss/coreconf/Linux.mk     2006-05-27 21:07:22.101515500 +0200
 @@ -169,8 +169,8 @@
  DSO_LDFLAGS           =
  LDFLAGS                       += $(ARCHFLAG)
@@ -10,9 +10,8 @@
  
  #
  # Always set CPU_TAG on Linux, OpenVMS, WINCE.
-diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/security/coreconf/ruleset.mk
---- nss-3.11.orig/mozilla/security/coreconf/ruleset.mk 2005-09-16 18:09:23.000000000 +0100
-+++ nss-3.11/mozilla/security/coreconf/ruleset.mk      2006-01-26 15:13:55.000000000 +0000
+--- nss-3.15/nss/coreconf/ruleset.mk.orig      2005-09-16 18:09:23.000000000 +0100
++++ nss-3.15/nss/coreconf/ruleset.mk   2006-01-26 15:13:55.000000000 +0000
 @@ -118,7 +118,7 @@
  
  ifdef LIBRARY_NAME
@@ -22,19 +21,27 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
      endif
      ifndef SHARED_LIBRARY
        SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
---- nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk.orig       2009-08-28 22:37:12.708606747 +0200
-+++ nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk    2009-08-28 22:39:19.888606747 +0200
-@@ -144,7 +128,7 @@
- else
- 
+--- nss-3.15/nss/cmd/platlibs.mk.orig  2013-06-08 07:11:01.663565564 +0200
++++ nss-3.15/nss/cmd/platlibs.mk       2013-06-08 07:15:25.283560068 +0200
+@@ -37,13 +37,13 @@
+ DEFINES += -DNSS_USE_STATIC_LIBS
  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
--CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
-+CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- 
- PKIXLIB = \
-       $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
-@@ -161,29 +145,29 @@
-       $(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
+ ifndef NSS_USE_SYSTEM_FREEBL
+-CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
+-SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX)
++CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
++SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX)
+ else
+ # Use the system installed freebl static library and set softoken one to empty.
+ # Some tools need to link statically with freebl but none with softoken. Only
+ # the softoken shared library, not the static one, is installed in the system.
+-CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
++CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
+ SOFTOKENLIB=
+ EXTRA_SHARED_LIBS += \
+       -L$(SOFTOKEN_LIB_DIR) \
+@@ -102,29 +102,29 @@
+ else
  
  EXTRA_LIBS += \
 -      $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
@@ -55,10 +62,9 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
        $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
 -      $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 -      $(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
--      $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 +      $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
 +      $(DIST)/lib/$(LIB_PREFIX)pk11wrap3.$(LIB_SUFFIX) \
-+      $(DIST)/lib/$(LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
+       $(SOFTOKENLIB) \
        $(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
 -      $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
 +      $(DIST)/lib/$(LIB_PREFIX)nsspki3.$(LIB_SUFFIX) \
@@ -74,8 +80,8 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
        $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
        $(NULL)
  
---- nss-3.14/mozilla/security/nss/lib/ssl/config.mk.orig       2012-10-22 19:40:03.822256886 +0200
-+++ nss-3.14/mozilla/security/nss/lib/ssl/config.mk    2012-10-22 20:42:30.725432977 +0200
+--- nss-3.15/nss/lib/ssl/config.mk.orig        2012-10-22 19:40:03.822256886 +0200
++++ nss-3.15/nss/lib/ssl/config.mk     2012-10-22 20:42:30.725432977 +0200
 @@ -14,7 +14,7 @@
  ifdef NSS_NO_PKCS11_BYPASS
  DEFINES += -DNO_PKCS11_BYPASS
@@ -85,8 +91,8 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
  
  EXTRA_LIBS += \
        $(CRYPTOLIB) \
---- nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk.orig       2009-06-11 02:55:49.000000000 +0200
-+++ nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk    2009-08-28 22:40:40.392606747 +0200
+--- nss-3.15/nss/lib/softoken/legacydb/config.mk.orig  2009-06-11 02:55:49.000000000 +0200
++++ nss-3.15/nss/lib/softoken/legacydb/config.mk       2009-08-28 22:40:40.392606747 +0200
 @@ -36,7 +36,7 @@
  # ***** END LICENSE BLOCK *****
  
@@ -96,8 +102,8 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
  
  EXTRA_LIBS += $(CRYPTOLIB) 
  
---- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig        2009-06-11 02:55:48.000000000 +0200
-+++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk     2009-08-28 22:39:36.436608423 +0200
+--- nss-3.15/nss/lib/softoken/config.mk.orig   2009-06-11 02:55:48.000000000 +0200
++++ nss-3.15/nss/lib/softoken/config.mk        2009-08-28 22:39:36.436608423 +0200
 @@ -36,7 +36,7 @@
  # ***** END LICENSE BLOCK *****
  

diff --git a/nss.spec b/nss.spec
index 647ab64835e2c0cac21c31fee690753db06eafe1..d65fdcd28b07f5eb7a1bf4374dc79f5b0df731b6 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -2,31 +2,26 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.14.3
+Version:       3.15
 Release:       1
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:         Libraries
-# :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/dbm -r DBM_1_61_RTM
-# :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/dbm -r DBM_1_61_RTM
-# :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/coreconf -r NSS_3_9_4_RTM
-# :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: b326c2be8df277f62fb9c65fb3428148
+# Source0-md5: 391fd6ef006f59ddc440054cad33d259
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Patch0:                %{name}-Makefile.patch
 URL:           http://www.mozilla.org/projects/security/pki/nss/
-BuildRequires: nspr-devel >= 1:4.9
+BuildRequires: nspr-devel >= 1:4.10
 BuildRequires: nss-tools
 BuildRequires: perl-base
 BuildRequires: sqlite3-devel
 BuildRequires: zlib-devel
 BuildConflicts:        mozilla < 0.9.6-3
-Requires:      nspr >= 1:4.9
+Requires:      nspr >= 1:4.10
 Requires:      %{name}-softokn-freebl = %{epoch}:%{version}-%{release}
 Obsoletes:     libnss3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,7 +60,7 @@ Summary:      NSS - header files
 Summary(pl.UTF-8):     NSS - pliki nagłówkowe
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      nspr-devel >= 1:4.9
+Requires:      nspr-devel >= 1:4.10
 Obsoletes:     libnss3-devel
 
 %description devel
@@ -103,11 +98,11 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %if 0%{!?debug:1}
 # strip before signing
-sed -i -e '/export ADDON_PATH$/a\    echo STRIP \; %{__strip} --strip-unneeded -R.comment -R.note ${5}' mozilla/security/nss/cmd/shlibsign/sign.sh
+%{__sed} -i -e '/export ADDON_PATH$/a\    echo STRIP \; %{__strip} --strip-unneeded -R.comment -R.note ${5}' nss/cmd/shlibsign/sign.sh
 %endif
 
 %build
-cd mozilla/security/nss
+cd nss
 
 # http://wiki.cacert.org/wiki/NSSLib
 addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> lib/ckfw/builtins/certdata.txt
@@ -116,7 +111,7 @@ addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> lib/ckfw/builtins/certda
 export USE_64=1
 %endif
 
-%{__make} -j1 build_coreconf \
+%{__make} -C coreconf -j1 \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
        MOZILLA_CLIENT=1 \
@@ -126,18 +121,7 @@ export USE_64=1
        CC="%{__cc}" \
        OPTIMIZER="%{rpmcflags}"
 
-%{__make} -j1 build_dbm \
-       NSDISTMODE=copy \
-       NS_USE_GCC=1 \
-       MOZILLA_CLIENT=1 \
-       NO_MDUPDATE=1 \
-       USE_PTHREADS=1 \
-       BUILD_OPT=1 \
-       CC="%{__cc}" \
-       OPTIMIZER="%{rpmcflags}" \
-       PLATFORM="pld"
-
-%{__make} -j1 all \
+%{__make} -j1 \
        NSDISTMODE=copy \
        NS_USE_GCC=1 \
        MOZILLA_CLIENT=1 \
@@ -154,22 +138,23 @@ export USE_64=1
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/nss,/%{_lib},%{_libdir},%{_pkgconfigdir}}
 
-install mozilla/dist/private/nss/*     $RPM_BUILD_ROOT%{_includedir}/nss
-install mozilla/dist/public/dbm/*      $RPM_BUILD_ROOT%{_includedir}/nss
-install mozilla/dist/public/nss/*      $RPM_BUILD_ROOT%{_includedir}/nss
-install mozilla/dist/pld/bin/*         $RPM_BUILD_ROOT%{_bindir}
-install mozilla/dist/pld/lib/*         $RPM_BUILD_ROOT%{_libdir}
+install dist/private/nss/*     $RPM_BUILD_ROOT%{_includedir}/nss
+install dist/public/dbm/*      $RPM_BUILD_ROOT%{_includedir}/nss
+install dist/public/nss/*      $RPM_BUILD_ROOT%{_includedir}/nss
+install dist/pld/bin/*         $RPM_BUILD_ROOT%{_bindir}
+install dist/pld/lib/*         $RPM_BUILD_ROOT%{_libdir}
 
 %{__sed} -e '
        s#libdir=.*#libdir=%{_libdir}#g
        s#includedir=.*#includedir=%{_includedir}#g
        s#VERSION#%{version}#g
-' %{SOURCE1} > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nss.pc
-ln -s mozilla-nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/nss.pc
+' %{SOURCE1} > $RPM_BUILD_ROOT%{_pkgconfigdir}/nss.pc
+# compatibility symlink
+ln -s nss.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nss.pc
 
-NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h)
-NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h)
-NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' mozilla/security/nss/lib/nss/nss.h)
+NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h)
+NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h)
+NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
 %{__sed} -e "
        s,@libdir@,%{_libdir},g
        s,@prefix@,%{_prefix},g
@@ -221,8 +206,61 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/nss-config
+%attr(755,root,root) %{_bindir}/addbuiltin
+%attr(755,root,root) %{_bindir}/atob
+%attr(755,root,root) %{_bindir}/baddbdir
+%attr(755,root,root) %{_bindir}/bltest
+%attr(755,root,root) %{_bindir}/btoa
+%attr(755,root,root) %{_bindir}/certcgi
+%attr(755,root,root) %{_bindir}/certutil
+%attr(755,root,root) %{_bindir}/checkcert
+%attr(755,root,root) %{_bindir}/chktest
+%attr(755,root,root) %{_bindir}/cmsutil
+%attr(755,root,root) %{_bindir}/conflict
+%attr(755,root,root) %{_bindir}/crlutil
+%attr(755,root,root) %{_bindir}/crmftest
+%attr(755,root,root) %{_bindir}/dbtest
+%attr(755,root,root) %{_bindir}/derdump
+%attr(755,root,root) %{_bindir}/dertimetest
+%attr(755,root,root) %{_bindir}/digest
+%attr(755,root,root) %{_bindir}/encodeinttest
+%attr(755,root,root) %{_bindir}/fipstest
+%attr(755,root,root) %{_bindir}/httpserv
+%attr(755,root,root) %{_bindir}/listsuites
+%attr(755,root,root) %{_bindir}/lowhashtest
+%attr(755,root,root) %{_bindir}/makepqg
+%attr(755,root,root) %{_bindir}/mangle
+%attr(755,root,root) %{_bindir}/modutil
+%attr(755,root,root) %{_bindir}/multinit
+%attr(755,root,root) %{_bindir}/nonspr10
+%attr(755,root,root) %{_bindir}/ocspclnt
+%attr(755,root,root) %{_bindir}/ocspresp
+%attr(755,root,root) %{_bindir}/oidcalc
+%attr(755,root,root) %{_bindir}/p7content
+%attr(755,root,root) %{_bindir}/p7env
+%attr(755,root,root) %{_bindir}/p7sign
+%attr(755,root,root) %{_bindir}/p7verify
+%attr(755,root,root) %{_bindir}/pk11gcmtest
+%attr(755,root,root) %{_bindir}/pk11mode
+%attr(755,root,root) %{_bindir}/pk12util
+%attr(755,root,root) %{_bindir}/pk1sign
+%attr(755,root,root) %{_bindir}/pkix-errcodes
+%attr(755,root,root) %{_bindir}/pp
+%attr(755,root,root) %{_bindir}/pwdecrypt
+%attr(755,root,root) %{_bindir}/remtest
+%attr(755,root,root) %{_bindir}/rsaperf
+%attr(755,root,root) %{_bindir}/sdrtest
+%attr(755,root,root) %{_bindir}/secmodtest
+%attr(755,root,root) %{_bindir}/selfserv
+%attr(755,root,root) %{_bindir}/shlibsign
+%attr(755,root,root) %{_bindir}/signtool
+%attr(755,root,root) %{_bindir}/signver
+%attr(755,root,root) %{_bindir}/ssltap
+%attr(755,root,root) %{_bindir}/strsclnt
+%attr(755,root,root) %{_bindir}/symkeyutil
+%attr(755,root,root) %{_bindir}/tstclnt
+%attr(755,root,root) %{_bindir}/vfychain
+%attr(755,root,root) %{_bindir}/vfyserv
 
 %files static
 %defattr(644,root,root,755)