Re: CVS commit: pkgsrc/devel/nss

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

Somehow I don't see the right checksum:

# grep freebl distinfo
SHA1 (patch-nss_lib_freebl_blinit.c) = 14d250c1aaa84c74cc300e490540ecda551731b9
# cksum -a sha1 patches/patch-nss_lib_freebl_blinit.c 
SHA1 (patches/patch-nss_lib_freebl_blinit.c) = cfa7319c722d650f98e26b9379691cc9d60354b9
# ident distinfo patches/patch-nss_lib_freebl_blinit.c 
distinfo:
     $NetBSD: distinfo,v 1.85 2018/04/12 10:37:11 bouyer Exp $

patches/patch-nss_lib_freebl_blinit.c:
     $NetBSD: patch-nss_lib_freebl_blinit.c,v 1.1 2018/04/12 10:37:11 bouyer Exp $


On Thu, Apr 12, 2018 at 10:37:11AM +0000, Manuel Bouyer wrote:
> Module Name:  pkgsrc
> Committed By: bouyer
> Date:         Thu Apr 12 10:37:11 UTC 2018
> 
> Modified Files:
>       pkgsrc/devel/nss: distinfo
> Added Files:
>       pkgsrc/devel/nss/patches: patch-nss_lib_freebl_blinit.c
> 
> Log Message:
> !defined(__ANDROID__) doens't mean this is a linux host.
> Check defined(__linux__) instead.
> 
> XXX do other systems have <sys/auxv.h> ?
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.84 -r1.85 pkgsrc/devel/nss/distinfo
> cvs rdiff -u -r0 -r1.1 pkgsrc/devel/nss/patches/patch-nss_lib_freebl_blinit.c
> 
> 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/distinfo
> diff -u pkgsrc/devel/nss/distinfo:1.84 pkgsrc/devel/nss/distinfo:1.85
> --- pkgsrc/devel/nss/distinfo:1.84    Tue Apr 10 15:21:29 2018
> +++ pkgsrc/devel/nss/distinfo Thu Apr 12 10:37:11 2018
> @@ -1,4 +1,4 @@
> -$NetBSD: distinfo,v 1.84 2018/04/10 15:21:29 maya Exp $
> +$NetBSD: distinfo,v 1.85 2018/04/12 10:37:11 bouyer Exp $
>  
>  SHA1 (nss-3.36.1.tar.gz) = d8b73f808054c7cc50f5e67bb94e5dd853ccc09f
>  RMD160 (nss-3.36.1.tar.gz) = bdb7f2627cb42a871f5f046893699f9c01fc4cf2
> @@ -16,6 +16,7 @@ SHA1 (patch-mn) = 5b79783e48249044be1a90
>  SHA1 (patch-nss_cmd_platlibs.mk) = 7dadcb72acf15714c61ae74b21c5baf45bc51d4c
>  SHA1 (patch-nss_coreconf_OpenBSD.mk) = fccc17845c28f5b1268c96eb4e952e32dd530d1d
>  SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078
> +SHA1 (patch-nss_lib_freebl_blinit.c) = 14d250c1aaa84c74cc300e490540ecda551731b9
>  SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
>  SHA1 (patch-nss_tests_all.sh) = f8d0fcfcd67dca757c9ce016660210b20b1e6e8f
>  SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
> 
> Added files:
> 
> Index: pkgsrc/devel/nss/patches/patch-nss_lib_freebl_blinit.c
> diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_lib_freebl_blinit.c:1.1
> --- /dev/null Thu Apr 12 10:37:11 2018
> +++ pkgsrc/devel/nss/patches/patch-nss_lib_freebl_blinit.c    Thu Apr 12 10:37:11 2018
> @@ -0,0 +1,55 @@
> +$NetBSD: patch-nss_lib_freebl_blinit.c,v 1.1 2018/04/12 10:37:11 bouyer Exp $
> +
> +--- ./nss/lib/freebl/blinit.c.orig   2018-04-10 17:16:55.885129976 +0200
> ++++ ./nss/lib/freebl/blinit.c        2018-04-10 17:20:26.723480086 +0200
> +@@ -91,7 +91,7 @@
> + }
> + #endif /* NSS_X86_OR_X64 */
> + 
> +-#if (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
> ++#if (defined(__aarch64__) || defined(__arm__)) && defined(__linux__)
> + #if defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
> + #include <sys/auxv.h>
> + extern unsigned long getauxval(unsigned long type) __attribute__((weak));
> +@@ -100,9 +100,9 @@
> + #define AT_HWCAP2
> + #define AT_HWCAP
> + #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
> +-#endif /* (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__) */
> ++#endif /* (defined(__aarch64__) || defined(__arm__)) && defined(__linux__) */
> + 
> +-#if defined(__aarch64__) && !defined(__ANDROID__)
> ++#if defined(__aarch64__) && defined(__linux__)
> + // Defines from hwcap.h in Linux kernel - ARM64
> + #define HWCAP_AES (1 << 3)
> + #define HWCAP_PMULL (1 << 4)
> +@@ -124,9 +124,9 @@
> +     /* aarch64 must support NEON. */
> +     arm_neon_support_ = disable_arm_neon == NULL;
> + }
> +-#endif /* defined(__aarch64__) && !defined(__ANDROID__) */
> ++#endif /* defined(__aarch64__) && defined(__linux__) */
> + 
> +-#if defined(__arm__) && !defined(__ANDROID__)
> ++#if defined(__arm__) && defined(__linux__)
> + // Defines from hwcap.h in Linux kernel - ARM
> + /*
> +  * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
> +@@ -155,7 +155,7 @@
> +         arm_neon_support_ = hwcaps & HWCAP_NEON && disable_arm_neon == NULL;
> +     }
> + }
> +-#endif /* defined(__arm__) && !defined(__ANDROID__) */
> ++#endif /* defined(__arm__) && defined(__linux__) */
> + 
> + // Enable when Firefox can use it.
> + // #if defined(__ANDROID__) && (defined(__arm__) || defined(__aarch64__))
> +@@ -238,7 +238,7 @@
> + {
> + #ifdef NSS_X86_OR_X64
> +     CheckX86CPUSupport();
> +-#elif (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
> ++#elif (defined(__aarch64__) || defined(__arm__)) && defined(__linux__)
> +     CheckARMSupport();
> + #endif
> +     return PR_SUCCESS;
>