From c6d84b2cacd22f30665557c3bed9709797ee93d0 Mon Sep 17 00:00:00 2001 From: martynas Date: Mon, 26 Mar 2007 20:45:44 +0000 Subject: [PATCH] update to nss-3.11.5 --- security/nss/Makefile | 7 +++---- security/nss/distinfo | 10 +++++----- .../patch-mozilla_security_coreconf_OpenBSD_mk | 12 +++++------- .../patches/patch-mozilla_security_coreconf_UNIX_mk | 12 ++++++++++++ .../patch-mozilla_security_nss_lib_freebl_Makefile | 12 ++++++++++++ 5 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 security/nss/patches/patch-mozilla_security_coreconf_UNIX_mk create mode 100644 security/nss/patches/patch-mozilla_security_nss_lib_freebl_Makefile diff --git a/security/nss/Makefile b/security/nss/Makefile index 47923827c49..74fc365a7e4 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2007/02/13 17:11:05 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2007/03/26 20:45:44 martynas Exp $ SHARED_ONLY= Yes COMMENT= "libraries to support development of security-enabled apps" -VERSION= 3.11.4 +VERSION= 3.11.5 DISTNAME= nss-${VERSION} -PKGNAME= ${DISTNAME}p2 SO_VERSION= 19.0 .for _lib in freebl3 nss3 nssckbi smime3 softokn3 ssl3 SHARED_LIBS+= ${_lib} ${SO_VERSION} @@ -15,7 +14,7 @@ CATEGORIES= security HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/ -MAINTAINER= Martynas Venckus +MAINTAINER= Martynas Venckus # mozilla public license PERMIT_PACKAGE_CDROM= Yes diff --git a/security/nss/distinfo b/security/nss/distinfo index b63d8e3bd83..77502676407 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,5 +1,5 @@ -MD5 (nss-3.11.4.tar.gz) = 74af8ebdf94307f47ff8931adbef9c39 -RMD160 (nss-3.11.4.tar.gz) = 5047c7f56444b22bc5f64dbaa02576e48ab5ef2a -SHA1 (nss-3.11.4.tar.gz) = fc032211f38bd3b688b75f3bdf36a32a23e4abd2 -SHA256 (nss-3.11.4.tar.gz) = c50062df123d733f25d4903f42e8855adf51b7324c786c714f7dd1ab9e328f06 -SIZE (nss-3.11.4.tar.gz) = 3713920 +MD5 (nss-3.11.5.tar.gz) = 1add44e6a41dbf5091cfd000f19ad6b9 +RMD160 (nss-3.11.5.tar.gz) = fe49128857bbc645d6ee8824c96e9ff0461438c0 +SHA1 (nss-3.11.5.tar.gz) = 2cde010908ab41777e43fda83be0a925010c4a09 +SHA256 (nss-3.11.5.tar.gz) = ea3876f5aea92231228130b451479a7fda94436d7c328f0fe1c07ea6f8fc9a40 +SIZE (nss-3.11.5.tar.gz) = 3696893 diff --git a/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk b/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk index b1eb7bc2f06..548e9e0a49d 100644 --- a/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk +++ b/security/nss/patches/patch-mozilla_security_coreconf_OpenBSD_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.1.1.1 2006/12/04 17:19:54 kurt Exp $ +$OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.2 2007/03/26 20:45:44 martynas Exp $ --- mozilla/security/coreconf/OpenBSD.mk.orig Sun Apr 25 18:02:17 2004 -+++ mozilla/security/coreconf/OpenBSD.mk Tue Nov 14 17:01:49 2006 -@@ -37,12 +37,12 @@ ++++ mozilla/security/coreconf/OpenBSD.mk Thu Mar 22 00:11:10 2007 +@@ -37,12 +37,11 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -9,7 +9,6 @@ $OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.1.1.1 2006/12/04 17:19: -CC = gcc -CCC = g++ +DEFAULT_COMPILER = ${CC} -+#CC = ${CC} +CCC = ${CXX} RANLIB = ranlib @@ -18,7 +17,7 @@ $OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.1.1.1 2006/12/04 17:19: ifeq ($(CPU_ARCH),i386) OS_REL_CFLAGS = -Di386 CPU_ARCH = x86 -@@ -55,17 +55,19 @@ OS_LIBS += -pthread +@@ -55,17 +54,19 @@ OS_LIBS += -pthread DSO_LDOPTS += -pthread endif @@ -37,8 +36,7 @@ $OpenBSD: patch-mozilla_security_coreconf_OpenBSD_mk,v 1.1.1.1 2006/12/04 17:19: +DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) DSO_LDFLAGS = --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) + MKSHLIB = $(CC) $(DSO_LDOPTS) +USE_SYSTEM_ZLIB = 1 +ZLIB_LIBS = -lz diff --git a/security/nss/patches/patch-mozilla_security_coreconf_UNIX_mk b/security/nss/patches/patch-mozilla_security_coreconf_UNIX_mk new file mode 100644 index 00000000000..d0eedd7b09f --- /dev/null +++ b/security/nss/patches/patch-mozilla_security_coreconf_UNIX_mk @@ -0,0 +1,12 @@ +$OpenBSD: patch-mozilla_security_coreconf_UNIX_mk,v 1.1 2007/03/26 20:45:44 martynas Exp $ +--- mozilla/security/coreconf/UNIX.mk.orig Sat Feb 5 03:35:47 2005 ++++ mozilla/security/coreconf/UNIX.mk Wed Mar 21 23:41:27 2007 +@@ -42,7 +42,7 @@ AR = ar cr $@ + LDOPTS += -L$(SOURCE_LIB_DIR) + + ifdef BUILD_OPT +- OPTIMIZER += -O ++ OPTIMIZER += + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g diff --git a/security/nss/patches/patch-mozilla_security_nss_lib_freebl_Makefile b/security/nss/patches/patch-mozilla_security_nss_lib_freebl_Makefile new file mode 100644 index 00000000000..7c2adef734f --- /dev/null +++ b/security/nss/patches/patch-mozilla_security_nss_lib_freebl_Makefile @@ -0,0 +1,12 @@ +$OpenBSD: patch-mozilla_security_nss_lib_freebl_Makefile,v 1.1 2007/03/26 20:45:44 martynas Exp $ +--- mozilla/security/nss/lib/freebl/Makefile.orig Thu Dec 7 03:59:41 2006 ++++ mozilla/security/nss/lib/freebl/Makefile Thu Mar 22 00:03:26 2007 +@@ -192,7 +192,7 @@ endif + # to bind the blapi function references in FREEBLVector vector + # (ldvector.c) to the blapi functions defined in the freebl + # shared libraries. +-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET))) ++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) + MKSHLIB += -Wl,-Bsymbolic + endif +