Pullup ticket #6048 - requested by nia

www/seamonkey: security fix

Revisions pulled up:
- www/seamonkey/Makefile                                        1.196
- www/seamonkey/distinfo                                        1.159
- www/seamonkey/patches/patch-ao                                deleted
- www/seamonkey/patches/patch-mozilla_ipc_chromium_src_build_build__config.h deleted
- www/seamonkey/patches/patch-mozilla_security_manager_ssl_moz.build 1.1
- www/seamonkey/patches/patch-mozilla_toolkit_moz.configure     1.3

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Wed Sep  4 20:07:53 UTC 2019

   Modified Files:
   	pkgsrc/www/seamonkey: Makefile distinfo
   	pkgsrc/www/seamonkey/patches: patch-mozilla_toolkit_moz.configure
   Added Files:
   	pkgsrc/www/seamonkey/patches:
   	    patch-mozilla_security_manager_ssl_moz.build
   Removed Files:
   	pkgsrc/www/seamonkey/patches: patch-ao
   	    patch-mozilla_ipc_chromium_src_build_build__config.h

   Log Message:
   seamonkey: Update to 2.49.5

   SeaMonkey 2.49.5 contains (among other changes) the following major changes relative to SeaMonkey 2.49.4:

   SeaMonkey 2.49.5 uses the same backend as Firefox and contains the relevant Firefox 52.9.0 ESR security fixes.

   SeaMonkey 2.49.5 shares most parts of the mail and news code with Thunderbird. Please read the Thunderbird 52.9.1 release notes for specific changes and security fixes in this release.

   Additional security fixes up to ESR 60.2 and a few enhancements have been backported.

   SeaMonkey-specific changes
   ==========================

   * Among the general platform and mail fixes this release contains backported fixes from Thunderbird for the EFAIL security vulnerability.

6 files changed, 29 insertions, 52 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 09a51104484..557e9b0ecee 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.193 2019/06/13 23:08:05 nia Exp $
+# $NetBSD: Makefile,v 1.193.2.1 2019/09/22 09:25:00 bsiegert Exp $
 
 DISTNAME=	seamonkey-${SM_VER}.source
 PKGNAME=	seamonkey-${SM_VER:S/b/beta/}
-PKGREVISION=	11
-SM_VER=		2.49.4
+SM_VER=		2.49.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 35f19999c87..a697355a9a6 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.158 2019/06/13 10:53:11 nia Exp $
+$NetBSD: distinfo,v 1.158.2.1 2019/09/22 09:25:00 bsiegert Exp $
 
-SHA1 (seamonkey-2.49.4.source.tar.xz) = e9fa6d1c57e9141a299f6ec093683fb105ea6657
-RMD160 (seamonkey-2.49.4.source.tar.xz) = 072caadf376b7726356d6121abff87cc1fb62144
-SHA512 (seamonkey-2.49.4.source.tar.xz) = f67dfb269c946da3d8dd6091daf51b80edac0f9e1fe88d860018c8628e5aaaaf17c91d086b6d7502465ccbfe6485fabdf072bb088af5c59520e77f12a5812625
-Size (seamonkey-2.49.4.source.tar.xz) = 231795176 bytes
-SHA1 (patch-ao) = e466058ed1899a64a9ab5b57290ff2baad1ea03c
+SHA1 (seamonkey-2.49.5.source.tar.xz) = 366953dee336185102d9a17028d49834cdb897d2
+RMD160 (seamonkey-2.49.5.source.tar.xz) = 6423a548286a166e88695060713afefd7365f389
+SHA512 (seamonkey-2.49.5.source.tar.xz) = 31309def1ad4276f13ecb343e936c7cade4b6850db88d9d84700f86bff7024b2b217b9e50fc3756b1d1beea483ceaa2a5a3afd053da00f6ac06e3795e9116789
+Size (seamonkey-2.49.5.source.tar.xz) = 231748204 bytes
 SHA1 (patch-ldap_c-sdk_include_portable.h) = ce0b643fa031b74bf7d74eedc4f3729807aef799
 SHA1 (patch-mail_app_Makefile.in) = da6ac87ffdcff733f11218cb11f8ef316bb1bc18
 SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = 0cbabcf5b188e86404e3ded8452c73a7f498efe3
@@ -54,7 +53,6 @@ SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = 738e1306fbadebd20b5
 SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = d67e126dfb26e2394a9c21aab5e3b6cc3ab238f1
 SHA1 (patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc) = ad8d2843316ec1dd0b1309afe4f3eaaa711db6df
 SHA1 (patch-mozilla_ipc_chromium_src_base_time__posix.cc) = 2662bf55bf5276d06c4754cdce125a0bfbac17a0
-SHA1 (patch-mozilla_ipc_chromium_src_build_build__config.h) = 86e88aa90bd4d573fd59d47f5a3e45c5c52c7e45
 SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = 53c37dedaf5f0b302627be5dddebcb39decfa5e3
 SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = 7a52fef553345a46171aeb3c93db30e6b3998c2c
 SHA1 (patch-mozilla_js_src_jit_arm_Architecture-arm.cpp) = 315d98f471d0c17434b8d1b94e06c792c3ec110f
@@ -89,6 +87,7 @@ SHA1 (patch-mozilla_mozglue_build_arm.cpp) = 592ae5ce1a404227cc2ab6a06418cc813c5
 SHA1 (patch-mozilla_mozglue_build_arm.h) = 94e2b1a1a9ebf20bfa8a542066aa0dad475db320
 SHA1 (patch-mozilla_netwerk_dns_moz.build) = d87c07ebfa01d32ca826932af733b37ce586e9f7
 SHA1 (patch-mozilla_old-configure.in) = e98e393a90c8283259d7c6fe2a2fff03f2747e4d
