cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to nss 3.12.6, tested by jasper@ in a bulk, thanks!

Browse Source 
ok naddy@
This commit is contained in:
landry 2010-04-03 09:21:00 +00:00
parent a96d33f2e6
commit 6c94d7699b
7 changed files with 65 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
security/nss/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.16 2009/11/14 16:31:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2010/04/03 09:21:00 landry Exp $
SHARED_ONLY= Yes
COMMENT= libraries to support development of security-enabled apps
VERSION= 3.12.3.1
VERSION= 3.12.6
DISTNAME= nss-${VERSION}
PKGNAME= ${DISTNAME}p2
SO_VERSION= 24.0
SO_VERSION= 25.0
.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@ -54,25 +53,19 @@ MAIN_TOOLS= certutil modutil pk12util signtool ssltap crlutil \
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/nss
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
@cd ${NSSDIST}/public && ${TAR} -chf - nss/ | \
find . -type d \
-exec ${INSTALL_DATA_DIR} ${PREFIX}/include/{} \; && \
find . ! -type d \
-exec ${INSTALL_DATA} {} ${PREFIX}/include/{} \;
@cd ${NSSOBJ}/lib && ${TAR} -chf - *.so.${SO_VERSION} | \
${TAR} -xf - -C ${PREFIX}/lib
@chmod 444 ${PREFIX}/lib/*.so.${SO_VERSION}
${INSTALL_DATA} ${NSSDIST}/public/nss/*.{h,api} ${PREFIX}/include/nss/
${INSTALL_DATA} ${NSSOBJ}/lib/*.so.${SO_VERSION} ${PREFIX}/lib/
${INSTALL_DATA} ${NSSOBJ}/lib/{libcrmf.a,*.chk} ${PREFIX}/lib/
@cd ${NSSOBJ}/bin && ${INSTALL_PROGRAM} ${MAIN_TOOLS} ${PREFIX}/bin/
cd ${NSSOBJ}/bin && ${INSTALL_PROGRAM} ${MAIN_TOOLS} ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/nss-config ${PREFIX}/bin/
${INSTALL_DATA} ${FILESDIR}/nss.pc ${PREFIX}/lib/pkgconfig/
@perl -pi -e 's|!!PREFIX!!|${TRUEPREFIX}|g; s|!!VERSION!!|${VERSION}|g' \
${PREFIX}/bin/nss-config ${PREFIX}/lib/pkgconfig/nss.pc
do-regress:
cd ${WRKSRC}/tests && ${SETENV} BUILD_OPT=1 \
cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} \
PATH="${NSSOBJ}/bin:${PATH}" \
LD_LIBRARY_PATH="${NSSOBJ}/lib" ./all.sh
LD_LIBRARY_PATH="${NSSOBJ}/lib" /bin/sh ./all.sh
.include <bsd.port.mk>

10
security/nss/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nss-3.12.3.1.tar.gz) = dQg5ycAYoJhP2U96nMPdfw==
RMD160 (nss-3.12.3.1.tar.gz) = oTZaAywGWocBBmstXEhlRJ+118w=
SHA1 (nss-3.12.3.1.tar.gz) = OGed1hsaZQoZfb0ex4V3Qn2UrB4=
SHA256 (nss-3.12.3.1.tar.gz) = 0t3I6p3l/w4vxVitKfTRprQA5XB/Z94uazyhXM0+DtA=
SIZE (nss-3.12.3.1.tar.gz) = 5320607
MD5 (nss-3.12.6.tar.gz) = 2kJZZmXyJt5es+z8HsV80Q==
RMD160 (nss-3.12.6.tar.gz) = yxHhVHMKEscvaExgNvpvJ9ENK2A=
SHA1 (nss-3.12.6.tar.gz) = Rh6Brb3vbD+Ej8/uDcWtjC2+vUY=
SHA256 (nss-3.12.6.tar.gz) = j5dZvhzpKOgoMJI/3mKmbicMRkXxCkwXas/MtgIal5U=
SIZE (nss-3.12.6.tar.gz) = 5947630

10
security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.4 2008/07/25 00:47:00 martynas Exp $
--- mozilla/security/coreconf/OpenBSD.mk.orig Thu Nov 22 06:39:56 2007
+++ mozilla/security/coreconf/OpenBSD.mk Sat Jul 19 22:45:35 2008
$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.5 2010/04/03 09:21:00 landry Exp $
--- mozilla/security/coreconf/OpenBSD.mk.orig Thu Sep 3 06:57:00 2009
+++ mozilla/security/coreconf/OpenBSD.mk Tue Mar 30 23:35:29 2010
@@ -56,7 +56,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
endif
@ -10,9 +10,9 @@ $OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.4 2008/07/25 00:47:00 m
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
@@ -68,7 +68,7 @@ DSO_CFLAGS = -fPIC -DPIC
@@ -67,7 +67,7 @@ ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
DSO_LDFLAGS =
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)

56
security/nss/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c
View File

@ -1,30 +1,30 @@
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2009/08/08 12:57:17 martynas Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig Thu Jul 16 18:02:46 2009
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c Thu Jul 16 18:09:58 2009
@@ -900,6 +900,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_280
static const CK_ATTRIBUTE_TYPE nss_builtins_types_281 [] = {
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.2 2010/04/03 09:21:00 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.c.orig Tue Feb 16 23:14:34 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.c Tue Mar 30 23:38:42 2010
@@ -1020,6 +1020,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320
static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_282 [] = {
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_283 [] = {
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_284 [] = {
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_285 [] = {
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = {
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
+};
#ifdef DEBUG
static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -18953,6 +18965,332 @@ static const NSSItem nss_builtins_items_281 [] = {
@@ -21537,6 +21549,332 @@ static const NSSItem nss_builtins_items_321 [] = {
{ (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
};
+static const NSSItem nss_builtins_items_282 [] = {
+static const NSSItem nss_builtins_items_322 [] = {
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@ -171,7 +171,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2009/08/
+"\103"
+, (PRUint32)1857 }
+};
+static const NSSItem nss_builtins_items_283 [] = {
+static const NSSItem nss_builtins_items_323 [] = {
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@ -198,7 +198,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2009/08/
+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_284 [] = {
+static const NSSItem nss_builtins_items_324 [] = {
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@ -323,7 +323,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2009/08/
+"\322\156\245\033\231\047\200\347\013\251\250\000"
+, (PRUint32)1548 }
+};
+static const NSSItem nss_builtins_items_285 [] = {
+static const NSSItem nss_builtins_items_325 [] = {
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@ -353,22 +353,22 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2009/08/
builtinsInternalObject
nss_builtins_data[] = {
@@ -19239,11 +19577,15 @@ nss_builtins_data[] = {
{ 11, nss_builtins_types_278, nss_builtins_items_278, {NULL} },
{ 13, nss_builtins_types_279, nss_builtins_items_279, {NULL} },
{ 11, nss_builtins_types_280, nss_builtins_items_280, {NULL} },
- { 13, nss_builtins_types_281, nss_builtins_items_281, {NULL} }
+ { 13, nss_builtins_types_281, nss_builtins_items_281, {NULL} },
+ { 11, nss_builtins_types_282, nss_builtins_items_282, {NULL} },
+ { 13, nss_builtins_types_283, nss_builtins_items_283, {NULL} },
+ { 11, nss_builtins_types_284, nss_builtins_items_284, {NULL} },
+ { 13, nss_builtins_types_285, nss_builtins_items_285, {NULL} }
@@ -21863,11 +22201,15 @@ nss_builtins_data[] = {
{ 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
{ 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
{ 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
- { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
+ { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} },
+ { 13, nss_builtins_types_322, nss_builtins_items_322, {NULL} },
+ { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} },
+ { 13, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+ { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }
};
const PRUint32
#ifdef DEBUG
- nss_builtins_nObjects = 281+1;
+ nss_builtins_nObjects = 285+1;
- nss_builtins_nObjects = 321+1;
+ nss_builtins_nObjects = 325+1;
#else
- nss_builtins_nObjects = 281;
+ nss_builtins_nObjects = 285;
- nss_builtins_nObjects = 321;
+ nss_builtins_nObjects = 325;
#endif /* DEBUG */

