CVS commit: pkgsrc/devel/nss

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 24 11:35:48 UTC 2018

Modified Files:
        pkgsrc/devel/nss: Makefile distinfo
Added Files:
        pkgsrc/devel/nss/patches: patch-nss_lib_util_utilpars.c
            patch-nss_tests_all.sh patch-nss_tests_merge_merge.sh

Log Message:
Change default file type back to DBM from SQL. Bump PKGREVISION

This back out fixes XML-based files open of misc/libreoffice.
The problem is reported by Mustafa Dogan via private e-mail.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 pkgsrc/devel/nss/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/nss/patches/patch-nss_lib_util_utilpars.c \
    pkgsrc/devel/nss/patches/patch-nss_tests_all.sh \
    pkgsrc/devel/nss/patches/patch-nss_tests_merge_merge.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.146 pkgsrc/devel/nss/Makefile:1.147
--- pkgsrc/devel/nss/Makefile:1.146     Wed Jan 24 16:23:52 2018
+++ pkgsrc/devel/nss/Makefile   Sat Feb 24 11:35:48 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.146 2018/01/24 16:23:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.147 2018/02/24 11:35:48 ryoon Exp $
 
 DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=           3.35.0
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.81 pkgsrc/devel/nss/distinfo:1.82
--- pkgsrc/devel/nss/distinfo:1.81      Wed Jan 24 16:23:52 2018
+++ pkgsrc/devel/nss/distinfo   Sat Feb 24 11:35:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2018/01/24 16:23:52 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2018/02/24 11:35:48 ryoon Exp $
 
 SHA1 (nss-3.35.tar.gz) = 72fb5bd2fc56113fec0d8867a1030bb0dfa108ac
 RMD160 (nss-3.35.tar.gz) = fdd93a1d787f6223b91b4fcb339cf3cf1204a9ef
@@ -16,4 +16,7 @@ SHA1 (patch-mn) = 5b79783e48249044be1a90
 SHA1 (patch-nss_cmd_platlibs.mk) = 7dadcb72acf15714c61ae74b21c5baf45bc51d4c
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = fccc17845c28f5b1268c96eb4e952e32dd530d1d
 SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078
+SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
+SHA1 (patch-nss_tests_all.sh) = f8d0fcfcd67dca757c9ce016660210b20b1e6e8f
+SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
 SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af

Added files:

Index: pkgsrc/devel/nss/patches/patch-nss_lib_util_utilpars.c
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_lib_util_utilpars.c:1.1
--- /dev/null   Sat Feb 24 11:35:48 2018
+++ pkgsrc/devel/nss/patches/patch-nss_lib_util_utilpars.c      Sat Feb 24 11:35:48 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-nss_lib_util_utilpars.c,v 1.1 2018/02/24 11:35:48 ryoon Exp $
+
+Revert Bug 1377940 to fix misc/libreoffice
+
+--- nss/lib/util/utilpars.c.orig       2018-01-18 14:19:59.000000000 +0000
++++ nss/lib/util/utilpars.c
+@@ -1111,8 +1111,12 @@ _NSSUTIL_EvaluateConfigDir(const char *c
+     NSSDBType dbType;
+     PRBool checkEnvDefaultDB = PR_FALSE;
+     *appName = NULL;
+-    /* force the default */
++/* force the default */
++#ifdef NSS_DISABLE_DBM
+     dbType = NSS_DB_TYPE_SQL;
++#else
++    dbType = NSS_DB_TYPE_LEGACY;
++#endif
+     if (configdir == NULL) {
+         checkEnvDefaultDB = PR_TRUE;
+     } else if (PORT_Strncmp(configdir, MULTIACCESS, sizeof(MULTIACCESS) - 1) == 0) {
Index: pkgsrc/devel/nss/patches/patch-nss_tests_all.sh
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_tests_all.sh:1.1
--- /dev/null   Sat Feb 24 11:35:48 2018
+++ pkgsrc/devel/nss/patches/patch-nss_tests_all.sh     Sat Feb 24 11:35:48 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-nss_tests_all.sh,v 1.1 2018/02/24 11:35:48 ryoon Exp $
+
+Revert Bug 1377940 to fix misc/libreoffice
+
+--- nss/tests/all.sh.orig      2018-01-18 14:19:59.000000000 +0000
++++ nss/tests/all.sh
+@@ -111,8 +111,6 @@ RUN_FIPS=""
+ ########################################################################
+ run_tests()
+ {
+-    echo "Running test cycle: ${TEST_MODE} ----------------------"
+-    echo "List of tests that will be executed: ${TESTS}"
+     for TEST in ${TESTS}
+     do
+         # NOTE: the spaces are important. If you don't include
+@@ -174,9 +172,8 @@ run_cycle_pkix()
+     NSS_SSL_TESTS=`echo "${NSS_SSL_TESTS}" | sed -e "s/normal//g" -e "s/fips//g" -e "s/_//g"`
+     export -n NSS_SSL_RUN
+ 
+-    # use the default format. (unset for the shell, export -n for binaries)
++    # use the default format
+     export -n NSS_DEFAULT_DB_TYPE
+-    unset NSS_DEFAULT_DB_TYPE
+ 
+     run_tests
+ }
Index: pkgsrc/devel/nss/patches/patch-nss_tests_merge_merge.sh
diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_tests_merge_merge.sh:1.1
--- /dev/null   Sat Feb 24 11:35:48 2018
+++ pkgsrc/devel/nss/patches/patch-nss_tests_merge_merge.sh     Sat Feb 24 11:35:48 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-nss_tests_merge_merge.sh,v 1.1 2018/02/24 11:35:48 ryoon Exp $
+
+Revert Bug 1377940 to fix misc/libreoffice
+
+--- nss/tests/merge/merge.sh.orig      2018-01-18 14:19:59.000000000 +0000
++++ nss/tests/merge/merge.sh
+@@ -98,7 +98,7 @@ merge_init()
+   # are dbm databases.
+   if [ "${TEST_MODE}" = "UPGRADE_DB" ]; then
+       save=${NSS_DEFAULT_DB_TYPE}
+-      NSS_DEFAULT_DB_TYPE=dbm ; export NSS_DEFAULT_DB_TYPE
++      NSS_DEFAULT_DB_TYPE= ; export NSS_DEFAULT_DB_TYPE
+   fi
+ 
+   certutil -N -d ${CONFLICT1DIR} -f ${R_PWFILE}