From dd1f83866fc4bab4bf3531eda9b902532ae5b6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 25 Jul 2020 18:05:55 +0700 Subject: [PATCH 1/2] nspr: update to 4.27. --- srcpkgs/nspr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index a1e3e7d1b7f..433498beb3c 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -1,6 +1,6 @@ # Template file for 'nspr' pkgname=nspr -version=4.26 +version=4.27 revision=1 build_wrksrc=nspr build_style=gnu-configure @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="http://www.mozilla.org/projects/nspr/" distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz" -checksum=fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d +checksum=6d495192b6ab00a3c28db053492cf794329f7c0351a5728db198111a1816e89b do_configure() { CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE" From 1e96aa3cef4a7f4a23f8127d5f0c1e178ea34691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 26 Jul 2020 10:26:50 +0700 Subject: [PATCH 2/2] nss: update to 3.55. --- ...-enable-AVX2-if-applicable-on-x86_64.patch | 80 ------------------- srcpkgs/nss/template | 27 ++++--- 2 files changed, 16 insertions(+), 91 deletions(-) delete mode 100644 srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch diff --git a/srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch b/srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch deleted file mode 100644 index f410c8ad855..00000000000 --- a/srcpkgs/nss/patches/0001-enable-AVX2-if-applicable-on-x86_64.patch +++ /dev/null @@ -1,80 +0,0 @@ -From f8d9ecea60d99c6143dcb9e2f8fe41c8e17e4d0f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Sun, 31 May 2020 12:13:08 +0700 -Subject: [PATCH] enable AVX2 if applicable on x86_64 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There's a runtime check for AVX2 before using, see: - - lib/freebl/chacha20poly1305.c:140 - lib/freebl/blinit.c:117 - -Signed-off-by: Đoàn Trần Công Danh ---- - nss/coreconf/arch.mk | 1 + - nss/coreconf/config.mk | 2 ++ - nss/lib/freebl/Makefile | 9 +++++++-- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git nss/coreconf/arch.mk nss/coreconf/arch.mk -index 790372d..cc13ced 100644 ---- nss/coreconf/arch.mk -+++ nss/coreconf/arch.mk -@@ -116,6 +116,7 @@ ifeq ($(OS_ARCH),Linux) - OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) - endif - KERNEL = Linux -+ include $(CORE_DEPTH)/coreconf/Linux.mk - endif - - # Since all uses of OS_ARCH that follow affect only userland, we can -diff --git nss/coreconf/config.mk nss/coreconf/config.mk -index 39f755d..b65e684 100644 ---- nss/coreconf/config.mk -+++ nss/coreconf/config.mk -@@ -149,8 +149,10 @@ DEFINES += -DNSS_DISABLE_DBM - endif - - ifdef NSS_DISABLE_AVX2 -+ifneq ($(NSS_DISABLE_AVX2),0) - DEFINES += -DNSS_DISABLE_AVX2 - endif -+endif - - ifdef NSS_DISABLE_CHACHAPOLY - DEFINES += -DNSS_DISABLE_CHACHAPOLY -diff --git nss/lib/freebl/Makefile nss/lib/freebl/Makefile -index 5f73844..8b98370 100644 ---- nss/lib/freebl/Makefile -+++ nss/lib/freebl/Makefile -@@ -552,10 +552,12 @@ endif - ifndef NSS_DISABLE_CHACHAPOLY - ifeq ($(CPU_ARCH),x86_64) - ifndef NSS_DISABLE_AVX2 -+ NSS_DISABLE_AVX2 = 0 -+ endif -+ ifeq ($(NSS_DISABLE_AVX2),0) - EXTRA_SRCS += Hacl_Poly1305_256.c Hacl_Chacha20_Vec256.c Hacl_Chacha20Poly1305_256.c -- else -- EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c - endif # NSS_DISABLE_AVX2 -+ EXTRA_SRCS += Hacl_Poly1305_128.c Hacl_Chacha20_Vec128.c Hacl_Chacha20Poly1305_128.c - endif # x86_64 - - VERIFIED_SRCS += Hacl_Poly1305_32.c Hacl_Chacha20.c Hacl_Chacha20Poly1305_32.c -@@ -737,6 +739,9 @@ $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20Poly1305_128$(OBJ_SUFFIX): CFLAGS += -mssse - $(OBJDIR)/$(PROG_PREFIX)Hacl_Poly1305_128$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpclmul - - ifndef NSS_DISABLE_AVX2 -+ NSS_DISABLE_AVX2 = 0 -+endif -+ifeq ($(NSS_DISABLE_AVX2),0) - $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20Poly1305_256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx2 -maes - $(OBJDIR)/$(PROG_PREFIX)Hacl_Chacha20_Vec256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -maes - $(OBJDIR)/$(PROG_PREFIX)Hacl_Poly1305_256$(OBJ_SUFFIX): CFLAGS += -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -maes -mpclmul --- -2.26.2.672.g232c24e857 - diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index e4402440ed3..55b41037235 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,9 +1,9 @@ # Template file for 'nss' -_nsprver=4.26 +_nsprver=4.27 pkgname=nss -version=3.54 +version=3.55 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://www.mozilla.org/projects/security/pki/nss" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43 +checksum=fc692e3db45a082ee6328cd989e795c171a00df9c518df090937f7604f850004 do_build() { local _native_use64 _target_use64 @@ -50,17 +50,10 @@ do_build() { if [ "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in - aarch64*|ppc64*) + aarch64*|ppc64*|x86_64*) _ARCH="${XBPS_TARGET_MACHINE%-*}" CFLAGS+=" -DNS_PTR_GT_32" ;; - armv7*) - _ARCH="arm" - # gcm-arm32-neon.c use mfpu=neon, - # force mfpu=neon for everything else. - CFLAGS+=" -mfpu=neon" - CXXFLAGS+=" -mfpu=neon" - ;; arm*) _ARCH="arm";; mips*) _ARCH="mips";; ppc*) _ARCH="ppc";; @@ -155,6 +148,18 @@ do_install() { done install -m644 dist/public/nss/*.h ${DESTDIR}/usr/include/nss + + sed -ne '/Copyright/,/SUCH DAMAGE/p' nss/lib/dbm/src/db.c >dbm.LICENSE + vlicense dbm.LICENSE + sed -ne '/The MIT License/,\!// SOFTWARE[.]$!p' \ + nss/lib/freebl/ecl/curve25519_32.c >fiat.LICENSE + vlicense fiat.LICENSE + sed -ne '/The MIT License/,/ [*] SOFTWARE[.]$/p' \ + nss/lib/freebl/ecl/ecp_secp384r1.c >ecckiila.LICENSE + vlicense ecckiila.LICENSE + sed -ne '/The MIT License/,/ [*] SOFTWARE[.]$/p' \ + nss/lib/freebl/verified/Hacl_Chacha20.c >hacl.LICENSE + vlicense hacl.LICENSE } nss-devel_package() {