19
security/nss/patches/patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt
View File

@ -1,12 +1,10 @@
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.1 2009/08/08 12:57:17 martynas Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig Thu Jul 16 18:02:46 2009
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt Thu Jul 16 18:07:17 2009
@@ -19536,3 +19536,349 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DE
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
$OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.2 2010/04/03 09:21:00 landry Exp $
--- mozilla/security/nss/lib/ckfw/builtins/certdata.txt.orig Tue Feb 16 23:14:35 2010
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt Tue Mar 30 23:35:30 2010
@@ -19538,6 +19538,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
#
+# Certificate "CAcert.org Class 1 Certification Authority"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
@ -351,3 +349,8 @@ $OpenBSD: patch-mozilla_security_nss_lib_ckfw_builtins_certdata_txt,v 1.1 2009/0
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
# Certificate "ePKI Root Certification Authority"
#
CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE

12
security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.6 2009/08/04 14:00:21 martynas Exp $
--- 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)
$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.7 2010/04/03 09:21:00 landry Exp $
--- mozilla/security/nss/lib/freebl/unix_rand.c.orig Wed Jun 10 02:42:17 2009
+++ mozilla/security/nss/lib/freebl/unix_rand.c Tue Mar 30 23:35:30 2010
@@ -849,7 +849,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 @@ $OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.6 2009/08/04 14:
void RNG_SystemInfoForRNG(void)
{
@@ -957,7 +956,7 @@ void RNG_SystemInfoForRNG(void)
@@ -916,7 +915,7 @@ void RNG_SystemInfoForRNG(void)
GiveSystemInfo();
/* grab some data from system's PRNG before any other files. */
@ -18,7 +18,7 @@ $OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.6 2009/08/04 14:
/* If the user points us to a random file, pass it through the rng */
randfile = getenv("NSRANDFILE");
@@ -1259,7 +1258,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
@@ -1159,7 +1158,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
size_t fileBytes = 0;
unsigned char *buffer = dest;

3
security/nss/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2009/08/04 14:00:21 martynas Exp $
@comment $OpenBSD: PLIST,v 1.6 2010/04/03 09:21:00 landry Exp $
@bin bin/certutil
@bin bin/cmsutil
@bin bin/crlutil
@ -105,6 +105,7 @@ lib/libfreebl3.chk
@lib lib/libfreebl3.so.${LIBfreebl3_VERSION}
@lib lib/libnss3.so.${LIBnss3_VERSION}
@lib lib/libnssckbi.so.${LIBnssckbi_VERSION}
lib/libnssdbm3.chk
@lib lib/libnssdbm3.so.${LIBnssdbm3_VERSION}
@lib lib/libnssutil3.so.${LIBnssutil3_VERSION}
@lib lib/libsmime3.so.${LIBsmime3_VERSION}