pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/nss Update 3.13.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/cebd4d97f697
branches: trunk
changeset: 602723:cebd4d97f697
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Wed Apr 18 21:01:42 2012 +0000
description:
Update 3.13.4
* Change distfile to separated source.
Changelog is not shown.
Probably some bugs are fixed.
Tested on NetBSD/i386 6.99.4 and DragonFly/i386 3.0.1.
diffstat:
devel/nss/Makefile | 19 +--
devel/nss/distinfo | 16 ++
devel/nss/patches/patch-ai | 13 ++
devel/nss/patches/patch-am | 17 ++
devel/nss/patches/patch-an | 48 +++++++
devel/nss/patches/patch-md | 17 ++
devel/nss/patches/patch-me | 15 ++
devel/nss/patches/patch-mf | 21 +++
devel/nss/patches/patch-mg | 90 ++++++++++++++
devel/nss/patches/patch-mh | 13 ++
devel/nss/patches/patch-mj | 15 ++
devel/nss/patches/patch-mn | 15 ++
devel/nss/patches/patch-security_nss_cmd_shlibsign_sign.sh | 17 ++
13 files changed, 303 insertions(+), 13 deletions(-)
diffs (truncated from 387 to 300 lines):
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/Makefile
--- a/devel/nss/Makefile Wed Apr 18 20:57:33 2012 +0000
+++ b/devel/nss/Makefile Wed Apr 18 21:01:42 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2012/03/15 08:32:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2012/04/18 21:01:42 ryoon Exp $
-.include "../../devel/xulrunner/dist.mk"
-PKGNAME= nss-${NSS_RELEASE}
-NSS_RELEASE= 3.13.3
+DISTNAME= nss-${NSS_RELEASE}
+NSS_RELEASE= 3.13.4
CATEGORIES= security
+MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_13_4_RTM/src/}
MAINTAINER= tnn%NetBSD.org@localhost
HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
@@ -15,6 +15,8 @@
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure
+WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla
+
USE_TOOLS+= gmake perl pax pkg-config
.include "../../mk/bsd.prefs.mk"
@@ -48,15 +50,6 @@
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:
-# 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
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/distinfo Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.21 2012/04/18 21:01:42 ryoon Exp $
+
+SHA1 (nss-3.13.4.tar.gz) = c5a829c3bd56aa743457faf21469065f87c2db75
+RMD160 (nss-3.13.4.tar.gz) = 52c2984b3678af34da55c2b4dc50a1274afa7c59
+Size (nss-3.13.4.tar.gz) = 6087584 bytes
+SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
+SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
+SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
+SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
+SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
+SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e
+SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
+SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3
+SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
+SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
+SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-ai Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.5 2012/04/18 21:01:42 ryoon Exp $
+
+--- dbm/src/mktemp.c.orig 2009-06-29 18:14:43.000000000 +0200
++++ dbm/src/mktemp.c
+@@ -90,7 +90,7 @@ mktemp(char *path)
+ static int
+ _gettemp(char *path, register int *doopen, int extraFlags)
+ {
+-#if !defined(_WINDOWS) || defined(_WIN32)
++#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno)
+ extern int errno;
+ #endif
+ register char *start, *trv;
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-am Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.3 2012/04/18 21:01:42 ryoon Exp $
+
+SHA1_Update conflicts with openssl which may be dynamically loaded
+at runtime via libcups or libgssapi so causing a crash due to using
+the wrong binding. So rename here to avoid conflict.
+
+--- security/nss/lib/freebl/blapi.h.orig 2009-06-29 18:15:13.000000000 +0200
++++ security/nss/lib/freebl/blapi.h
+@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Cont
+ */
+ extern void SHA1_Begin(SHA1Context *cx);
+
++#define SHA1_Update NSS_SHA1_Update
++
+ /*
+ ** Update the SHA-1 hash function with more data.
+ ** "cx" the context
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-an Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-an,v 1.5 2012/04/18 21:01:42 ryoon Exp $
+
+SHA1_Update conflicts with openssl which may be dynamically loaded
+at runtime via libcups or libgssapi so causing a crash due to using
+the wrong binding. So rename here to avoid conflict.
+
+--- security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2009-06-29 18:15:14.000000000 +0200
++++ security/nss/lib/freebl/sha-fast-amd64-sun.s
+@@ -1712,9 +1712,9 @@ shaCompress:
+ .LFE7:
+ .size shaCompress, .-shaCompress
+ .align 16
+-.globl SHA1_Update
+- .type SHA1_Update, @function
+-SHA1_Update:
++.globl NSS_SHA1_Update
++ .type NSS_SHA1_Update, @function
++NSS_SHA1_Update:
+ .LFB5:
+ pushq %rbp
+ .LCFI5:
+@@ -1800,7 +1800,7 @@ SHA1_Update:
+ call shaCompress
+ jmp .L245
+ .LFE5:
+- .size SHA1_Update, .-SHA1_Update
++ .size NSS_SHA1_Update, .-NSS_SHA1_Update
+ .section .rodata
+ .align 32
+ .type bulk_pad.0, @object
+@@ -1902,7 +1902,7 @@ SHA1_End:
+ subl %r8d, %edx
+ andl $63, %edx
+ incl %edx
+- call SHA1_Update@PLT
++ call NSS_SHA1_Update@PLT
+ movq %rbx, %rdi
+ movq %r12, %rsi
+ shrq $32, %rdi
+@@ -2018,7 +2018,7 @@ SHA1_HashBuf:
+ movl %r12d, %edx
+ movq %r13, %rsi
+ movq %rbx, %rdi
+- call SHA1_Update@PLT
++ call NSS_SHA1_Update@PLT
+ leaq -292(%rbp), %rdx
+ movq %r14, %rsi
+ movq %rbx, %rdi
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-md Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-md,v 1.1 2012/04/18 21:01:42 ryoon Exp $
+
+???. from www/firefox/patch-ax.
+
+--- security/coreconf/SunOS5.mk.orig 2009-06-29 18:15:11.000000000 +0200
++++ security/coreconf/SunOS5.mk
+@@ -156,6 +156,10 @@ endif
+ endif
+ DSO_LDOPTS += -z combreloc -z defs -z ignore
+
++ifdef LIBRUNPATH
++DSO_LDOPTS += -R$(LIBRUNPATH)
++endif
++
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)
+ ifdef NS_USE_GCC
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-me
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-me Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-me,v 1.1 2012/04/18 21:01:42 ryoon Exp $
+
+Add DragonFly support.
+
+--- security/nss/lib/freebl/Makefile.orig 2009-06-29 18:15:13.000000000 +0200
++++ security/nss/lib/freebl/Makefile
+@@ -212,7 +212,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 OpenBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
+ MKSHLIB += -Wl,-Bsymbolic
+ endif
+
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-mf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-mf Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-mf,v 1.1 2012/04/18 21:01:42 ryoon Exp $
+
+Add DragonFly support.
+Make sure nss libraries have a run path defined.
+
+--- security/coreconf/config.mk.orig 2011-11-04 21:34:14.000000000 +0000
++++ security/coreconf/config.mk
+@@ -63,7 +63,7 @@ endif
+ #######################################################################
+
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+- AIX RISCOS WINNT WIN95 WINCE Linux
++ AIX RISCOS WINNT WIN95 WINCE Linux DragonFly
+
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+@@ -207,3 +207,4 @@ endif
+ DEFINES += -DUSE_UTIL_DIRECTLY
+ USE_UTIL_DIRECTLY = 1
+
++EXTRA_SHARED_LIBS += -Wl,-R${PREFIX}/lib/${MOZILLA_PKG_NAME}
diff -r 6e5a2ea33247 -r cebd4d97f697 devel/nss/patches/patch-mg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nss/patches/patch-mg Wed Apr 18 21:01:42 2012 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-mg,v 1.1 2012/04/18 21:01:42 ryoon Exp $
+
+Add DragonFly support.
+
+--- security/coreconf/DragonFly.mk.orig 2009-06-30 22:20:24.000000000 +0200
++++ security/coreconf/DragonFly.mk
+@@ -0,0 +1,83 @@
++#
++# 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
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = freebsd
++
++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
++
++DLL_SUFFIX = so
++
++ifdef LIBRUNPATH
++DSO_LDOPTS += -Wl,-R$(LIBRUNPATH)
++endif
Home |
Main Index |
Thread Index |
Old Index