From owner-freebsd-gecko@FreeBSD.ORG Fri Jul 18 12:58:42 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4E6B3F7 for ; Fri, 18 Jul 2014 12:58:42 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6AD1B206F for ; Fri, 18 Jul 2014 12:58:42 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s6ICweWI042255 for ; Fri, 18 Jul 2014 12:58:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s6ICwZAU040396 for freebsd-gecko@freebsd.org; Fri, 18 Jul 2014 12:58:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 18 Jul 2014 12:58:35 GMT Message-Id: <201407181258.s6ICwZAU040396@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1622 - in trunk: . Mk devel/nspr security/nss www/firefox-esr www/firefox-nightly www/libxul www/linux-seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jul 2014 12:58:42 -0000 Author: jbeich Date: Fri Jul 18 12:58:35 2014 New Revision: 1622 Log: define CPE_URI to help finding known vulnerabilities Modified: trunk/Gecko_ChangeLog trunk/Mk/bsd.gecko.mk trunk/devel/nspr/Makefile trunk/security/nss/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/libxul/Makefile trunk/www/linux-seamonkey/Makefile.common Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/Gecko_ChangeLog Fri Jul 18 12:58:35 2014 (r1622) @@ -4,6 +4,7 @@ - restore hooking jemalloc in sqlite on freebsd 10+ - fix thunderbird build with -jN [2] - respect MAKE_JOBS_NUMBER regardless of kern.smp.cpus [2] +- define CPE_URI for nspr/nss and firefox/thunderbird/seamonkey PR: ports/165263 [1] PR: ports/184630 [2] Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/Mk/bsd.gecko.mk Fri Jul 18 12:58:35 2014 (r1622) @@ -85,7 +85,8 @@ MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} -USES+= compiler:c++11-lib gmake iconv perl5 pkgconfig desktop-file-utils +USES+= cpe compiler:c++11-lib gmake iconv perl5 pkgconfig desktop-file-utils +CPE_VENDOR?=mozilla USE_PERL5= build USE_XORG= xext xrender xt Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/devel/nspr/Makefile Fri Jul 18 12:58:35 2014 (r1622) @@ -11,7 +11,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build -USES= gmake +USES= cpe gmake +CPE_VENDOR= mozilla +CPE_PRODUCT= netscape_portable_runtime USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/security/nss/Makefile Fri Jul 18 12:58:35 2014 (r1622) @@ -20,7 +20,9 @@ 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" \ Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/www/firefox-esr/Makefile Fri Jul 18 12:58:35 2014 (r1622) @@ -31,6 +31,7 @@ USE_PYTHON_BUILD=2 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko +CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS= firefox-2[0-35-9].* firefox-1[1-689].* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= # empty Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/www/firefox-nightly/Makefile Fri Jul 18 12:58:35 2014 (r1622) @@ -37,6 +37,8 @@ USE_PYTHON_BUILD=-2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko +CPE_VERSION= ${PORTVERSION:R} +CPE_UPDATE= alpha1 MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -cairo MOZILLA_NAME= Firefox Nightly Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/www/libxul/Makefile Fri Jul 18 12:58:35 2014 (r1622) @@ -47,6 +47,7 @@ MOZ_OPTIONS?= --enable-application=xulrunner MOZ_EXTENSIONS= default,cookie,permissions USE_GECKO= gecko +CPE_PRODUCT= firefox_esr OBJDIR_BUILD= # in-tree build broken after bug 789837 MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= # empty Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Fri Jul 18 12:58:11 2014 (r1621) +++ trunk/www/linux-seamonkey/Makefile.common Fri Jul 18 12:58:35 2014 (r1622) @@ -21,6 +21,9 @@ usr/lib/libgtk-x11-2.0.so.0 .endif +USES+= cpe +CPE_VENDOR?= mozilla +CPE_TARGET_SW?= linux NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 APP_NAME= ${PKGBASE}