diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-04-03 20:27:48 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-04-03 20:27:48 +0000 |
| commit | 513d21d8384e61cc02b820137587b3680ffbb51c (patch) | |
| tree | fc7673f01258f369254c78eaa2111a667c2fd1f7 /security/nss | |
| parent | 7f2a857b2964490ac2c8b80ef6a315366e9bf55a (diff) | |
| download | ports-513d21d8384e61cc02b820137587b3680ffbb51c.tar.gz ports-513d21d8384e61cc02b820137587b3680ffbb51c.zip | |
- update thunderbird, firefox-esr, linux-thunderbird and linux-firefox to
17.0.5
- update firefox to 20.0
- update seamonkey and linux-seamonkey to 2.17
- update nspr to 4.9.6
- remove mail/thunderbird-esr, Mozilla stopped providing 2 versions of
thunderbird
- prune support for old FreeBSD versions; users of 8.2, 7.4 or earlier
are advised to upgrade - http://www.freebsd.org/security/
- add vuln.xml entry
Security: 94976433-9c74-11e2-a9fc-d43d7e0c7c02
Approved by: portmgr (miwi)
In collaboration with: Jan Beich <jbeich@tormail.org>
Notes
Notes:
svn path=/head/; revision=315713
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 13 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 8 | ||||
| -rw-r--r-- | security/nss/files/patch-bug856300 (renamed from security/nss/files/extra-bug835050) | 5 |
3 files changed, 6 insertions, 20 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index f3386c88da35..94b93a4a50a8 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -22,11 +22,11 @@ MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss USE_GMAKE= yes USE_PERL5_BUILD=yes -MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ +MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 ALL_TARGET= nss_build_all -CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ @@ -55,13 +55,6 @@ BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin -.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 -EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 -.endif -.if ${CC:Mcc} && (${OSVERSION} >= 800000 && ${OSVERSION} < 802503 \ - || ${OSVERSION} < 704101) -USE_GCC?= yes # -mssse3 -.endif .endif check regression-test test: @@ -79,8 +72,6 @@ check regression-test test: fi post-patch: - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk index c215c366f0af..6bdfef625b29 100644 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk @@ -27,13 +27,7 @@ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -65,20 +80,20 @@ - USE_PTHREADS = 1 - DEFINES += -D_THREAD_SAFE -D_REENTRANT - OS_LIBS += -pthread --DSO_LDOPTS += -pthread -+DSO_LDOPTS += $(BSD_LDOPTS) - endif +@@ -70,15 +85,15 @@ ARCH = freebsd diff --git a/security/nss/files/extra-bug835050 b/security/nss/files/patch-bug856300 index a9ccd0a0c0d1..7653f0fd6b4b 100644 --- a/security/nss/files/extra-bug835050 +++ b/security/nss/files/patch-bug856300 @@ -1,10 +1,11 @@ --- lib/freebl/Makefile~ +++ lib/freebl/Makefile -@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( +@@ -659,7 +659,7 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( # symbolic names to registers, for example, # .set Htbl, %rdi # So we can't use Clang's integrated assembler with intel-gcm.s. -ifneq (,$(findstring clang,$(AS))) ++ifneq (,$(findstring clang,$(shell $(AS) -v 2>&1))) $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as endif --endif + endif |