svn commit: r312612 - in head: security/vuxml www/firefox www/firefox/files

[Florian Smeets]

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
     <affects>
       <package>
 	<name>firefox</name>
-	<range><gt>11.0,1</gt><lt>19.0,1</lt></range>
+	<range><gt>18.0,1</gt><lt>19.0,1</lt></range>
 	<range><lt>17.0.3,1</lt></range>
       </package>
       <package>
@@ -169,6 +169,7 @@ Note:  Please add new entries to the beg
     <dates>
       <discovery>2013-02-19</discovery>
       <entry>2013-02-19</entry>
+      <modified>2013-02-20</modified>
     </dates>
   </vuln>
 

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 <stddef.h>
  #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