Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 ChangeLog                                               |    3 
 archive-libs/libarchive/DETAILS                         |    6 
 archive-libs/libarchive/HISTORY                         |    3 
 crypto/nss/DETAILS                                      |    5 
 crypto/nss/HISTORY                                      |    3 
 crypto/nss/PREPARE                                      |    4 
 graphics/openexr/DETAILS                                |    6 
 graphics/openexr/HISTORY                                |    3 
 http/firefox/DEPENDS                                    |   14 
 http/firefox/DETAILS                                    |    5 
 http/firefox/HISTORY                                    |   11 
 http/firefox/patches/2000_system_harfbuzz_support.patch |  238 ---------
 http/firefox/patches/2008_custom_vendor_lexicon.patch   |  422 
----------------
 http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch   |  173 ------
 libs/gmp/DETAILS                                        |    4 
 libs/gmp/HISTORY                                        |    3 
 libs/ncurses/DETAILS                                    |    3 
 libs/ncurses/HISTORY                                    |    3 
 shell-term-fm/fish/DETAILS                              |    4 
 shell-term-fm/fish/HISTORY                              |    3 
 utils/lsix/BUILD                                        |    1 
 utils/lsix/DEPENDS                                      |    2 
 utils/lsix/DETAILS                                      |   13 
 utils/lsix/HISTORY                                      |    3 
 utils/lsix/INSTALL                                      |    1 
 xorg-extras/xterm/CONFIGURE                             |    4 
 xorg-extras/xterm/HISTORY                               |    3 
 27 files changed, 86 insertions(+), 857 deletions(-)

New commits:
commit c60d1ddd4be31d6cbf79868c2cb6f6eae29eac8f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    xorg-extras/xterm: add support for sixel

commit c9fc6687fe5e1f7b2971cd1c3a49dcdeec84702d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/ncurses: version 6.2

commit c37917b49023cc921a180b869a77e71926ced3b3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/nss: version 3.49.2

commit cc5dd5c4c33bd2cce2aa90a763beba9b6ee344a3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/firefox: version 73.0, security update

commit 40a720196bf4fc592fede6b4eebb16e4e2c155b6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    archive-libs/libarchive: version 3.4.2, security update

commit 807b546c0b12a09d4fb1470a38ef0b83c010f2b6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/openexr: version 2.4.1, security update

commit 82a81161e1515bf98d068809bdb6a22f0418a56b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    shell-term-fm/fish: version 3.1.0

commit 9bdee62674624619e41e18e21b35c4db4a88bc33
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/lsix: new spell, like ls but for images

commit ef3bc314e3af95acae60d4c85e6d7157a7de9d0d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/gmp: version 6.2.0

diff --git a/ChangeLog b/ChangeLog
index 1557c38..a5293d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * utils/lsix: new spell, like ls but for images
+
 2020-02-04 Ismael Luceno <ismael AT sourcemage.org>
        * net/dropwatch: new spell, Watch dropped network packets
 
diff --git a/archive-libs/libarchive/DETAILS b/archive-libs/libarchive/DETAILS
index 58b857c..b132e89 100755
--- a/archive-libs/libarchive/DETAILS
+++ b/archive-libs/libarchive/DETAILS
@@ -1,11 +1,11 @@
            SPELL=libarchive
-         VERSION=3.4.1
-  SECURITY_PATCH=7
+         VERSION=3.4.2
+  SECURITY_PATCH=8
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.libarchive.org
    
SOURCE_URL[0]=https://github.com/libarchive/libarchive/releases/download/v${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha256:fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191:UPSTREAM_HASH
+     
SOURCE_HASH=sha512:a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
          ENTERED=20080629
       LICENSE[0]=BSD
         KEYWORDS="archive"
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index 375934b..fb98f5c 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 3.4.2, SECURITY_PATCH++
+
 2020-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: replace signature with upstream hash
 
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index c10c5d9..ad02ec8 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -24,6 +24,11 @@ case $NSS_BRANCH in
   3.48)
           VERSION=3.48
       
SOURCE_HASH=sha512:71aefe323501dd8d750ed36606554f2e67ecb2bca85b55bc798d5dfc3a47f3d454348ca950971aaaafb16f6d847c098d2b1c40d40b50380e0c2540ed1b9a9e9a
+  ;;
+  3.49)
+          VERSION=3.49.2
+      
SOURCE_HASH=sha512:fe0fe032db15853384a50b145dd6f3187a855109f0b81f1846312d33f8c628aededcbca4d199f974ae52530aec3f2312f80afbca3e5b97ed1ff96fcffafd2881
+  ;;
 esac
            SOURCE=$SPELL-$VERSION.tar.gz
     
SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index e80e29a..a4949dd 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, PREPARE: version 3.49.2
+
 2019-12-14 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 3.48.1 for 3.48 branch
 
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index fb6e248..f5ce9ab 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,6 +1,6 @@
 . "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 &&
+prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 3.49 &&
 
 if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
-  NSS_BRANCH=3.46
+  NSS_BRANCH=3.49
 fi
diff --git a/graphics/openexr/DETAILS b/graphics/openexr/DETAILS
index 5e97356..8940a4a 100755
--- a/graphics/openexr/DETAILS
+++ b/graphics/openexr/DETAILS
@@ -1,11 +1,11 @@
 source $GRIMOIRE/CMAKE_FUNCTIONS
            SPELL=openexr
-         VERSION=2.4.0
-  SECURITY_PATCH=1
+         VERSION=2.4.1
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    
SOURCE_URL[0]=https://github.com/openexr/openexr/archive/v${VERSION}.tar.gz
-  
SOURCE_HASH[0]=sha512:b544b1fc9d785cad029f35388894d1e9dae278dfda3c80d5615280386206f2af5c94b72c17e1e1d1514f73a7151b5be0f166a4be5b74abefc2f27fdf0500dfe8
+  
SOURCE_HASH[0]=sha512:23c0c07fafa42f832e67cbfeeeb12b6b9e373dd0a5b858f463bf5c4d0661c58fad662cef64ef6a3053f0db2f69aee46816568b814872d617284664d1effbbbab
         WEB_SITE=http://www.openexr.com/
          ENTERED=20030123
       LICENSE[0]=http://www.ilm.com/opensource/ilm-bsd-lic.html
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index 594aaad..193a058 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.4.1, SECURITY_PATCH++
+
 2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
 
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 74268ac..5ca9658 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -30,10 +30,10 @@ depends  libwebp       "--with-system-webp"               
       &&
 
 depends  nspr               "--with-system-nspr"                 &&
 
