Re: UPDATE: nss-3.12.3

Martynas Venckus Sun, 21 Jun 2009 07:43:12 -0700
- merge after arandom changes;  reported&tested by Simon Kuhnle

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/nss/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile    23 Mar 2009 07:50:47 -0000      1.11
+++ Makefile    21 Jun 2009 14:34:00 -0000
@@ -4,10 +4,9 @@
 
 COMMENT=               libraries to support development of security-enabled 
apps
 
-VERSION=               3.12
+VERSION=               3.12.3
 DISTNAME=              nss-${VERSION}
-PKGNAME=               ${DISTNAME}p0
-SO_VERSION=            22.0
+SO_VERSION=            22.1
 .for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
 SHARED_LIBS+=          ${_lib} ${SO_VERSION}
 .endfor
@@ -26,9 +25,10 @@
 
 MASTER_SITES=          
http://ftp.eu.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION:S/./_/g}_RTM/src/
 \
                        
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION:S/./_/g}_RTM/src/
+EXTRACT_SUFX=          .tar.bz2
 
-LIB_DEPENDS=           nspr4.>=20,plc4.>=20,plds4.>=20:nspr->=4.7:devel/nspr \
-                       sqlite3.>=10.0:sqlite3->=3.5:databases/sqlite3
+LIB_DEPENDS=           
nspr4.>=20.1,plc4.>=20.1,plds4.>=20.1:nspr->=4.8:devel/nspr \
+                       sqlite3.>=13.3:sqlite3->=3.6.13:databases/sqlite3
 
 MAKE_ENV=              BUILD_OPT=1 \
                        LOCALBASE="${LOCALBASE}" \
@@ -43,7 +43,7 @@
 
 WRKSRC=                        ${WRKDIST}/mozilla/security/nss
 NSSDIST=               ${WRKDIST}/mozilla/dist
-NSSOBJ=                        ${NSSDIST}/OpenBSD`uname -r`_OPT.OBJ
+NSSOBJ=                        ${NSSDIST}/OpenBSD`uname -r`${OBJ64}_OPT.OBJ
 
 ALL_TARGET=            nss_build_all
 
@@ -72,3 +72,10 @@
                LD_LIBRARY_PATH="${NSSOBJ}/lib" ./all.sh
 
 .include <bsd.port.mk>
+
+.for _m in ${MACHINE_ARCH}
+. if !empty(LP64_ARCHS:M${_m})
+MAKE_ENV+=             USE_64=1
+OBJ64=                 _64
+. endif
+.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/nss/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    25 Jul 2008 00:46:59 -0000      1.7
+++ distinfo    21 Jun 2009 14:34:00 -0000
@@ -1,5 +1,5 @@
-MD5 (nss-3.12.tar.gz) = kX9OBfOYK9f86u3hl/Dh1A==
-RMD160 (nss-3.12.tar.gz) = qE+foR6f2xwT9tm4BLbzfaxO4K8=
-SHA1 (nss-3.12.tar.gz) = a46DwJMc+tFhqumT00Roe2fzF6o=
-SHA256 (nss-3.12.tar.gz) = 0wp0cLgqc+1EJSWzZa+vAEJyBON3Ht/qsFdDrMqXEis=
-SIZE (nss-3.12.tar.gz) = 5163155
+MD5 (nss-3.12.3.tar.bz2) = 7LcHm6Trzym3cWd1OE8fGA==
+RMD160 (nss-3.12.3.tar.bz2) = tTOe2p38hzhbLBHiylO+JJt17Wk=
+SHA1 (nss-3.12.3.tar.bz2) = 7soUo3YpKHuqEOt1YqX7kn6d0XE=
+SHA256 (nss-3.12.3.tar.bz2) = aBUvmtYrSciGAwamBW9cQvGmYJV0npc0aiwwAVKAdfQ=
+SIZE (nss-3.12.3.tar.bz2) = 4066954
Index: patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
===================================================================
RCS file: 
/cvs/ports/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c,v
retrieving revision 1.5
diff -u -r1.5 patch-mozilla_security_nss_lib_freebl_unix_rand_c
--- patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c   23 Mar 2009 
07:50:47 -0000      1.5
+++ patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c   21 Jun 2009 
14:34:00 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.5 2009/03/23 
07:50:47 jakemsr Exp $
---- mozilla/security/nss/lib/freebl/unix_rand.c.orig   Mon Dec  3 13:07:01 2007
-+++ mozilla/security/nss/lib/freebl/unix_rand.c        Sun Mar 22 00:41:15 2009
-@@ -888,7 +888,6 @@ safe_pclose(FILE *fp)
+--- mozilla/security/nss/lib/freebl/unix_rand.c.orig   Sun Mar 29 06:45:33 2009
++++ mozilla/security/nss/lib/freebl/unix_rand.c        Sun Jun 21 16:57:18 2009
+@@ -890,7 +890,6 @@ safe_pclose(FILE *fp)
  /* Fork netstat to collect its output by default. Do not unset this unless
   * another source of entropy is available
   */
@@ -9,7 +9,7 @@
  
  void RNG_SystemInfoForRNG(void)
  {
-@@ -955,7 +954,7 @@ void RNG_SystemInfoForRNG(void)
+@@ -957,7 +956,7 @@ void RNG_SystemInfoForRNG(void)
      GiveSystemInfo();
  
      /* grab some data from system's PRNG before any other files. */
@@ -18,12 +18,12 @@
  
      /* If the user points us to a random file, pass it through the rng */
      randfile = getenv("NSRANDFILE");
-@@ -1132,7 +1131,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
+@@ -1259,7 +1258,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
      size_t fileBytes = 0;
      unsigned char *buffer = dest;
  
 -    file = fopen("/dev/urandom", "r");
 +    file = fopen(RAND_DEV, "r");
      if (file == NULL) {
-       PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
-       return fileBytes;
+       return rng_systemFromNoise(dest, maxLen);
+     }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/nss/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST   25 Jul 2008 00:47:00 -0000      1.4
+++ pkg/PLIST   21 Jun 2009 14:34:00 -0000
@@ -53,6 +53,7 @@
 include/nss/nsslocks.h
 include/nss/nssrwlk.h
 include/nss/nssrwlkt.h
+include/nss/nssutil.h
 include/nss/ocsp.h
 include/nss/ocspt.h
 include/nss/p12.h
@@ -99,7 +100,6 @@
 include/nss/sslproto.h
 include/nss/sslt.h
 include/nss/utilrename.h
-include/nss/watcomfx.h
 lib/libcrmf.a
 lib/libfreebl3.chk
 @lib lib/libfreebl3.so.${LIBfreebl3_VERSION}
Re: UPDATE: nss-3.12.3

Reply via email to
