From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 11:06:59 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8B4E29B0 for ; Mon, 28 Jan 2013 11:06:59 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6500BD05 for ; Mon, 28 Jan 2013 11:06:59 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0SB6xvA034866 for ; Mon, 28 Jan 2013 11:06:59 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0SB6w8g034864 for gecko@FreeBSD.org; Mon, 28 Jan 2013 11:06:58 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 28 Jan 2013 11:06:58 GMT Message-Id: <201301281106.r0SB6w8g034864@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 11:06:59 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/175421 gecko workaround: www/firefox is MAKE_JOBS_SAFE but never us o ports/174096 gecko mail/thunderbird 17 and 16 crashes when try write a ne o ports/173937 gecko mail/thunderbird core dumps when using enigmail to gen p ports/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 21 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 17:00:29 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 885616E8 for ; Mon, 28 Jan 2013 17:00:29 +0000 (UTC) (envelope-from portscout@portscout.freebsd.org) Received: from null.zi0r.com (null.zi0r.com [71.245.171.204]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0B9BE2 for ; Mon, 28 Jan 2013 17:00:29 +0000 (UTC) Received: from null.zi0r.com (localhost [127.0.0.1]) by null.zi0r.com (8.14.5/8.14.5) with ESMTP id r0SH0M59098599 for ; Mon, 28 Jan 2013 12:00:22 -0500 (EST) (envelope-from portscout@null.zi0r.com) Received: (from portscout@localhost) by null.zi0r.com (8.14.5/8.14.5/Submit) id r0SH0MpQ098502; Mon, 28 Jan 2013 12:00:22 -0500 (EST) (envelope-from portscout) Message-Id: <201301281700.r0SH0MpQ098502@null.zi0r.com> MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain Date: Mon, 28 Jan 2013 12:00:22 -0500 From: portscout@portscout.freebsd.org To: gecko@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 17:00:29 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/gecko@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ www/xpi-unplug | 2.050 | 2.054 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@portscout.freebsd.org Thanks. From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 17:13:46 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A6066A21; Mon, 28 Jan 2013 17:13:46 +0000 (UTC) (envelope-from flo@smeets.im) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:4f8:162:1142::2]) by mx1.freebsd.org (Postfix) with ESMTP id 38C79D27; Mon, 28 Jan 2013 17:13:46 +0000 (UTC) Received: from cpos1.nexxtmobile.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 5E4895E8D; Mon, 28 Jan 2013 18:13:45 +0100 (CET) X-Virus-Scanned: amavisd-new at nexxtmobile.de Received: from mail.solomo.de ([127.0.0.1]) by cpos1.nexxtmobile.de (cpos1.nexxtmobile.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id JZfXwbH0Tg4I; Mon, 28 Jan 2013 18:13:43 +0100 (CET) Received: from [192.168.43.222] (tmo-102-13.customers.d1-online.com [80.187.102.13]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.solomo.de (Postfix) with ESMTPSA id 3FAC55E84; Mon, 28 Jan 2013 18:13:43 +0100 (CET) Message-ID: <5106B1C5.1080707@smeets.im> Date: Mon, 28 Jan 2013 18:13:41 +0100 From: Florian Smeets User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Thunderbird/21.0a1 MIME-Version: 1.0 To: Dimitry Andric , gecko@FreeBSD.org Subject: Re: Getting www/libxul19 building with clang References: <51040DFC.7090008@FreeBSD.org> In-Reply-To: <51040DFC.7090008@FreeBSD.org> X-Enigmail-Version: 1.6a1pre Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2XRAJUXPTCHMEXMNUVSUO" Cc: Koop Mast , Mark Linimon , Niclas Zeising X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 17:13:46 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2XRAJUXPTCHMEXMNUVSUO Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 26.01.13 18:10, Dimitry Andric wrote: > Hi, >=20 Hi, thank you for taking a look at it. > I got several reports about www/libxul19 not building with clang. I ha= d > a look, and gathered a bunch of upstream patches which make it build > correctly. I am not sure how to run the test suite though, so if > somebody could please verify it behaves correctly at runtime, that woul= d > be great. >=20 I'm not sure we should perform any more necromancy on the libuxl19 port. It has various security vulnerabilities and we would have nuked it a long time ago if it weren't for all the stuff that still depends on it. This has been a long time TODO item on the gecko@ TODO list, but nobody had the courage to do it, yet... :) So I think basically I'm saying I'm ok with fixing it to compile with clang, but it could get nuked in the not too distant future. With the next update we should probably update www/libxul to 17.0.x that should work with clang out of the box, I believe even the 10.0.x that is in www/libxul now works with clang. Florian ------enig2XRAJUXPTCHMEXMNUVSUO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlEGscUACgkQapo8P8lCvwkTHgCffAS48PY5XbQHaEmmlXES6EQe iF8AoIdDYkn0PwIza1+IJb8uHurFDvlp =W4xw -----END PGP SIGNATURE----- ------enig2XRAJUXPTCHMEXMNUVSUO-- From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 17:49:19 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 90429642; Mon, 28 Jan 2013 17:49:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by mx1.freebsd.org (Postfix) with ESMTP id 4E8A3F16; Mon, 28 Jan 2013 17:49:19 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:84db:bc:f927:3c07] (unknown [IPv6:2001:7b8:3a7:0:84db:bc:f927:3c07]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 83FDF5C43; Mon, 28 Jan 2013 18:49:11 +0100 (CET) Message-ID: <5106BA13.3010803@FreeBSD.org> Date: Mon, 28 Jan 2013 18:49:07 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:19.0) Gecko/20130117 Thunderbird/19.0 MIME-Version: 1.0 To: Florian Smeets , gecko@FreeBSD.org Subject: Re: Getting www/libxul19 building with clang References: <51040DFC.7090008@FreeBSD.org> <5106B1C5.1080707@smeets.im> In-Reply-To: <5106B1C5.1080707@smeets.im> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Koop Mast , Mark Linimon , Niclas Zeising X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 17:49:19 -0000 On 2013-01-28 18:13, Florian Smeets wrote: > On 26.01.13 18:10, Dimitry Andric wrote: >> I got several reports about www/libxul19 not building with clang. I had >> a look, and gathered a bunch of upstream patches which make it build >> correctly. I am not sure how to run the test suite though, so if >> somebody could please verify it behaves correctly at runtime, that would >> be great. > I'm not sure we should perform any more necromancy on the libuxl19 port. > It has various security vulnerabilities and we would have nuked it a > long time ago if it weren't for all the stuff that still depends on it. Yes, it is only because of the list of dependencies, that I submit this diff. Cleaning up the dependencies one by one can be done incrementally later on, but that will probably take more time than just getting libxul19 building right now. :-) > This has been a long time TODO item on the gecko@ TODO list, but nobody > had the courage to do it, yet... :) > > So I think basically I'm saying I'm ok with fixing it to compile with > clang, but it could get nuked in the not too distant future. I have absolutely no problems with this diff being just a temporary fix. But at least it makes a fair number of additional ports 'accessible' for clang in the mean time. > With the next update we should probably update www/libxul to 17.0.x that > should work with clang out of the box, I believe even the 10.0.x that is > in www/libxul now works with clang. Indeed, some of the patch files in the diff are from upstream authors who are contributors to both Mozilla and the Clang project. IIRC the Clang guys build Mozilla sources (amongst many others) as smoke tests, these days. From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 19:20:00 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E563A4AB for ; Mon, 28 Jan 2013 19:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C80C3674; Mon, 28 Jan 2013 19:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0SJK07H027438; Mon, 28 Jan 2013 19:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0SJK0e2027433; Mon, 28 Jan 2013 19:20:00 GMT (envelope-from gnats) Resent-Date: Mon, 28 Jan 2013 19:20:00 GMT Resent-Message-Id: <201301281920.r0SJK0e2027433@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: gecko@freebsd.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan Beich Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6967A437 for ; Mon, 28 Jan 2013 19:16:06 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id 08B2964B for ; Mon, 28 Jan 2013 19:16:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1TzuBQ-0002qd-8v for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Jan 2013 22:15:57 +0300 Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Tzu8z-000HFS-05 for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Jan 2013 19:13:28 +0000 Message-Id: <1Tzu8z-000HFS-05@internal.tormail.org> Date: Mon, 28 Jan 2013 16:11:07 -0300 From: Jan Beich To: FreeBSD-gnats-submit@freebsd.org X-GNATS-Notify: gecko@freebsd.org Subject: ports/175656: [patch] databases/sqlite3: update to 3.7.15.2 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 19:20:01 -0000 >Number: 175656 >Category: ports >Synopsis: [patch] databases/sqlite3: update to 3.7.15.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jan 28 19:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jan Beich >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: seperficial testing with firefox-nightly and subversion >Description: sqlite-3.7.15.X brings us SQLITE_FCNTL_TEMPFILENAME which is currently required for upcoming nss-3.14.2 [1] and an option to use SQLITE_CONFIG_SQLLOG [2] among other things [3]. [1] https://mxr.mozilla.org/security/ident?i=SQLITE_FCNTL_TEMPFILENAME [2] https://www.sqlite.org/cgi/src/info/f0843f885a [3] https://www.sqlite.org/releaselog/3_7_15.html >How-To-Repeat: $ make # nss-3.14.2 [...] sdb.c:266:44: error: use of undeclared identifier 'SQLITE_FCNTL_TEMPFILENAME' sqlrv = sqlite3_file_control(sqlDB, 0, SQLITE_FCNTL_TEMPFILENAME, ^ 1 error generated. >Fix: --- update.diff begins here --- Index: databases/sqlite3/Makefile =================================================================== --- databases/sqlite3/Makefile (revision 310604) +++ databases/sqlite3/Makefile (working copy) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= sqlite3 -PORTVERSION= 3.7.14.1 +PORTVERSION= 3.7.15.2 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ http://www2.sqlite.org/ http://www3.sqlite.org/ -DISTNAME= sqlite-autoconf-3071401 +DISTNAME= sqlite-autoconf-3071502 MAINTAINER= pavelivolkov@gmail.com COMMENT= An SQL database engine in a C library @@ -38,6 +38,7 @@ OPTIONS= \ MEMMAN "Allows it to release unused memory" off \ SECURE_DELETE "Overwrite deleted information with zeros" on \ UNLOCK_NOTIFY "Enable notification on unlocking" on \ + SQLLOG "Allow logging operations" off \ THREADSAFE "Build thread-safe library" on \ EXTENSION "Allow loadable extensions" on \ @@ -137,6 +138,10 @@ CPPFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 CPPFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA=1 .endif +.if !defined(WITHOUT_SQLLOG) +CPPFLAGS+= -DSQLITE_ENABLE_SQLLOG=1 +.endif + .if !defined(WITHOUT_THREADSAFE) CONFIGURE_ARGS+= --enable-threadsafe LDFLAGS+= ${PTHREAD_LIBS} @@ -152,6 +157,10 @@ CONFIGURE_ARGS+= --disable-dynamic-extensions .include +post-patch: + @${REINPLACE_CMD} '/^pkgconf/s,$${libdir},$${prefix}/libdata,' \ + ${WRKSRC}/Makefile.in + post-install: .if !defined(NO_INSTALL_MANPAGES) @${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1 Index: databases/sqlite3/distinfo =================================================================== --- databases/sqlite3/distinfo (revision 310604) +++ databases/sqlite3/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (sqlite-autoconf-3071401.tar.gz) = d46d302a63b23d9c3b80e519be12cb7d6a8d3da57bd9c119341a0aa8b3b28692 -SIZE (sqlite-autoconf-3071401.tar.gz) = 1832051 +SHA256 (sqlite-autoconf-3071502.tar.gz) = 782d16b797f6ca879f6f679ba3fb6ceb54bcb0cab65feef332058bf04b36ba8c +SIZE (sqlite-autoconf-3071502.tar.gz) = 1846778 Index: databases/sqlite3/files/patch-Makefile.in =================================================================== --- databases/sqlite3/files/patch-Makefile.in (revision 310604) +++ databases/sqlite3/files/patch-Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2012-05-25 09:51:37.000000000 +0400 -+++ ./Makefile.in 2012-05-25 09:52:43.000000000 +0400 -@@ -243,7 +243,7 @@ - sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la - include_HEADERS = sqlite3.h sqlite3ext.h - EXTRA_DIST = sqlite3.pc sqlite3.1 tea --pkgconfigdir = ${libdir}/pkgconfig -+pkgconfigdir = ${prefix}/libdata/pkgconfig - pkgconfig_DATA = sqlite3.pc - man_MANS = sqlite3.1 - all: all-am --- update.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 19:20:09 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2395A4DA for ; Mon, 28 Jan 2013 19:20:09 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id F2DED676; Mon, 28 Jan 2013 19:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0SJK8mi027542; Mon, 28 Jan 2013 19:20:08 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0SJK82W027538; Mon, 28 Jan 2013 19:20:08 GMT (envelope-from edwin) Date: Mon, 28 Jan 2013 19:20:08 GMT Message-Id: <201301281920.r0SJK82W027538@freefall.freebsd.org> To: gecko@freebsd.org, jbeich@tormail.org, edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org From: edwin@FreeBSD.org Subject: Re: ports/175656: [patch] databases/sqlite3: update to 3.7.15.2 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 19:20:09 -0000 Synopsis: [patch] databases/sqlite3: update to 3.7.15.2 State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Mon Jan 28 19:20:08 UTC 2013 State-Changed-Why: Awaiting maintainers feedback (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=175656 From owner-freebsd-gecko@FreeBSD.ORG Tue Jan 29 02:57:48 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3E91B7B3 for ; Tue, 29 Jan 2013 02:57:48 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id B0E14FAB for ; Tue, 29 Jan 2013 02:57:47 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0T2ve9r009889 for ; Tue, 29 Jan 2013 02:57: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 r0T2vZgS009261 for freebsd-gecko@freebsd.org; Tue, 29 Jan 2013 02:57:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 29 Jan 2013 02:57:35 GMT Message-Id: <201301290257.r0T2vZgS009261@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] r1149 - in trunk/security/nss: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2013 02:57:48 -0000 Author: jbeich Date: Tue Jan 29 02:57:34 2013 New Revision: 1149 Log: unbreak build with bundled sqlite3 Deleted: trunk/security/nss/files/patch-lib_softoken_manifest.mn Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Jan 25 12:02:18 2013 (r1148) +++ trunk/security/nss/Makefile Tue Jan 29 02:57:34 2013 (r1149) @@ -28,6 +28,7 @@ USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${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 Deleted: trunk/security/nss/files/patch-lib_softoken_manifest.mn ============================================================================== --- trunk/security/nss/files/patch-lib_softoken_manifest.mn Tue Jan 29 02:57:34 2013 (r1148) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- lib/softoken/manifest.mn.orig 2010-07-30 04:33:26.000000000 +0200 -+++ lib/softoken/manifest.mn 2010-10-17 12:01:04.000000000 +0200 -@@ -47,9 +47,7 @@ - - DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" - --ifdef SQLITE_INCLUDE_DIR --INCLUDES += -I$(SQLITE_INCLUDE_DIR) --endif -+INCLUDES += -I$(LOCALBASE)/include - - EXPORTS = \ - secmodt.h \ From owner-freebsd-gecko@FreeBSD.ORG Tue Jan 29 05:03:43 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1D8D396D for ; Tue, 29 Jan 2013 05:03:43 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id B47947AE for ; Tue, 29 Jan 2013 05:03:42 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0T53fpd071623 for ; Tue, 29 Jan 2013 05:03:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0T53ZPs070843 for freebsd-gecko@freebsd.org; Tue, 29 Jan 2013 05:03:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 29 Jan 2013 05:03:35 GMT Message-Id: <201301290503.r0T53ZPs070843@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] r1150 - in trunk: Mk devel/nspr/files security/nss/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jan 2013 05:03:43 -0000 Author: jbeich Date: Tue Jan 29 05:03:35 2013 New Revision: 1150 Log: simplify patching for bundled nspr/nss Modified: trunk/Mk/bsd.gecko.mk trunk/devel/nspr/files/patch-..::configure trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk trunk/security/nss/files/patch-..::coreconf::rules.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Jan 29 02:57:34 2013 (r1149) +++ trunk/Mk/bsd.gecko.mk Tue Jan 29 05:03:35 2013 (r1150) @@ -851,18 +851,12 @@ @for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \ done - @${REINPLACE_CMD} -e '/DLL_SUFFIX/s/so\.1$$/so/' \ - ${MOZSRC}/nsprpub/configure .endif .if ${USE_MOZILLA:M-nss} @${ECHO_MSG} "===> Applying NSS patches" @for i in ${.CURDIR}/../../security/nss/files/patch-*; do \ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \ done - @${REINPLACE_CMD} -e '/DLL_SUFFIX/d' \ - ${MOZSRC}/security/coreconf/FreeBSD.mk - @${REINPLACE_CMD} -e '/\.so/d' \ - ${MOZSRC}/security/coreconf/rules.mk .endif .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ Modified: trunk/devel/nspr/files/patch-..::configure ============================================================================== --- trunk/devel/nspr/files/patch-..::configure Tue Jan 29 02:57:34 2013 (r1149) +++ trunk/devel/nspr/files/patch-..::configure Tue Jan 29 05:03:35 2013 (r1150) @@ -1,14 +1,19 @@ --- ../configure.orig 2012-02-14 20:06:00.000000000 +0100 +++ ../configure 2012-02-17 17:14:27.862323726 +0100 -@@ -4062,7 +4062,7 @@ +@@ -4035,11 +4035,8 @@ EOF + EOF + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - if test "$MOZ_OBJFORMAT" = "elf"; then +- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` +- if test "$MOZ_OBJFORMAT" = "elf"; then - DLL_SUFFIX=so +- else +- DLL_SUFFIX=so.1.0 ++ if test -z "$MOZILLA_CLIENT"; then + DLL_SUFFIX=so.1 - else - DLL_SUFFIX=so.1.0 fi + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC @@ -6271,11 +6271,6 @@ #define _THREAD_SAFE 1 EOF Modified: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk ============================================================================== --- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Tue Jan 29 02:57:34 2013 (r1149) +++ trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Tue Jan 29 05:03:35 2013 (r1150) @@ -27,7 +27,7 @@ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -65,20 +80,18 @@ +@@ -65,20 +80,20 @@ USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT OS_LIBS += -pthread @@ -38,7 +38,9 @@ ARCH = freebsd -MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) ++ifndef MOZILLA_CLIENT +DLL_SUFFIX = so.1 ++endif -ifeq ($(MOZ_OBJFORMAT),elf) -DLL_SUFFIX = so Modified: trunk/security/nss/files/patch-..::coreconf::rules.mk ============================================================================== --- trunk/security/nss/files/patch-..::coreconf::rules.mk Tue Jan 29 02:57:34 2013 (r1149) +++ trunk/security/nss/files/patch-..::coreconf::rules.mk Tue Jan 29 05:03:35 2013 (r1150) @@ -1,10 +1,12 @@ --- ../coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007 +++ ../coreconf/rules.mk Fri Mar 23 10:15:46 2007 -@@ -114,6 +114,7 @@ +@@ -114,6 +114,9 @@ endif ifdef SHARED_LIBRARY $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) ++ifndef MOZILLA_CLIENT + ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so)) ++endif ifdef MOZ_DEBUG_SYMBOLS ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) $(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR) From owner-freebsd-gecko@FreeBSD.ORG Wed Jan 30 15:42:58 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id AF90CE9B for ; Wed, 30 Jan 2013 15:42:58 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 47B6C1B7 for ; Wed, 30 Jan 2013 15:42:57 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0UFgv0R095718 for ; Wed, 30 Jan 2013 15:42:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0UFgqjc095636 for freebsd-gecko@freebsd.org; Wed, 30 Jan 2013 15:42:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 30 Jan 2013 15:42:52 GMT Message-Id: <201301301542.r0UFgqjc095636@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] r1151 - trunk/security/nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 15:42:58 -0000 Author: jbeich Date: Wed Jan 30 15:42:51 2013 New Revision: 1151 Log: remove leftover from r256919 (un)intentionally added in r270119 Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Jan 29 05:03:35 2013 (r1150) +++ trunk/security/nss/Makefile Wed Jan 30 15:42:51 2013 (r1151) @@ -83,8 +83,6 @@ @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"||' - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/lib/softoken/manifest.mn ${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \ ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' From owner-freebsd-gecko@FreeBSD.ORG Thu Jan 31 19:36:17 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A70B0333 for ; Thu, 31 Jan 2013 19:36:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 27161D59 for ; Thu, 31 Jan 2013 19:36:16 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0VJa9pI099925 for ; Thu, 31 Jan 2013 19:36:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0VJa4SS099091 for freebsd-gecko@freebsd.org; Thu, 31 Jan 2013 19:36:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 31 Jan 2013 19:36:04 GMT Message-Id: <201301311936.r0VJa4SS099091@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] r1152 - trunk/security/ca_root_nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 19:36:17 -0000 Author: jbeich Date: Thu Jan 31 19:36:04 2013 New Revision: 1152 Log: allow using CERTDIR=/etc/ssl/certs (openssl default directory) Modified: trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/pkg-plist Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Wed Jan 30 15:42:51 2013 (r1151) +++ trunk/security/ca_root_nss/Makefile Thu Jan 31 19:36:04 2013 (r1152) @@ -17,8 +17,9 @@ USE_PERL5_BUILD= yes NO_WRKSUBDIR= yes -CERTDIR?= share/certs -PLIST_SUB+= CERTDIR=${CERTDIR} +CERTDIR?= ${PREFIX}/share/certs +PLIST_SUB+= CERTDIR=${CERTDIR:S,^/,,} \ + CA_ROOT_NSS_HASH="$$(cat ${WRKDIR}/ca-root-nss.hash)" # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !!! These versions are indented to track security/nss. !!! @@ -56,12 +57,16 @@ @${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKDIR}/certdata.txt > \ ${WRKDIR}/ca-root-nss.crt + openssl x509 -hash -noout -in \ + ${WRKDIR}/ca-root-nss.crt >${WRKDIR}/ca-root-nss.hash do-install: - ${MKDIR} ${PREFIX}/${CERTDIR} - ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${PREFIX}/${CERTDIR} + ${MKDIR} ${CERTDIR} + ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${CERTDIR} + cd ${CERTDIR} && ${LN} -fs ca-root-nss.crt \ + $$(cat ${WRKDIR}/ca-root-nss.hash).0 .if ${PORT_OPTIONS:METCSYMLINK} - ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem + ${LN} -sf ${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem .endif .include Modified: trunk/security/ca_root_nss/pkg-plist ============================================================================== --- trunk/security/ca_root_nss/pkg-plist Wed Jan 30 15:42:51 2013 (r1151) +++ trunk/security/ca_root_nss/pkg-plist Thu Jan 31 19:36:04 2013 (r1152) @@ -1,4 +1,5 @@ +@cwd / %%CERTDIR%%/ca-root-nss.crt +%%CERTDIR%%/%%CA_ROOT_NSS_HASH%%.0 @dirrmtry %%CERTDIR%% -%%ETCSYMLINK%%@cwd / %%ETCSYMLINK%%etc/ssl/cert.pem From owner-freebsd-gecko@FreeBSD.ORG Thu Jan 31 19:40:01 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6BE8144B for ; Thu, 31 Jan 2013 19:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 4319BD80 for ; Thu, 31 Jan 2013 19:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0VJe1NE000845 for ; Thu, 31 Jan 2013 19:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0VJe1mx000844; Thu, 31 Jan 2013 19:40:01 GMT (envelope-from gnats) Date: Thu, 31 Jan 2013 19:40:01 GMT Message-Id: <201301311940.r0VJe1mx000844@freefall.freebsd.org> To: gecko@FreeBSD.org From: Jan Beich Subject: Re: ports/160387: security/ca_root_nss: Allow user to trust extra local certificates X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Jan Beich List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2013 19:40:01 -0000 The following reply was made to PR ports/160387; it has been noted by GNATS. From: Jan Beich To: Romain Tartiere Cc: bug-followup@freebsd.org Subject: Re: ports/160387: security/ca_root_nss: Allow user to trust extra local certificates Date: Fri, 01 Feb 2013 00:30:34 +0500 Romain Tartiere writes: > 1. Have some domain protected by some self-made certificate or e.g. cacert > 2. Install security/ca_root_nss and ftp/curl > 3. curl https://some.domain.example.com/ > ** fails ** > 4. cat cert >> /usr/local/share/certs/ca-root-nss.crt > 5. curl https://some.domain.example.com/ > ** success ** This mostly depends on the app e.g., - openssl(1) only uses CA certs with -CApath or -CAfile - subversion (neon), lynx, etc. call SSL_CTX_set_default_verify_paths() - curl (openssl) hardcodes either /etc/ssl/certs/ or ${LOCALBASE}/share/certs/ca-root-nss.crt (CA_BUNDLE option) - curl (gnutls) hardcodes /etc/ssl/cert.pem - epiphany2 (gnutls?) accepts self-signed certificates without warning but otherwise hardcodes path to ca-root-nss.crt - firefox and chromium use hardcode CA certs into libnssckbi.so from a bundled copy of certdata.txt in nss port (not ca_root_nss) and a bit more detailed # add a shared self-signed certificate $ mkdir /etc/ssl/certs; cd /etc/ssl/certs $ openssl s_client -connect trillian.chruetertee.ch:https &0 | sed -n '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | openssl x509 -text -fingerprint >freebsd-gecko.crt $ ln -sf freebsd-gecko.crt $(openssl x509 -hash -noout -in freebsd-gecko.crt).0 $ openssl s_client -connect trillian.chruetertee.ch:https -CApath /var/empty ... Verify return code: 0 (ok) $ curl https://trillian.chruetertee.ch/svn/freebsd-gecko/trunk/ ... $ HOME=/var/empty svn ls https://trillian.chruetertee.ch/svn/freebsd-gecko/trunk/ Gecko_ChangeLog Gecko_TODO Mk/ devel/ mail/ security/ www/ It may be worth to look at how other distros tried to solve the mess. https://fedoraproject.org/wiki/FedoraCryptoConsolidation http://en.opensuse.org/SDB:Share_certificates_between_applications_or_whole_system From owner-freebsd-gecko@FreeBSD.ORG Fri Feb 1 02:17:38 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4B6733E8 for ; Fri, 1 Feb 2013 02:17:38 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id CC06021E for ; Fri, 1 Feb 2013 02:17:37 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1124gcO048434 for ; Fri, 1 Feb 2013 02:04:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1124bFA048085 for freebsd-gecko@freebsd.org; Fri, 1 Feb 2013 02:04:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 1 Feb 2013 02:04:37 GMT Message-Id: <201302010204.r1124bFA048085@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] r1153 - trunk/security/ca_root_nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 02:17:38 -0000 Author: jbeich Date: Fri Feb 1 02:04:36 2013 New Revision: 1153 Log: turn recently added openssl dependency into an option A .0 is required[1] in order for OpenSSL to pick up a certificate from, say, /etc/ssl/certs or /usr/local/openssl/certs. However, if CERTDIR is neither of those directories (default) or a user disabled OPENSSL in src.conf and haven't installed security/openssl it makes no sense to have the link or call non-existing openssl(1). [1] http://gagravarr.org/writing/openssl-certs/others.shtml Modified: trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/pkg-plist Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Thu Jan 31 19:36:04 2013 (r1152) +++ trunk/security/ca_root_nss/Makefile Fri Feb 1 02:04:36 2013 (r1153) @@ -11,15 +11,15 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The root certificate bundle from the Mozilla Project -OPTIONS_DEFINE= ETCSYMLINK +OPTIONS_DEFINE= ETCSYMLINK OPENSSL ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem +OPENSSL_DESC= Add a hashed symlink for use with OpenSSL USE_PERL5_BUILD= yes NO_WRKSUBDIR= yes CERTDIR?= ${PREFIX}/share/certs -PLIST_SUB+= CERTDIR=${CERTDIR:S,^/,,} \ - CA_ROOT_NSS_HASH="$$(cat ${WRKDIR}/ca-root-nss.hash)" +PLIST_SUB+= CERTDIR=${CERTDIR:S,^/,,} # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !!! These versions are indented to track security/nss. !!! @@ -41,6 +41,13 @@ PLIST_SUB+= ETCSYMLINK="@comment " .endif +.if ${PORT_OPTIONS:MOPENSSL} +PLIST_SUB+= OPENSSL= \ + CA_ROOT_NSS_HASH="$$(cat ${WRKDIR}/ca-root-nss.hash)" +.else +PLIST_SUB+= OPENSSL="@comment " +.endif + do-extract: @${MKDIR} ${WRKDIR} @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ @@ -57,14 +64,18 @@ @${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKDIR}/certdata.txt > \ ${WRKDIR}/ca-root-nss.crt +.if ${PORT_OPTIONS:MOPENSSL} openssl x509 -hash -noout -in \ ${WRKDIR}/ca-root-nss.crt >${WRKDIR}/ca-root-nss.hash +.endif do-install: ${MKDIR} ${CERTDIR} ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${CERTDIR} +.if ${PORT_OPTIONS:MOPENSSL} cd ${CERTDIR} && ${LN} -fs ca-root-nss.crt \ $$(cat ${WRKDIR}/ca-root-nss.hash).0 +.endif .if ${PORT_OPTIONS:METCSYMLINK} ${LN} -sf ${CERTDIR}/ca-root-nss.crt /etc/ssl/cert.pem .endif Modified: trunk/security/ca_root_nss/pkg-plist ============================================================================== --- trunk/security/ca_root_nss/pkg-plist Thu Jan 31 19:36:04 2013 (r1152) +++ trunk/security/ca_root_nss/pkg-plist Fri Feb 1 02:04:36 2013 (r1153) @@ -1,5 +1,5 @@ @cwd / %%CERTDIR%%/ca-root-nss.crt -%%CERTDIR%%/%%CA_ROOT_NSS_HASH%%.0 +%%OPENSSL%%%%CERTDIR%%/%%CA_ROOT_NSS_HASH%%.0 @dirrmtry %%CERTDIR%% %%ETCSYMLINK%%etc/ssl/cert.pem From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 2 13:13:16 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 254486BF for ; Sat, 2 Feb 2013 13:13:16 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9B4A4F0 for ; Sat, 2 Feb 2013 13:13:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r12DD7GY003491 for ; Sat, 2 Feb 2013 13:13:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r12DD2MP002739 for freebsd-gecko@freebsd.org; Sat, 2 Feb 2013 13:13:02 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 2 Feb 2013 13:13:02 GMT Message-Id: <201302021313.r12DD2MP002739@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] r1154 - in trunk/security: ca_root_nss nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 13:13:16 -0000 Author: jbeich Date: Sat Feb 2 13:13:02 2013 New Revision: 1154 Log: simplify ckbi version suffix to just one variable Modified: trunk/security/ca_root_nss/Makefile trunk/security/nss/Makefile Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Fri Feb 1 02:04:36 2013 (r1153) +++ trunk/security/ca_root_nss/Makefile Sat Feb 2 13:13:02 2013 (r1154) @@ -5,7 +5,7 @@ PORTVERSION= ${VERSION_NSS} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src +MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} MAINTAINER= gecko@FreeBSD.org @@ -27,8 +27,7 @@ # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! VERSION_NSS= 3.14.1 -CKBI_VER= 1.93 -NSS_SUFFIX= .with.ckbi.${CKBI_VER} +NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Feb 1 02:04:36 2013 (r1153) +++ trunk/security/nss/Makefile Sat Feb 2 13:13:02 2013 (r1154) @@ -3,10 +3,10 @@ PORTNAME= nss PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} +DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src -DISTNAME= nss-${PORTVERSION}.with.ckbi.${CKBI_VER} +MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications @@ -20,7 +20,6 @@ _MINOR= 14 _PATCH= 1 -CKBI_VER= 1.93 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss MAKE_JOBS_UNSAFE= yes From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 2 13:13:17 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DF3146C0 for ; Sat, 2 Feb 2013 13:13:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 85273F1 for ; Sat, 2 Feb 2013 13:13:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r12DDGK0005899 for ; Sat, 2 Feb 2013 13:13:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r12DDBfn004522 for freebsd-gecko@freebsd.org; Sat, 2 Feb 2013 13:13:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 2 Feb 2013 13:13:11 GMT Message-Id: <201302021313.r12DDBfn004522@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] r1155 - in trunk/security: ca_root_nss ca_root_nss/files nss nss/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 13:13:17 -0000 Author: jbeich Date: Sat Feb 2 13:13:11 2013 New Revision: 1155 Log: remove homegrown macro preprocessing Added: trunk/security/ca_root_nss/files/MAca-bundle.pl.in - copied, changed from r1154, trunk/security/ca_root_nss/files/MAca-bundle.pl Deleted: trunk/security/ca_root_nss/files/MAca-bundle.pl Modified: trunk/security/ca_root_nss/Makefile trunk/security/nss/Makefile trunk/security/nss/files/nss-config.in trunk/security/nss/files/nss.pc.in Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Sat Feb 2 13:13:02 2013 (r1154) +++ trunk/security/ca_root_nss/Makefile Sat Feb 2 13:13:11 2013 (r1155) @@ -30,6 +30,8 @@ NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl +SUB_FILES= MAca-bundle.pl +SUB_LIST= VERSION_NSS=${VERSION_NSS} .include @@ -52,14 +54,9 @@ @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ ${CERTDATA_TXT_PATH} @${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR} - @${CP} ${FILESDIR}/${BUNDLE_PROCESSOR} ${WRKDIR} @${RM} -rf ${WRKDIR}/nss-${VERSION_NSS} -post-patch: - @${PERL} -pi -e 's,%%VERSION_NSS%%,${VERSION_NSS}${NSS_SUFFIX},g;' \ - ${WRKDIR}/${BUNDLE_PROCESSOR} - -do-build: +do-build: apply-slist @${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKDIR}/certdata.txt > \ ${WRKDIR}/ca-root-nss.crt Deleted: trunk/security/ca_root_nss/files/MAca-bundle.pl ============================================================================== --- trunk/security/ca_root_nss/files/MAca-bundle.pl Sat Feb 2 13:13:11 2013 (r1154) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,190 +0,0 @@ -## -## MAca-bundle.pl -- Regenerate ca-root-nss.crt from the Mozilla certdata.txt -## -## Rewritten in September 2011 by Matthias Andree to heed untrust -## - -## Copyright (c) 2011, Matthias Andree -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -## FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -## COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -## INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -## BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -## ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -## POSSIBILITY OF SUCH DAMAGE. - -use strict; -use MIME::Base64; - -my $VERSION = '$FreeBSD: ports/security/ca_root_nss/files/MAca-bundle.pl,v 1.3 2011/09/04 15:11:48 mandree Exp $'; - -# configuration -print <) { - last if /^END/; - my (undef,@oct) = split /\\/; - my @bin = map(chr(oct), @oct); - $data .= join('', @bin); - } - - return $data; -} - - -sub grabcert() -{ - my $certdata; - my $cka_label; - my $serial; - - while (<>) { - chomp; - last if ($_ eq ''); - - if (/^CKA_LABEL UTF8 "([^"]+)"/) { - $cka_label = $1; - } - - if (/^CKA_VALUE MULTILINE_OCTAL/) { - $certdata = graboct(); - } - - if (/^CKA_SERIAL_NUMBER MULTILINE_OCTAL/) { - $serial = graboct(); - } - } - return ($serial, $cka_label, $certdata); -} - -sub grabtrust() { - my $cka_label; - my $serial; - my $trust = 1; - - while (<>) { - chomp; - last if ($_ eq ''); - - if (/^CKA_LABEL UTF8 "([^"]+)"/) { - $cka_label = $1; - } - - if (/^CKA_SERIAL_NUMBER MULTILINE_OCTAL/) { - $serial = graboct(); - } - - if (/^CKA_TRUST_.*\s.*_(UN|NOT_)TRUSTED/) { - $trust = 0; - } - } - return ($serial, $cka_label, $trust); -} - -while (<>) { - if (/^CKA_CLASS .* CKO_CERTIFICATE/) { - my ($serial, $label, $certdata) = grabcert(); - if (defined $certs{$serial.$label}) { - warn "Certificate $label duplicated!\n"; - } - $certs{$serial.$label} = $certdata; - } elsif (/^CKA_CLASS .* CKO_(NSS|NETSCAPE)_TRUST/) { - my ($serial, $label, $trust) = grabtrust(); - if (defined $trusts{$serial.$label}) { - warn "Trust for $label duplicated!\n"; - } - $trusts{$serial.$label} = $trust; - } elsif (/^CVS_ID.*Revision: ([^ ]*).*/) { - print "## Source: \"certdata.txt\" CVS revision $1\n##\n\n"; - } -} - -# weed out untrusted certificates -my $untrusted = 0; -foreach my $it (keys %trusts) { - if (!$trusts{$it}) { - if (!exists($certs{$it})) { - warn "Found trust for nonexistent certificate\n"; - } else { - delete $certs{$it}; - $untrusted++; - } - } -} - -print "## Untrusted certificates omitted from this bundle: $untrusted\n\n"; - -my $certcount = 0; -foreach my $it (keys %certs) { - if (!exists($trusts{$it})) { - die "Found certificate without trust block,\naborting"; - } - printcert("", $certs{$it}); - print "\n\n\n"; - $certcount++; -} - -print "## Number of certificates: $certcount\n"; -print "## End of file.\n"; Copied and modified: trunk/security/ca_root_nss/files/MAca-bundle.pl.in (from r1154, trunk/security/ca_root_nss/files/MAca-bundle.pl) ============================================================================== Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Sat Feb 2 13:13:02 2013 (r1154) +++ trunk/security/nss/Makefile Sat Feb 2 13:13:11 2013 (r1155) @@ -2,7 +2,7 @@ # $FreeBSD: head/security/nss/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= nss -PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} +PORTVERSION= 3.14.1 DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -16,10 +16,6 @@ LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 -_MAJOR= 3 -_MINOR= 14 -_PATCH= 1 - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss MAKE_JOBS_UNSAFE= yes @@ -32,6 +28,10 @@ ALL_TARGET= nss_build_all CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib +SUB_FILES= nss-config nss.pc +SUB_LIST= MAJOR_VERSION=${PORTVERSION:C/\..*//} \ + PORTVERSION=${PORTVERSION} + DIST= ${WRKSRC:H:H}/dist EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm @@ -67,16 +67,6 @@ post-patch: @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk - @${SED} -e 's|@exec_prefix@|${PREFIX}|; \ - s|@includedir@|${PREFIX}/include/nss|; \ - s|@libdir@|${PREFIX}/lib/nss|; \ - s|@prefix@|${PREFIX}|' \ - ${FILESDIR}/nss-config.in >${WRKDIR}/nss-config - @${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \ - ${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc -.for i in MAJOR MINOR PATCH - @${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config -.endfor @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ Modified: trunk/security/nss/files/nss-config.in ============================================================================== --- trunk/security/nss/files/nss-config.in Sat Feb 2 13:13:02 2013 (r1154) +++ trunk/security/nss/files/nss-config.in Sat Feb 2 13:13:11 2013 (r1155) @@ -1,10 +1,6 @@ #!/bin/sh -prefix=@prefix@ - -major_version=@MAJOR@ -minor_version=@MINOR@ -patch_version=@PATCH@ +prefix=%%PREFIX%% usage() { @@ -68,7 +64,7 @@ echo_libdir=yes ;; --version) - echo ${major_version}.${minor_version}.${patch_version} + echo %%PORTVERSION%% ;; --cflags) echo_cflags=yes @@ -97,13 +93,13 @@ # Set variables that may be dependent upon other variables if test -z "$exec_prefix"; then - exec_prefix=@exec_prefix@ + exec_prefix=$prefix fi if test -z "$includedir"; then - includedir=@includedir@ + includedir=$prefix/include/nss fi if test -z "$libdir"; then - libdir=@libdir@ + libdir=$prefix/lib/nss fi if test "$echo_prefix" = "yes"; then @@ -129,16 +125,16 @@ if test "$echo_libs" = "yes"; then libdirs="-L$libdir" if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" + libdirs="$libdirs -lssl%%MAJOR_VERSION%%" fi if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" + libdirs="$libdirs -lsmime%%MAJOR_VERSION%%" fi if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" + libdirs="$libdirs -lnss%%MAJOR_VERSION%%" fi if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" + libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%" fi echo $libdirs fi Modified: trunk/security/nss/files/nss.pc.in ============================================================================== --- trunk/security/nss/files/nss.pc.in Sat Feb 2 13:13:02 2013 (r1154) +++ trunk/security/nss/files/nss.pc.in Sat Feb 2 13:13:11 2013 (r1155) @@ -1,11 +1,11 @@ -prefix=@PREFIX@ -exec_prefix=@PREFIX@ -libdir=@PREFIX@/lib/nss -includedir=@PREFIX@/include +prefix=%%PREFIX%% +exec_prefix=%%PREFIX%% +libdir=%%PREFIX%%/lib/nss +includedir=%%PREFIX%%/include Name: NSS Description: Mozilla Network Security Services -Version: @PORTVERSION@ +Version: %%PORTVERSION%% Requires: nspr Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lnssutil3 Cflags: -I${includedir}/nss -I${includedir}/nss/nss From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 2 13:13:29 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CEF026DA for ; Sat, 2 Feb 2013 13:13:29 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 74DCAF5 for ; Sat, 2 Feb 2013 13:13:29 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r12DDS5K011973 for ; Sat, 2 Feb 2013 13:13:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r12DDNMU007806 for freebsd-gecko@freebsd.org; Sat, 2 Feb 2013 13:13:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 2 Feb 2013 13:13:23 GMT Message-Id: <201302021313.r12DDNMU007806@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] r1156 - in trunk: devel/nspr devel/nspr/files security/ca_root_nss security/nss security/nss/files www/firefox www/firefox-nightly www/firefox-nightly/files www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 13:13:29 -0000 Author: jbeich Date: Sat Feb 2 13:13:23 2013 New Revision: 1156 Log: update Added: trunk/security/nss/files/extra-bug835050 trunk/security/nss/files/patch-pr175656 Deleted: trunk/devel/nspr/files/patch-bug782815 Modified: trunk/devel/nspr/Makefile trunk/devel/nspr/distinfo trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/distinfo trunk/security/nss/Makefile trunk/security/nss/distinfo trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug807492 trunk/www/firefox-nightly/files/patch-bug826985 trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/devel/nspr/Makefile Sat Feb 2 13:13:23 2013 (r1156) @@ -6,7 +6,7 @@ # $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $ PORTNAME= nspr -DISTVERSION= 4.9.4 +DISTVERSION= 4.9.5 CATEGORIES= devel MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src Modified: trunk/devel/nspr/distinfo ============================================================================== --- trunk/devel/nspr/distinfo Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/devel/nspr/distinfo Sat Feb 2 13:13:23 2013 (r1156) @@ -1,2 +1,2 @@ -SHA256 (nspr-4.9.4.tar.gz) = 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 -SIZE (nspr-4.9.4.tar.gz) = 1160641 +SHA256 (nspr-4.9.5.tar.gz) = 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 +SIZE (nspr-4.9.5.tar.gz) = 1156396 Deleted: trunk/devel/nspr/files/patch-bug782815 ============================================================================== --- trunk/devel/nspr/files/patch-bug782815 Sat Feb 2 13:13:23 2013 (r1155) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ../pr/src/pthreads/ptio.c~ -+++ ../pr/src/pthreads/ptio.c -@@ -1150,7 +1150,7 @@ void _PR_InitIO(void) - osfd = socket(AF_INET6, SOCK_STREAM, 0); - if (osfd != -1) { - int on; -- int optlen = sizeof(on); -+ socklen_t optlen = sizeof(on); - if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, - &on, &optlen) == 0) { - _pr_ipv6_v6only_on_by_default = on; Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/security/ca_root_nss/Makefile Sat Feb 2 13:13:23 2013 (r1156) @@ -26,8 +26,8 @@ # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.14.1 -NSS_SUFFIX= .with.ckbi.1.93 +VERSION_NSS= 3.14.2 +#NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl SUB_FILES= MAca-bundle.pl Modified: trunk/security/ca_root_nss/distinfo ============================================================================== --- trunk/security/ca_root_nss/distinfo Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/security/ca_root_nss/distinfo Sat Feb 2 13:13:23 2013 (r1156) @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98 -SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393 +SHA256 (nss-3.14.2.tar.gz) = a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95 +SIZE (nss-3.14.2.tar.gz) = 6178419 Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/security/nss/Makefile Sat Feb 2 13:13:23 2013 (r1156) @@ -2,8 +2,8 @@ # $FreeBSD: head/security/nss/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= nss -PORTVERSION= 3.14.1 -DISTVERSIONSUFFIX= .with.ckbi.1.93 +PORTVERSION= 3.14.2 +#DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src @@ -50,6 +50,12 @@ BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif +.include + +.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 +EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 +.endif + check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ @@ -92,4 +98,4 @@ ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig -.include +.include Modified: trunk/security/nss/distinfo ============================================================================== --- trunk/security/nss/distinfo Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/security/nss/distinfo Sat Feb 2 13:13:23 2013 (r1156) @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98 -SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393 +SHA256 (nss-3.14.2.tar.gz) = a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95 +SIZE (nss-3.14.2.tar.gz) = 6178419 Added: trunk/security/nss/files/extra-bug835050 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/security/nss/files/extra-bug835050 Sat Feb 2 13:13:23 2013 (r1156) @@ -0,0 +1,10 @@ +--- lib/freebl/Makefile~ ++++ lib/freebl/Makefile +@@ -659,7 +659,5 @@ $(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))) + $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as + endif +-endif Added: trunk/security/nss/files/patch-pr175656 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/security/nss/files/patch-pr175656 Sat Feb 2 13:13:23 2013 (r1156) @@ -0,0 +1,13 @@ +--- lib/softoken/sdb.c~ ++++ lib/softoken/sdb.c +@@ -38,6 +38,10 @@ + #include + #endif + ++#ifndef SQLITE_FCNTL_TEMPFILENAME ++#define SQLITE_FCNTL_TEMPFILENAME 16 ++#endif ++ + #ifdef SQLITE_UNSAFE_THREADS + #include "prlock.h" + /* Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox-nightly/Makefile Sat Feb 2 13:13:23 2013 (r1156) @@ -18,7 +18,7 @@ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -# nss>=3.14.2:${PORTSDIR}/security/nss \ +# bug808224 nss>=3.14.2:${PORTSDIR}/security/nss \ USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=2.7 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 2 13:13:23 2013 (r1156) @@ -1 +1 @@ -HGREV= 119809:a207f33adc1a +HGREV= 120602:4e7c92906a79 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox-nightly/distinfo Sat Feb 2 13:13:23 2013 (r1156) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/a207f33adc1a.tar.bz2) = 32e3bbb22685d8c75e4af8d387151f5a3999800486362c2d732f0352c0bc2148 -SIZE (firefox-nightly/a207f33adc1a.tar.bz2) = 100615158 +SHA256 (firefox-nightly/4e7c92906a79.tar.bz2) = 99006f0ce4b9ee49204dcd6965a7d705e3653e4e140f09a76cef40f358cde5d9 +SIZE (firefox-nightly/4e7c92906a79.tar.bz2) = 100537621 Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox-nightly/files/patch-bug807492 Sat Feb 2 13:13:23 2013 (r1156) @@ -45,14 +45,14 @@ # -Wtype-limits - catches overflow bugs, few false positives # -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives # -@@ -5211,17 +5222,17 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5208,17 +5219,17 @@ dnl --enable-webrtc to override. Can di + dnl --enable-webrtc to override. Can disable for everything in + dnl the master list above. + if test -n "$MOZ_WEBRTC"; then + case "$target" in *-android*|*-linuxandroid*) - if test -n "$MOZ_B2G"; then - MOZ_WEBRTC=1 - else - dnl Make sure doesn't get matched by *-linux* - MOZ_WEBRTC= - fi + dnl Make sure doesn't get matched by *-linux* + MOZ_WEBRTC= ;; - *-linux*|*-mingw*|*-darwin*) + *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) @@ -64,12 +64,12 @@ ;; esac fi -@@ -9004,16 +9015,21 @@ elif test "${OS_TARGET}" = "Android"; th - fi +@@ -8996,16 +9008,21 @@ elif test "${OS_TARGET}" = "Android"; th + EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android " if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then - EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=0 " + EXTRA_GYP_DEFINES+=" -D armv7=0 " else - EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=1 " + EXTRA_GYP_DEFINES+=" -D armv7=1 " fi fi @@ -81,11 +81,11 @@ if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") - if test "${MOZ_WIDGET_TOOLKIT}" = "gonk"; then - EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D moz_widget_toolkit_gonk=1" - else - EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D moz_widget_toolkit_gonk=0" - fi + dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries + dnl so that regeneration via dependencies works correctly + WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" + + GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} -D target_arch=${WEBRTC_TARGET_ARCH} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- js/src/config/system-headers @@ -368,17 +368,17 @@ +#endif /* HAVE_XLOCALE */ { if (nbytes == (size_t)-1) /* should never happen */ { - assert(0); + assert(0); ABORT(R_INTERNAL); - } + } if (nbytes == (size_t)-2) /* encoding error */ { - assert(0); + assert(0); ABORT(R_BAD_DATA); diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp index 3cc8e1c..74016c6 100644 --- media/mtransport/third_party/nrappkit/nrappkit.gyp +++ media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -142,26 +142,35 @@ +@@ -142,26 +142,36 @@ 'R_DEFINED_UINT2=uint16_t', 'R_DEFINED_INT4=int32_t', 'R_DEFINED_UINT4=uint32_t', @@ -397,6 +397,7 @@ + [ 'os_bsd == 1', { + 'defines' : [ + 'BSD', ++ 'USE_OWN_INET_NTOP', + ], + }], + [ 'OS == "mac" or os_bsd == 1', { @@ -416,32 +417,6 @@ 'NEW_STDIO' 'RETSIGTYPE=void', 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -index 15452e3..2c9651a 100644 ---- media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -+++ media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h -@@ -37,16 +37,21 @@ - */ - - - #ifndef _platform_h - #define _platform_h - - #include - -+#ifdef BSD -+/* Hack version of addr2ascii (in util/util.c) */ -+char *addr2ascii(int af, const void *addrp, int len,char *buf); -+#endif -+ - #define STDIO_BYTES_BUFFERED(fp) (fp->_r) - - #ifdef NR_SOCKET_IS_VOID_PTR - typedef void* NR_SOCKET; - #else - typedef int NR_SOCKET; - #define NR_SOCKET_READ(sock,buf,count) read((sock),(buf),(count)) - #define NR_SOCKET_WRITE(sock,buf,count) write((sock),(buf),(count)) diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h index bcb1ec0..bb73591 100644 --- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h @@ -465,49 +440,6 @@ for ((var) = STAILQ_FIRST((head)); \ (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ (var) = (tvar)) -diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c -index 3aced8b..be020bb 100644 ---- media/mtransport/third_party/nrappkit/src/util/util.c -+++ media/mtransport/third_party/nrappkit/src/util/util.c -@@ -36,16 +36,19 @@ - ekr@rtfm.com Wed Dec 26 17:19:36 2001 - */ - - - static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $"; - - #ifndef WIN32 - #include -+#include -+#include -+#include - #include - #include - #endif - #include - #include - #include - #ifdef OPENSSL - #include -@@ -431,17 +434,17 @@ int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_ - abort: - if(die && _status){ - r_log(log_fac,LOG_CRIT,"Exiting due to invalid configuration (key '%s')",key); - exit(1); - } - return(_status); - } - --#if defined(LINUX) || defined(WIN32) -+#if defined(LINUX) || defined(BSD) || defined(WIN32) - /* Hack version of addr2ascii */ - char *addr2ascii(int af, const void *addrp, int len,char *buf) - { - static char buf2[256]; - char *ret; - struct in_addr *addr=(struct in_addr *)addrp; - - if (! buf) diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp index 2a91e3d..31de641 100644 --- media/webrtc/signaling/signaling.gyp @@ -1742,7 +1674,7 @@ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", _numberOfCores); - #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) + #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) _numberOfCores = get_nprocs(); WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", _numberOfCores); Modified: trunk/www/firefox-nightly/files/patch-bug826985 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug826985 Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox-nightly/files/patch-bug826985 Sat Feb 2 13:13:23 2013 (r1156) @@ -15,14 +15,9 @@ index 6d05f9c..297615f 100644 --- configure.in +++ configure.in -@@ -5256,16 +5267,28 @@ if test -n "$MOZ_WEBRTC"; then - fi - case "$target" in - *-android*|*-linuxandroid*) - LDFLAGS="$LDFLAGS -lOpenSLES" - ;; - esac - fi +@@ -5267,6 +5267,18 @@ if test -n "$MOZ_WEBRTC"; then + ;; + esac + dnl use libv4l on Linux to support more cameras + case "$target" in @@ -39,11 +34,6 @@ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) - if test "${OS_TARGET}" = "WINNT"; then - MOZ_WEBRTC_IN_LIBXUL=1 - fi - dnl enable once PeerConnection lands - MOZ_PEERCONNECTION=1 @@ -5311,6 +5323,7 @@ AC_SUBST(MOZ_WEBRTC) AC_SUBST(MOZ_WEBRTC_LEAKING_TESTS) AC_SUBST(MOZ_WEBRTC_SIGNALING) Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox/Makefile Sat Feb 2 13:13:23 2013 (r1156) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 19.0b3 +DISTVERSION= 19.0b4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/firefox/distinfo Sat Feb 2 13:13:23 2013 (r1156) @@ -1,2 +1,2 @@ -SHA256 (firefox-19.0b3.source.tar.bz2) = 6bae086fba574fd7afde3ce48eacb253bf5f74ac4fbd7962fac5dc9598395365 -SIZE (firefox-19.0b3.source.tar.bz2) = 98935380 +SHA256 (firefox-19.0b4.source.tar.bz2) = 2fa2b337e1fb5e60ed678d4d8407e67460025908add2fe7046944dcaa189a99d +SIZE (firefox-19.0b4.source.tar.bz2) = 98941706 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/seamonkey/Makefile Sat Feb 2 13:13:23 2013 (r1156) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $ PORTNAME= seamonkey -DISTVERSION= 2.16b1 +DISTVERSION= 2.16b3 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Sat Feb 2 13:13:11 2013 (r1155) +++ trunk/www/seamonkey/distinfo Sat Feb 2 13:13:23 2013 (r1156) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.16b1.source.tar.bz2) = 4feabd38674595c839e689142106bb1428dcdc1d5575e02ad5375039e1d047e7 -SIZE (seamonkey-2.16b1.source.tar.bz2) = 122349139 +SHA256 (seamonkey-2.16b3.source.tar.bz2) = 79ece21f1ec50a21e5cfd1ede3d76d97ce6433af9f823f4a5a9373d66652a350 +SIZE (seamonkey-2.16b3.source.tar.bz2) = 122375280 SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 SIZE (enigmail-1.5.0.tar.gz) = 1216071 From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 2 18:09:23 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 54832825 for ; Sat, 2 Feb 2013 18:09:23 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id ED86AEA6 for ; Sat, 2 Feb 2013 18:09:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r12I9LbW093319 for ; Sat, 2 Feb 2013 18:09:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r12I9GSL092665 for freebsd-gecko@freebsd.org; Sat, 2 Feb 2013 18:09:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 2 Feb 2013 18:09:16 GMT Message-Id: <201302021809.r12I9GSL092665@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] r1157 - in trunk: security/nss/files www/firefox-nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 18:09:23 -0000 Author: jbeich Date: Sat Feb 2 18:09:16 2013 New Revision: 1157 Log: apply a workaround to build Nightly with system nss Added: trunk/security/nss/files/patch-bug834091 Modified: trunk/www/firefox-nightly/Makefile Added: trunk/security/nss/files/patch-bug834091 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/security/nss/files/patch-bug834091 Sat Feb 2 18:09:16 2013 (r1157) @@ -0,0 +1,150 @@ +commit 8d8975b +Author: Carmen Jiménez Cabezas +Date: Fri Jan 25 15:36:36 2013 -0800 + + Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith + + --HG-- + extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f + extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4 +--- + .../manager/ssl/src/JARSignatureVerification.cpp | 6 +- + security/nss/lib/pkcs7/p7decode.c | 41 +++- + security/nss/lib/pkcs7/secpkcs7.h | 17 ++ + security/nss/lib/smime/smime.def | 6 + + security/patches/README | 4 + + security/patches/bug-834091.patch | 216 +++++++++++++++++++++ + 6 files changed, 281 insertions(+), 9 deletions(-) + +diff --git lib/pkcs7/p7decode.c lib/pkcs7/p7decode.c +index d0d02d7..dc3339a 100644 +--- lib/pkcs7/p7decode.c ++++ lib/pkcs7/p7decode.c +@@ -1281,7 +1281,8 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, + SECCertUsage certusage, + const SECItem *detached_digest, + HASH_HashType digest_type, +- PRBool keepcerts) ++ PRBool keepcerts, ++ PRTime atTime) + { + SECAlgorithmID **digestalgs, *bulkid; + const SECItem *digest; +@@ -1299,7 +1300,8 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, + SECItem *content_type; + PK11SymKey *sigkey; + SECItem *encoded_stime; +- int64 stime; ++ PRTime stime; ++ PRTime verificationTime; + SECStatus rv; + + /* +@@ -1436,8 +1438,10 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, + * in a time (and for non-S/MIME callers to pass in nothing, or + * maybe make them pass in the current time, always?). + */ ++ verificationTime = atTime ? atTime ++ : (encoded_stime ? stime : PR_Now()); + if (CERT_VerifyCert (certdb, cert, PR_TRUE, certusage, +- encoded_stime != NULL ? stime : PR_Now(), ++ verificationTime, + cinfo->pwfn_arg, NULL) != SECSuccess) + { + /* +@@ -1757,7 +1761,7 @@ SEC_PKCS7VerifySignature(SEC_PKCS7ContentInfo *cinfo, + PRBool keepcerts) + { + return sec_pkcs7_verify_signature (cinfo, certusage, +- NULL, HASH_AlgNULL, keepcerts); ++ NULL, HASH_AlgNULL, keepcerts, 0); + } + + /* +@@ -1779,9 +1783,34 @@ SEC_PKCS7VerifyDetachedSignature(SEC_PKCS7ContentInfo *cinfo, + { + return sec_pkcs7_verify_signature (cinfo, certusage, + detached_digest, digest_type, +- keepcerts); ++ keepcerts, 0); + } + ++/* ++ * SEC_PKCS7VerifyDetachedSignatureAtTime ++ * Look at a PKCS7 contentInfo and check if the signature matches ++ * a passed-in digest (calculated, supposedly, from detached contents). ++ * The verification checks that the signing cert is valid and trusted ++ * for the purpose specified by "certusage" at time "atTime" ++ * if "atTime" is non-zero, or at the current time (as returned by ++ * PR_Now) otherwise. ++ */ ++PRBool ++SEC_PKCS7VerifyDetachedSignatureAtTime(SEC_PKCS7ContentInfo *cinfo, ++ SECCertUsage certusage, ++ const SECItem *detached_digest, ++ HASH_HashType digest_type, ++ PRBool keepcerts, ++ PRTime atTime) ++{ ++ if (!atTime) { ++ atTime = PR_Now(); ++ } ++ ++ return sec_pkcs7_verify_signature (cinfo, certusage, ++ detached_digest, digest_type, ++ keepcerts, atTime); ++} + + /* + * Return the asked-for portion of the name of the signer of a PKCS7 +@@ -1844,7 +1873,7 @@ sec_pkcs7_get_signer_cert_info(SEC_PKCS7ContentInfo *cinfo, int selector) + * some valid usage to pass in. + */ + (void) sec_pkcs7_verify_signature (cinfo, certUsageEmailSigner, +- NULL, HASH_AlgNULL, PR_FALSE); ++ NULL, HASH_AlgNULL, PR_FALSE, 0); + signercert = signerinfos[0]->cert; + if (signercert == NULL) + return NULL; +diff --git lib/pkcs7/secpkcs7.h lib/pkcs7/secpkcs7.h +index a50f5ae..d1dd7b9 100644 +--- lib/pkcs7/secpkcs7.h ++++ lib/pkcs7/secpkcs7.h +@@ -133,6 +133,23 @@ extern PRBool SEC_PKCS7VerifyDetachedSignature(SEC_PKCS7ContentInfo *cinfo, + HASH_HashType digest_type, + PRBool keepcerts); + ++ ++/* ++ * SEC_PKCS7VerifyDetachedSignatureAtTime ++ * Look at a PKCS7 contentInfo and check if the signature matches ++ * a passed-in digest (calculated, supposedly, from detached contents). ++ * The verification checks that the signing cert is valid and trusted ++ * for the purpose specified by "certusage" at time "atTime" ++ * if "atTime" is non-zero, or at the current time (as returned by ++ * PR_Now) otherwise. ++ */ ++extern PRBool SEC_PKCS7VerifyDetachedSignatureAtTime(SEC_PKCS7ContentInfo *cinfo, ++ SECCertUsage certusage, ++ const SECItem *detached_digest, ++ HASH_HashType digest_type, ++ PRBool keepcerts, ++ PRTime atTime); ++ + /* + * SEC_PKCS7GetSignerCommonName, SEC_PKCS7GetSignerEmailAddress + * The passed-in contentInfo is espected to be Signed, and these +diff --git lib/smime/smime.def lib/smime/smime.def +index 623eaa4..b205d1c 100644 +--- lib/smime/smime.def ++++ lib/smime/smime.def +@@ -267,3 +267,9 @@ NSSSMIME_GetVersion; + ;+ local: + ;+ *; + ;+}; ++;+NSS_3.14.2 { # NSS 3.14.2 release ++;+ global: ++SEC_PKCS7VerifyDetachedSignatureAtTime; ++;+ local: ++;+ *; ++;+}; Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Feb 2 13:13:23 2013 (r1156) +++ trunk/www/firefox-nightly/Makefile Sat Feb 2 18:09:16 2013 (r1157) @@ -14,18 +14,18 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ + nss>=3.14.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -# bug808224 nss>=3.14.2:${PORTSDIR}/security/nss \ USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss +USE_MOZILLA= # empty MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX}