nss-hg: remove, not kept in sync with nss

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: nss-hg: remove, not kept in sync with nss
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Tue, 09 Mar 2021 08:32:53 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Mar 9 09:32:53 2021 +0100
Changeset:	0184da09c422d3bd8aed502d39acf01cee0d9e29

Removed Files:
	nss-hg/DESCR
	nss-hg/Makefile
	nss-hg/PLIST
	nss-hg/buildlink3.mk
	nss-hg/distinfo
	nss-hg/files/nss-config.in
	nss-hg/files/nss.pc.in
	nss-hg/patches/patch-cmd_shlibsign_sign.sh
	nss-hg/patches/patch-coreconf_OpenBSD.mk
	nss-hg/patches/patch-coreconf_SunOS5.mk
	nss-hg/patches/patch-coreconf_config.mk
	nss-hg/patches/patch-lib_freebl_blapi.h
	nss-hg/patches/patch-lib_freebl_chacha20poly1305.c
	nss-hg/patches/patch-lib_freebl_sha-fast-amd64-sun.s
	nss-hg/patches/patch-lib_softoken_config.mk
	nss-hg/patches/patch-lib_zlib_gzread.c
	nss-hg/patches/patch-lib_zlib_gzwrite.c
	nss-hg/patches/patch-tests_libpkix_libpkix.sh
	nss-hg/patches/patch-tests_multinit_multinit.sh

Log Message:
nss-hg: remove, not kept in sync with nss

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0184da09c422d3bd8aed502d39acf01cee0d9e29

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

diffstat:
 nss-hg/DESCR                                       |   7 -
 nss-hg/Makefile                                    | 111 ----------------
 nss-hg/PLIST                                       | 114 -----------------
 nss-hg/buildlink3.mk                               |  19 ---
 nss-hg/distinfo                                    |  17 ---
 nss-hg/files/nss-config.in                         | 142 ---------------------
 nss-hg/files/nss.pc.in                             |  11 --
 nss-hg/patches/patch-cmd_shlibsign_sign.sh         |  15 ---
 nss-hg/patches/patch-coreconf_OpenBSD.mk           |  15 ---
 nss-hg/patches/patch-coreconf_SunOS5.mk            |  17 ---
 nss-hg/patches/patch-coreconf_config.mk            |  14 --
 nss-hg/patches/patch-lib_freebl_blapi.h            |  15 ---
 nss-hg/patches/patch-lib_freebl_chacha20poly1305.c |  26 ----
 .../patches/patch-lib_freebl_sha-fast-amd64-sun.s  |  46 -------
 nss-hg/patches/patch-lib_softoken_config.mk        |  17 ---
 nss-hg/patches/patch-lib_zlib_gzread.c             |  14 --
 nss-hg/patches/patch-lib_zlib_gzwrite.c            |  14 --
 nss-hg/patches/patch-tests_libpkix_libpkix.sh      |  22 ----
 nss-hg/patches/patch-tests_multinit_multinit.sh    |  32 -----
 19 files changed, 668 deletions(-)

diffs:
diff --git a/nss-hg/DESCR b/nss-hg/DESCR
deleted file mode 100644
index b141d9ca6b..0000000000
--- a/nss-hg/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled server
-applications.  Applications built with NSS can support SSL v2 and
-v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
-certificates, and other security standards.
-
-This package contains the hg version.
diff --git a/nss-hg/Makefile b/nss-hg/Makefile
deleted file mode 100644
index 34b70e8334..0000000000
--- a/nss-hg/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2015/01/24 16:48:48 thomasklausner Exp $
-
-# necessary because hg-package.mk would override it
-PKGNAME=		nss-${NSS_RELEASE}
-DISTNAME=		nss-${NSS_RELEASE}
-# see lib/nss/nss.h
-NSS_RELEASE=		3.29.0beta1
-CATEGORIES=		security
-MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_MAJOR_VERSION}_${NSS_MINOR_VERSION}_RTM/src/}
-
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://www.mozilla.org/projects/security/pki/nss/
-COMMENT=		Libraries to support development of security-enabled applications (hg version)
-LICENSE=		mpl-2.0
-
-HG_REPOSITORIES=	nss
-HG_REPO.nss=		https://hg.mozilla.org/projects/nss
-WRKSRC=			${WRKDIR}/nss
-#WRKSRC=		${WRKDIR}
-
-USE_LANGUAGES=		c c++
-
-BUILDLINK_TRANSFORM+=	rm:-Werror
-
-# wants to use zlib before making sure it's built
-MAKE_JOBS_SAFE=		no
-
-CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/configure
-CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}configure
-
-USE_GCC_RUNTIME=	yes
-USE_TOOLS+=		gmake perl pax pkg-config
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=			exec_path
-SUBST_STAGE.exec_path=		pre-configure
-SUBST_MESSAGE.exec_path=	Fixing @executable_path
-SUBST_FILES.exec_path=		coreconf/Darwin.mk
-SUBST_SED.exec_path=		-e 's,@executable_path,${PREFIX}/lib/nss,g'
-.endif
-
-.if ${OPSYS} == "Linux"
-MAKE_ENV+=	FREEBL_NO_DEPEND=0
-.endif
-
-.if ${OBJECT_FMT} == "ELF"
-SO_SUFFIX=		so
-.elif ${OBJECT_FMT} == "Mach-O"
-SO_SUFFIX=		dylib
-.else
-SO_SUFFIX=		so.1.0
-.endif
-PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
-
-.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
-MAKE_ENV+=	NS_USE_GCC=YES
-.endif
-
-.for platform in ${LP64PLATFORMS}
-.  if ${MACHINE_PLATFORM:M${platform}}
-MAKE_ENV+=	USE_64=1
-.  endif
-.endfor
-
-MAKE_ENV+=	BUILD_OPT=1
-#MAKE_ENV+=	OPTIMIZER=${CFLAGS:Q}
-MAKE_ENV+=	INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr
-MAKE_ENV+=	NSS_USE_SYSTEM_SQLITE=1
-MAKE_ENV+=	EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
-
-NSS_MAJOR_VERSION=	${NSS_RELEASE:C/\.[0-9.]*//}
-NSS_MINOR_VERSION=	${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
-NSS_PATCH_VERSION=	${NSS_RELEASE:C/[0-9.]*\.//}
-
-SUBST_CLASSES+=		config
-SUBST_VARS.config=	PREFIX
-SUBST_VARS.config+=	NSS_MAJOR_VERSION
-SUBST_VARS.config+=	NSS_MINOR_VERSION
-SUBST_VARS.config+=	NSS_PATCH_VERSION
-SUBST_VARS.config+=	COMPILER_RPATH_FLAG
-SUBST_SED.config+=	-e "s,@PTHREAD@,${BUILDLINK_LIBS.pthread:Q},"
-SUBST_STAGE.config=	pre-build
-SUBST_MESSAGE.config=	Preparing *-config files.
-SUBST_FILES.config+=	nss.pc nss-config
-
-INSTALLATION_DIRS=	bin include/nss lib/nss lib/pkgconfig
-DIST=	${WRKDIR}/dist
-
-post-extract:
-	find ${WRKSRC} -type f | xargs ${CHMOD} 644
-	find ${WRKSRC} -type d | xargs ${CHMOD} 755
-	${CP} ${FILESDIR}/nss.pc.in ${WRKSRC}/nss.pc
-	${CP} ${FILESDIR}/nss-config.in ${WRKSRC}/nss-config
-
-do-install:
-	(cd ${DIST}/public && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss/ )
-	(cd ${DIST}/*_OPT.OBJ/lib && \
-		pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
-	${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
-		${DESTDIR}${PREFIX}/lib/nss/
-	${INSTALL_DATA} ${WRKSRC}/nss.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
-	${INSTALL_SCRIPT} ${WRKSRC}/nss-config ${DESTDIR}${PREFIX}/bin/nss-config
-
-.include "../../databases/sqlite3/buildlink3.mk"
-.include "../../wip/nspr-hg/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../wip/mk/hg-package.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/nss-hg/PLIST b/nss-hg/PLIST
deleted file mode 100644
index 3c166682c1..0000000000
--- a/nss-hg/PLIST
+++ /dev/null
@@ -1,114 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2015/08/12 11:34:44 thomasklausner Exp $
-bin/nss-config
-include/nss/dbm/mcom_db.h
-include/nss/dbm/ncompat.h
-include/nss/dbm/winfile.h
-include/nss/nss/base64.h
-include/nss/nss/blapit.h
-include/nss/nss/cert.h
-include/nss/nss/certdb.h
-include/nss/nss/certt.h
-include/nss/nss/ciferfam.h
-include/nss/nss/cmmf.h
-include/nss/nss/cmmft.h
-include/nss/nss/cms.h
-include/nss/nss/cmsreclist.h
-include/nss/nss/cmst.h
-include/nss/nss/crmf.h
-include/nss/nss/crmft.h
-include/nss/nss/cryptohi.h
-include/nss/nss/cryptoht.h
-include/nss/nss/eccutil.h
-include/nss/nss/ecl-exp.h
-include/nss/nss/hasht.h
-include/nss/nss/jar-ds.h
-include/nss/nss/jar.h
-include/nss/nss/jarfile.h
-include/nss/nss/key.h
-include/nss/nss/keyhi.h
-include/nss/nss/keyt.h
-include/nss/nss/keythi.h
-include/nss/nss/lowkeyi.h
-include/nss/nss/lowkeyti.h
-include/nss/nss/nss.h
-include/nss/nss/nssb64.h
-include/nss/nss/nssb64t.h
-include/nss/nss/nssbase.h
-include/nss/nss/nssbaset.h
-include/nss/nss/nssck.api
-include/nss/nss/nssckbi.h
-include/nss/nss/nssckepv.h
-include/nss/nss/nssckft.h
-include/nss/nss/nssckfw.h
-include/nss/nss/nssckfwc.h
-include/nss/nss/nssckfwt.h
-include/nss/nss/nssckg.h
-include/nss/nss/nssckmdt.h
-include/nss/nss/nssckt.h
-include/nss/nss/nssilckt.h
-include/nss/nss/nssilock.h
-include/nss/nss/nsslocks.h
-include/nss/nss/nssrwlk.h
-include/nss/nss/nssrwlkt.h
-include/nss/nss/nssutil.h
-include/nss/nss/ocsp.h
-include/nss/nss/ocspt.h
-include/nss/nss/p12.h
-include/nss/nss/p12plcy.h
-include/nss/nss/p12t.h
-include/nss/nss/pk11func.h
-include/nss/nss/pk11pqg.h
-include/nss/nss/pk11priv.h
-include/nss/nss/pk11pub.h
-include/nss/nss/pk11sdr.h
-include/nss/nss/pkcs11.h
-include/nss/nss/pkcs11f.h
-include/nss/nss/pkcs11n.h
-include/nss/nss/pkcs11p.h
-include/nss/nss/pkcs11t.h
-include/nss/nss/pkcs11u.h
-include/nss/nss/pkcs12.h
-include/nss/nss/pkcs12t.h
-include/nss/nss/pkcs1sig.h
-include/nss/nss/pkcs7t.h
-include/nss/nss/portreg.h
-include/nss/nss/preenc.h
-include/nss/nss/secasn1.h
-include/nss/nss/secasn1t.h
-include/nss/nss/seccomon.h
-include/nss/nss/secder.h
-include/nss/nss/secdert.h
-include/nss/nss/secdig.h
-include/nss/nss/secdigt.h
-include/nss/nss/secerr.h
-include/nss/nss/sechash.h
-include/nss/nss/secitem.h
-include/nss/nss/secmime.h
-include/nss/nss/secmod.h
-include/nss/nss/secmodt.h
-include/nss/nss/secoid.h
-include/nss/nss/secoidt.h
-include/nss/nss/secpkcs5.h
-include/nss/nss/secpkcs7.h
-include/nss/nss/secport.h
-include/nss/nss/shsign.h
-include/nss/nss/smime.h
-include/nss/nss/ssl.h
-include/nss/nss/sslerr.h
-include/nss/nss/sslproto.h
-include/nss/nss/sslt.h
-include/nss/nss/utilmodt.h
-include/nss/nss/utilpars.h
-include/nss/nss/utilparst.h
-include/nss/nss/utilrename.h
-lib/nss/libcrmf.a
-lib/nss/libfreebl3.${SO_SUFFIX}
-lib/nss/libgtest1.${SO_SUFFIX}
-lib/nss/libnss3.${SO_SUFFIX}
-lib/nss/libnssckbi.${SO_SUFFIX}
-lib/nss/libnssdbm3.${SO_SUFFIX}
-lib/nss/libnssutil3.${SO_SUFFIX}
-lib/nss/libsmime3.${SO_SUFFIX}
-lib/nss/libsoftokn3.${SO_SUFFIX}
-lib/nss/libssl3.${SO_SUFFIX}
-lib/pkgconfig/nss.pc
diff --git a/nss-hg/buildlink3.mk b/nss-hg/buildlink3.mk
deleted file mode 100644
index 5b56b98eca..0000000000
--- a/nss-hg/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/09/28 14:20:08 thomasklausner Exp $
-
-BUILDLINK_TREE+=	nss
-
-.if !defined(NSS_BUILDLINK3_MK)
-NSS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.nss+=	nss>=3.25
-BUILDLINK_PKGSRCDIR.nss?=	../../wip/nss-hg
-
-BUILDLINK_LIBDIRS.nss+=		lib/nss
-BUILDLINK_RPATHDIRS.nss+=	lib/nss
-
-BUILDLINK_INCDIRS.nss+=		include/nss/nss
-
-.include "../../wip/nspr-hg/buildlink3.mk"
-.endif # NSS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-nss
diff --git a/nss-hg/distinfo b/nss-hg/distinfo
deleted file mode 100644
index 0117a4882c..0000000000
--- a/nss-hg/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/03/17 14:28:41 thomasklausner Exp $
-
-SHA1 (nss-3.16.5.tar.gz) = bec488835954698e7b19149a15205db299cd13de
-RMD160 (nss-3.16.5.tar.gz) = 19630a0815d69ee5959b562d7849d35d677c6329
-Size (nss-3.16.5.tar.gz) = 6429830 bytes
-SHA1 (patch-cmd_shlibsign_sign.sh) = 9be9719d9e4cc212d9503616a1145b8c68b97a6a
-SHA1 (patch-coreconf_OpenBSD.mk) = 0c22a08a6024aa7505e8307e598cbd02ac569a88
-SHA1 (patch-coreconf_SunOS5.mk) = db81e955db52ccccc2dbdae364449870b9724e15
-SHA1 (patch-coreconf_config.mk) = a24f2c6bbbe525f2c402e2da5e238ccc4a027c21
-SHA1 (patch-lib_freebl_blapi.h) = 9afa4db40b32deb611215cec049aedabf407c6ef
-SHA1 (patch-lib_freebl_chacha20poly1305.c) = ee99e7c04f628d285f497ae9b172a8a72da7286a
-SHA1 (patch-lib_freebl_sha-fast-amd64-sun.s) = 6feb56632584f04c5259dcb72e330e13d485b50a
-SHA1 (patch-lib_softoken_config.mk) = c1262775ba60facae1b00324b668dfab0eecc6c3
-SHA1 (patch-lib_zlib_gzread.c) = ee8c4cf094ccd1938a55350ad0529e0be31e0dd4
-SHA1 (patch-lib_zlib_gzwrite.c) = e094e35e7f73ddd1d24fc11de7765407e3ecff57
-SHA1 (patch-tests_libpkix_libpkix.sh) = 4df0e877ab59637fcc4b54c29b14408c73ff5105
-SHA1 (patch-tests_multinit_multinit.sh) = 97f6895c693a2606f9d178c10886bd20cc9187ed
diff --git a/nss-hg/files/nss-config.in b/nss-hg/files/nss-config.in
deleted file mode 100644
index 6b8c631203..0000000000
--- a/nss-hg/files/nss-config.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-
-prefix=@PREFIX@
-
-major_version=@NSS_MAJOR_VERSION@
-minor_version=@NSS_MINOR_VERSION@
-patch_version=@NSS_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	ssl
-	smime
-	nssutil
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-    if test -z "$exec_prefix"; then
-        exec_prefix=`pkg-config --variable=prefix nss`/bin
-    fi
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test -z "$cflags"; then
-    cflags=`pkg-config --cflags nss`
-fi
-
-if test -z "$libs"; then
-    libs=`pkg-config --libs nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
-   echo $libs
-fi
diff --git a/nss-hg/files/nss.pc.in b/nss-hg/files/nss.pc.in
deleted file mode 100644
index 945dffb246..0000000000
--- a/nss-hg/files/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@/bin
-libdir=@PREFIX@/lib/nss
-includedir=@PREFIX@/include/nss
-
-Name: NSS
-Description: Mozilla Network Security Services
-Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-Requires: nspr >= 4.10.3
-Cflags: -I${includedir}
-Libs: @COMPILER_RPATH_FLAG@${libdir} -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3 @PTHREAD@
diff --git a/nss-hg/patches/patch-cmd_shlibsign_sign.sh b/nss-hg/patches/patch-cmd_shlibsign_sign.sh
deleted file mode 100644
index 60bdeb25c6..0000000000
--- a/nss-hg/patches/patch-cmd_shlibsign_sign.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cmd_shlibsign_sign.sh,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Add ${PREFIX}/lib to search path (pkgsrc specific)
-
---- cmd/shlibsign/sign.sh.orig	2014-09-28 13:54:02.000000000 +0000
-+++ cmd/shlibsign/sign.sh
-@@ -37,7 +37,7 @@ WIN*)
-     export LIBPATH
-     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
-     export SHLIB_PATH
--    LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
-+    LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH
-     export LD_LIBRARY_PATH
-     DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
-     export DYLD_LIBRARY_PATH
diff --git a/nss-hg/patches/patch-coreconf_OpenBSD.mk b/nss-hg/patches/patch-coreconf_OpenBSD.mk
deleted file mode 100644
index b0bec34f9b..0000000000
--- a/nss-hg/patches/patch-coreconf_OpenBSD.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-coreconf_OpenBSD.mk,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-PLIST unification (see nspr)?
-
---- coreconf/OpenBSD.mk.orig	2016-04-25 00:47:19.000000000 +0000
-+++ coreconf/OpenBSD.mk
-@@ -24,7 +24,7 @@ OS_LIBS			+= -pthread
- DSO_LDOPTS		+= -pthread
- endif
- 
--DLL_SUFFIX		= so.1.0
-+DLL_SUFFIX		= so
- 
- OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DOPENBSD
- 
diff --git a/nss-hg/patches/patch-coreconf_SunOS5.mk b/nss-hg/patches/patch-coreconf_SunOS5.mk
deleted file mode 100644
index b0ae45d7ec..0000000000
--- a/nss-hg/patches/patch-coreconf_SunOS5.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-coreconf_SunOS5.mk,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Embed proper runtime library path in executables
-
---- coreconf/SunOS5.mk.orig	2014-09-28 13:54:02.000000000 +0000
-+++ coreconf/SunOS5.mk
-@@ -119,6 +119,10 @@ endif
- endif
- DSO_LDOPTS += -z combreloc -z defs -z ignore
- 
-+ifdef LIBRUNPATH
-+DSO_LDOPTS += -R$(LIBRUNPATH)
-+endif
-+
- # -KPIC generates position independent code for use in shared libraries.
- # (Similarly for -fPIC in case of gcc.)
- ifdef NS_USE_GCC
diff --git a/nss-hg/patches/patch-coreconf_config.mk b/nss-hg/patches/patch-coreconf_config.mk
deleted file mode 100644
index fb80c28f73..0000000000
--- a/nss-hg/patches/patch-coreconf_config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-coreconf_config.mk,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Set proper dynamic library runtime search path
-
---- coreconf/config.mk.orig	2014-09-28 13:54:02.000000000 +0000
-+++ coreconf/config.mk
-@@ -183,6 +183,7 @@ endif
- DEFINES += -DUSE_UTIL_DIRECTLY
- USE_UTIL_DIRECTLY = 1
- 
-+EXTRA_SHARED_LIBS +=    -Wl,-R${PREFIX}/lib/${MOZILLA_PKG_NAME}
- # Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
- DEFINES += -DNO_NSPR_10_SUPPORT
- 
diff --git a/nss-hg/patches/patch-lib_freebl_blapi.h b/nss-hg/patches/patch-lib_freebl_blapi.h
deleted file mode 100644
index 59abbcec33..0000000000
--- a/nss-hg/patches/patch-lib_freebl_blapi.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_freebl_blapi.h,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Avoid namespace collision (?)
-
---- lib/freebl/blapi.h.orig	2016-08-31 09:42:50.000000000 +0000
-+++ lib/freebl/blapi.h
-@@ -12,6 +12,8 @@
- #include "hasht.h"
- #include "alghmac.h"
- 
-+#define SHA1_Update NSS_SHA1_Update
-+
- SEC_BEGIN_PROTOS
- 
- /*
diff --git a/nss-hg/patches/patch-lib_freebl_chacha20poly1305.c b/nss-hg/patches/patch-lib_freebl_chacha20poly1305.c
deleted file mode 100644
index c47e9e1759..0000000000
--- a/nss-hg/patches/patch-lib_freebl_chacha20poly1305.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- lib/freebl/chacha20poly1305.c.orig	2016-02-15 10:09:28.000000000 +0000
-+++ lib/freebl/chacha20poly1305.c
-@@ -140,8 +140,8 @@ ChaCha20Poly1305_Seal(const ChaCha20Poly
-     }
- 
-     PORT_Memset(block, 0, sizeof(block));
--    // Generate a block of keystream. The first 32 bytes will be the poly1305
--    // key. The remainder of the block is discarded.
-+    /* Generate a block of keystream. The first 32 bytes will be the poly1305
-+     * key. The remainder of the block is discarded. */
-     ChaCha20XOR(block, block, sizeof(block), ctx->key, nonce, 0);
-     ChaCha20XOR(output, input, inputLen, ctx->key, nonce, 1);
- 
-@@ -182,8 +182,8 @@ ChaCha20Poly1305_Open(const ChaCha20Poly
-     }
- 
-     PORT_Memset(block, 0, sizeof(block));
--    // Generate a block of keystream. The first 32 bytes will be the poly1305
--    // key. The remainder of the block is discarded.
-+    /* Generate a block of keystream. The first 32 bytes will be the poly1305
-+     * key. The remainder of the block is discarded. */
-     ChaCha20XOR(block, block, sizeof(block), ctx->key, nonce, 0);
-     Poly1305Do(tag, ad, adLen, input, ciphertextLen, block);
-     if (NSS_SecureMemcmp(tag, &input[ciphertextLen], ctx->tagLen) != 0) {
diff --git a/nss-hg/patches/patch-lib_freebl_sha-fast-amd64-sun.s b/nss-hg/patches/patch-lib_freebl_sha-fast-amd64-sun.s
deleted file mode 100644
index 2dcd4208aa..0000000000
--- a/nss-hg/patches/patch-lib_freebl_sha-fast-amd64-sun.s
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-lib_freebl_sha-fast-amd64-sun.s,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Rename global symbol SHA1_Update to avoid namespace collision
-
---- lib/freebl/sha-fast-amd64-sun.s.orig	2014-09-28 13:54:02.000000000 +0000
-+++ lib/freebl/sha-fast-amd64-sun.s
-@@ -1680,9 +1680,9 @@ shaCompress:
- .LFE7:
- 	.size	shaCompress, .-shaCompress
- 	.align 16
--.globl SHA1_Update
--	.type	SHA1_Update, @function
--SHA1_Update:
-+.globl NSS_SHA1_Update
-+	.type	NSS_SHA1_Update, @function
-+NSS_SHA1_Update:
- .LFB5:
- 	pushq	%rbp
- .LCFI5:
-@@ -1768,7 +1768,7 @@ SHA1_Update:
- 	call	shaCompress
- 	jmp	.L245
- .LFE5:
--	.size	SHA1_Update, .-SHA1_Update
-+	.size	NSS_SHA1_Update, .-NSS_SHA1_Update
- 	.section	.rodata
- 	.align 32
- 	.type	bulk_pad.0, @object
-@@ -1870,7 +1870,7 @@ SHA1_End:
- 	subl	%r8d, %edx
- 	andl	$63, %edx
- 	incl	%edx
--	call	SHA1_Update@PLT
-+	call	NSS_SHA1_Update@PLT
- 	movq	%rbx, %rdi
- 	movq	%r12, %rsi
- 	shrq	$32, %rdi
-@@ -1989,7 +1989,7 @@ SHA1_HashBuf:
- 	movl	%r12d, %edx
- 	movq	%r13, %rsi
- 	movq	%rbx, %rdi
--	call	SHA1_Update@PLT
-+	call	NSS_SHA1_Update@PLT
- 	leaq	-292(%rbp), %rdx
- 	movq	%r14, %rsi
- 	movq	%rbx, %rdi
diff --git a/nss-hg/patches/patch-lib_softoken_config.mk b/nss-hg/patches/patch-lib_softoken_config.mk
deleted file mode 100644
index 33bae8f173..0000000000
--- a/nss-hg/patches/patch-lib_softoken_config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-lib_softoken_config.mk,v 1.3 2015/03/17 14:28:41 thomasklausner Exp $
-
-Use pkg-config to find the proper sqlite3 (when not using the version
-distributed with firefox - might not need upstreaming and stay as local
-patch)
-
---- lib/softoken/config.mk.orig	2015-03-17 10:30:28.000000000 +0000
-+++ lib/softoken/config.mk
-@@ -48,7 +48,7 @@ else
- # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
- EXTRA_SHARED_LIBS += \
- 	-L$(SQLITE_LIB_DIR) \
--	-l$(SQLITE_LIB_NAME) \
-+	`pkg-config --libs sqlite3` \
- 	-L$(NSSUTIL_LIB_DIR) \
- 	-lnssutil3 \
- 	-L$(NSPR_LIB_DIR) \
diff --git a/nss-hg/patches/patch-lib_zlib_gzread.c b/nss-hg/patches/patch-lib_zlib_gzread.c
deleted file mode 100644
index 1bff2fab6f..0000000000
--- a/nss-hg/patches/patch-lib_zlib_gzread.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Missing header for read/write/close.
-
---- lib/zlib/gzread.c.orig	2016-01-30 10:42:11.000000000 +0000
-+++ lib/zlib/gzread.c
-@@ -4,6 +4,7 @@
-  */
- 
- #include "gzguts.h"
-+#include <unistd.h>
- 
- /* Local functions */
- local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
diff --git a/nss-hg/patches/patch-lib_zlib_gzwrite.c b/nss-hg/patches/patch-lib_zlib_gzwrite.c
deleted file mode 100644
index 0d087f7ec5..0000000000
--- a/nss-hg/patches/patch-lib_zlib_gzwrite.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Missing header for read/write/close.
-
---- lib/zlib/gzwrite.c.orig	2016-01-30 10:42:11.000000000 +0000
-+++ lib/zlib/gzwrite.c
-@@ -4,6 +4,7 @@
-  */
- 
- #include "gzguts.h"
-+#include <unistd.h>
- 
- /* Local functions */
- local int gz_init OF((gz_statep));
diff --git a/nss-hg/patches/patch-tests_libpkix_libpkix.sh b/nss-hg/patches/patch-tests_libpkix_libpkix.sh
deleted file mode 100644
index f581ed54fa..0000000000
--- a/nss-hg/patches/patch-tests_libpkix_libpkix.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-tests_libpkix_libpkix.sh,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Posix compatibility - avoid bash specific == operator
-
---- tests/libpkix/libpkix.sh.orig	2014-09-28 13:54:02.000000000 +0000
-+++ tests/libpkix/libpkix.sh
-@@ -52,12 +52,12 @@ libpkix_cleanup()
- ParseArgs ()
- {
-     while [ $# -gt 0 ]; do
--        if [ $1 == "-checkmem" ]; then
-+        if [ $1 = "-checkmem" ]; then
-             checkMemArg=$1
-             memText="   (Memory Checking Enabled)"
--        elif [ $1 == "-quiet" ]; then
-+        elif [ $1 = "-quiet" ]; then
-             quietArg=$1
--        elif [ $1 == "-arenas" ]; then
-+        elif [ $1 = "-arenas" ]; then
-             arenasArg=$1
-         fi
-         shift
diff --git a/nss-hg/patches/patch-tests_multinit_multinit.sh b/nss-hg/patches/patch-tests_multinit_multinit.sh
deleted file mode 100644
index e1064e419a..0000000000
--- a/nss-hg/patches/patch-tests_multinit_multinit.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-tests_multinit_multinit.sh,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
-
-Posix compatibility - avoid bash specific == operator
-
---- tests/multinit/multinit.sh.orig	2014-09-28 13:54:02.000000000 +0000
-+++ tests/multinit/multinit.sh
-@@ -91,14 +91,14 @@ multinit_main()
- 	# the database type.
- 	if [ "$tag" != "all" ]; then
- 	    read tag2 expected_result2
--	    if [ "$NSS_DEFAULT_DB_TYPE" == "$tag2" ]; then
-+	    if [ "$NSS_DEFAULT_DB_TYPE" = "$tag2" ]; then
- 		expected_result=$expected_result2
- 	    fi
- 	fi
- 
- 	# convert shutdown type to option flags
- 	shutdown_command="";
--	if [ "$shutdown_type" == "old" ]; then
-+	if [ "$shutdown_type" = "old" ]; then
- 	   shutdown_command="--oldStype"
- 	fi
- 
-@@ -134,7 +134,7 @@ multinit_main()
- 	# show what we got and what we expected for diagnostic purposes
- 	echo "actual   = |$actual_result|"
- 	echo "expected = |$expected_result|"
--	test  "$actual_result" == "$expected_result" 
-+	test  "$actual_result" = "$expected_result" 
- 	html_msg $? 0 "$testname"
-     fi
-   done
Prev by Date: *: remove duplicate nss/nss now that devel/nss has changed
Next by Date: rterm: bug fixes and misc updates
Previous by Thread: *: remove duplicate nss/nss now that devel/nss has changed
Next by Thread: rterm: bug fixes and misc updates
Indexes:
Home | Main Index | Thread Index | Old Index