-local NSS_BRANCH="3.48"                                          &&
+local NSS_BRANCH="3.49"                                          &&
 if spell_ok nss                                                  &&
    is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
-  depends  -sub "${NSS_BRANCH}.x" nss  "--with-system-nss"
+  depends  -sub "${NSS_BRANCH}" nss  "--with-system-nss"
 else
   depends  nss  "--with-system-nss"
 fi                                                               &&
@@ -128,11 +128,11 @@ suggest_depends_2 firefox-smglwiki "" "" \
 #                  "--without-system-graphite2" \
 #                  "for system graphite2" &&
 #
-optional_depends  harfbuzz \
-                  "--with-system-harfbuzz" \
-                  "--without-system-harfbuzz" \
-                  "for system harfbuzz" &&
-
+#optional_depends  harfbuzz \
+#                  "--with-system-harfbuzz" \
+#                  "--without-system-harfbuzz" \
+#                  "for system harfbuzz" &&
+#
 optional_depends  dav1d \
                   "--enable-av1 --with-system-av1" \
                   "--disable-av1" \
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index e7f9e0c..5c19d33 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,7 +1,6 @@
            SPELL=firefox
-         VERSION=72.0.2
-       ATCHLEVEL=1
-  SECURITY_PATCH=138
+         VERSION=73.0
+  SECURITY_PATCH=139
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    
SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
          SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 59f05d2..48a654c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,14 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 73.0, SECURITY_PATCH++, fixes
+         CVE-2020-6796,
+         CVE-2020-6797,
+         CVE-2020-6799,
+         CVE-2020-6800,
+         CVE-2020-6801
+       * firefox-72.0.2-sqlite-3.31.patch, 2008_custom_vendor_lexicon.patch,
+         2000_system_harfbuzz_support.patch: removed
+       * DEPENDS: do not use system harfbuzz, depend on nss 3.49
+
 2020-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, patches/firefox-72.0.2-sqlite-3.31.patch: fix crash with
          sqlite 3.31, patch from mandriva
