diff options
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 2 | ||||
| -rw-r--r-- | security/nss/distinfo | 4 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 26 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::UNIX.mk | 13 | ||||
| -rw-r--r-- | security/nss/files/patch-bug301986 | 11 |
5 files changed, 33 insertions, 23 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 47a899797d7c..5c59ceee6f10 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ _MAJOR= 3 _MINOR= 13 -_PATCH= 5 +_PATCH= 6 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss diff --git a/security/nss/distinfo b/security/nss/distinfo index 9c961ba22116..bd813768ecef 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.13.5.tar.gz) = ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e139d25018ee993e71b012a -SIZE (nss-3.13.5.tar.gz) = 6087983 +SHA256 (nss-3.13.6.tar.gz) = f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 +SIZE (nss-3.13.6.tar.gz) = 6109538 diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk index 089dac36d915..a6bb4772784c 100644 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk @@ -13,33 +13,19 @@ RANLIB = ranlib CPU_ARCH = $(OS_TEST) -@@ -50,7 +50,26 @@ - CPU_ARCH = x86 - endif +@@ -52,6 +52,12 @@ endif ifeq ($(CPU_ARCH),amd64) CPU_ARCH = x86_64 -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc + endif ++ifneq (,$(filter powerpc%, $(CPU_ARCH))) ++CPU_ARCH = ppc +endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 ++ifneq (,$(filter %64, $(CPU_ARCH))) +USE_64 = 1 +endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+USE_64 = 1 - endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + @@ -65,20 +80,18 @@ USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT diff --git a/security/nss/files/patch-..::coreconf::UNIX.mk b/security/nss/files/patch-..::coreconf::UNIX.mk new file mode 100644 index 000000000000..def25e7ab936 --- /dev/null +++ b/security/nss/files/patch-..::coreconf::UNIX.mk @@ -0,0 +1,13 @@ +--- ../coreconf/UNIX.mk~ ++++ ../coreconf/UNIX.mk +@@ -42,10 +42,8 @@ AR = ar cr $@ + LDOPTS += -L$(SOURCE_LIB_DIR) + + ifdef BUILD_OPT +- OPTIMIZER += -O + DEFINES += -UDEBUG -DNDEBUG + else +- OPTIMIZER += -g + USERNAME := $(shell whoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) diff --git a/security/nss/files/patch-bug301986 b/security/nss/files/patch-bug301986 new file mode 100644 index 000000000000..0745e23e9172 --- /dev/null +++ b/security/nss/files/patch-bug301986 @@ -0,0 +1,11 @@ +--- lib/util/nssilckt.h~ ++++ lib/util/nssilckt.h +@@ -195,7 +195,7 @@ typedef enum { + ** Declare the trace record + */ + struct pzTrace_s { +- PRUint32 threadID; /* PR_GetThreadID() */ ++ pthread_t threadID; /* PR_GetThreadID() */ + nssILockOp op; /* operation being performed */ + nssILockType ltype; /* lock type identifier */ + PRIntervalTime callTime; /* time spent in function */ |