summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2011-03-02 13:52:01 +0000
committerKoop Mast <kwm@FreeBSD.org>2011-03-02 13:52:01 +0000
commit0262adf6bad92a1934aa1dda8affbd386fa2f396 (patch)
tree4e6bebc15b21f9ddcbe25e59f022ae25478c04ae /security
parentUpdate to 4.8.7. (diff)
Update to 3.12.9.
Submitted by: beat
Notes
Notes: svn path=/head/; revision=270119
Diffstat (limited to 'security')
-rw-r--r--security/nss/Makefile4
-rw-r--r--security/nss/distinfo5
-rw-r--r--security/nss/files/patch-lib_softoken_legacydb_lgfind.c11
3 files changed, 5 insertions, 15 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 4be6d923d477..af9e6b666254 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \
_MAJOR= 3
_MINOR= 12
-_PATCH= 8
+_PATCH= 9
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss
@@ -75,6 +75,8 @@ post-patch:
@cd ${WRKSRC} && \
${FIND} . -name "*.c" -o -name "*.h" | \
${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ ${WRKSRC}/lib/softoken/manifest.mn
do-install:
${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 52e9352c0af4..db8fef32021a 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,2 @@
-MD5 (nss-3.12.8.tar.gz) = 40bf1bb0c7567827d3768d1fc6081100
-SHA256 (nss-3.12.8.tar.gz) = 9178ce29749e8d09cb93ce70c38f1c2c10630926b2bb7259c7dfff42cb090c14
-SIZE (nss-3.12.8.tar.gz) = 5951955
+SHA256 (nss-3.12.9.tar.gz) = 0dc77718016654bbf6ffdda09e968e2b2875c05dacec967abf5725b5daae5978
+SIZE (nss-3.12.9.tar.gz) = 5984608
diff --git a/security/nss/files/patch-lib_softoken_legacydb_lgfind.c b/security/nss/files/patch-lib_softoken_legacydb_lgfind.c
deleted file mode 100644
index 719fb840bded..000000000000
--- a/security/nss/files/patch-lib_softoken_legacydb_lgfind.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/softoken/legacydb/lgfind.c.orig 2009-10-19 16:07:48.000000000 +0200
-+++ lib/softoken/legacydb/lgfind.c 2009-10-19 16:08:04.000000000 +0200
-@@ -778,7 +778,7 @@
- classFlags &= LG_TRUST;
- copy = &cert_md5_hash; break;
- case CKA_CERTIFICATE_TYPE:
-- crv = lg_GetULongAttribute(CKA_CLASS,&pTemplate[i],1,&certType);
-+ crv = lg_GetULongAttribute(CKA_CERTIFICATE_TYPE,&pTemplate[i],1,&certType);
- if (crv != CKR_OK) {
- classFlags = 0;
- }