On Thu, Apr 02, 2015 at 02:01:45PM +0200, Landry Breuil wrote:
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/nss/Makefile,v
> retrieving revision 1.49
> diff -u -r1.49 Makefile
> --- Makefile 16 Mar 2015 19:15:44 -0000 1.49
> +++ Makefile 2 Apr 2015 11:59:56 -0000
> @@ -6,6 +6,7 @@
>
> VERSION= 3.17.4
> DISTNAME = nss-${VERSION}
> +REVISION = 0
>
> SO_VERSION= 36.0
> .for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3
> Index: patches/patch-nss_lib_freebl_blapi_h
> ===================================================================
> RCS file: /cvs/ports/security/nss/patches/patch-nss_lib_freebl_blapi_h,v
> retrieving revision 1.2
> diff -u -r1.2 patch-nss_lib_freebl_blapi_h
> --- patches/patch-nss_lib_freebl_blapi_h 9 Jan 2014 20:09:44 -0000
> 1.2
> +++ patches/patch-nss_lib_freebl_blapi_h 2 Apr 2015 11:59:56 -0000
> @@ -3,13 +3,19 @@
> From firefox in pkgsrc:
> SHA1_Update conflicts with openssl which may be dynamically loaded
>
> ---- nss/lib/freebl/blapi.h.orig Fri Jan 3 20:59:10 2014
> -+++ nss/lib/freebl/blapi.h Mon Jan 6 22:46:56 2014
> -@@ -1189,6 +1189,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
> +--- nss/lib/freebl/blapi.h.orig Thu Jan 22 20:49:26 2015
> ++++ nss/lib/freebl/blapi.h Thu Apr 2 13:59:37 2015
> +@@ -1189,6 +1189,14 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
> */
> extern void SHA1_Begin(SHA1Context *cx);
>
> +#define SHA1_Update NSS_SHA1_Update
> ++#define SHA224_Update NSS_SHA224_Update
> ++#define SHA256_Update NSS_SHA256_Update
> ++#define SHA384_Update NSS_SHA384_Update
> ++#define SHA512_Update NSS_SHA512_Update
> ++#define MD5_Update NSS_MD5_Update
> ++#define MD2_Update NSS_MD2_Update
> +
> /*
> ** Update the SHA-1 hash function with more data.
Unfortunatelly `make repackage rebuild DEBUG="-O0 -g"' fails:
gmake[3]: Entering directory
'/home/jirib/openbsd/pobj/nss-3.17.4/nss-3.17.4/nss/lib/freebl'
cc -o OpenBSD5.7_64_OPT.OBJ/OpenBSD_SINGLE_SHLIB/freeblver.o -c -fPIC -DPIC
-ansi -Wall -Wno-switch -pipe -DOPENBSD -DXP_UNIX -DSHLIB_SUFFIX=\"so.36.0\"
-DSHLIB_PREFIX=\"lib\" -DSHLIB_VERSION=\"3\" -DSOFTOKEN_SHLIB_VERSION=\"3\"
-DRIJNDAEL_INCLUDE_TABLES -UDEBUG -DNDEBUG -pthread -DUSE_UTIL_DIRECTLY
-DNO_NSPR_10_SUPPORT -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -DNSS_USE_64
-DMP_API_COMPATIBLE -I/usr/local/include/nspr
-I../../../dist/OpenBSD5.7_64_OPT.OBJ/include -I../../../dist/public/nss
-I../../../dist/private/nss -Impi -Iecl -I/usr/local/include -O2 -pipe -O0 -g
freeblver.c
cc -o OpenBSD5.7_64_OPT.OBJ/OpenBSD_SINGLE_SHLIB/ldvector.o -c -fPIC -DPIC
-ansi -Wall -Wno-switch -pipe -DOPENBSD -DXP_UNIX -DSHLIB_SUFFIX=\"so.36.0\"
-DSHLIB_PREFIX=\"lib\" -DSHLIB_VERSION=\"3\" -DSOFTOKEN_SHLIB_VERSION=\"3\"
-DRIJNDAEL_INCLUDE_TABLES -UDEBUG -DNDEBUG -pthread -DUSE_UTIL_DIRECTLY
-DNO_NSPR_10_SUPPORT -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES -DNSS_USE_64
-DMP_API_COMPATIBLE -I/usr/local/include/nspr
-I../../../dist/OpenBSD5.7_64_OPT.OBJ/include -I../../../dist/public/nss
-I../../../dist/private/nss -Impi -Iecl -I/usr/local/include -O2 -pipe -O0 -g
ldvector.c
ldvector.c:61: error: 'NSS_MD5_Update' undeclared here (not in a function)
ldvector.c:71: error: 'NSS_MD2_Update' undeclared here (not in a function)
../../coreconf/rules.mk:384: recipe for target
'OpenBSD5.7_64_OPT.OBJ/OpenBSD_SINGLE_SHLIB/ldvector.o' failed
gmake[3]: *** [OpenBSD5.7_64_OPT.OBJ/OpenBSD_SINGLE_SHLIB/ldvector.o] Error 1
gmake[3]: Leaving directory
'/home/jirib/openbsd/pobj/nss-3.17.4/nss-3.17.4/nss/lib/freebl'
Makefile:565: recipe for target 'libs' failed
gmake[2]: *** [libs] Error 2
gmake[2]: Leaving directory
'/home/jirib/openbsd/pobj/nss-3.17.4/nss-3.17.4/nss/lib/freebl'
../coreconf/rules.mk:101: recipe for target 'libs' failed
gmake[1]: *** [libs] Error 2
gmake[1]: Leaving directory
'/home/jirib/openbsd/pobj/nss-3.17.4/nss-3.17.4/nss/lib'
coreconf/rules.mk:101: recipe for target 'libs' failed
gmake: *** [libs] Error 2
*** Error 2 in .
(/home/jirib/cvs/openbsd-ports/infrastructure/mk/bsd.port.mk:2748
'/home/jirib/openbsd/pobj/nss-3.17.4/.build_done')
*** Error 1 in .
(/home/jirib/cvs/openbsd-ports/infrastructure/mk/bsd.port.mk:1940
'/home/jirib/openbsd/packages/amd64/all/nss-3.17.4p0.tgz')
*** Error 1 in .
(/home/jirib/cvs/openbsd-ports/infrastructure/mk/bsd.port.mk:2493
'_internal-package')
*** Error 1 in .
(/home/jirib/cvs/openbsd-ports/infrastructure/mk/bsd.port.mk:2473 'package')
*** Error 1 in /home/jirib/cvs/openbsd-ports/security/nss
(/home/jirib/cvs/openbsd-ports/infrastructure/mk/bsd.port.mk:3450 'repackage')
