packages: nss/nss-Makefile.patch, nss/nss.spec - up to 3.12.3

[arekm]

Author: arekm                        Date: Sun May 10 20:32:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.12.3

---- Files affected:
packages/nss:
   nss-Makefile.patch (1.12 -> 1.13) , nss.spec (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: packages/nss/nss-Makefile.patch
diff -u packages/nss/nss-Makefile.patch:1.12 packages/nss/nss-Makefile.patch:1.13
--- packages/nss/nss-Makefile.patch:1.12	Thu Jun 19 00:07:55 2008
+++ packages/nss/nss-Makefile.patch	Sun May 10 22:32:48 2009
@@ -55,7 +55,9 @@
  endif
  
  PKIXLIB = \
-@@ -161,30 +153,30 @@
+--- nss/mozilla/security/nss/cmd/platlibs.mk~	2009-05-10 22:23:08.330366552 +0200
++++ nss/mozilla/security/nss/cmd/platlibs.mk	2009-05-10 22:26:38.034387811 +0200
+@@ -159,29 +159,29 @@
  	$(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
  
  EXTRA_LIBS += \
@@ -87,9 +89,7 @@
  	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
  	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
  	$(CRYPTOLIB) \
--	$(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
-+	$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
+ 	$(DBMLIB) \
  	$(PKIXLIB) \
 -	$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
 -	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \

================================================================
Index: packages/nss/nss.spec
diff -u packages/nss/nss.spec:1.88 packages/nss/nss.spec:1.89
--- packages/nss/nss.spec:1.88	Tue Oct 28 00:19:11 2008
+++ packages/nss/nss.spec	Sun May 10 22:32:48 2009
@@ -3,8 +3,8 @@
 Summary:	NSS - Network Security Services
 Summary(pl.UTF-8):	NSS - Network Security Services
 Name:		nss
-Version:	3.12
-Release:	4
+Version:	3.12.3
+Release:	1
 Epoch:		1
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		Libraries
@@ -13,8 +13,8 @@
 # :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot mozilla/security/coreconf -r NSS_3_9_4_RTM
 # :pserver:anonymous at 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:	917f4e05f3982bd7fceaede197f0e1d4
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	ecb7079ba4ebcf29b7716775384f1f18
 Source1:	%{name}-mozilla-nss.pc
 Source2:	%{name}-config.in
 Source3:	http://www.cacert.org/certs/root.der
@@ -170,9 +170,6 @@
 " %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
 chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config
 
-# resolve conflict with squid
-mv -f $RPM_BUILD_ROOT%{_bindir}/{,nss-}client
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -245,6 +242,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2009/05/10 20:32:48  arekm
+- up to 3.12.3
+
 Revision 1.88  2008/10/27 23:19:11  glen
 - refresh certdata.c
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nss/nss-Makefile.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nss/nss.spec?r1=1.88&r2=1.89&f=u