Update to 38.2.1

* Fix build with newer freetype.

Changelog:
Fixed in Firefox ESR 38.2.1

    2015-95 Add-on notification bypass through data URLs
    2015-94 Use-after-free when resizing canvas element during restyling

3 files changed, 21 insertions, 13 deletions

diff --git a/www/firefox38/Makefile b/www/firefox38/Makefile
index 798be2a205a..4311982f79a 100644
--- a/www/firefox38/Makefile
+++ b/www/firefox38/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2015/08/21 09:08:56 he Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/29 12:48:25 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	38.2
-MOZ_BRANCH_MINOR=	.0esr
+MOZ_BRANCH_MINOR=	.1esr
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox38-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
diff --git a/www/firefox38/distinfo b/www/firefox38/distinfo
index 1c67ac26ba2..695d97ac4ea 100644
--- a/www/firefox38/distinfo
+++ b/www/firefox38/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/08/21 09:08:56 he Exp $
+$NetBSD: distinfo,v 1.4 2015/08/29 12:48:25 ryoon Exp $
 
-SHA1 (firefox-38.2.0esr.source.tar.bz2) = 11fb31a128bf27c18765f91d0d997c5ab50b5a52
-RMD160 (firefox-38.2.0esr.source.tar.bz2) = 8f20435048d6168e9454458fdf3d7b4bcb9209cd
-Size (firefox-38.2.0esr.source.tar.bz2) = 180722192 bytes
+SHA1 (firefox-38.2.1esr.source.tar.bz2) = c596174e7273be5079bf55aecde33ec191d99538
+RMD160 (firefox-38.2.1esr.source.tar.bz2) = 422942c46bba6c52f95807346e2486da97b6ae0a
+Size (firefox-38.2.1esr.source.tar.bz2) = 180722074 bytes
 SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a
 SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb
 SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
@@ -24,7 +24,7 @@ SHA1 (patch-config_external_moz.build) = ee5fe1672333a7d71e61a23f3739ffefcca692d
 SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = 79f48d468edb4a5acdedb0c6d8d79c193cd140b2
+SHA1 (patch-config_system-headers) = 70af0acd7d17b08c79654020a7e949f6d275c802
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46
 SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6
diff --git a/www/firefox38/patches/patch-config_system-headers b/www/firefox38/patches/patch-config_system-headers
index eac9b5565a8..d800c2f5c80 100644
--- a/www/firefox38/patches/patch-config_system-headers
+++ b/www/firefox38/patches/patch-config_system-headers
@@ -1,6 +1,6 @@
-$NetBSD: patch-config_system-headers,v 1.1 2015/07/09 14:13:52 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.2 2015/08/29 12:48:25 ryoon Exp $
 
---- config/system-headers.orig	2015-05-04 00:43:23.000000000 +0000
+--- config/system-headers.orig	2015-08-26 12:01:31.000000000 +0000
 +++ config/system-headers
 @@ -189,7 +189,6 @@ asm/signal.h
  ASRegistry.h
@@ -10,7 +10,15 @@ $NetBSD: patch-config_system-headers,v 1.1 2015/07/09 14:13:52 ryoon Exp $
  atlcom.h
  atlconv.h
  atlctl.cpp
-@@ -636,6 +635,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
+@@ -471,6 +470,7 @@ freetype/ftbitmap.h
+ freetype/ftxf86.h
+ freetype.h
+ ftcache.h
++ftfntfmt.h
+ ftglyph.h
+ ftsynth.h
+ ftoutln.h
+@@ -636,6 +636,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
  libgnomevfs/gnome-vfs-mime-utils.h
  libgnomevfs/gnome-vfs-ops.h
  libgnomevfs/gnome-vfs-standard-callbacks.h
@@ -18,7 +26,7 @@ $NetBSD: patch-config_system-headers,v 1.1 2015/07/09 14:13:52 ryoon Exp $
  lib$routines.h
  limits
  limits.h
-@@ -1266,7 +1266,6 @@ X11/Xlocale.h
+@@ -1266,7 +1267,6 @@ X11/Xlocale.h
  X11/Xos.h
  X11/Xutil.h
  zmouse.h
@@ -26,7 +34,7 @@ $NetBSD: patch-config_system-headers,v 1.1 2015/07/09 14:13:52 ryoon Exp $
  #if MOZ_NATIVE_PNG==1
  png.h
  #endif
-@@ -1328,10 +1327,13 @@ vorbis/codec.h
+@@ -1328,10 +1328,13 @@ vorbis/codec.h
  theora/theoradec.h
  tremor/ivorbiscodec.h
  speex/speex_resampler.h
@@ -40,7 +48,7 @@ $NetBSD: patch-config_system-headers,v 1.1 2015/07/09 14:13:52 ryoon Exp $
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1360,3 +1362,43 @@ unicode/utypes.h
+@@ -1360,3 +1363,43 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h