+SHA1 (patch-mozilla_security_manager_ssl_moz.build) = 70b36809c96e586c93af4ea54a383a74835b2192
 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = db4084f6a7dba2fc5d35cd256c6f149fabbf7bc7
 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 1e8d0883d3cc12541020c7df0b1d67f60e7391f5
 SHA1 (patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 0b5cad33bc9a90f4ae2d6346065707b642aba3a9
@@ -97,7 +96,7 @@ SHA1 (patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_platfo
 SHA1 (patch-mozilla_toolkit_components_terminator_nsTerminator.cpp) = c54660b4699925c49bd2a98ef8915d49960fbd13
 SHA1 (patch-mozilla_toolkit_library_moz.build) = fa16eaf09857a8db6df5d09c2af42e06dbeb604f
 SHA1 (patch-mozilla_toolkit_modules_GMPUtils.jsm) = 4cfec16c0ec538ac80d590291db1eebd378e0b1a
-SHA1 (patch-mozilla_toolkit_moz.configure) = 001013666d1f59c271010a11c64634bb2012948b
+SHA1 (patch-mozilla_toolkit_moz.configure) = 2adee84691022b12513dc6b9483b06626efdbaa7
 SHA1 (patch-mozilla_toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js) = 85f482aecaf5bd971775c6fbf35d3d6bfd04a296
 SHA1 (patch-mozilla_toolkit_xre_glxtest.cpp) = a8f6653760e33014c5e6f104b19fce8a0f331d24
 SHA1 (patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp) = 70030e59b2ed09b9bc9827d35e17b12be7f0cd71
diff --git a/www/seamonkey/patches/patch-ao b/www/seamonkey/patches/patch-ao
deleted file mode 100644
index 4a23a53d68b..00000000000
--- a/www/seamonkey/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.17 2017/11/10 22:45:27 ryoon Exp $
-
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2017-10-16 07:20:50.000000000 +0000
-+++ mozilla/toolkit/mozapps/installer/packager.mk
-@@ -139,8 +139,8 @@ endif
- 	  (cd $(DESTDIR)$(installdir) && tar -xf -)
- 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
- 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
--	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--ifdef INSTALL_SDK # Here comes the hard part
-+	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/${MOZILLA_PKG_NAME}
-+ifeq ($(MOZ_APP_NAME),xulrunner)
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
- 	(cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_build_build__config.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_build_build__config.h
deleted file mode 100644
index 33a23c7c9f7..00000000000
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_build_build__config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_build_build__config.h,v 1.1 2013/08/11 03:18:46 ryoon Exp $
-
---- mozilla/ipc/chromium/src/build/build_config.h.orig	2013-08-04 03:05:29.000000000 +0000
-+++ mozilla/ipc/chromium/src/build/build_config.h
-@@ -27,6 +27,8 @@
- #define OS_NETBSD 1
- #elif defined(__OpenBSD__)
- #define OS_OPENBSD 1
-+#elif defined(__sun)
-+#define OS_SOLARIS 1
- #elif defined(_WIN32)
- #define OS_WIN 1
- #else
-@@ -42,7 +44,7 @@
- 
- // For access to standard POSIX features, use OS_POSIX instead of a more
- // specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
- #define OS_POSIX 1
- #endif
- 
diff --git a/www/seamonkey/patches/patch-mozilla_security_manager_ssl_moz.build b/www/seamonkey/patches/patch-mozilla_security_manager_ssl_moz.build
new file mode 100644
index 00000000000..f00fbae2b7b
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_security_manager_ssl_moz.build
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_security_manager_ssl_moz.build,v 1.1.2.2 2019/09/22 09:25:00 bsiegert Exp $
+
+--- mozilla/security/manager/ssl/moz.build.orig	2019-05-06 17:30:52.000000000 +0000
++++ mozilla/security/manager/ssl/moz.build
+@@ -184,10 +184,6 @@ for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
+ 
+ DEFINES['CERT_AddTempCertToPerm'] = '__CERT_AddTempCertToPerm'
+ 
+-USE_LIBS += [
+-    'crmf',
+-]
+-
+ include('/ipc/chromium/chromium-config.mozbuild')
+ 
+ if CONFIG['GNU_CXX']:
diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_moz.configure b/www/seamonkey/patches/patch-mozilla_toolkit_moz.configure
index cce115cdc40..4b457be3db6 100644
--- a/www/seamonkey/patches/patch-mozilla_toolkit_moz.configure
+++ b/www/seamonkey/patches/patch-mozilla_toolkit_moz.configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-mozilla_toolkit_moz.configure,v 1.2 2017/11/10 22:45:27 ryoon Exp $
+$NetBSD: patch-mozilla_toolkit_moz.configure,v 1.2.14.1 2019/09/22 09:25:00 bsiegert Exp $
 
---- mozilla/toolkit/moz.configure.orig	2017-10-16 07:20:55.000000000 +0000
+--- mozilla/toolkit/moz.configure.orig	2019-05-06 17:31:10.000000000 +0000
 +++ mozilla/toolkit/moz.configure
-@@ -338,6 +338,26 @@ add_old_configure_assignment('FT2_LIBS',
+@@ -338,6 +338,27 @@ add_old_configure_assignment('FT2_LIBS',
  add_old_configure_assignment('FT2_CFLAGS',
-                              delayed_getattr(ft2_info, 'cflags'))
+                              ft2_info.cflags)
  
 +# Graphite2
 +# ==============================================================
@@ -26,6 +26,7 @@ $NetBSD: patch-mozilla_toolkit_moz.configure,v 1.2 2017/11/10 22:45:27 ryoon Exp
 +
 +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
 +
++
  # Apple platform decoder support
  # ==============================================================
  @depends(toolkit)