Date: Thu, 25 Sep 2014 12:55:21 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r369250 - in branches/2014Q3/security: ca_root_nss nss nss/files Message-ID: <201409251255.s8PCtL62059001@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Thu Sep 25 12:55:21 2014 New Revision: 369250 URL: http://svnweb.freebsd.org/changeset/ports/369250 QAT: https://qat.redports.org/buildarchive/r369250/ Log: Update security/nss and security/ca_root_nss to 3.17.1. Manual merge because these ports have very complex revision history interleaved with other Mozilla ports. Approved by: ports-secteam Security: CVE-2014-1544 Security: 48108fb0-751c-4cbb-8f33-09239ead4b55.html Deleted: branches/2014Q3/security/nss/files/patch-bug856300 Modified: branches/2014Q3/security/ca_root_nss/Makefile branches/2014Q3/security/ca_root_nss/distinfo branches/2014Q3/security/ca_root_nss/pkg-plist branches/2014Q3/security/nss/Makefile branches/2014Q3/security/nss/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/ca_root_nss/Makefile ============================================================================== --- branches/2014Q3/security/ca_root_nss/Makefile Thu Sep 25 12:48:21 2014 (r369249) +++ branches/2014Q3/security/ca_root_nss/Makefile Thu Sep 25 12:55:21 2014 (r369250) @@ -14,6 +14,7 @@ ETCSYMLINK_DESC= Add symlink to /etc/ssl USES= perl5 USE_PERL5= build +NO_ARCH= yes NO_WRKSUBDIR= yes CERTDIR?= share/certs @@ -24,7 +25,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.16.1 +VERSION_NSS= 3.17.1 #NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2014Q3/security/ca_root_nss/distinfo ============================================================================== --- branches/2014Q3/security/ca_root_nss/distinfo Thu Sep 25 12:48:21 2014 (r369249) +++ branches/2014Q3/security/ca_root_nss/distinfo Thu Sep 25 12:55:21 2014 (r369250) @@ -1,2 +1,2 @@ -SHA256 (nss-3.16.1.tar.gz) = fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e -SIZE (nss-3.16.1.tar.gz) = 6409506 +SHA256 (nss-3.17.1.tar.gz) = 0e210afba7cd1e033a08f61fcd1f466639649fc413e72aa050f3d52c19376e5f +SIZE (nss-3.17.1.tar.gz) = 6927105 Modified: branches/2014Q3/security/ca_root_nss/pkg-plist ============================================================================== --- branches/2014Q3/security/ca_root_nss/pkg-plist Thu Sep 25 12:48:21 2014 (r369249) +++ branches/2014Q3/security/ca_root_nss/pkg-plist Thu Sep 25 12:55:21 2014 (r369250) @@ -1,4 +1,2 @@ %%CERTDIR%%/ca-root-nss.crt -@dirrmtry %%CERTDIR%% -%%ETCSYMLINK%%@cwd / -%%ETCSYMLINK%%etc/ssl/cert.pem +%%ETCSYMLINK%%/etc/ssl/cert.pem Modified: branches/2014Q3/security/nss/Makefile ============================================================================== --- branches/2014Q3/security/nss/Makefile Thu Sep 25 12:48:21 2014 (r369249) +++ branches/2014Q3/security/nss/Makefile Thu Sep 25 12:55:21 2014 (r369250) @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.16.1 -PORTREVISION= 1 -#DISTVERSIONSUFFIX= .with.ckbi.1.93 +PORTVERSION= 3.17.1 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src @@ -12,7 +10,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - nspr>=4.10.3:${PORTSDIR}/devel/nspr \ + nspr>=4.10.5:${PORTSDIR}/devel/nspr \ sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 @@ -21,7 +19,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss -USES= gmake perl5 +USES= cpe gmake perl5 +CPE_VENDOR= mozilla +CPE_PRODUCT= network_security_services USE_PERL5= build MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ @@ -40,15 +40,17 @@ INSTALL_BINS= certcgi certutil checkcert p7verify pk12util rsaperf shlibsign signtool signver \ ssltap strsclnt symkeyutil vfychain vfyserv -.if !defined(WITH_DEBUG) +OPTIONS_DEFINE= DEBUG + +.include <bsd.port.options.mk> + +.if ! ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= BUILD_OPT=1 BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ .else BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif -.include <bsd.port.pre.mk> - .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin @@ -81,7 +83,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \; - ${INSTALL_DATA} ${BINS}/lib/*.so.1 \ + ${INSTALL_LIB} ${BINS}/lib/*.so.1 \ ${STAGEDIR}${PREFIX}/lib/nss ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${STAGEDIR}${PREFIX}/lib/nss @@ -94,4 +96,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: branches/2014Q3/security/nss/distinfo ============================================================================== --- branches/2014Q3/security/nss/distinfo Thu Sep 25 12:48:21 2014 (r369249) +++ branches/2014Q3/security/nss/distinfo Thu Sep 25 12:55:21 2014 (r369250) @@ -1,2 +1,2 @@ -SHA256 (nss-3.16.1.tar.gz) = fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e -SIZE (nss-3.16.1.tar.gz) = 6409506 +SHA256 (nss-3.17.1.tar.gz) = 0e210afba7cd1e033a08f61fcd1f466639649fc413e72aa050f3d52c19376e5f +SIZE (nss-3.17.1.tar.gz) = 6927105
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409251255.s8PCtL62059001>