Thu Oct 7 20:30:37 2021 UTC ()
Pullup ticket #6505 - requested by wiz
security/tor-browser: bugfix

Revisions pulled up:
- security/tor-browser/Makefile                                 1.98
- security/tor-browser/PLIST                                    1.17
- security/tor-browser/distinfo                                 1.45

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Oct  7 12:17:10 UTC 2021

   Modified Files:
   	pkgsrc/security/tor-browser: Makefile PLIST distinfo

   Log Message:
   tor-browser: update to 10.5.8.

   Update Firefox to 78.15.0esr
   Bug 40049: Add banner for VPN survey to about:tor
   Bug 40363: Change bsaes git url


(tm)
diff -r1.97 -r1.97.2.1 pkgsrc/security/tor-browser/Makefile
diff -r1.16 -r1.16.2.1 pkgsrc/security/tor-browser/PLIST
diff -r1.44 -r1.44.2.1 pkgsrc/security/tor-browser/distinfo
cvs diff -r1.97 -r1.97.2.1 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2021/09/14 22:35:44 1.97
+++ pkgsrc/security/tor-browser/Makefile 2021/10/07 20:30:37 1.97.2.1
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.97 2021/09/14 22:35:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.97.2.1 2021/10/07 20:30:37 tm Exp $
2# 2#
3# How to update this package: 3# How to update this package:
4# 4#
5# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE} 5# replace all patches with the one from the correspoding www/firefox${ESR_RELEASE}
6# compare e.g. the output of 6# compare e.g. the output of
7# diff -r -I NetBSD . ../../www/firefox78 7# diff -r -I NetBSD . ../../www/firefox78
8# BUT keep: 8# BUT keep:
9# patch-.mozconfig (if still necessary) 9# patch-.mozconfig (if still necessary)
10# patch-browser_app_profile_000-tor-browser.js 10# patch-browser_app_profile_000-tor-browser.js
11# patch-toolkit_moz.configure (second chunk) 11# patch-toolkit_moz.configure (second chunk)
12# patch-xpcom_io_TorFileUtils.cpp 12# patch-xpcom_io_TorFileUtils.cpp
13# make the patches apply 13# make the patches apply
14# 14#
15# when packaged up, read MESSAGE and test by visiting https://check.torproject.org 15# when packaged up, read MESSAGE and test by visiting https://check.torproject.org
16# and https://panopticlick.eff.org 16# and https://panopticlick.eff.org
17 17
18DISTNAME= src-firefox-tor-browser-78.14.0esr-10.5-1-build1 18DISTNAME= src-firefox-tor-browser-78.15.0esr-10.5-1-build2
19PKGNAME= tor-browser-10.5.6 19PKGNAME= tor-browser-10.5.8
20CATEGORIES= security www 20CATEGORIES= security www
21MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/ 21MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
22EXTRACT_SUFX= .tar.xz 22EXTRACT_SUFX= .tar.xz
23DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 23DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
24DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX} 24DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX}
25#DISTFILES+= src-tor-launcher-0.2.30${EXTRACT_SUFX} 25#DISTFILES+= src-tor-launcher-0.2.30${EXTRACT_SUFX}
26 26
27MAINTAINER= wiz@NetBSD.org 27MAINTAINER= wiz@NetBSD.org
28HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 28HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
29COMMENT= Tor Browser based on Firefox 29COMMENT= Tor Browser based on Firefox
30LICENSE= mpl-1.1 30LICENSE= mpl-1.1
31 31
32UNLIMIT_RESOURCES+= datasize virtualsize 32UNLIMIT_RESOURCES+= datasize virtualsize
cvs diff -r1.16 -r1.16.2.1 pkgsrc/security/tor-browser/PLIST (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/PLIST 2021/08/15 13:21:41 1.16
+++ pkgsrc/security/tor-browser/PLIST 2021/10/07 20:30:37 1.16.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2021/08/15 13:21:41 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.16.2.1 2021/10/07 20:30:37 tm Exp $
2bin/tor-browser 2bin/tor-browser
3lib/tor-browser/actors/AboutHttpsOnlyErrorChild.jsm 3lib/tor-browser/actors/AboutHttpsOnlyErrorChild.jsm
4lib/tor-browser/actors/AboutHttpsOnlyErrorParent.jsm 4lib/tor-browser/actors/AboutHttpsOnlyErrorParent.jsm
5lib/tor-browser/actors/AudioPlaybackChild.jsm 5lib/tor-browser/actors/AudioPlaybackChild.jsm
6lib/tor-browser/actors/AudioPlaybackParent.jsm 6lib/tor-browser/actors/AudioPlaybackParent.jsm
7lib/tor-browser/actors/AutoCompleteChild.jsm 7lib/tor-browser/actors/AutoCompleteChild.jsm
8lib/tor-browser/actors/AutoCompleteParent.jsm 8lib/tor-browser/actors/AutoCompleteParent.jsm
9lib/tor-browser/actors/AutoScrollChild.jsm 9lib/tor-browser/actors/AutoScrollChild.jsm
10lib/tor-browser/actors/AutoScrollParent.jsm 10lib/tor-browser/actors/AutoScrollParent.jsm
11lib/tor-browser/actors/AutoplayChild.jsm 11lib/tor-browser/actors/AutoplayChild.jsm
12lib/tor-browser/actors/AutoplayParent.jsm 12lib/tor-browser/actors/AutoplayParent.jsm
13lib/tor-browser/actors/BrowserElementChild.jsm 13lib/tor-browser/actors/BrowserElementChild.jsm
14lib/tor-browser/actors/BrowserElementParent.jsm 14lib/tor-browser/actors/BrowserElementParent.jsm
@@ -747,29 +747,29 @@ lib/tor-browser/browser/chrome/browser/r @@ -747,29 +747,29 @@ lib/tor-browser/browser/chrome/browser/r
747lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/weibo-com.ico 747lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/weibo-com.ico
748lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/wikipedia-org.ico 748lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/wikipedia-org.ico
749lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/wykop-pl.png 749lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/wykop-pl.png
750lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/yandex-com.png 750lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/yandex-com.png
751lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/yandex-ru.png 751lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/yandex-ru.png
752lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/youtube-com.png 752lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/youtube-com.png
753lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/zhihu-com.ico 753lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/zhihu-com.ico
754lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/aliexpress-com@2x.png 754lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/aliexpress-com@2x.png
755lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/allegro-pl@2x.png 755lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/allegro-pl@2x.png
756lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/amazon@2x.png 756lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/amazon@2x.png
757lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/avito-ru@2x.png 757lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/avito-ru@2x.png
758lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/baidu-com@2x.png 758lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/baidu-com@2x.png
759lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/bbc-uk@2x.png 759lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/bbc-uk@2x.png
760lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/bing-com@2x.png 760lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/bing-com@2x.svg
761lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ctrip-com@2x.png 761lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ctrip-com@2x.png
762lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/duckduckgo-com@2x.png 762lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/duckduckgo-com@2x.svg
763lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ebay@2x.png 763lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ebay@2x.png
764lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/facebook-com@2x.png 764lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/facebook-com@2x.png
765lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/google-com@2x.png 765lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/google-com@2x.png
766lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ifeng-com@2x.png 766lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ifeng-com@2x.png
767lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/iqiyi-com@2x.png 767lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/iqiyi-com@2x.png
768lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/leboncoin-fr@2x.png 768lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/leboncoin-fr@2x.png
769lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ok-ru@2x.png 769lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/ok-ru@2x.png
770lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/olx-pl@2x.png 770lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/olx-pl@2x.png
771lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/reddit-com@2x.png 771lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/reddit-com@2x.png
772lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/twitter-com@2x.png 772lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/twitter-com@2x.png
773lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/vk-com@2x.png 773lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/vk-com@2x.png
774lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/weibo-com@2x.png 774lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/weibo-com@2x.png
775lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/wikipedia-org@2x.png 775lib/tor-browser/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/wikipedia-org@2x.png
@@ -5328,26 +5328,27 @@ lib/tor-browser/chrome/torbutton/modules @@ -5328,26 +5328,27 @@ lib/tor-browser/chrome/torbutton/modules
5328lib/tor-browser/chrome/torbutton/modules/tor-control-port.js 5328lib/tor-browser/chrome/torbutton/modules/tor-control-port.js
5329lib/tor-browser/chrome/torbutton/modules/utils.js 5329lib/tor-browser/chrome/torbutton/modules/utils.js
5330lib/tor-browser/chrome/torbutton/skin/about-wordmark.png 5330lib/tor-browser/chrome/torbutton/skin/about-wordmark.png
5331lib/tor-browser/chrome/torbutton/skin/aboutDialog.css 5331lib/tor-browser/chrome/torbutton/skin/aboutDialog.css
5332lib/tor-browser/chrome/torbutton/skin/aboutTor.css 5332lib/tor-browser/chrome/torbutton/skin/aboutTor.css
5333lib/tor-browser/chrome/torbutton/skin/dax-logo.svg 5333lib/tor-browser/chrome/torbutton/skin/dax-logo.svg
5334lib/tor-browser/chrome/torbutton/skin/icon-newsletter.png 5334lib/tor-browser/chrome/torbutton/skin/icon-newsletter.png
5335lib/tor-browser/chrome/torbutton/skin/preferences-mobile.css 5335lib/tor-browser/chrome/torbutton/skin/preferences-mobile.css
5336lib/tor-browser/chrome/torbutton/skin/preferences.css 5336lib/tor-browser/chrome/torbutton/skin/preferences.css
5337lib/tor-browser/chrome/torbutton/skin/tor-circuit-display.css 5337lib/tor-browser/chrome/torbutton/skin/tor-circuit-display.css
5338lib/tor-browser/chrome/torbutton/skin/tor-circuit-line-first.svg 5338lib/tor-browser/chrome/torbutton/skin/tor-circuit-line-first.svg
5339lib/tor-browser/chrome/torbutton/skin/tor-circuit-line-last.svg 5339lib/tor-browser/chrome/torbutton/skin/tor-circuit-line-last.svg
5340lib/tor-browser/chrome/torbutton/skin/tor-circuit-line.svg 5340lib/tor-browser/chrome/torbutton/skin/tor-circuit-line.svg
 5341lib/tor-browser/chrome/torbutton/skin/tor-survey-icon.svg
5341lib/tor-browser/chrome/torbutton/skin/tor.png 5342lib/tor-browser/chrome/torbutton/skin/tor.png
5342lib/tor-browser/chrome/torbutton/skin/torbrowser_mobile_logo.png 5343lib/tor-browser/chrome/torbutton/skin/torbrowser_mobile_logo.png
5343lib/tor-browser/chrome/torbutton/skin/torbutton.css 5344lib/tor-browser/chrome/torbutton/skin/torbutton.css
5344lib/tor-browser/chrome/torbutton/skin/torbutton.svg 5345lib/tor-browser/chrome/torbutton/skin/torbutton.svg
5345lib/tor-browser/components/EnterprisePolicies.js 5346lib/tor-browser/components/EnterprisePolicies.js
5346lib/tor-browser/components/EnterprisePoliciesContent.js 5347lib/tor-browser/components/EnterprisePoliciesContent.js
5347lib/tor-browser/components/HandlerService.js 5348lib/tor-browser/components/HandlerService.js
5348lib/tor-browser/components/components.manifest 5349lib/tor-browser/components/components.manifest
5349lib/tor-browser/components/marionette.js 5350lib/tor-browser/components/marionette.js
5350lib/tor-browser/contentaccessible/ImageDocument.css 5351lib/tor-browser/contentaccessible/ImageDocument.css
5351lib/tor-browser/contentaccessible/TopLevelImageDocument.css 5352lib/tor-browser/contentaccessible/TopLevelImageDocument.css
5352lib/tor-browser/contentaccessible/TopLevelVideoDocument.css 5353lib/tor-browser/contentaccessible/TopLevelVideoDocument.css
5353lib/tor-browser/contentaccessible/html/folder.png 5354lib/tor-browser/contentaccessible/html/folder.png
cvs diff -r1.44 -r1.44.2.1 pkgsrc/security/tor-browser/distinfo (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/distinfo 2021/09/14 22:35:44 1.44
+++ pkgsrc/security/tor-browser/distinfo 2021/10/07 20:30:37 1.44.2.1
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.44 2021/09/14 22:35:44 wiz Exp $ 1$NetBSD: distinfo,v 1.44.2.1 2021/10/07 20:30:37 tm Exp $
2 2
3SHA1 (src-firefox-tor-browser-78.14.0esr-10.5-1-build1.tar.xz) = 327d362b14b8a2fa36b29b86a48181c2e361c6fd 3SHA1 (src-firefox-tor-browser-78.15.0esr-10.5-1-build2.tar.xz) = ee9c9b6aa65d93a0d743dbc7184a6621a6c13959
4RMD160 (src-firefox-tor-browser-78.14.0esr-10.5-1-build1.tar.xz) = c129240af56f58759b64d525a745f850b6b0329a 4RMD160 (src-firefox-tor-browser-78.15.0esr-10.5-1-build2.tar.xz) = 5dd9e419f7b6b50acfdb214deac2b44d139402b0
5SHA512 (src-firefox-tor-browser-78.14.0esr-10.5-1-build1.tar.xz) = fa1a9cf950eaf616826697cf2d1c63fd5c47e08791686a92a248ddfc4775dac39235a9863cf39c00dfcd2296bbc3007d0f91b05108307ecdbdf1572b44ff4347 5SHA512 (src-firefox-tor-browser-78.15.0esr-10.5-1-build2.tar.xz) = ede30e87af34fab37bd8b34b702fb7ad5a73aa0d40e89a6136c89941ae3bca4a8b21c9966385c4727b0c79f2ec19bdf7b39342b3b3fc652d7800e10e7c739dab
6Size (src-firefox-tor-browser-78.14.0esr-10.5-1-build1.tar.xz) = 364119680 bytes 6Size (src-firefox-tor-browser-78.15.0esr-10.5-1-build2.tar.xz) = 364778700 bytes
7SHA1 (tor-browser-linux64-10.5.6_en-US.tar.xz) = b164a9880ef7526cd4d05877da4a0c09b5aa2153 7SHA1 (tor-browser-linux64-10.5.8_en-US.tar.xz) = f7d1f942aa3959bee2d9b55b7a253efff3e6e225
8RMD160 (tor-browser-linux64-10.5.6_en-US.tar.xz) = b52afb8fed717bdda8f0330904bcb7e2ee72ec78 8RMD160 (tor-browser-linux64-10.5.8_en-US.tar.xz) = f388d5ce4592a495851a67d23a67a7ef8a8dd7e3
9SHA512 (tor-browser-linux64-10.5.6_en-US.tar.xz) = 80403c2d46e2bd1c40f60abde221540fb365a6efd98a0ca9ec10c356bfbb885b460b129ea91bfea15ca6637bdffd0a4f2ec4eaec3ab17bcb00ec09246f255778 9SHA512 (tor-browser-linux64-10.5.8_en-US.tar.xz) = 59430f1367e806b172586291101240140e55eee2aa05f595afd23982c5512ff335b51058af2aa7384f1360e01e703a32760af57e3208bf4764f0e5e5a8c807bb
10Size (tor-browser-linux64-10.5.6_en-US.tar.xz) = 83628572 bytes 10Size (tor-browser-linux64-10.5.8_en-US.tar.xz) = 83624192 bytes
11SHA1 (patch-.mozconfig) = 949472d011d40b02146c06e90ed07673667d192b 11SHA1 (patch-.mozconfig) = 949472d011d40b02146c06e90ed07673667d192b
12SHA1 (patch-aa) = 458ee59cec3d2d1d52b222ab2031720e7a11fc02 12SHA1 (patch-aa) = 458ee59cec3d2d1d52b222ab2031720e7a11fc02
13SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280 13SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
14SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0 14SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
15SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8 15SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
16SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2 16SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
17SHA1 (patch-config_makefiles_rust.mk) = 8637cd3f56774648fd586c7ad8dd49e269b9eb2a 17SHA1 (patch-config_makefiles_rust.mk) = 8637cd3f56774648fd586c7ad8dd49e269b9eb2a
18SHA1 (patch-configure.in) = b40651b008dcecc49664660ac376df2bd7c2c6be 18SHA1 (patch-configure.in) = b40651b008dcecc49664660ac376df2bd7c2c6be
19SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 19SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
20SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a 20SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
21SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 21SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
22SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 22SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
23SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c 23SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c