pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/nss - update to 3.12.4.5
details: https://anonhg.NetBSD.org/pkgsrc/rev/2f7dcda0f54b
branches: trunk
changeset: 569476:2f7dcda0f54b
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Jan 16 14:41:25 2010 +0000
description:
- update to 3.12.4.5
- reach over to xulrunner, track the stable gecko release
- use external sqlite3
- cleanup
- take maintainership
This is the second part of PR pkg/42277.
diffstat:
devel/nss/Makefile | 82 ++++++++++++++++++-------------------------
devel/nss/PLIST | 9 +++-
devel/nss/buildlink3.mk | 12 +-----
devel/nss/distinfo | 16 --------
devel/nss/files/DragonFly.mk | 81 -------------------------------------------
devel/nss/patches/patch-aa | 13 ------
devel/nss/patches/patch-ab | 13 ------
devel/nss/patches/patch-ae | 21 -----------
devel/nss/patches/patch-af | 16 --------
devel/nss/patches/patch-ag | 16 --------
devel/nss/patches/patch-ah | 13 ------
devel/nss/patches/patch-ai | 13 ------
devel/nss/patches/patch-ak | 13 ------
devel/nss/patches/patch-an | 32 -----------------
devel/nss/patches/patch-as | 62 ---------------------------------
devel/nss/patches/patch-at | 16 --------
16 files changed, 43 insertions(+), 385 deletions(-)
diffs (truncated from 557 to 300 lines):
diff -r b5a37bfc5047 -r 2f7dcda0f54b devel/nss/Makefile
--- a/devel/nss/Makefile Sat Jan 16 14:41:03 2010 +0000
+++ b/devel/nss/Makefile Sat Jan 16 14:41:25 2010 +0000
@@ -1,28 +1,18 @@
-# $NetBSD: Makefile,v 1.33 2009/08/19 15:01:21 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2010/01/16 14:41:25 tnn Exp $
-DISTNAME= nss-3.11.5
+.include "../../devel/xulrunner/dist.mk"
+PKGNAME= ${DISTNAME:S/firefox-3.5/nss-${NSS_RELEASE}/:S/.source//}
+NSS_RELEASE= 3.12.4.5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_11_5_RTM/src/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= tnn%NetBSD.org@localhost
HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
COMMENT= Libraries to support development of security-enabled applications
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
-
PKG_DESTDIR_SUPPORT= user-destdir
-
-BUILD_DIRS= mozilla/security/nss
+CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-USE_TOOLS+= awk gmake pax perl
-DIST= ${WRKSRC}/mozilla/dist
-BUILD_TARGET= nss_build_all
-MAKE_ENV+= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
-MAKE_ENV+= LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
-
-INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig
-
-MAKE_JOBS_SAFE= no
+USE_TOOLS+= gmake perl pax
.include "../../mk/bsd.prefs.mk"
@@ -36,18 +26,36 @@
PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
-MAKEFLAGS+= NS_USE_GCC=YES
+MAKE_ENV+= NS_USE_GCC=YES
.endif
-.if ${OPSYS} == "Linux"
-. if defined(ABI) && ${ABI} == "64"
-MAKE_FLAGS+= USE_64=1
+.for platform in ${LP64PLATFORMS}
+. if ${MACHINE_PLATFORM:M${platform}}
+MAKE_ENV+= USE_64=1
. endif
-.endif
+.endfor
+
+MAKE_ENV+= BUILD_OPT=1
+#MAKE_ENV+= OPTIMIZER=${CFLAGS:Q}
+MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr
+MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1
+MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
pre-configure:
- ${CP} ${FILESDIR}/DragonFly.mk \
- ${WRKSRC}/mozilla/security/coreconf/
+# sanity check: make sure the nss release is what we think it is.
+ @set -e; if [ '"${NSS_RELEASE}"' != \
+ "`${AWK} '/NSS_VERSION/ {print $$3}' < \
+ ${WRKSRC}/security//nss/lib/nss/nss.h`" ]; then \
+ ${ECHO} "package is out of date"; \
+ exit 1; \
+ fi
+
+do-build:
+ cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+ build_coreconf build_dbm all
+
+INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig
+DIST= ${WRKSRC}/dist
do-install:
(cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
@@ -57,34 +65,14 @@
{ ${ECHO} "Name: NSS"; \
${ECHO} "Description: Mozilla Network Security Services"; \
${ECHO} "Version: ${PKGVERSION}"; \
- ${ECHO} "Cflags: -I${PREFIX}/include/nss"; \
+ ${ECHO} "Requires: nspr >= 4.8.2"; \
+ ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \
${ECHO} "Libs: -L${PREFIX}/lib/nss" \
"${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
"-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \
} >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
-# The exact set of libfreebl* libs built and installed depends on the
-# operating system and platform. For example, on solaris/sparc you might
-# get
-# libfreebl_32fpu_3.so
-# libfreebl_32int_3.so
-# libfreebl_32int64_3.so
-# and on others
-# libfreebl3.so
-# Since this has been a continual problem in many mozilla packages, just
-# do that part dynamically rather than trying to always keep our conditionals
-# up to date.
-PLIST_SRC= ${WRKDIR}/PLIST
-post-install:
- ${AWK} '/@comment libfreebl/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC}
- ls ${DESTDIR}${PREFIX}/lib/nss/libfreebl*.${SO_SUFFIX} | ${SORT} | \
- ${SED} 's;${DESTDIR}${PREFIX}/;;g' >> ${PLIST_SRC}
- ${AWK} 'ok == 1 {print} /@comment libfreebl/ {ok=1}' ${.CURDIR}/PLIST >> ${PLIST_SRC}
- cd ${DESTDIR}${PREFIX}/include/nss && \
- ${CHMOD} ${SHAREMODE} nss/*.h dbm/*.h nss/*.api
-
-BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb2
-
.include "../../devel/nspr/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b5a37bfc5047 -r 2f7dcda0f54b devel/nss/PLIST
--- a/devel/nss/PLIST Sat Jan 16 14:41:03 2010 +0000
+++ b/devel/nss/PLIST Sat Jan 16 14:41:25 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:49:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/01/16 14:41:25 tnn Exp $
include/nss/dbm/cdefs.h
include/nss/dbm/mcom_db.h
include/nss/dbm/ncompat.h
@@ -47,6 +47,7 @@
include/nss/nss/nsslocks.h
include/nss/nss/nssrwlk.h
include/nss/nss/nssrwlkt.h
+include/nss/nss/nssutil.h
include/nss/nss/ocsp.h
include/nss/nss/ocspt.h
include/nss/nss/p12.h
@@ -92,10 +93,12 @@
include/nss/nss/sslerr.h
include/nss/nss/sslproto.h
include/nss/nss/sslt.h
-include/nss/nss/watcomfx.h
-@comment libfreebl
+include/nss/nss/utilrename.h
+lib/nss/libfreebl3.${SO_SUFFIX}
lib/nss/libnss3.${SO_SUFFIX}
lib/nss/libnssckbi.${SO_SUFFIX}
+lib/nss/libnssdbm3.${SO_SUFFIX}
+lib/nss/libnssutil3.${SO_SUFFIX}
lib/nss/libsmime3.${SO_SUFFIX}
lib/nss/libsoftokn3.${SO_SUFFIX}
lib/nss/libssl3.${SO_SUFFIX}
diff -r b5a37bfc5047 -r 2f7dcda0f54b devel/nss/buildlink3.mk
--- a/devel/nss/buildlink3.mk Sat Jan 16 14:41:03 2010 +0000
+++ b/devel/nss/buildlink3.mk Sat Jan 16 14:41:25 2010 +0000
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/01/16 14:41:25 tnn Exp $
BUILDLINK_TREE+= nss
.if !defined(NSS_BUILDLINK3_MK)
NSS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.nss+= nss>=3.9.2nb1
-BUILDLINK_ABI_DEPENDS.nss+= nss>=3.9.2nb4
+BUILDLINK_API_DEPENDS.nss+= nss>=3.12.4.5
BUILDLINK_PKGSRCDIR.nss?= ../../devel/nss
-BUILDLINK_FILES.nss+= lib/nss/*
-BUILDLINK_FILES.nss+= include/nss/*
-
-BUILDLINK_INCDIRS.nss+= include/nss
-BUILDLINK_LIBDIRS.nss+= lib/nss
-BUILDLINK_RPATHDIRS.nss+= lib/nss
-
.include "../../devel/nspr/buildlink3.mk"
.endif # NSS_BUILDLINK3_MK
diff -r b5a37bfc5047 -r 2f7dcda0f54b devel/nss/distinfo
--- a/devel/nss/distinfo Sat Jan 16 14:41:03 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.19 2009/10/11 07:51:48 sno Exp $
-
-SHA1 (nss-3.11.5.tar.gz) = 2cde010908ab41777e43fda83be0a925010c4a09
-RMD160 (nss-3.11.5.tar.gz) = fe49128857bbc645d6ee8824c96e9ff0461438c0
-Size (nss-3.11.5.tar.gz) = 3696893 bytes
-SHA1 (patch-aa) = 25b1442791326ba3b4c5cfa299c7a453c77e457e
-SHA1 (patch-ab) = 371e04afd51d4182a1324cbd04c1d93bdbb8949a
-SHA1 (patch-ae) = 71c90bac798706a38634a2883bd1541d76d01861
-SHA1 (patch-af) = c0e5a68911eb6503224c569552a5e94cfa036364
-SHA1 (patch-ag) = ead4d79ac6ebe718230ce47fb3e296b2b4f7584b
-SHA1 (patch-ah) = fa302e20163db73a1453b4e360f7f55377b7bea2
-SHA1 (patch-ai) = 80a18536703d7f01b28448e503f49da50b07304e
-SHA1 (patch-ak) = 371eb96e2874ef8ec841dc886a70f2b5215f701d
-SHA1 (patch-an) = c9d8f350488cc383a0e9bd25b69b270f678c4736
-SHA1 (patch-as) = 5d1c7f7bfc3f167052985c2714099f82ad8f4e25
-SHA1 (patch-at) = 3c963ca8a6a2ad8c6591d2ec37c431435cd6704a
diff -r b5a37bfc5047 -r 2f7dcda0f54b devel/nss/files/DragonFly.mk
--- a/devel/nss/files/DragonFly.mk Sat Jan 16 14:41:03 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1994-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above. If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL. If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for DragonFly
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = gcc
-CC = gcc
-CCC = g++
-RANLIB = ranlib
-
-ifeq ($(OS_TEST),alpha)
-CPU_ARCH = alpha
-else
-CPU_ARCH = x86
-endif
-
-OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-
-#
-# The default implementation strategy for FreeBSD is pthreads.
-#
-ifndef CLASSIC_NSPR
-USE_PTHREADS = 1
-DEFINES += -D_THREAD_SAFE -D_REENTRANT
-OS_LIBS += -pthread $(BSD_LDOPTS)
-DSO_LDOPTS += -pthread $(BSD_LDOPTS)
-endif
-
-ARCH = freebsd
-
-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX = so
-else
-DLL_SUFFIX = so.1.0
-endif
-
-MKSHLIB = $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-INCLUDES += -I/usr/X11R6/include
diff -r b5a37bfc5047 -r 2f7dcda0f54b devel/nss/patches/patch-aa
--- a/devel/nss/patches/patch-aa Sat Jan 16 14:41:03 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/01/20 18:55:09 wiz Exp $
-
---- mozilla/security/nss/Makefile.orig 2006-04-14 22:48:17.000000000 +0000
-+++ mozilla/security/nss/Makefile
-@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
-
Home |
Main Index |
Thread Index |
Old Index