From owner-svn-ports-head@FreeBSD.ORG Wed Feb 20 07:16:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C441D9A2; Wed, 20 Feb 2013 07:16:32 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9E279716; Wed, 20 Feb 2013 07:16:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1K7GW6q073350; Wed, 20 Feb 2013 07:16:32 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1K7GVVU073347; Wed, 20 Feb 2013 07:16:31 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201302200716.r1K7GVVU073347@svn.freebsd.org> From: Florian Smeets Date: Wed, 20 Feb 2013 07:16:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312612 - in head: security/vuxml www/firefox www/firefox/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2013 07:16:32 -0000 Author: flo Date: Wed Feb 20 07:16:31 2013 New Revision: 312612 URL: http://svnweb.freebsd.org/changeset/ports/312612 Log: Fix up the latest gecko update by: - reapplying the workaround for svn:eol-style and svn:keywords - fixing version matching in vuln.xml, 17.0.3 is NOT vulnerable Modified: head/security/vuxml/vuln.xml head/www/firefox/Makefile head/www/firefox/files/patch-bug807492 (contents, props changed) Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Wed Feb 20 06:16:01 2013 (r312611) +++ head/security/vuxml/vuln.xml Wed Feb 20 07:16:31 2013 (r312612) @@ -101,7 +101,7 @@ Note: Please add new entries to the beg firefox - 11.0,119.0,1 + 18.0,119.0,1 17.0.3,1 @@ -169,6 +169,7 @@ Note: Please add new entries to the beg 2013-02-19 2013-02-19 + 2013-02-20 Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Wed Feb 20 06:16:01 2013 (r312611) +++ head/www/firefox/Makefile Wed Feb 20 07:16:31 2013 (r312612) @@ -37,6 +37,7 @@ GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl +USE_DOS2UNIX= media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp NO_MOZPKGINSTALL=yes FIREFOX_ICON= ${MOZILLA}.png Modified: head/www/firefox/files/patch-bug807492 ============================================================================== --- head/www/firefox/files/patch-bug807492 Wed Feb 20 06:16:01 2013 (r312611) +++ head/www/firefox/files/patch-bug807492 Wed Feb 20 07:16:31 2013 (r312612) @@ -446,25 +446,15 @@ diff --git media/mtransport/third_party/ index bcb1ec0..bb73591 100644 --- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -28,17 +28,17 @@ - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD$ - */ - - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - +@@ -33,5 +33,5 @@ + #define _SYS_QUEUE_H_ + -#ifndef DARWIN +#if !defined(BSD) && !defined(DARWIN) #include #define __offsetof offsetof #endif - - #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ - 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