diff --git a/http/firefox/patches/2000_system_harfbuzz_support.patch 
b/http/firefox/patches/2000_system_harfbuzz_support.patch
deleted file mode 100644
index 21ccd1f..0000000
--- a/http/firefox/patches/2000_system_harfbuzz_support.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From: Jan Beich <jbeich AT FreeBSD.org>
-
-Add ability to use system-harfbuzz instead of bundled.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=847568
-
-diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
---- a/config/system-headers.mozbuild
-+++ b/config/system-headers.mozbuild
-@@ -1228,16 +1228,23 @@ if CONFIG['OS_TARGET'] == 'Android':
-         'utils/TypeHelpers.h',
-         'utils/Unicode.h',
-         'utils/Vector.h',
-         'utils/VectorImpl.h',
-         'vr/gvr/capi/include/gvr_controller.h',
-         'vr/gvr/capi/include/gvr.h',
-     ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    system_headers += [
-+      'harfbuzz/hb-glib.h',
-+      'harfbuzz/hb-ot.h',
-+      'harfbuzz/hb.h',
-+    ]
-+
- if CONFIG['MOZ_JACK']:
-     system_headers += [
-         'jack/jack.h',
-         'jack/statistics.h',
-     ]
- 
- if CONFIG['MOZ_SYSTEM_JPEG']:
-     system_headers += [
-diff --git a/dom/base/moz.build b/dom/base/moz.build
---- a/dom/base/moz.build
-+++ b/dom/base/moz.build
-@@ -538,13 +538,16 @@ include('/ipc/chromium/chromium-config.m
- FINAL_LIBRARY = 'xul'
- 
- if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
-     DEFINES['HAVE_SIDEBAR'] = True
- 
- if CONFIG['MOZ_X11']:
-     CXXFLAGS += CONFIG['TK_CFLAGS']
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- GeneratedFile('UseCounterList.h', script='gen-usecounters.py',
-               entry_point='use_counter_list', inputs=['UseCounters.conf'])
- 
- if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-     CXXFLAGS += ['-Wno-error=shadow']
-diff --git a/gfx/moz.build b/gfx/moz.build
---- a/gfx/moz.build
-+++ b/gfx/moz.build
-@@ -8,26 +8,28 @@ with Files('**'):
-     BUG_COMPONENT = ('Core', 'Graphics')
-     SCHEDULES.inclusive += ['android-hw-gfx']
- with Files('wr/**'):
-     BUG_COMPONENT = ('Core', 'Graphics: WebRender')
- 
- if CONFIG['MOZ_TREE_CAIRO']:
-     DIRS += ['cairo']
- 
-+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    DIRS += ['harfbuzz/src']
-+
- DIRS += [
-     '2d',
-     'ycbcr',
-     'angle',
-     'src',
-     'qcms',
-     'gl',
-     'layers',
-     'graphite2/src',
--    'harfbuzz/src',
-     'ots/src',
-     'thebes',
-     'ipc',
-     'vr',
-     'config',
-     'webrender_bindings',
- ]
- 
-diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
---- a/gfx/skia/generate_mozbuild.py
-+++ b/gfx/skia/generate_mozbuild.py
-@@ -112,16 +112,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
-     CXXFLAGS += [
-         '-Wno-implicit-fallthrough',
-         '-Wno-inconsistent-missing-override',
-         '-Wno-macro-redefined',
-         '-Wno-unused-private-field',
-     ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
-     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- 
- if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
-diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
---- a/gfx/skia/moz.build
-+++ b/gfx/skia/moz.build
-@@ -488,16 +488,19 @@ if CONFIG['CC_TYPE'] == 'gcc':
- if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
-     CXXFLAGS += [
-         '-Wno-implicit-fallthrough',
-         '-Wno-inconsistent-missing-override',
-         '-Wno-macro-redefined',
-         '-Wno-unused-private-field',
-     ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
-     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- 
- if CONFIG['MOZ_ENABLE_SKIA_PDF_SFNTLY']:
-diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
---- a/gfx/thebes/moz.build
-+++ b/gfx/thebes/moz.build
-@@ -281,11 +281,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk'
- 
- if CONFIG['MOZ_WAYLAND']:
-     CXXFLAGS += CONFIG['MOZ_WAYLAND_CFLAGS']
- 
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
- 
- DEFINES['GRAPHITE2_STATIC'] = True
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['CC_TYPE'] == 'clang':
-     # Suppress warnings from Skia header files.
-     SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
-diff --git a/intl/unicharutil/util/moz.build 
b/intl/unicharutil/util/moz.build
---- a/intl/unicharutil/util/moz.build
-+++ b/intl/unicharutil/util/moz.build
-@@ -20,9 +20,12 @@ UNIFIED_SOURCES += [
-     'ICUUtils.cpp',
-     'IrishCasing.cpp',
-     'nsBidiUtils.cpp',
-     'nsSpecialCasingData.cpp',
-     'nsUnicharUtils.cpp',
-     'nsUnicodeProperties.cpp',
- ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- FINAL_LIBRARY = 'xul'
-diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
---- a/netwerk/dns/moz.build
-+++ b/netwerk/dns/moz.build
-@@ -77,12 +77,15 @@ FINAL_LIBRARY = 'xul'
- GeneratedFile('etld_data.inc', script='prepare_tlds.py',
-               inputs=['effective_tld_names.dat'])
- 
- # need to include etld_data.inc
- LOCAL_INCLUDES += [
-     '/netwerk/base',
- ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- USE_LIBS += ['icu']
- 
- if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-     CXXFLAGS += ['-Wno-error=shadow']
-diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
---- a/toolkit/library/moz.build
-+++ b/toolkit/library/moz.build
-@@ -234,16 +234,19 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
-     OS_LIBS += [
-         '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
-         '-lgvr',
-     ]
- 
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
- if CONFIG['MOZ_SYSTEM_JPEG']:
-     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
- 
- if CONFIG['MOZ_SYSTEM_PNG']:
-     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
- 
- if CONFIG['MOZ_SYSTEM_WEBP']:
-     OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -394,16 +394,26 @@ def freetype2_combined_info(fontconfig_i
-     return namespace(
-         cflags=freetype2_info.cflags + fontconfig_info.cflags,
-         libs=freetype2_info.libs + fontconfig_info.libs,
-     )
- 
- add_old_configure_assignment('_HAVE_FREETYPE2',
-                              depends_if(freetype2_info)(lambda _: True))
- 
-+# HarfBuzz
-+# ==============================================================
-+option('--with-system-harfbuzz',
-+       help="Use system harfbuzz (located with pkgconfig)")
-+
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.3.1',
-+                                    when='--with-system-harfbuzz')
-+
-+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: 
True))
-+
- # Apple platform decoder support
- # ==============================================================
- @depends(toolkit)
- def applemedia(toolkit):
-     if toolkit in ('cocoa', 'uikit'):
-         return True
- 
- set_config('MOZ_APPLEMEDIA', applemedia)
diff --git a/http/firefox/patches/2008_custom_vendor_lexicon.patch 
b/http/firefox/patches/2008_custom_vendor_lexicon.patch
deleted file mode 100644
index aaa0dc4..0000000
--- a/http/firefox/patches/2008_custom_vendor_lexicon.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-# HG changeset patch
-# Parent  b060564081862e54ec7058fd4c8614709a3c8f0f
-Add support for custom vendors, as in "x86_64-gentoo-linux-musl".
-
-diff --git a/third_party/rust/target-lexicon/.cargo-checksum.json 
b/third_party/rust/target-lexicon/.cargo-checksum.json
---- a/third_party/rust/target-lexicon/.cargo-checksum.json
-+++ b/third_party/rust/target-lexicon/.cargo-checksum.json
-@@ -1,1 +1,1 @@
--{"files":{"Cargo.lock":"75d1f84b3d9e98d87e2f74984f7d032f5b28d7610cccf5e13977367189a77acd","Cargo.toml":"fe18dc2e0c86e6b28ed0244ced50e26f481087c693cb7cc1ff3062929894b0d4","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"a9f00c32de64b949c3bb23442304fc7943154efcc831aa0d87c9b83247e4e28a","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","host.rs":"4ef91a2c26405151454c2695dc0a7f455374207900ea6814d4eafdfef5f7b630","newlist":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","sorted.txt":"5548c14054ea61b51e2d8a495da662546523c3c13e8f742f6dd57754e11f46b5","src/host.rs":"fb543df4f362e9119a58523563e453110f4e3a426f0995911d0ca386657cf1d9","src/lib.rs":"5ad3a9418a6cb52cacc0a662645ccc671c326df954671b5ec0db667653dd125a","src/parse_error.rs":"f6689a741589ca8e659b1639728696f987c9da4948701f3b7ab6dc3e35754dab","src/targets.rs":"81320bd0280c96846a328689afe22be283cb7df9c37f005ff693ee1834b345a8","src/triple.rs":"ae2895bb2ee8451b90aa6e92d7fbf24c021230416fef030fb6ad0ef051c786c3","test.sh":"40761ee2ab0b361bdce4dc17708e671f32661f62cb56a45724d60510f9498b74"},"package":"7975cb2c6f37d77b190bc5004a2bb015971464756fde9514651a525ada2a741a"}
-\ No newline at end of file
-+{"files":{"Cargo.lock":"75d1f84b3d9e98d87e2f74984f7d032f5b28d7610cccf5e13977367189a77acd","Cargo.toml":"fe18dc2e0c86e6b28ed0244ced50e26f481087c693cb7cc1ff3062929894b0d4","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"8fad88eb56ac757d5a8e115b136f2bfb497b762e0ff10f7e587b99fd5a5cfe4f","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","host.rs":"4ef91a2c26405151454c2695dc0a7f455374207900ea6814d4eafdfef5f7b630","newlist":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","sorted.txt":"5548c14054ea61b51e2d8a495da662546523c3c13e8f742f6dd57754e11f46b5","src/host.rs":"fb543df4f362e9119a58523563e453110f4e3a426f0995911d0ca386657cf1d9","src/lib.rs":"2acf0373ad7d4b23753f1cf24889f4d4ccd709b277f15dfc3e5d81804d1da0f2","src/parse_error.rs":"f6689a741589ca8e659b1639728696f987c9da4948701f3b7ab6dc3e35754dab","src/targets.rs":"50b491ef337676a7b593af7243d799ee96b1b5a9a21d060a0750a674e65826a3","src/triple.rs":"780bc76830fbdafc6682b4290d07eabeacb3572b608739688b0b681e800d78e8","test.sh":"40761ee2ab0b361bdce4dc17708e671f32661f62cb56a45724d60510f9498b74"},"package":"7975cb2c6f37d77b190bc5004a2bb015971464756fde9514651a525ada2a741a"}
-diff --git a/third_party/rust/target-lexicon/build.rs 
b/third_party/rust/target-lexicon/build.rs
---- a/third_party/rust/target-lexicon/build.rs
-+++ b/third_party/rust/target-lexicon/build.rs
-@@ -32,16 +32,17 @@ mod parse_error {
-         UnrecognizedOperatingSystem(String),
-         UnrecognizedEnvironment(String),
-         UnrecognizedBinaryFormat(String),
-         UnrecognizedField(String),
-         NoneWithoutBinaryFormat,
-     }
- }
- 
-+use self::targets::Vendor;
- use self::triple::{Endianness, PointerWidth, Triple};
- 
- /// Assuming `target` is a path to a custom target json config file, open it
- /// and build a `Triple` using its contents.
- fn read_target_from_file(path: &Path) -> Triple {
-     let mut file = File::open(path).expect("error opening target file");
-     let mut json = String::new();
-     file.read_to_string(&mut json)
-@@ -124,25 +125,27 @@ fn write_host_rs(mut out: File, triple: 
-     // The generated Debug implementation for the inner architecture 
variants
-     // doesn't print the enum name qualifier, so import them here. There
-     // shouldn't be any conflicts because these enums all share a namespace
-     // in the triple string format.
-     writeln!(out, "#[allow(unused_imports)]")?;
-     writeln!(out, "use crate::Aarch64Architecture::*;")?;
-     writeln!(out, "#[allow(unused_imports)]")?;
-     writeln!(out, "use crate::ArmArchitecture::*;")?;
-+    writeln!(out, "#[allow(unused_imports)]")?;
-+    writeln!(out, "use crate::CustomVendor;")?;
-     writeln!(out)?;
-     writeln!(out, "/// The `Triple` of the current host.")?;
-     writeln!(out, "pub const HOST: Triple = Triple {{")?;
-     writeln!(
-         out,
-         "    architecture: Architecture::{:?},",
-         triple.architecture
-     )?;
--    writeln!(out, "    vendor: Vendor::{:?},", triple.vendor)?;
-+    writeln!(out, "    vendor: {},", vendor_display(&triple.vendor))?;
-     writeln!(
-         out,
-         "    operating_system: OperatingSystem::{:?},",
-         triple.operating_system
-     )?;
-     writeln!(
-         out,
-         "    environment: Environment::{:?},",
-@@ -162,17 +165,17 @@ fn write_host_rs(mut out: File, triple: 
-     writeln!(out, "        Architecture::{:?}", triple.architecture)?;
-     writeln!(out, "    }}")?;
-     writeln!(out, "}}")?;
-     writeln!(out)?;
- 
-     writeln!(out, "impl Vendor {{")?;
-     writeln!(out, "    /// Return the vendor for the current host.")?;
-     writeln!(out, "    pub const fn host() -> Self {{")?;
--    writeln!(out, "        Vendor::{:?}", triple.vendor)?;
-+    writeln!(out, "        {}", vendor_display(&triple.vendor))?;
-     writeln!(out, "    }}")?;
-     writeln!(out, "}}")?;
-     writeln!(out)?;
- 
-     writeln!(out, "impl OperatingSystem {{")?;
-     writeln!(
-         out,
-         "    /// Return the operating system for the current host."
-@@ -210,17 +213,21 @@ fn write_host_rs(mut out: File, triple: 
-     writeln!(out, "    /// Return the triple for the current host.")?;
-     writeln!(out, "    pub const fn host() -> Self {{")?;
-     writeln!(out, "        Self {{")?;
-     writeln!(
-         out,
-         "            architecture: Architecture::{:?},",
-         triple.architecture
-     )?;
--    writeln!(out, "            vendor: Vendor::{:?},", triple.vendor)?;
-+    writeln!(
-+        out,
-+        "            vendor: {},",
-+        vendor_display(&triple.vendor)
-+    )?;
-     writeln!(
-         out,
-         "            operating_system: OperatingSystem::{:?},",
-         triple.operating_system
-     )?;
-     writeln!(
-         out,
-         "            environment: Environment::{:?},",
-@@ -232,8 +239,18 @@ fn write_host_rs(mut out: File, triple: 
-         triple.binary_format
-     )?;
-     writeln!(out, "        }}")?;
-     writeln!(out, "    }}")?;
-     writeln!(out, "}}")?;
- 
-     Ok(())
- }
-+
-+fn vendor_display(vendor: &Vendor) -> String {
-+    match vendor {
-+        Vendor::Custom(custom) => format!(
-+            "Vendor::Custom(CustomVendor::Static({:?}))",
-+            custom.as_str()
-+        ),
-+        known => format!("Vendor::{:?}", known),
-+    }
-+}
-diff --git a/third_party/rust/target-lexicon/src/lib.rs 
b/third_party/rust/target-lexicon/src/lib.rs
---- a/third_party/rust/target-lexicon/src/lib.rs
-+++ b/third_party/rust/target-lexicon/src/lib.rs
-@@ -26,12 +26,12 @@ mod host;
- mod parse_error;
- mod targets;
- #[macro_use]
- mod triple;
- 
- pub use self::host::HOST;
- pub use self::parse_error::ParseError;
- pub use self::targets::{
--    Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, 
Environment, OperatingSystem,
--    Vendor,
-+    Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, 
CustomVendor, Environment,
-+    OperatingSystem, Vendor,
- };
- pub use self::triple::{CallingConvention, Endianness, PointerWidth, Triple};
-diff --git a/third_party/rust/target-lexicon/src/targets.rs 
b/third_party/rust/target-lexicon/src/targets.rs
---- a/third_party/rust/target-lexicon/src/targets.rs
-+++ b/third_party/rust/target-lexicon/src/targets.rs
-@@ -1,12 +1,15 @@
- // This file defines all the identifier enums and target-aware logic.
- 
- use crate::triple::{Endianness, PointerWidth, Triple};
-+use alloc::boxed::Box;
-+use alloc::string::String;
- use core::fmt;
-+use core::hash::{Hash, Hasher};
- use core::str::FromStr;
- 
- /// The "architecture" field, which in some cases also specifies a specific
- /// subarchitecture.
- #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
- #[allow(missing_docs)]
- pub enum Architecture {
-     Unknown,
-@@ -285,32 +288,74 @@ impl Aarch64Architecture {
-     pub fn endianness(self) -> Endianness {
-         match self {
-             Aarch64Architecture::Aarch64 => Endianness::Little,
-             Aarch64Architecture::Aarch64be => Endianness::Big,
-         }
-     }
- }
- 
-+/// A string for a `Vendor::Custom` that can either be used in `const`
-+/// contexts or hold dynamic strings.
-+#[derive(Clone, Debug, Eq)]
-+pub enum CustomVendor {
-+    /// An owned `String`. This supports the general case.
-+    Owned(Box<String>),
-+    /// A static `str`, so that `CustomVendor` can be constructed in `const`
-+    /// contexts.
-+    Static(&'static str),
-+}
-+
-+impl CustomVendor {
-+    /// Extracts a string slice.
-+    pub fn as_str(&self) -> &str {
-+        match self {
-+            CustomVendor::Owned(s) => s,
-+            CustomVendor::Static(s) => s,
-+        }
-+    }
-+}
-+
-+impl PartialEq for CustomVendor {
-+    fn eq(&self, other: &Self) -> bool {
-+        self.as_str() == other.as_str()
-+    }
-+}
-+
-+impl Hash for CustomVendor {
-+    fn hash<H: Hasher>(&self, state: &mut H) {
-+        self.as_str().hash(state)
-+    }
-+}
-+
- /// The "vendor" field, which in practice is little more than an arbitrary
- /// modifier.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
- #[allow(missing_docs)]
- pub enum Vendor {
-     Unknown,
-     Amd,
-     Apple,
-     Experimental,
-     Fortanix,
-     Nvidia,
-     Pc,
-     Rumprun,
-     Sun,
-     Uwp,
-     Wrs,
-+
-+    /// A custom vendor. "Custom" in this context means that the vendor is
-+    /// not specifically recognized by upstream Autotools, LLVM, Rust, or 
other
-+    /// relevant authorities on triple naming. It's useful for people 
building
-+    /// and using locally patched toolchains.
-+    ///
-+    /// Outside of such patched environments, users of `target-lexicon` 
should
-+    /// treat `Custom` the same as `Unknown` and ignore the string.
-+    Custom(CustomVendor),
- }
- 
- /// The "operating system" field, which sometimes implies an environment, 
and
- /// sometimes isn't an actual operating system.
- #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
- #[allow(missing_docs)]
- pub enum OperatingSystem {
-     Unknown,
-@@ -710,16 +755,17 @@ impl fmt::Display for Vendor {
-             Vendor::Experimental => "experimental",
-             Vendor::Fortanix => "fortanix",
-             Vendor::Nvidia => "nvidia",
-             Vendor::Pc => "pc",
-             Vendor::Rumprun => "rumprun",
-             Vendor::Sun => "sun",
-             Vendor::Uwp => "uwp",
-             Vendor::Wrs => "wrs",
-+            Vendor::Custom(ref name) => name.as_str(),
-         };
-         f.write_str(s)
-     }
- }
- 
- impl FromStr for Vendor {
-     type Err = ();
- 
-@@ -731,17 +777,54 @@ impl FromStr for Vendor {
-             "experimental" => Vendor::Experimental,
-             "fortanix" => Vendor::Fortanix,
-             "nvidia" => Vendor::Nvidia,
-             "pc" => Vendor::Pc,
-             "rumprun" => Vendor::Rumprun,
-             "sun" => Vendor::Sun,
-             "uwp" => Vendor::Uwp,
-             "wrs" => Vendor::Wrs,
--            _ => return Err(()),
-+            custom => {
-+                use alloc::borrow::ToOwned;
-+
-+                // A custom vendor. Since triple syntax is so loosely 
defined,
-+                // be as conservative as we can to avoid potential 
ambiguities.
-+                // We err on the side of being too strict here, as we can
-+                // always relax it if needed.
-+
-+                // Don't allow empty string names.
-+                if custom.is_empty() {
-+                    return Err(());
-+                }
-+
-+                // Don't allow any other recognized name as a custom vendor,
-+                // since vendors can be omitted in some contexts.
-+                if Architecture::from_str(custom).is_ok()
-+                    || OperatingSystem::from_str(custom).is_ok()
-+                    || Environment::from_str(custom).is_ok()
-+                    || BinaryFormat::from_str(custom).is_ok()
-+                {
-+                    return Err(());
-+                }
-+
-+                // Require the first character to be an ascii lowercase.
-+                if !custom.chars().nth(0).unwrap().is_ascii_lowercase() {
-+                    return Err(());
-+                }
-+
-+                // Restrict the set of characters permitted in a custom 
vendor.
-+                fn is_prohibited_char(c: char) -> bool {
-+                    !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == 
'_' || c == '.')
-+                }
-+                if custom.chars().any(is_prohibited_char) {
-+                    return Err(());
-+                }
-+
-+                
Vendor::Custom(CustomVendor::Owned(Box::new(custom.to_owned())))
-+            }
-         })
-     }
- }
- 
- impl fmt::Display for OperatingSystem {
-     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-         let s = match *self {
-             OperatingSystem::Unknown => "unknown",
-@@ -1106,9 +1189,88 @@ mod tests {
-             t.architecture,
-             Architecture::Arm(ArmArchitecture::Thumbv7em)
-         );
-         assert_eq!(t.vendor, Vendor::Unknown);
-         assert_eq!(t.operating_system, OperatingSystem::None_);
-         assert_eq!(t.environment, Environment::Eabihf);
-         assert_eq!(t.binary_format, BinaryFormat::Elf);
-     }
-+
-+    #[test]
-+    fn custom_vendors() {
-+        // Test various invalid cases.
-+        assert!(Triple::from_str("x86_64--linux").is_err());
-+        assert!(Triple::from_str("x86_64-42-linux").is_err());
-+        assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err());
-+        assert!(Triple::from_str("x86_64-^-linux").is_err());
-+        assert!(Triple::from_str("x86_64- -linux").is_err());
-+        assert!(Triple::from_str("x86_64-CustomVendor-linux").is_err());
-+        assert!(Triple::from_str("x86_64-linux-linux").is_err());
-+        assert!(Triple::from_str("x86_64-x86_64-linux").is_err());
-+        assert!(Triple::from_str("x86_64-elf-linux").is_err());
-+        assert!(Triple::from_str("x86_64-gnu-linux").is_err());
-+        assert!(Triple::from_str("x86_64-linux-customvendor").is_err());
-+        assert!(Triple::from_str("customvendor").is_err());
-+        assert!(Triple::from_str("customvendor-x86_64").is_err());
-+        assert!(Triple::from_str("x86_64-").is_err());
-+        assert!(Triple::from_str("x86_64--").is_err());
-+
-+        // Test various Unicode things.
-+        assert!(
-+            Triple::from_str("x86_64-𝓬𝓾𝓼𝓽𝓸𝓶𝓿𝓮𝓷𝓭𝓸𝓻-linux").is_err(),
-+            "unicode font hazard"
-+        );
-+        assert!(
-+            Triple::from_str("x86_64-ćúśtőḿvéńdőŕ-linux").is_err(),
-+            "diacritical mark stripping hazard"
-+        );
-+        assert!(
-+            Triple::from_str("x86_64-customvendοr-linux").is_err(),
-+            "homoglyph hazard"
-+        );
-+        assert!(Triple::from_str("x86_64-customvendor-linux").is_ok());
-+        assert!(
-+            Triple::from_str("x86_64-ffi-linux").is_err(),
-+            "normalization hazard"
-+        );
-+        assert!(Triple::from_str("x86_64-ffi-linux").is_ok());
-+        assert!(
-+            Triple::from_str("x86_64-custom‍vendor-linux").is_err(),
-+            "zero-width character hazard"
-+        );
-+
-+        // Test some valid cases.
-+        let t = Triple::from_str("x86_64-customvendor-linux")
-+            .expect("can't parse target with custom vendor");
-+        assert_eq!(t.architecture, Architecture::X86_64);
-+        assert_eq!(
-+            t.vendor,
-+            Vendor::Custom(CustomVendor::Static("customvendor"))
-+        );
-+        assert_eq!(t.operating_system, OperatingSystem::Linux);
-+        assert_eq!(t.environment, Environment::Unknown);
-+        assert_eq!(t.binary_format, BinaryFormat::Elf);
-+        assert_eq!(t.to_string(), "x86_64-customvendor-linux");
-+
-+        let t =
-+            Triple::from_str("x86_64-customvendor").expect("can't parse 
target with custom vendor");
-+        assert_eq!(t.architecture, Architecture::X86_64);
-+        assert_eq!(
-+            t.vendor,
-+            Vendor::Custom(CustomVendor::Static("customvendor"))
-+        );
-+        assert_eq!(t.operating_system, OperatingSystem::Unknown);
-+        assert_eq!(t.environment, Environment::Unknown);
-+        assert_eq!(t.binary_format, BinaryFormat::Unknown);
-+
-+        assert_eq!(
-+            Triple::from_str("unknown-foo"),
-+            Ok(Triple {
-+                architecture: Architecture::Unknown,
-+                vendor: Vendor::Custom(CustomVendor::Static("foo")),
-+                operating_system: OperatingSystem::Unknown,
-+                environment: Environment::Unknown,
-+                binary_format: BinaryFormat::Unknown,
-+            })
-+        );
-+    }
- }
-diff --git a/third_party/rust/target-lexicon/src/triple.rs 
b/third_party/rust/target-lexicon/src/triple.rs
---- a/third_party/rust/target-lexicon/src/triple.rs
-+++ b/third_party/rust/target-lexicon/src/triple.rs
-@@ -303,20 +303,16 @@ mod tests {
-             Triple::from_str(""),
-             Err(ParseError::UnrecognizedArchitecture("".to_owned()))
-         );
-         assert_eq!(
-             Triple::from_str("foo"),
-             Err(ParseError::UnrecognizedArchitecture("foo".to_owned()))
-         );
-         assert_eq!(
--            Triple::from_str("unknown-foo"),
--            Err(ParseError::UnrecognizedVendor("foo".to_owned()))
--        );
--        assert_eq!(
-             Triple::from_str("unknown-unknown-foo"),
-             Err(ParseError::UnrecognizedOperatingSystem("foo".to_owned()))
-         );
-         assert_eq!(
-             Triple::from_str("unknown-unknown-unknown-foo"),
-             Err(ParseError::UnrecognizedEnvironment("foo".to_owned()))
-         );
-         assert_eq!(
diff --git a/http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch 
b/http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch
deleted file mode 100644
index 27693a8..0000000
--- a/http/firefox/patches/firefox-72.0.2-sqlite-3.31.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -up firefox-72.0.2/storage/TelemetryVFS.cpp.omv~ 
firefox-72.0.2/storage/TelemetryVFS.cpp
---- firefox-72.0.2/storage/TelemetryVFS.cpp.omv~       2020-01-23 
23:39:53.926584589 +0100
-+++ firefox-72.0.2/storage/TelemetryVFS.cpp    2020-01-23 23:40:01.604584216 
+0100
-@@ -167,140 +167,12 @@ struct telemetry_file {
-   sqlite3_file pReal[1];
- };
- 
--const char* DatabasePathFromWALPath(const char* zWALName) {
--  /**
--   * Do some sketchy pointer arithmetic to find the parameter key. The WAL
--   * filename is in the middle of a big allocated block that contains:
--   *
--   *   - Random Values
--   *   - Main Database Path
--   *   - \0
--   *   - Multiple URI components consisting of:
--   *     - Key
--   *     - \0
--   *     - Value
--   *     - \0
--   *   - \0
--   *   - Journal Path
--   *   - \0
--   *   - WAL Path (zWALName)
--   *   - \0
--   *
--   * Because the main database path is preceded by a random value we have 
to be
--   * careful when trying to figure out when we should terminate this loop.
--   */
--  MOZ_ASSERT(zWALName);
--
--  nsDependentCSubstring dbPath(zWALName, strlen(zWALName));
--
--  // Chop off the "-wal" suffix.
--  NS_NAMED_LITERAL_CSTRING(kWALSuffix, "-wal");
--  MOZ_ASSERT(StringEndsWith(dbPath, kWALSuffix));
--
--  dbPath.Rebind(zWALName, dbPath.Length() - kWALSuffix.Length());
--  MOZ_ASSERT(!dbPath.IsEmpty());
--
--  // We want to scan to the end of the key/value URI pairs. Skip the 
preceding
--  // null and go to the last char of the journal path.
--  const char* cursor = zWALName - 2;
--
--  // Make sure we just skipped a null.
--  MOZ_ASSERT(!*(cursor + 1));
--
--  // Walk backwards over the journal path.
--  while (*cursor) {
--    cursor--;
--  }
--
--  // There should be another null here.
--  cursor--;
--  MOZ_ASSERT(!*cursor);
--
--  // Back up one more char to the last char of the previous string. It may 
be
--  // the database path or it may be a key/value URI pair.
--  cursor--;
--
--#ifdef DEBUG
--  {
--    // Verify that we just walked over the journal path. Account for the two
--    // nulls we just skipped.
--    const char* journalStart = cursor + 3;
--
--    nsDependentCSubstring journalPath(journalStart, strlen(journalStart));
--
--    // Chop off the "-journal" suffix.
--    NS_NAMED_LITERAL_CSTRING(kJournalSuffix, "-journal");
--    MOZ_ASSERT(StringEndsWith(journalPath, kJournalSuffix));
--
--    journalPath.Rebind(journalStart,
--                       journalPath.Length() - kJournalSuffix.Length());
--    MOZ_ASSERT(!journalPath.IsEmpty());
--
--    // Make sure that the database name is a substring of the journal name.
--    MOZ_ASSERT(journalPath == dbPath);
--  }
--#endif
--
--  // Now we're either at the end of the key/value URI pairs or we're at the
--  // end of the database path. Carefully walk backwards one character at a
--  // time to do this safely without running past the beginning of the 
database
--  // path.
--  const char* const dbPathStart = dbPath.BeginReading();
--  const char* dbPathCursor = dbPath.EndReading() - 1;
--  bool isDBPath = true;
--
--  while (true) {
--    MOZ_ASSERT(*dbPathCursor, "dbPathCursor should never see a null char!");
--
--    if (isDBPath) {
--      isDBPath =
--          dbPathStart <= dbPathCursor && *dbPathCursor == *cursor && 
*cursor;
--    }
--
--    if (!isDBPath) {
--      // This isn't the database path so it must be a value. Scan past it 
and
--      // the key also.
--      for (size_t stringCount = 0; stringCount < 2; stringCount++) {
--        // Scan past the string to the preceding null character.
--        while (*cursor) {
--          cursor--;
--        }
--
--        // Back up one more char to the last char of preceding string.
--        cursor--;
--      }
--
--      // Reset and start again.
--      dbPathCursor = dbPath.EndReading() - 1;
--      isDBPath = true;
--
--      continue;
--    }
--
--    MOZ_ASSERT(isDBPath);
--    MOZ_ASSERT(*cursor);
--
--    if (dbPathStart == dbPathCursor) {
--      // Found the full database path, we're all done.
--      MOZ_ASSERT(nsDependentCString(cursor) == dbPath);
--      return cursor;
--    }
--
--    // Change the cursors and go through the loop again.
--    cursor--;
--    dbPathCursor--;
--  }
--
--  MOZ_CRASH("Should never get here!");
--}
--
- already_AddRefed<QuotaObject> GetQuotaObjectFromNameAndParameters(
--    const char* zName, const char* zURIParameterKey) {
-+    const char* zName) {
-   MOZ_ASSERT(zName);
--  MOZ_ASSERT(zURIParameterKey);
- 
-   const char* directoryLockIdParam =
--      sqlite3_uri_parameter(zURIParameterKey, "directoryLockId");
-+      sqlite3_uri_parameter(zName, "directoryLockId");
-   if (!directoryLockIdParam) {
-     return nullptr;
-   }
-@@ -328,13 +200,7 @@ void MaybeEstablishQuotaControl(const ch
- 
-   MOZ_ASSERT(zName);
- 
--  const char* zURIParameterKey =
--      (flags & SQLITE_OPEN_WAL) ? DatabasePathFromWALPath(zName) : zName;
--
--  MOZ_ASSERT(zURIParameterKey);
--
--  pFile->quotaObject =
--      GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey);
-+  pFile->quotaObject = GetQuotaObjectFromNameAndParameters(zName);
- }
- 
- /*
-@@ -687,10 +553,7 @@ int xDelete(sqlite3_vfs* vfs, const char
-   RefPtr<QuotaObject> quotaObject;
- 
-   if (StringEndsWith(nsDependentCString(zName), 
NS_LITERAL_CSTRING("-wal"))) {
--    const char* zURIParameterKey = DatabasePathFromWALPath(zName);
--    MOZ_ASSERT(zURIParameterKey);
--
--    quotaObject = GetQuotaObjectFromNameAndParameters(zName, 
zURIParameterKey);
-+    quotaObject = GetQuotaObjectFromNameAndParameters(zName);
-   }
- 
-   rc = orig_vfs->xDelete(orig_vfs, zName, syncDir);
diff --git a/libs/gmp/DETAILS b/libs/gmp/DETAILS
index a2e3504..17f8914 100755
--- a/libs/gmp/DETAILS
+++ b/libs/gmp/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gmp
 if [[ $GMP_DEVEL == "y" ]]; then
-         VERSION=6.1.2
+         VERSION=6.2.0
           SOURCE=$SPELL-$VERSION.tar.xz
 else
-         VERSION=6.1.2
+         VERSION=6.2.0
           SOURCE=$SPELL-$VERSION.tar.xz
 fi
          SOURCE2=$SOURCE.sig
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 6a2715e..7818676 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: devel version 6.2.0
+
 2019-08-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: rmeove ancient logic - g++ is always built since longtime
 
diff --git a/libs/ncurses/DETAILS b/libs/ncurses/DETAILS
index e8e3a5c..a886dc2 100755
--- a/libs/ncurses/DETAILS
+++ b/libs/ncurses/DETAILS
@@ -1,6 +1,5 @@
            SPELL=ncurses
-         VERSION=6.1
-      PATCHLEVEL=2
+         VERSION=6.2
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index b76d499..c2fdb84 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 6.2
+
 2019-08-09 David C. Haley <khoralin AT gmail.com>
        * INSTALL: Removed unneeded symlink creation
 
diff --git a/shell-term-fm/fish/DETAILS b/shell-term-fm/fish/DETAILS
index 20c864a..83eff00 100755
--- a/shell-term-fm/fish/DETAILS
+++ b/shell-term-fm/fish/DETAILS
@@ -1,9 +1,9 @@
 source "${GRIMOIRE}/CMAKE_FUNCTIONS"
            SPELL=fish
-         VERSION=3.1b1
+         VERSION=3.1.0
           SOURCE=$SPELL-$VERSION.tar.gz
    
SOURCE_URL[0]=https://github.com/fish-shell/fish-shell/releases/download/$VERSION/$SOURCE
-     
SOURCE_HASH=sha256:7847cb2777cc6ea2a18f147a0e567de5bdac4febf6afdfcf867eb45501183a1a:UPSTREAM_HASH
+     
SOURCE_HASH=sha256:e5db1e6839685c56f172e1000c138e290add4aa521f187df4cd79d4eab294368:UPSTREAM_HASH
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://fishshell.com/
          ENTERED=20051220
diff --git a/shell-term-fm/fish/HISTORY b/shell-term-fm/fish/HISTORY
index f823b55..e456389 100644
--- a/shell-term-fm/fish/HISTORY
+++ b/shell-term-fm/fish/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 3.1.0
+
 2020-01-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.1b1
        * PRE_BUILD: removed
diff --git a/utils/lsix/BUILD b/utils/lsix/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/utils/lsix/BUILD
@@ -0,0 +1 @@
+true
diff --git a/utils/lsix/DEPENDS b/utils/lsix/DEPENDS
new file mode 100755
index 0000000..1e7141e
--- /dev/null
+++ b/utils/lsix/DEPENDS
@@ -0,0 +1,2 @@
+depends bash &&
+depends imagemagick 
diff --git a/utils/lsix/DETAILS b/utils/lsix/DETAILS
new file mode 100755
index 0000000..80a6ffe
--- /dev/null
+++ b/utils/lsix/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=lsix
+         VERSION=1.7.0
+          SOURCE="$SPELL-$VERSION.tar.gz"
+   
SOURCE_URL[0]=https://github.com/hackerb9/${SPELL}/archive/${VERSION}.tar.gz
+     
SOURCE_HASH=sha512:89e3e4c8054ee4466147f59b843dc10c19e090e18bfed61200bb31921321629bafafa83014beaa692e65ca1ebc4b4104bb21d7fc40c787ac76056683a3f3281c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="https://github.com/hackerb9/lsix";
+      LICENSE[0]=GPL
+         ENTERED=20200212
+           SHORT="like ls but for images"
+cat << EOF
+lsix shows thumbnails in terminal using sixel graphics.
+EOF
diff --git a/utils/lsix/HISTORY b/utils/lsix/HISTORY
new file mode 100644
index 0000000..27b7a64
--- /dev/null
+++ b/utils/lsix/HISTORY
@@ -0,0 +1,3 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/utils/lsix/INSTALL b/utils/lsix/INSTALL
new file mode 100755
index 0000000..c96a826
--- /dev/null
+++ b/utils/lsix/INSTALL
@@ -0,0 +1 @@
+install -m755 -o root -g root "$SOURCE_DIRECTORY/lsix" 
"$INSTALL_ROOT/usr/bin/"
diff --git a/xorg-extras/xterm/CONFIGURE b/xorg-extras/xterm/CONFIGURE
index de933f9..e0745cc 100755
--- a/xorg-extras/xterm/CONFIGURE
+++ b/xorg-extras/xterm/CONFIGURE
@@ -35,5 +35,9 @@ config_query_option  XTERM_OPTS                             
          \
                      "--enable-color-class"  "--disable-color-class"  &&
 
 config_query_option  XTERM_OPTS                                     \
+                     "Enable sixel support?"  y        \
+                     "--enable-sixel-graphics"  "--enable-sixel-graphics"    
&&
+
+config_query_option  XTERM_OPTS                                     \
                      "Enable default colorMode resource?"  y        \
                      "--enable-color-mode"  "--disable-color-mode"
diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY
index 9152e7e..222504a 100644
--- a/xorg-extras/xterm/HISTORY
+++ b/xorg-extras/xterm/HISTORY
@@ -1,3 +1,6 @@
+2020-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * CONFIGURE: add support for sixel
+
 2020-02-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 353