Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dev-libs/nss/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST nss-3.109.tar.gz 76610986 BLAKE2B 0d7b3e7395c7b22a5cea0355e00131c9f2eada9fd3ce3ff23a29697b4a21f09178ca625a6e1b1847c3e869628e5ca3948ad91ae6e664130f3ac6bfee1368d91e SHA512 eb7997004db8046c985372d1b05a4e7563584fb0febaf05abd26cd223e23dc2e84099c76ca97596d67a8c4bab9fd9df5999e14a7242704f27b8a80710cc135be
DIST nss-3.115.1.tar.gz 76656855 BLAKE2B ce0ddb2eb17b079131210bbf82c6d614b5efe0b6d6fefb88461ae59518afd870011f278480ec14cbaafab88d715833acb3ae4e56347fb413516d5fceb547c9e1 SHA512 c75ab9bdddeda40d0e50837f47539b370b342216aeabf82614285485b50461600623e9a506e6026cf0928f6b0ada05a02ac1a060fca7938049b3471ac418a008
49 changes: 49 additions & 0 deletions dev-libs/nss/files/gyp-config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index 6900f79..9188d53 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -35,7 +35,7 @@
['OS=="mac"', {
'use_system_sqlite%': 1,
},{
- 'use_system_sqlite%': 0,
+ 'use_system_sqlite%': 1,
}],
['OS=="mac" or OS=="ios" or OS=="solaris" or OS=="win"', {
'cc_use_gnu_ld%': 0,
@@ -102,8 +102,8 @@
'disable_intel_hw_sha%': 0,
'disable_tests%': 0,
'disable_chachapoly%': 0,
- 'disable_deprecated_seed%': 0,
- 'disable_deprecated_rc2%': 0,
+ 'disable_deprecated_seed%': 1,
+ 'disable_deprecated_rc2%': 1,
'disable_dbm%': 1,
'disable_libpkix%': 1,
'disable_werror%': 0,
diff --git a/nss.gyp b/nss.gyp
index 2cf713a..10c9b63 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -210,20 +210,6 @@
'cmd/vfychain/vfychain.gyp:vfychain',
'cmd/vfyserv/vfyserv.gyp:vfyserv',
'cmd/mpitests/mpitests.gyp:mpi_tests',
- 'gtests/base_gtest/base_gtest.gyp:base_gtest',
- 'gtests/certhigh_gtest/certhigh_gtest.gyp:certhigh_gtest',
- 'gtests/cryptohi_gtest/cryptohi_gtest.gyp:cryptohi_gtest',
- 'gtests/der_gtest/der_gtest.gyp:der_gtest',
- 'gtests/certdb_gtest/certdb_gtest.gyp:certdb_gtest',
- 'gtests/freebl_gtest/freebl_gtest.gyp:freebl_gtest',
- 'gtests/mozpkix_gtest/mozpkix_gtest.gyp:mozpkix_gtest',
- 'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim',
- 'gtests/pkcs11testmodule/pkcs11testmodule.gyp:pkcs11testmodule',
- 'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
- 'gtests/smime_gtest/smime_gtest.gyp:smime_gtest',
- 'gtests/softoken_gtest/softoken_gtest.gyp:softoken_gtest',
- 'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
- 'gtests/util_gtest/util_gtest.gyp:util_gtest',
'lib/ckfw/builtins/testlib/builtins-testlib.gyp:nssckbi-testlib',
],
'conditions': [
145 changes: 145 additions & 0 deletions dev-libs/nss/files/nss-config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
#!/bin/sh

prefix=@prefix@

major_version=@MOD_MAJOR_VERSION@
minor_version=@MOD_MINOR_VERSION@
patch_version=@MOD_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
nssutil
ssl
smime
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`
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 "$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 -I$includedir
fi

if test "$echo_libs" = "yes"; then
libdirs="-Wl,-rpath-link,$libdir -L$libdir"
if test -n "$lib_ssl"; then
libdirs="$libdirs -lssl${major_version}"
fi
if test -n "$lib_smime"; then
libdirs="$libdirs -lsmime${major_version}"
fi
if test -n "$lib_nss"; then
libdirs="$libdirs -lnss${major_version}"
fi
if test -n "$lib_nssutil"; then
libdirs="$libdirs -lnssutil${major_version}"
fi
echo $libdirs
fi

11 changes: 11 additions & 0 deletions dev-libs/nss/files/nss-softokn.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: NSS-SOFTOKN
Description: Network Security Services Softoken PKCS #11 Module
Version: %SOFTOKEN_VERSION%
Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
Cflags: -I${includedir}/private
11 changes: 11 additions & 0 deletions dev-libs/nss/files/nss-util.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: NSS-UTIL
Description: Network Security Services Utility Library
Version: %NSSUTIL_VERSION%
Requires: nspr >= %NSPR_VERSION%
Libs: -L${libdir} -lnssutil3
Cflags: -I${includedir}
11 changes: 11 additions & 0 deletions dev-libs/nss/files/nss.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: NSS
Description: Network Security Services
Version: %NSS_VERSION%
Requires: nspr >= %NSPR_VERSION%
Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
Cflags: -I${includedir}
Loading
Loading