From owner-svn-ports-head@freebsd.org Sun Sep 9 18:27:57 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC684109B517; Sun, 9 Sep 2018 18:27:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9354C7CE8B; Sun, 9 Sep 2018 18:27:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E6421D598; Sun, 9 Sep 2018 18:27:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w89IRuma060817; Sun, 9 Sep 2018 18:27:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w89IRujE060816; Sun, 9 Sep 2018 18:27:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201809091827.w89IRujE060816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 9 Sep 2018 18:27:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479330 - head/security/nss/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/security/nss/files X-SVN-Commit-Revision: 479330 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2018 18:27:57 -0000 Author: jbeich Date: Sun Sep 9 18:27:56 2018 New Revision: 479330 URL: https://svnweb.freebsd.org/changeset/ports/479330 Log: security/nss: sort system db(3) patch per "make makepatch" Modified: head/security/nss/files/patch-sysdb (contents, props changed) Modified: head/security/nss/files/patch-sysdb ============================================================================== --- head/security/nss/files/patch-sysdb Sun Sep 9 18:27:42 2018 (r479329) +++ head/security/nss/files/patch-sysdb Sun Sep 9 18:27:56 2018 (r479330) @@ -1,3 +1,69 @@ +--- cmd/platlibs.mk.orig 2018-08-31 12:55:53 UTC ++++ cmd/platlibs.mk +@@ -29,7 +29,7 @@ endif # BUILD_SUN_PKG + ifdef NSS_DISABLE_DBM + DBMLIB = $(NULL) + else +-DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) ++DBMLIB = $(NULL) + endif + + ifeq ($(NSS_BUILD_UTIL_ONLY),1) +--- lib/certdb/xauthkid.c.orig 2018-08-31 12:55:53 UTC ++++ lib/certdb/xauthkid.c +@@ -7,7 +7,7 @@ + * + */ + +-#include "prtypes.h" ++#include + #include "seccomon.h" + #include "secdert.h" + #include "secoidt.h" +--- lib/certdb/xbsconst.c.orig 2018-08-31 12:55:53 UTC ++++ lib/certdb/xbsconst.c +@@ -6,7 +6,7 @@ + * X.509 v3 Basic Constraints Extension + */ + +-#include "prtypes.h" ++#include + #include /* for LONG_MAX */ + #include "seccomon.h" + #include "secdert.h" +--- lib/certdb/xconst.c.orig 2018-08-31 12:55:53 UTC ++++ lib/certdb/xconst.c +@@ -6,7 +6,7 @@ + * X.509 Extension Encoding + */ + +-#include "prtypes.h" ++#include + #include "seccomon.h" + #include "secdert.h" + #include "secoidt.h" +--- lib/ckfw/dbm/ckdbm.h.orig 2018-08-31 12:55:53 UTC ++++ lib/ckfw/dbm/ckdbm.h +@@ -23,7 +23,7 @@ + #include "ckt.h" + #endif /* CKT_H */ + +-#include "mcom_db.h" ++#include + + NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance; + +--- lib/manifest.mn.orig 2018-08-31 12:55:53 UTC ++++ lib/manifest.mn +@@ -20,7 +20,7 @@ ifndef NSS_BUILD_UTIL_ONLY + SOFTOKEN_SRCDIRS = \ + $(FREEBL_SRCDIR) \ + $(SQLITE_SRCDIR) \ +- $(DBM_SRCDIR) \ ++ $(NULL) \ + $(SOFTOKEN_SRCDIR) \ + $(NULL) + ifndef NSS_BUILD_SOFTOKEN_ONLY --- lib/softoken/legacydb/cdbhdl.h.orig 2018-08-31 12:55:53 UTC +++ lib/softoken/legacydb/cdbhdl.h @@ -9,7 +9,8 @@ @@ -10,6 +76,16 @@ #include "pcertt.h" #include "prtypes.h" +--- lib/softoken/legacydb/config.mk.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/config.mk +@@ -8,7 +8,6 @@ CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX + + EXTRA_LIBS += \ + $(CRYPTOLIB) \ +- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ + $(NULL) + + # can't do this in manifest.mn because OS_TARGET isn't defined there. --- lib/softoken/legacydb/dbmshim.c.orig 2018-08-31 12:55:53 UTC +++ lib/softoken/legacydb/dbmshim.c @@ -5,7 +5,8 @@ @@ -67,79 +143,3 @@ #include "secerr.h" #include "utilpars.h" ---- lib/ckfw/dbm/ckdbm.h.orig 2018-08-31 12:55:53 UTC -+++ lib/ckfw/dbm/ckdbm.h -@@ -23,7 +23,7 @@ - #include "ckt.h" - #endif /* CKT_H */ - --#include "mcom_db.h" -+#include - - NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance; - ---- lib/softoken/legacydb/config.mk.orig 2018-08-31 12:55:53 UTC -+++ lib/softoken/legacydb/config.mk -@@ -8,7 +8,6 @@ CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX - - EXTRA_LIBS += \ - $(CRYPTOLIB) \ -- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ - $(NULL) - - # can't do this in manifest.mn because OS_TARGET isn't defined there. ---- lib/certdb/xauthkid.c.orig 2018-08-31 12:55:53 UTC -+++ lib/certdb/xauthkid.c -@@ -7,7 +7,7 @@ - * - */ - --#include "prtypes.h" -+#include - #include "seccomon.h" - #include "secdert.h" - #include "secoidt.h" ---- lib/certdb/xbsconst.c.orig 2018-08-31 12:55:53 UTC -+++ lib/certdb/xbsconst.c -@@ -6,7 +6,7 @@ - * X.509 v3 Basic Constraints Extension - */ - --#include "prtypes.h" -+#include - #include /* for LONG_MAX */ - #include "seccomon.h" - #include "secdert.h" ---- lib/certdb/xconst.c.orig 2018-08-31 12:55:53 UTC -+++ lib/certdb/xconst.c -@@ -6,7 +6,7 @@ - * X.509 Extension Encoding - */ - --#include "prtypes.h" -+#include - #include "seccomon.h" - #include "secdert.h" - #include "secoidt.h" ---- lib/manifest.mn.orig 2018-08-31 12:55:53 UTC -+++ lib/manifest.mn -@@ -20,7 +20,7 @@ ifndef NSS_BUILD_UTIL_ONLY - SOFTOKEN_SRCDIRS = \ - $(FREEBL_SRCDIR) \ - $(SQLITE_SRCDIR) \ -- $(DBM_SRCDIR) \ -+ $(NULL) \ - $(SOFTOKEN_SRCDIR) \ - $(NULL) - ifndef NSS_BUILD_SOFTOKEN_ONLY ---- cmd/platlibs.mk.orig 2018-08-31 12:55:53 UTC -+++ cmd/platlibs.mk -@@ -29,7 +29,7 @@ endif # BUILD_SUN_PKG - ifdef NSS_DISABLE_DBM - DBMLIB = $(NULL) - else --DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) -+DBMLIB = $(NULL) - endif - - ifeq ($(NSS_BUILD_UTIL_ONLY),1)