From a1ec1a100a3206aa1023ef98ac2c8245a058503d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 27 Sep 2014 11:18:48 +0000 Subject: [PATCH] nss: bump version to the latest 3.16. --- dev-libs/nss/nss-3.16.5.recipe | 179 +++++++++++++++++++++++ dev-libs/nss/patches/nss-3.16.5.patchset | 141 ++++++++++++++++++ 2 files changed, 320 insertions(+) create mode 100644 dev-libs/nss/nss-3.16.5.recipe create mode 100644 dev-libs/nss/patches/nss-3.16.5.patchset diff --git a/dev-libs/nss/nss-3.16.5.recipe b/dev-libs/nss/nss-3.16.5.recipe new file mode 100644 index 000000000..297113144 --- /dev/null +++ b/dev-libs/nss/nss-3.16.5.recipe @@ -0,0 +1,179 @@ +SUMMARY="Mozilla's Network Security Services library that implements PKI support" +DESCRIPTION=" +Network Security Services (NSS) is a set of libraries designed to support \ +cross-platform development of security-enabled client and 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. +" +LICENSE=" +GNU GPL v2 +GNU LGPL v2.1 +MPL v2.0 +" +COPYRIGHT="Mozilla Foundation" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" +NSS_VERSION=`echo $portVersion | sed 's/\./_/g'` +SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz" +CHECKSUM_SHA256="e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" +SOURCE_DIR="nss-$portVersion/nss" + +PROVIDES=" + nss$secondaryArchSuffix = $portVersion compat >= 3 + cmd:addbuiltin$secondaryArchSuffix = $portVersion compat >= 3 + cmd:atob$secondaryArchSuffix = $portVersion compat >= 3 + cmd:baddbdir$secondaryArchSuffix = $portVersion compat >= 3 + cmd:bltest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:btoa$secondaryArchSuffix = $portVersion compat >= 3 + cmd:certcgi$secondaryArchSuffix = $portVersion compat >= 3 + cmd:certutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:checkcert$secondaryArchSuffix = $portVersion compat >= 3 + cmd:chktest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:cmsutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:conflict$secondaryArchSuffix = $portVersion compat >= 3 + cmd:crlutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:crmftest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:dbtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:derdump$secondaryArchSuffix = $portVersion compat >= 3 + cmd:dertimetest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:digest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:encodeinttest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:fipstest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:httpserv$secondaryArchSuffix = $portVersion compat >= 3 + cmd:listsuites$secondaryArchSuffix = $portVersion compat >= 3 + cmd:makepqg$secondaryArchSuffix = $portVersion compat >= 3 + cmd:mangle$secondaryArchSuffix = $portVersion compat >= 3 + cmd:modutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:multinit$secondaryArchSuffix = $portVersion compat >= 3 + cmd:nonspr10$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ocspclnt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ocspresp$secondaryArchSuffix = $portVersion compat >= 3 + cmd:oidcalc$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7content$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7env$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7sign$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7verify$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk11gcmtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk11mode$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk12util$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk1sign$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pkix_errcodes$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pp$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pwdecrypt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:remtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:rsaperf$secondaryArchSuffix = $portVersion compat >= 3 + cmd:sdrtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:secmodtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:selfserv$secondaryArchSuffix = $portVersion compat >= 3 + cmd:shlibsign$secondaryArchSuffix = $portVersion compat >= 3 + cmd:signtool$secondaryArchSuffix = $portVersion compat >= 3 + cmd:signver$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ssltap$secondaryArchSuffix = $portVersion compat >= 3 + cmd:strsclnt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:symkeyutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:tstclnt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:vfychain$secondaryArchSuffix = $portVersion compat >= 3 + cmd:vfyserv$secondaryArchSuffix = $portVersion compat >= 3 + lib:libfreebl3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnss3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnssckbi${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnssdbm3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnssutil3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libsmime3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libsoftokn3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libssl3${secondaryArchSuffix} = $portVersion compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libnspr4${secondaryArchSuffix} >= 4 + lib:libsqlite3$secondaryArchSuffix + lib:libz${secondaryArchSuffix} + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libnspr4${secondaryArchSuffix} >= 4 + devel:libsqlite3$secondaryArchSuffix + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:awk + cmd:pkg_config$secondaryArchSuffix + " + +PATCHES="nss-$portVersion.patchset" + +BUILD() +{ + # FIXME: $secondaryArchSuffix is wrong here (_arch). What should be used? + myCPPFLAGS="${CPPFLAGS} `pkg-config nspr --cflags`" + myLDFLAGS="${LDFLAGS} `pkg-config nspr --libs-only-L`" + + export BUILD_OPT=1 + export NSDISTMODE=copy + export FREEBL_NO_DEPEND=1 + export ASFLAGS="" + if [ $effectiveTargetArchitecture == 'x86_64' ]; then + export USE_64=1 + fi + for d in . lib/dbm ; do + CPPFLAGS="${myCPPFLAGS}" + LDFLAGS="${myLDFLAGS}" + make -j1 -C ${d} + done +} + +INSTALL() +{ + # files are in /sources/dist + mkdir -p $includeDir $binDir + mkdir -p $(dirname $libDir) + mv ../dist/*/bin/* $binDir + mv ../dist/*/lib $libDir + mv ../dist/public/nss $includeDir + + # set up the develop directory correctly + prepareInstalledDevelLibs libnss3 libfreebl3 libnssckbi libnssdbm3 \ + libnssutil3 libsmime3 libsoftokn3 libssl3 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + rm $libDir/*.a +} + +TEST() +{ + echo TODO + # TODO +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + nss${secondaryArchSuffix}_devel = $portVersion compat >= 3 + devel:libfreebl3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnss3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnssckbi${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnssdbm3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnssutil3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libsmime3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libsoftokn3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libssl3${secondaryArchSuffix} = $portVersion compat >= 3 + " +REQUIRES_devel=" + nss${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/nss/patches/nss-3.16.5.patchset b/dev-libs/nss/patches/nss-3.16.5.patchset new file mode 100644 index 000000000..d99cd24fe --- /dev/null +++ b/dev-libs/nss/patches/nss-3.16.5.patchset @@ -0,0 +1,141 @@ +From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Sat, 5 Jul 2014 02:12:23 +0200 +Subject: Haiku support + + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index 750696d..b53cfea 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk + + XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) + +-USE_PTHREADS = ++USE_PTHREADS = 1 + + ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH +@@ -27,7 +27,7 @@ else + CPU_ARCH = x86 + endif + +-MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ++MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) + ifdef BUILD_OPT + OPTIMIZER = -O2 + endif +diff --git a/coreconf/arch.mk b/coreconf/arch.mk +index 782e6c0..669e52a 100644 +--- a/coreconf/arch.mk ++++ b/coreconf/arch.mk +@@ -41,6 +41,14 @@ else + endif + + # ++# Force the Haiku machines to use BeOS. ++# ++ ++ifeq ($(OS_ARCH),Haiku) ++ OS_ARCH = BeOS ++endif ++ ++# + # Force the IRIX64 machines to use IRIX. + # + +diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h +index f204484..5cb10ee 100644 +--- a/lib/dbm/include/mcom_db.h ++++ b/lib/dbm/include/mcom_db.h +@@ -66,7 +66,7 @@ typedef PRUint32 uint32; + #include + #endif + +-#if defined(__linux) || defined(__BEOS__) ++#if defined(__linux) || defined(BEOS) + #include + #ifndef BYTE_ORDER + #define BYTE_ORDER __BYTE_ORDER +-- +1.8.3.4 + + +From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Sep 2014 13:09:35 +0000 +Subject: define RTLD_NOLOAD + + +diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c +index 1de9b49..08d7753 100644 +--- a/lib/freebl/stubs.c ++++ b/lib/freebl/stubs.c +@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) + return SECSuccess; + } + ++#ifndef RTLD_NOLOAD ++ #define RTLD_NOLOAD 0 ++#endif ++ + /* + * fetch the library if it's loaded. For NSS it should already be loaded + */ +-- +1.8.3.4 + + +From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Sep 2014 13:40:13 +0000 +Subject: skip optionally the signing part + + +diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile +index 83f90fa..8934439 100644 +--- a/cmd/shlibsign/Makefile ++++ b/cmd/shlibsign/Makefile +@@ -95,5 +95,7 @@ else + endif + endif + ++ifndef SKIP_SHLIBSIGN + libs install :: $(CHECKLOC) ++endif + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index b53cfea..51fe162 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -45,3 +45,5 @@ ARCH = beos + + DSO_CFLAGS = -fPIC + DSO_LDOPTS = ++ ++SKIP_SHLIBSIGN=1 +-- +1.8.3.4 + + +From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Sep 2014 14:14:26 +0000 +Subject: use system libs + + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index 51fe162..fe54580 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC + DSO_LDOPTS = + + SKIP_SHLIBSIGN=1 ++USE_SYSTEM_ZLIB = 1 ++ZLIB_LIBS = -lz ++NSS_USE_SYSTEM_SQLITE=1 +-- +1.8.3.4 +