From 5d6a40f3aeb44175f4a48ff8b89753975c6c6163 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:22:25 +0000 Subject: [PATCH 01/12] electrum-nmc: Support stripping Qt GUI --- projects/electrum-nmc/build | 6 ++++++ projects/electrum-nmc/config | 1 + 2 files changed, 7 insertions(+) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index 5a82d16..51c9000 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -27,6 +27,12 @@ cd /var/tmp/dist/[% project %] cp -a /var/tmp/build/sdist/[% project %]/Electrum-NMC* ./Electrum-NMC-[% c('version') %] +cd ./Electrum-NMC-[% c('version') %] +[% IF ! c("var/enable_qt") %] + rm -r electrum_nmc/electrum/gui/qt/ +[% END %] +cd ../ + [% c('tar', { tar_src => '.', tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 547bfdc..b1eee02 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -7,6 +7,7 @@ git_hash: 49e6c3a9ef5097a8131a006ffb9900b18aa8f8d3 var: container: use_container: 1 + enable_qt: 1 input_files: - project: container-image From 45203c54b5ace942619fc65aaf6867610f5befa7 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:23:45 +0000 Subject: [PATCH 02/12] electrum-nmc: Support stripping Kivy GUI --- projects/electrum-nmc/build | 3 +++ projects/electrum-nmc/config | 1 + 2 files changed, 4 insertions(+) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index 51c9000..76e1102 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -31,6 +31,9 @@ cd ./Electrum-NMC-[% c('version') %] [% IF ! c("var/enable_qt") %] rm -r electrum_nmc/electrum/gui/qt/ [% END %] +[% IF ! c("var/enable_kivy") %] + rm -r electrum_nmc/electrum/gui/kivy/ +[% END %] cd ../ [% c('tar', { diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index b1eee02..6e08e6f 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -8,6 +8,7 @@ var: container: use_container: 1 enable_qt: 1 + enable_kivy: 1 input_files: - project: container-image From 2cd84ae0225285356cdd76032efd042f601a372e Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:25:43 +0000 Subject: [PATCH 03/12] electrum-nmc: Support stripping all GUI files --- projects/electrum-nmc/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index 76e1102..7f4dc9b 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -34,6 +34,9 @@ cd ./Electrum-NMC-[% c('version') %] [% IF ! c("var/enable_kivy") %] rm -r electrum_nmc/electrum/gui/kivy/ [% END %] +[% IF ! c("var/enable_qt") && ! c("var/enable_kivy") %] + rm -r electrum_nmc/electrum/gui/ +[% END %] cd ../ [% c('tar', { From 9897709bdcf228ae61f5ade49759b3ad4b243f1f Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:27:55 +0000 Subject: [PATCH 04/12] electrum-nmc: Support stripping plugins --- projects/electrum-nmc/build | 3 +++ projects/electrum-nmc/config | 1 + 2 files changed, 4 insertions(+) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index 7f4dc9b..9fe1bbe 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -37,6 +37,9 @@ cd ./Electrum-NMC-[% c('version') %] [% IF ! c("var/enable_qt") && ! c("var/enable_kivy") %] rm -r electrum_nmc/electrum/gui/ [% END %] +[% IF ! c("var/enable_plugins") %] + rm -r electrum_nmc/electrum/plugins/*/ +[% END %] cd ../ [% c('tar', { diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 6e08e6f..e57a1d6 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -9,6 +9,7 @@ var: use_container: 1 enable_qt: 1 enable_kivy: 1 + enable_plugins: 1 input_files: - project: container-image From ccb8fe011c16601b8ce9b4945032c659e4ba30ee Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:45:01 +0000 Subject: [PATCH 05/12] electrum-nmc: Don't include qdarkstyle if Qt disabled --- projects/electrum-nmc/build | 6 +++++- projects/electrum-nmc/config | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index 9fe1bbe..d6d1e4f 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -10,10 +10,14 @@ cd /var/tmp/build/[% project %]/[% project %]-* mkdir packages cd packages -[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'qdarkstyle', 'qrcode', 'six', 'typing_extensions', 'yarl'] -%] +[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'qrcode', 'six', 'typing_extensions', 'yarl'] -%] tar -C . -xf $rootdir/[% c('input_files_by_name/' _ dep) %] [% END -%] +[% IF c("var/enable_qt") %] + tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qdarkstyle') %] +[% END %] + tar -C . -xf $rootdir/[% c('input_files_by_name/protobuf') %]/python-protobuf.tar.gz cd ../ diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index e57a1d6..49e0f5f 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -49,6 +49,7 @@ input_files: name: pyaes - project: qdarkstyle name: qdarkstyle + enable: '[% c("var/enable_qt") %]' - project: qrcode name: qrcode - project: six From ba977fa6127f8e062ea847791178024266ad963a Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:44:06 +0000 Subject: [PATCH 06/12] electrum-nmc: Don't include qrcode if GUI disabled --- projects/electrum-nmc/build | 6 +++++- projects/electrum-nmc/config | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index d6d1e4f..90a9206 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -10,7 +10,7 @@ cd /var/tmp/build/[% project %]/[% project %]-* mkdir packages cd packages -[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'qrcode', 'six', 'typing_extensions', 'yarl'] -%] +[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'six', 'typing_extensions', 'yarl'] -%] tar -C . -xf $rootdir/[% c('input_files_by_name/' _ dep) %] [% END -%] @@ -18,6 +18,10 @@ cd packages tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qdarkstyle') %] [% END %] +[% IF c("var/enable_qt") || c("var/enable_kivy") %] + tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qrcode') %] +[% END %] + tar -C . -xf $rootdir/[% c('input_files_by_name/protobuf') %]/python-protobuf.tar.gz cd ../ diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 49e0f5f..e5a3fc6 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -52,6 +52,7 @@ input_files: enable: '[% c("var/enable_qt") %]' - project: qrcode name: qrcode + enable: '[% c("var/enable_qt") || c("var/enable_kivy") %]' - project: six name: six - project: typing_extensions From 9acfd3cc4db9d61266de67ac625762f7b1e98964 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:48:59 +0000 Subject: [PATCH 07/12] electrum-nmc: Don't include colorama if GUI disabled --- projects/electrum-nmc/build | 3 ++- projects/electrum-nmc/config | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index 90a9206..ae4f71d 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -10,7 +10,7 @@ cd /var/tmp/build/[% project %]/[% project %]-* mkdir packages cd packages -[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'six', 'typing_extensions', 'yarl'] -%] +[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'six', 'typing_extensions', 'yarl'] -%] tar -C . -xf $rootdir/[% c('input_files_by_name/' _ dep) %] [% END -%] @@ -19,6 +19,7 @@ cd packages [% END %] [% IF c("var/enable_qt") || c("var/enable_kivy") %] + tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'colorama') %] tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qrcode') %] [% END %] diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index e5a3fc6..8d945f0 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -31,6 +31,7 @@ input_files: name: chardet - project: colorama name: colorama + enable: '[% c("var/enable_qt") || c("var/enable_kivy") %]' - project: dns name: dns - project: ecdsa From dddeb3152a4e46fd778d5d33ee99c6558468c716 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:57:49 +0000 Subject: [PATCH 08/12] electrum-nmc: Support stripping wallet --- projects/electrum-nmc/build | 4 ++++ projects/electrum-nmc/config | 1 + 2 files changed, 5 insertions(+) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index ae4f71d..ab6e25e 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -49,6 +49,10 @@ cd ./Electrum-NMC-[% c('version') %] [% IF ! c("var/enable_plugins") %] rm -r electrum_nmc/electrum/plugins/*/ [% END %] +[% IF ! c("var/enable_wallet") %] + mv electrum_nmc/electrum/null_impl/null_wallet/*.py electrum_nmc/electrum/ +[% END %] +rm -r electrum_nmc/electrum/null_impl/ cd ../ [% c('tar', { diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 8d945f0..bb1cfd9 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -10,6 +10,7 @@ var: enable_qt: 1 enable_kivy: 1 enable_plugins: 1 + enable_wallet: 1 input_files: - project: container-image From 5aa2d1c19a13c0514f166386d057535cb78713c5 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 05:11:46 +0000 Subject: [PATCH 09/12] electrum-nmc: Don't include protobuf if BIP70 disabled --- projects/electrum-nmc/build | 4 +++- projects/electrum-nmc/config | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index ab6e25e..38a57b2 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -23,7 +23,9 @@ cd packages tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qrcode') %] [% END %] -tar -C . -xf $rootdir/[% c('input_files_by_name/protobuf') %]/python-protobuf.tar.gz +[% IF c("var/enable_bip70") %] + tar -C . -xf $rootdir/[% c('input_files_by_name/protobuf') %]/python-protobuf.tar.gz +[% END %] cd ../ python3 setup.py sdist --format=gztar diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index bb1cfd9..2a76993 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -11,6 +11,7 @@ var: enable_kivy: 1 enable_plugins: 1 enable_wallet: 1 + enable_bip70: 1 input_files: - project: container-image @@ -47,6 +48,7 @@ input_files: name: multidict - project: protobuf name: protobuf + enable: '[% c("var/enable_bip70") %]' - project: pyaes name: pyaes - project: qdarkstyle From 244967367ceca209eaba043bca34a8b70442ec14 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 05:57:19 +0000 Subject: [PATCH 10/12] certifi: Support restricting to only top 10 HTTPS issuers --- projects/certifi/build | 4 + projects/certifi/config | 3 + projects/certifi/roots_of_top_10_issuers.pem | 217 +++++++++++++++++++ 3 files changed, 224 insertions(+) create mode 100644 projects/certifi/roots_of_top_10_issuers.pem diff --git a/projects/certifi/build b/projects/certifi/build index e2f8a6c..75ffe38 100644 --- a/projects/certifi/build +++ b/projects/certifi/build @@ -15,6 +15,10 @@ cd /var/tmp/dist/[% project %] cp -a /var/tmp/build/sdist/[% project %]/[% project %]*/[% project %] ./[% project %] +[% IF c("var/only_top_10_issuers") %] + cp $rootdir/roots_of_top_10_issuers.pem ./[% project %]/cacert.pem +[% END %] + [% c('tar', { tar_src => '.', tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/certifi/config b/projects/certifi/config index c31e6cc..89a537a 100644 --- a/projects/certifi/config +++ b/projects/certifi/config @@ -4,6 +4,7 @@ filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz" var: container: use_container: 1 + only_top_10_issuers: 0 input_files: - project: container-image - project: python @@ -11,3 +12,5 @@ input_files: - URL: https://files.pythonhosted.org/packages/source/c/certifi/certifi-[% c("version") %].tar.gz sha256sum: b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae # TODO: This package uses GPG sigs; we should switch from SHA256 hash to GPG verification. + - filename: roots_of_top_10_issuers.pem + enable: '[% c("var/only_top_10_issuers") %]' diff --git a/projects/certifi/roots_of_top_10_issuers.pem b/projects/certifi/roots_of_top_10_issuers.pem new file mode 100644 index 0000000..2d53dd8 --- /dev/null +++ b/projects/certifi/roots_of_top_10_issuers.pem @@ -0,0 +1,217 @@ +# This file contains the root CA's used by the top 10 HTTPS cert issuers for +# the Alexa Top 1 Million as of February 2019, according to Scott Helme's HTTPS +# issuer list and crt.sh's root CA database. Each root CA is copied verbatim +# from cacert.pem from certifi-2019.3.9. + +# Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co. +# Subject: CN=DST Root CA X3 O=Digital Signature Trust Co. +# Label: "DST Root CA X3" +# Serial: 91299735575339953335919266965803778155 +# MD5 Fingerprint: 41:03:52:dc:0f:f7:50:1b:16:f0:02:8e:ba:6f:45:c5 +# SHA1 Fingerprint: da:c9:02:4f:54:d8:f6:df:94:93:5f:b1:73:26:38:ca:6a:d7:7c:13 +# SHA256 Fingerprint: 06:87:26:03:31:a7:24:03:d9:09:f1:05:e6:9b:cf:0d:32:e1:bd:24:93:ff:c6:d9:20:6d:11:bc:d6:77:07:39 +-----BEGIN CERTIFICATE----- +MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ +MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT +DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow +PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD +Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O +rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq +OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b +xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw +7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD +aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG +SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 +ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr +AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz +R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 +JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo +Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ +-----END CERTIFICATE----- + +# Issuer: CN=COMODO RSA Certification Authority O=COMODO CA Limited +# Subject: CN=COMODO RSA Certification Authority O=COMODO CA Limited +# Label: "COMODO RSA Certification Authority" +# Serial: 101909084537582093308941363524873193117 +# MD5 Fingerprint: 1b:31:b0:71:40:36:cc:14:36:91:ad:c4:3e:fd:ec:18 +# SHA1 Fingerprint: af:e5:d2:44:a8:d1:19:42:30:ff:47:9f:e2:f8:97:bb:cd:7a:8c:b4 +# SHA256 Fingerprint: 52:f0:e1:c4:e5:8e:c6:29:29:1b:60:31:7f:07:46:71:b8:5d:7e:a8:0d:5b:07:27:34:63:53:4b:32:b4:02:34 +-----BEGIN CERTIFICATE----- +MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB +hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV +BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5 +MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT +EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR +Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR +6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X +pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC +9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV +/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf +Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z ++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w +qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah +SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC +u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf +Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq +crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E +FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB +/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl +wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM +4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV +2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna +FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ +CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK +boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke +jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL +S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb +QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl +0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB +NVOFBkpdn627G190 +-----END CERTIFICATE----- + +# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited +# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited +# Label: "COMODO ECC Certification Authority" +# Serial: 41578283867086692638256921589707938090 +# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23 +# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11 +# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7 +-----BEGIN CERTIFICATE----- +MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT +IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw +MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy +ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N +T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR +FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J +cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW +BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/ +BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm +fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv +GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= +-----END CERTIFICATE----- + +# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc. +# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc. +# Label: "Go Daddy Root Certificate Authority - G2" +# Serial: 0 +# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01 +# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b +# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da +-----BEGIN CERTIFICATE----- +MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT +EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp +ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz +NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH +EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE +AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD +E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH +/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy +DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh +GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR +tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA +AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE +FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX +WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu +9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr +gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo +2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO +LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI +4uJEvlz36hz1 +-----END CERTIFICATE----- + +# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust +# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust +# Label: "Baltimore CyberTrust Root" +# Serial: 33554617 +# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4 +# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74 +# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ +RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD +VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX +DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y +ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy +VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr +mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr +IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK +mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu +XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy +dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye +jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 +BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 +DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 +9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx +jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 +Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz +ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS +R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- + +# Issuer: CN=Amazon Root CA 1 O=Amazon +# Subject: CN=Amazon Root CA 1 O=Amazon +# Label: "Amazon Root CA 1" +# Serial: 143266978916655856878034712317230054538369994 +# MD5 Fingerprint: 43:c6:bf:ae:ec:fe:ad:2f:18:c6:88:68:30:fc:c8:e6 +# SHA1 Fingerprint: 8d:a7:f9:65:ec:5e:fc:37:91:0f:1c:6e:59:fd:c1:cc:6a:6e:de:16 +# SHA256 Fingerprint: 8e:cd:e6:88:4f:3d:87:b1:12:5b:a3:1a:c3:fc:b1:3d:70:16:de:7f:57:cc:90:4f:e1:cb:97:c6:ae:98:19:6e +-----BEGIN CERTIFICATE----- +MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF +ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6 +b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL +MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv +b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj +ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM +9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw +IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6 +VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L +93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm +jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA +A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI +U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs +N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv +o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU +5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy +rqXRfboQnoZsG4q5WTP468SQvvG5 +-----END CERTIFICATE----- + +# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com +# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com +# Label: "DigiCert Global Root CA" +# Serial: 10944719598952040374951832963794454346 +# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e +# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36 +# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61 +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- + From 1f776570557039d6552e9ed9ebe724b26261fce8 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 07:25:39 +0000 Subject: [PATCH 11/12] electrum-nmc / certifi: Add stripping targets --- projects/certifi/config | 6 ++++++ projects/electrum-nmc/config | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/projects/certifi/config b/projects/certifi/config index 89a537a..364bc1e 100644 --- a/projects/certifi/config +++ b/projects/certifi/config @@ -5,6 +5,12 @@ var: container: use_container: 1 only_top_10_issuers: 0 + +targets: + only_top_10_issuers: + var: + only_top_10_issuers: 1 + input_files: - project: container-image - project: python diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 2a76993..924c988 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -13,6 +13,23 @@ var: enable_wallet: 1 enable_bip70: 1 +targets: + disable_qt: + var: + enable_qt: 0 + disable_kivy: + var: + enable_kivy: 0 + disable_plugins: + var: + enable_plugins: 0 + disable_wallet: + var: + enable_wallet: 0 + disable_bip70: + var: + enable_bip70: 0 + input_files: - project: container-image - project: python From 51916c45daec17b56e4fccd7e1a7725a64257d0e Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Mon, 11 Nov 2019 10:23:11 +0000 Subject: [PATCH 12/12] electrum-nmc: Bump to 3.3.8 --- projects/electrum-nmc/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 924c988..540763c 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -1,8 +1,8 @@ # vim: filetype=yaml sw=2 filename: 'Electrum-NMC-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 3.3.7 +version: 3.3.8 git_url: https://github.com/namecoin/electrum-nmc.git -git_hash: 49e6c3a9ef5097a8131a006ffb9900b18aa8f8d3 +git_hash: 6cd135c0061dfa96ef92bbec7dc34b8cd0735ce3 # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification. var: container: