mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-20 08:27:15 +00:00
- Update to 3.12.6
Approved by: marcus
This commit is contained in:
Beat Gaetzi
parent
88a0709719
commit
14d78e8c51
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=252517
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
PORTNAME= nss
|
PORTNAME= nss
|
||||||
PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
|
PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= security
|
CATEGORIES= security
|
||||||
MASTER_SITES= ${MASTER_SITE_MOZILLA}
|
MASTER_SITES= ${MASTER_SITE_MOZILLA}
|
||||||
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
|
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
|
||||||
@ -20,7 +19,7 @@ LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr
|
|||||||
|
|
||||||
_MAJOR= 3
|
_MAJOR= 3
|
||||||
_MINOR= 12
|
_MINOR= 12
|
||||||
_PATCH= 4
|
_PATCH= 6
|
||||||
|
|
||||||
OPTIONS= SYSSQLITE3 "Use system SQLite3 (slower)" Off
|
OPTIONS= SYSSQLITE3 "Use system SQLite3 (slower)" Off
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
MD5 (nss-3.12.4.tar.gz) = 1ee3ed9c1900079319bd1de51388d856
|
MD5 (nss-3.12.6.tar.gz) = da42596665f226de5eb3ecfc1ec57cd1
|
||||||
SHA256 (nss-3.12.4.tar.gz) = 8202546524c69ce03e1c3ef5e2956b71b8fa0a5bffdf06568597e7c0d1f83bf0
|
SHA256 (nss-3.12.6.tar.gz) = 8f9759be1ce928e82830923fde62a66e270c4645f10a4c176acfccb6021a9795
|
||||||
SIZE (nss-3.12.4.tar.gz) = 5412877
|
SIZE (nss-3.12.6.tar.gz) = 5947630
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- ../../security/coreconf/FreeBSD.mk.orig 2008-07-12 07:28:59.000000000 -0700
|
--- ../../security/coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
|
||||||
+++ ../../security/coreconf/FreeBSD.mk 2009-11-19 19:29:23.000000000 -0800
|
+++ ../../security/coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
|
||||||
@@ -37,16 +37,33 @@
|
@@ -37,9 +37,9 @@
|
||||||
|
|
||||||
include $(CORE_DEPTH)/coreconf/UNIX.mk
|
include $(CORE_DEPTH)/coreconf/UNIX.mk
|
||||||
|
|
||||||
@ -12,32 +12,32 @@
|
|||||||
+CCC = $(CXX)
|
+CCC = $(CXX)
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
|
|
||||||
ifeq ($(OS_TEST),alpha)
|
CPU_ARCH = $(OS_TEST)
|
||||||
CPU_ARCH = alpha
|
@@ -50,7 +50,22 @@
|
||||||
else
|
CPU_ARCH = x86
|
||||||
|
endif
|
||||||
|
ifeq ($(CPU_ARCH),amd64)
|
||||||
|
-CPU_ARCH = x86_64
|
||||||
|
+CPU_ARCH = amd64
|
||||||
|
+USE_64 = 1
|
||||||
|
+endif
|
||||||
|
+ifeq ($(OS_TEST),alpha)
|
||||||
|
+CPU_ARCH = alpha
|
||||||
|
+endif
|
||||||
+ifeq ($(OS_TEST),powerpc)
|
+ifeq ($(OS_TEST),powerpc)
|
||||||
+CPU_ARCH = powerpc
|
+CPU_ARCH = powerpc
|
||||||
+else
|
+endif
|
||||||
+ifeq ($(OS_TEST),sparc64)
|
+ifeq ($(OS_TEST),sparc64)
|
||||||
+CPU_ARCH = sparc64
|
+CPU_ARCH = sparc64
|
||||||
+USE_64 = 1
|
+USE_64 = 1
|
||||||
+else
|
+endif
|
||||||
+ifeq ($(OS_TEST),ia64)
|
+ifeq ($(OS_TEST),ia64)
|
||||||
+CPU_ARCH = ia64
|
+CPU_ARCH = ia64
|
||||||
+USE_64 = 1
|
+USE_64 = 1
|
||||||
+else
|
|
||||||
+ifeq ($(OS_TEST),amd64)
|
|
||||||
+USE_64 = 1
|
|
||||||
+endif
|
|
||||||
CPU_ARCH = x86
|
|
||||||
endif
|
endif
|
||||||
+endif
|
|
||||||
+endif
|
|
||||||
+endif
|
|
||||||
|
|
||||||
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
|
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
|
||||||
|
@@ -65,20 +80,18 @@
|
||||||
@@ -60,20 +77,18 @@
|
|
||||||
USE_PTHREADS = 1
|
USE_PTHREADS = 1
|
||||||
DEFINES += -D_THREAD_SAFE -D_REENTRANT
|
DEFINES += -D_THREAD_SAFE -D_REENTRANT
|
||||||
OS_LIBS += -pthread
|
OS_LIBS += -pthread
|
||||||
@ -63,7 +63,7 @@
|
|||||||
ifdef MAPFILE
|
ifdef MAPFILE
|
||||||
MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
||||||
endif
|
endif
|
||||||
@@ -82,4 +97,5 @@
|
@@ -87,4 +100,5 @@
|
||||||
|
|
||||||
G++INCLUDES = -I/usr/include/g++
|
G++INCLUDES = -I/usr/include/g++
|
||||||
|
|
||||||
|
|||||||
@ -18,8 +18,8 @@
|
|||||||
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
|
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
|
||||||
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||||
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||||
--- lib/sqlite/manifest.mn.orig 2009-08-31 17:54:32.000000000 +0200
|
--- lib/sqlite/manifest.mn.orig 2010-01-09 06:04:37.000000000 +0100
|
||||||
+++ lib/sqlite/manifest.mn 2009-08-31 17:54:44.000000000 +0200
|
+++ lib/sqlite/manifest.mn 2010-03-28 22:52:27.000000000 +0200
|
||||||
@@ -38,9 +38,9 @@
|
@@ -38,9 +38,9 @@
|
||||||
|
|
||||||
MODULE = nss
|
MODULE = nss
|
||||||
@ -29,7 +29,7 @@
|
|||||||
LIBRARY_VERSION = 3
|
LIBRARY_VERSION = 3
|
||||||
-MAPFILE = $(OBJDIR)/sqlite.def
|
-MAPFILE = $(OBJDIR)/sqlite.def
|
||||||
+MAPFILE = $(OBJDIR)/nsssqlite.def
|
+MAPFILE = $(OBJDIR)/nsssqlite.def
|
||||||
DEFINES += -DTHREADSAFE=1
|
DEFINES += -DSQLITE_THREADSAFE=1
|
||||||
|
|
||||||
EXPORTS = \
|
EXPORTS = \
|
||||||
--- lib/softoken/config.mk.orig 2009-08-31 17:55:03.000000000 +0200
|
--- lib/softoken/config.mk.orig 2009-08-31 17:55:03.000000000 +0200
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user