cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define HMAC_Update to NSS_HMAC_Update to prevent clashing symbol with libcrypto.

Browse Source 
input from landry@ and miod@
This commit is contained in:
ajacoutot 2017-05-30 18:57:01 +00:00
parent 953f18977b
commit 1619cca8f2
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/nss/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.75 2017/04/22 11:57:39 landry Exp $
# $OpenBSD: Makefile,v 1.76 2017/05/30 18:57:01 ajacoutot Exp $
COMMENT= libraries to support development of security-enabled apps
VERSION= 3.30.2
DISTNAME= nss-${VERSION}
REVISION= 0
SO_VERSION= 47.0
.for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3

16
security/nss/patches/patch-nss_lib_freebl_alghmac_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-nss_lib_freebl_alghmac_h,v 1.1 2017/05/30 18:57:01 ajacoutot Exp $
Prevent clashing symbol with libcrypto (bad ld.so(1)!).
Index: nss/lib/freebl/alghmac.h
--- nss/lib/freebl/alghmac.h.orig
+++ nss/lib/freebl/alghmac.h
@@ -34,6 +34,8 @@ HMAC_Init(HMACContext *cx, const SECHashObject *hash_o
extern void
HMAC_Begin(HMACContext *cx);
+#define HMAC_Update NSS_HMAC_Update
+
/* update HMAC
* cx HMAC Context
* data the data to perform HMAC on

5
security/nss/patches/patch-nss_lib_freebl_blapi_h
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-nss_lib_freebl_blapi_h,v 1.4 2016/10/06 12:10:22 landry Exp $
$OpenBSD: patch-nss_lib_freebl_blapi_h,v 1.5 2017/05/30 18:57:01 ajacoutot Exp $
From firefox in pkgsrc:
SHA1_Update conflicts with openssl which may be dynamically loaded
Prevent clashing symbol with libcrypto (bad ld.so(1)!).
--- nss/lib/freebl/blapi.h.orig Mon Sep 26 08:00:51 2016
+++ nss/lib/freebl/blapi.h Mon Oct 3 10:11:50 2016