CVS commit: pkgsrc/devel/nss

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Apr 23 16:07:44 UTC 2021

Modified Files:
        pkgsrc/devel/nss: Makefile distinfo
        pkgsrc/devel/nss/patches: patch-nss_coreconf_NetBSD.mk

Log Message:
nss: Fix support for NetBSD/aarch64eb. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 pkgsrc/devel/nss/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/devel/nss/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk

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

Modified files:

Index: pkgsrc/devel/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.203 pkgsrc/devel/nss/Makefile:1.204
--- pkgsrc/devel/nss/Makefile:1.203     Wed Apr 21 11:41:28 2021
+++ pkgsrc/devel/nss/Makefile   Fri Apr 23 16:07:43 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.203 2021/04/21 11:41:28 adam Exp $
+# $NetBSD: Makefile,v 1.204 2021/04/23 16:07:43 rin Exp $
 
 DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=           3.64.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel security
 MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 

Index: pkgsrc/devel/nss/distinfo
diff -u pkgsrc/devel/nss/distinfo:1.127 pkgsrc/devel/nss/distinfo:1.128
--- pkgsrc/devel/nss/distinfo:1.127     Fri Apr 16 14:29:22 2021
+++ pkgsrc/devel/nss/distinfo   Fri Apr 23 16:07:43 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.127 2021/04/16 14:29:22 ryoon Exp $
+$NetBSD: distinfo,v 1.128 2021/04/23 16:07:43 rin Exp $
 
 SHA1 (nss-3.64.tar.gz) = e8f7dd8ab325a57a46b1d717c86bdae1be66e911
 RMD160 (nss-3.64.tar.gz) = bad3022ebac60e794d999dd7c74092c6b80c39d0
@@ -10,7 +10,7 @@ SHA1 (patch-mf) = 40e58385fb6f944f463bf0
 SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
 SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
-SHA1 (patch-nss_coreconf_NetBSD.mk) = ed95aa1c245c9f2b8fda0a1769f9599223b61dbf
+SHA1 (patch-nss_coreconf_NetBSD.mk) = 61901b8f5d3f5b18b5f52dbb6c43215d425c70e5
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
 SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7

Index: pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk
diff -u pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.1 pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.2
--- pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk:1.1   Sun Apr 26 21:43:43 2020
+++ pkgsrc/devel/nss/patches/patch-nss_coreconf_NetBSD.mk       Fri Apr 23 16:07:43 2021
@@ -1,16 +1,20 @@
-$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.1 2020/04/26 21:43:43 tnn Exp $
+$NetBSD: patch-nss_coreconf_NetBSD.mk,v 1.2 2021/04/23 16:07:43 rin Exp $
 
-fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7f
+- fix wrong value of CPU_ARCH on NetBSD/evbarm-earmv7f
+- s/aarch64eb/aarch64/
 
---- nss/coreconf/NetBSD.mk.orig        2020-03-06 18:44:20.000000000 +0000
-+++ nss/coreconf/NetBSD.mk
-@@ -15,6 +15,9 @@ ifeq ($(CPU_ARCH),i386)
+--- nss/coreconf/NetBSD.mk.orig        2021-04-16 01:17:44.000000000 +0900
++++ nss/coreconf/NetBSD.mk     2021-04-24 00:37:05.764452953 +0900
+@@ -15,6 +15,12 @@
  OS_REL_CFLAGS         = -Di386
  CPU_ARCH              = x86
  endif
 +ifeq (,$(filter-out earm%,$(CPU_ARCH)))
 +CPU_ARCH              = arm
 +endif
++ifeq ($(CPU_ARCH),aarch64eb)
++CPU_ARCH              = aarch64
++endif
  
  ifndef OBJECT_FMT
  OBJECT_FMT            := $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)