nss-hg: adapt patch to upstream changes

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Sep 1 08:18:14 2016 +0200
Changeset:	7859d37b962f8b7bf32bb5b4073c8cd7f0e0b7fe

Modified Files:
	nss-hg/distinfo
	nss-hg/patches/patch-lib_freebl_blapi.h

Log Message:
nss-hg: adapt patch to upstream changes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7859d37b962f8b7bf32bb5b4073c8cd7f0e0b7fe

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

diffstat:
 nss-hg/distinfo                         |  2 +-
 nss-hg/patches/patch-lib_freebl_blapi.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs:
diff --git a/nss-hg/distinfo b/nss-hg/distinfo
index a36218b..0117a48 100644
--- a/nss-hg/distinfo
+++ b/nss-hg/distinfo
@@ -7,7 +7,7 @@ SHA1 (patch-cmd_shlibsign_sign.sh) = 9be9719d9e4cc212d9503616a1145b8c68b97a6a
 SHA1 (patch-coreconf_OpenBSD.mk) = 0c22a08a6024aa7505e8307e598cbd02ac569a88
 SHA1 (patch-coreconf_SunOS5.mk) = db81e955db52ccccc2dbdae364449870b9724e15
 SHA1 (patch-coreconf_config.mk) = a24f2c6bbbe525f2c402e2da5e238ccc4a027c21
-SHA1 (patch-lib_freebl_blapi.h) = 00e0dcfe1f6a54bffa97c4852f9f9fcb5ab783e1
+SHA1 (patch-lib_freebl_blapi.h) = 9afa4db40b32deb611215cec049aedabf407c6ef
 SHA1 (patch-lib_freebl_chacha20poly1305.c) = ee99e7c04f628d285f497ae9b172a8a72da7286a
 SHA1 (patch-lib_freebl_sha-fast-amd64-sun.s) = 6feb56632584f04c5259dcb72e330e13d485b50a
 SHA1 (patch-lib_softoken_config.mk) = c1262775ba60facae1b00324b668dfab0eecc6c3
diff --git a/nss-hg/patches/patch-lib_freebl_blapi.h b/nss-hg/patches/patch-lib_freebl_blapi.h
index 7db0b93..59abbce 100644
--- a/nss-hg/patches/patch-lib_freebl_blapi.h
+++ b/nss-hg/patches/patch-lib_freebl_blapi.h
@@ -2,14 +2,14 @@ $NetBSD: patch-lib_freebl_blapi.h,v 1.2 2014/10/05 20:12:38 thomasklausner Exp $
 
 Avoid namespace collision (?)
 
---- lib/freebl/blapi.h.orig	2014-09-28 13:54:02.000000000 +0000
+--- lib/freebl/blapi.h.orig	2016-08-31 09:42:50.000000000 +0000
 +++ lib/freebl/blapi.h
-@@ -1189,6 +1189,8 @@ extern void SHA1_DestroyContext(SHA1Cont
- */
- extern void SHA1_Begin(SHA1Context *cx);
+@@ -12,6 +12,8 @@
+ #include "hasht.h"
+ #include "alghmac.h"
  
 +#define SHA1_Update NSS_SHA1_Update
 +
+ SEC_BEGIN_PROTOS
+ 
  /*
- ** Update the SHA-1 hash function with more data.
- **	"cx" the context