From bd0e1feead6bb446f8a703338aa9893bf281e5b4 Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Wed, 25 Nov 2020 23:18:52 +0100 Subject: [PATCH 01/10] Fix saving the list of extensions in the Preferences dialog Thanks to @sandman7920 for providing the analysis and fix. See issue #2467. --- src/PreferencesDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PreferencesDialog.cpp b/src/PreferencesDialog.cpp index e14652a288..4bbe7dccb8 100644 --- a/src/PreferencesDialog.cpp +++ b/src/PreferencesDialog.cpp @@ -255,8 +255,8 @@ void PreferencesDialog::saveSettings() Settings::setValue("editor", "close_button_on_tabs", ui->checkCloseButtonOnTabs->isChecked()); QStringList extList; - for(const QListWidgetItem* item : ui->listExtensions->findItems(QString("*"), Qt::MatchWrap | Qt::MatchWildcard)) - extList.append(item->text()); + for(int i=0;ilistExtensions->count();++i) + extList.append(ui->listExtensions->item(i)->text()); Settings::setValue("extensions", "list", extList); Settings::setValue("extensions", "disableregex", ui->checkRegexDisabled->isChecked()); Settings::setValue("extensions", "enable_load_extension", ui->checkAllowLoadExtension->isChecked()); From beb61893a79f25f049b8662b9520cf5e79e16325 Mon Sep 17 00:00:00 2001 From: mgrojo Date: Mon, 1 Feb 2021 23:08:56 +0100 Subject: [PATCH 02/10] 'Continuous build' is marked as 'Latest Release' and not as 'Pre-release' The change in behaviour was due to https://github.com/probonopd/uploadtool/commit/8142d461aba7b92a058116fe5ee75be438b75fa4 See issue #2566 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f49424bf8..95e3c11e12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,8 @@ script: after_success: - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh - - bash upload.sh DB_Browser_for_SQLite*.AppImage* + - chmod a+x upload.sh + - UPLOADTOOL_ISPRERELEASE=true ./upload.sh DB_Browser_for_SQLite*.AppImage* notifications: email: From 72c7d5155bfdcbc8a4be3ba9b1695f71d9955451 Mon Sep 17 00:00:00 2001 From: mgrojo Date: Wed, 3 Feb 2021 23:45:52 +0100 Subject: [PATCH 03/10] Get a continuous release with AppImage in the v3.12.x branch This should approximate to issue #1092 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95e3c11e12..a0d8191ded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ dist: xenial branches: only: - master + - v3.12.x # env: # - ARCH=x86_64 DOCKER_IMAGE=amd64/ubuntu:trusty @@ -60,7 +61,7 @@ script: - git rev-list master --count - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage" - chmod a+x linuxdeployqt-6-x86_64.AppImage -- export VERSION=$(printf "`master`-`git rev-list HEAD --count`-` git -C . rev-parse --short HEAD`") #$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file +- export VERSION=$(printf "`git rev-parse --abbrev-ref HEAD`-`git rev-list HEAD --count`-` git -C . rev-parse --short HEAD`") #$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file - ./linuxdeployqt-6-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage @@ -68,7 +69,7 @@ after_success: - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh - chmod a+x upload.sh - - UPLOADTOOL_ISPRERELEASE=true ./upload.sh DB_Browser_for_SQLite*.AppImage* + - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=$VERSION ./upload.sh DB_Browser_for_SQLite*.AppImage* notifications: email: From ed72587d9b3ab148679bf6f0aa1a93ac890fcb33 Mon Sep 17 00:00:00 2001 From: Manuel Date: Thu, 4 Feb 2021 08:08:17 +0100 Subject: [PATCH 04/10] Remover unused reference to the master branch This command is failing --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a0d8191ded..ad6bb80dac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,6 @@ script: - cmake -DCMAKE_INSTALL_PREFIX:PATH=../appdir/usr -Wno-dev -Dsqlcipher=1 -DSQLITE_ENABLE_JSON1=1 .. - make install - cd .. -- git rev-list master --count - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage" - chmod a+x linuxdeployqt-6-x86_64.AppImage - export VERSION=$(printf "`git rev-parse --abbrev-ref HEAD`-`git rev-list HEAD --count`-` git -C . rev-parse --short HEAD`") #$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file From 216b5d0b9fe1f657a6459da34476d3d7d23d5c98 Mon Sep 17 00:00:00 2001 From: mgrojo Date: Sat, 6 Feb 2021 10:21:36 +0100 Subject: [PATCH 05/10] Simpler version for AppImage and branch name in the continuous release The command `git rev-parse --abbrev-ref HEAD` is not returning the branch name in the travis server, and for the version in AppImage filename it would be enough to have the short commit id. Note that these changes are branch dependant. See issue #1092 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad6bb80dac..531f1fb239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ script: - cd .. - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage" - chmod a+x linuxdeployqt-6-x86_64.AppImage -- export VERSION=$(printf "`git rev-parse --abbrev-ref HEAD`-`git rev-list HEAD --count`-` git -C . rev-parse --short HEAD`") #$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file +- export VERSION=`git -C . rev-parse --short HEAD` # linuxdeployqt uses this for naming the file - ./linuxdeployqt-6-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage @@ -68,7 +68,7 @@ after_success: - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh - chmod a+x upload.sh - - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=$VERSION ./upload.sh DB_Browser_for_SQLite*.AppImage* + - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=v3.12.x ./upload.sh DB_Browser_for_SQLite*.AppImage* notifications: email: From 5b6ad63a7595776233d7d0efa25fb6119f9fdc80 Mon Sep 17 00:00:00 2001 From: mgrojo Date: Sat, 6 Feb 2021 10:37:17 +0100 Subject: [PATCH 06/10] Generalize branch name in AppImage version and continuous release Travis environment variables are used. See issue #1092 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 531f1fb239..ed8e2f47cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ script: - cd .. - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage" - chmod a+x linuxdeployqt-6-x86_64.AppImage -- export VERSION=`git -C . rev-parse --short HEAD` # linuxdeployqt uses this for naming the file +- export VERSION=${TRAVIS_BRANCH}-`git -C . rev-parse --short HEAD` # linuxdeployqt uses this for naming the file - ./linuxdeployqt-6-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage @@ -68,7 +68,7 @@ after_success: - find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh - chmod a+x upload.sh - - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=v3.12.x ./upload.sh DB_Browser_for_SQLite*.AppImage* + - UPLOADTOOL_ISPRERELEASE=true UPLOADTOOL_SUFFIX=$TRAVIS_BRANCH ./upload.sh DB_Browser_for_SQLite*.AppImage* notifications: email: From 3bbd4ee271f98301476143749f7bf4abed052efe Mon Sep 17 00:00:00 2001 From: melnibon Date: Sat, 1 May 2021 09:26:44 +0200 Subject: [PATCH 07/10] Update sqlb_fr.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit correction d'une faute de frappe dans une chaîne (Bzse au lieu de Base) --- src/translations/sqlb_fr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/sqlb_fr.ts b/src/translations/sqlb_fr.ts index fd79d9fa6e..031adce943 100644 --- a/src/translations/sqlb_fr.ts +++ b/src/translations/sqlb_fr.ts @@ -5347,7 +5347,7 @@ Toutes vos préférences seront perdues et les valeurs par défaut seront utilis Current Database - Bzse de DOnnées en cours + Base de Données en cours From d85953c291b5f0bb467e2c12dfa4438f997d4f28 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Sun, 2 May 2021 23:36:04 +1000 Subject: [PATCH 08/10] Updated public user app cert and docker certs --- src/certs/ca-chain-docker.crt | 98 +++++++++++++++++------------------ src/certs/public.cert.pem | 92 ++++++++++++++++---------------- 2 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/certs/ca-chain-docker.crt b/src/certs/ca-chain-docker.crt index 20cbb5c60c..ec11f01dbe 100644 --- a/src/certs/ca-chain-docker.crt +++ b/src/certs/ca-chain-docker.crt @@ -1,9 +1,9 @@ -----BEGIN CERTIFICATE----- -MIIGSjCCBDKgAwIBAgICEAIwDQYJKoZIhvcNAQELBQAwga8xCzAJBgNVBAYTAkdC +MIIGSjCCBDKgAwIBAgICEAMwDQYJKoZIhvcNAQELBQAwga8xCzAJBgNVBAYTAkdC MRAwDgYDVQQIDAdFbmdsYW5kMREwDwYDVQQKDAhEQkh1Yi5pbzEnMCUGA1UECwwe REJIdWIuaW8gQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSwwKgYDVQQDDCNEQkh1Yi5p byBEb2NrZXIgRGV2ZWxvcG1lbnQgUm9vdCBDQTEkMCIGCSqGSIb3DQEJARYVanVz -dGluQHBvc3RncmVzcWwub3JnMB4XDTIwMDcwODE4NTQ0M1oXDTIxMDcwODE4NTQ0 +dGluQHBvc3RncmVzcWwub3JnMB4XDTIxMDUwMjExMjkxM1oXDTMxMDUwMzExMjkx M1owgbcxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMREwDwYDVQQKDAhE Qkh1Yi5pbzEnMCUGA1UECwweREJIdWIuaW8gQ2VydGlmaWNhdGUgQXV0aG9yaXR5 MTQwMgYDVQQDDCtEQkh1Yi5pbyBEb2NrZXIgRGV2ZWxvcG1lbnQgSW50ZXJtZWRp @@ -20,53 +20,53 @@ vrPZW0LCRZ0rnwHyCLqYTItYUlSItVBJnVJ77z1xVi1bNNHBBy8/1etM+LKMWLMu HmTKZK1dcpOqVZ9oIg3fvL3/8kdkaFVuloj6sU0SpNwDiF839O0sv5a0URrX+23K wjmtLNmXfZtz6ikSfc87mCZePHRqVejv1lQJYf9a5aw9Xm3FTSJDLPThNttsjCKg jVDRnvlT22ywtLNOlQIDAQABo2YwZDAdBgNVHQ4EFgQU/sG8zdpEuNy3LzZho0MA -bWZ/qoowHwYDVR0jBBgwFoAUd7sMPGKVbxpd0JLzVZEL148L0FowEgYDVR0TAQH/ -BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAD7U -xV1jgTfs+I0H1jlJlsz9c4HBW/JKy2QrgYb1UZ1PXMdz9ByDYHHRewlwh7NxY5W1 -0kfqjrZ0ucPyu6W6AhpEB0DI+q72MikB/EpihB2RGYAavhlzwc/wePs6f2YQr0gx -vEItREjprSwrlHEQH7MGscc9TfEZ3ruQ8SYhIKAlGZDFkwo941MJQRMuZhn1bBZ/ -+fAzZOjr7bh5JqQ7/H7XCNcb5dw7P58N+lBOylxPO2WAYsClAzaUbRndWqmzPYd1 -xHQAL8QJr1lgMwRoe5HHiCQHrPfJA8dPSfz3zVqLVMBPXnTYURilfOluS+zzGnvZ -PC2gljzLLiXaHhfldLCnpC1j0R5Rsquin1mkOVHlluHLxOzkiKTCNjMyGT6MtfCe -ndDVEyM/480dHpX7GbMJYClSDg9QvADuaZgZWGsypoG7zv99TlJCPs7C85pi64lY -OFf3TarYSJss8HtZk5Mtfjf3UX5X38DaWbQh/fmj9wZ69exFL0O2ePXBihgxTK3/ -uvYArmnpys/RvQRdgfwYtH5PXXVf4uUYkWQa0f3Dm/Vtd0b4el+RTAd+xDY3b/xC -YJGt90LA7xUIg4s481F3spEpIhm6qI9hE676QivkK6ystpU2USgg/KKJKEgtLyBz -WAwc2tzuzaXJkoptufNjNXTBZ7OOijBw2JYDswQr +bWZ/qoowHwYDVR0jBBgwFoAUQRp62y8gTl4irm8Q2gz7NNf9WSAwEgYDVR0TAQH/ +BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJkN +0y0PnBdC6OwKHEIFXVDauiKvVTdm5/1AGtvE7C1t8cnVb22Jygzaw7TyekYqTaTV +sVW8zXCgNMNvTZOfB17A1jn7zxXjHYi3/IZw5NAzz02SPutxWgetuas4EdDwD9iT +thHxkq2c6/1LaY/ZVHuQvnrIIfec01ZK6LzAlQyD8/v6CIoBTBqEIerVo9YNTimd +l/UF4DVnX17jyZKWJuKqyL8HCC42QqC9smGPGvnE8mVdo0ed40+Dsx82n2vWLNVr +nltNTCww4ryRcmtsuEsdRv1b+MJLJfFVEm9nevXZplAs0XwjEtETvlFWvPQz+zOH +hm6LglP3LXLYIIzHnwSV9e9Qwr4yXAReBZxnfVdUzw0JDZdVUniA7sUSMlRQIg1F +KXU42sT1AcCOuWUaD72MF29xpfOt5pWOM5R76y3xC6bhuRwkneUX9Nf5iHAkwG23 +MwpurAVZiO5VR/LCYuL1vPP2XOmC5a10qbCQzP5hACCTXr5P8xXVtB4tyMZ46Vnw +wnGxZ9bxhiXU8OO/FISWKmb9XFbbiNcJyRFQSjVU1prypvRpbbmwVg9bL1JgemH+ +VQK3XIKr3GHWqAwRVGcNYD4LVLO0HX5kKkeIB2NzfvR8Bxn1WIjJPPZFyc4gAoLg +v57ad/lF+jA0wlW68dB8AGV0HKjxq6b9jAeR+W2h -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIGRjCCBC6gAwIBAgIJAICSSfzvtSR5MA0GCSqGSIb3DQEBCwUAMIGvMQswCQYD -VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDERMA8GA1UECgwIREJIdWIuaW8xJzAl -BgNVBAsMHkRCSHViLmlvIENlcnRpZmljYXRlIEF1dGhvcml0eTEsMCoGA1UEAwwj -REJIdWIuaW8gRG9ja2VyIERldmVsb3BtZW50IFJvb3QgQ0ExJDAiBgkqhkiG9w0B -CQEWFWp1c3RpbkBwb3N0Z3Jlc3FsLm9yZzAeFw0xOTAxMTUwNTUyMTVaFw0yMTAx -MTYwNTUyMTVaMIGvMQswCQYDVQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDERMA8G -A1UECgwIREJIdWIuaW8xJzAlBgNVBAsMHkRCSHViLmlvIENlcnRpZmljYXRlIEF1 -dGhvcml0eTEsMCoGA1UEAwwjREJIdWIuaW8gRG9ja2VyIERldmVsb3BtZW50IFJv -b3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWp1c3RpbkBwb3N0Z3Jlc3FsLm9yZzCCAiIw -DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM8cDJKcXq/QQMmosVGozmiLHWu4 -v/AYtC21TbAnNB0wWULtMG499QcyPMSkDZgGr0gKg5YcX54rWU7xZRDfbx/jreZE -EiFOTADzFhkT8GMikXwSidJ0JtrojnksxgFXS5icYI9yv31DggwtYVjqPsfpzGSh -ueRXErytYpX1lrOsLbj8SsPBwR+jtc5ki6WBEDf7+MbZ9vJSx4GzjdwUDecVJvy/ -8VrjPvFIAq9XviFL1ajDU4C5s2fzRx1GyskbR23ZbD7smOyhFtag9Cw1xOj16+EM -BzEVzCLJf1JuF3j3s9awKwxKBbNoBQmPXupPtR6KpH0DSCZNkP1pqIok2ceJ0ncn -uKvxDWjelurnxMhlKp8/ZwnSB6Ot4D7yTbPtOr22u/hwckMBxaai+rE2D1/mc5pO -/YPASEwze7rhsh2xitqdMKcqhy/bfgM16HSi6fr0cbnliK+IEzDIe38XGrp8tOZ0 -MX7NmNhetje3uBg8FuIxh4hf7sCm/NObO5YSYTRK0IR7rPovZlPURD8jZ2S/wJ8v -B+ijRfmdxnN5DPUfmXwm1hiasf7ZHjqQzMCTPrVBgGBLCvLMpVrWt+YzgfmG6sH8 -EtOCYbsP4EU728H1BOOIVUrkq3LOzrUSxx4n9BoqbIvRjbxpEBV02MOF42GHK5W9 -bUdT+iE2zKk1omYfAgMBAAGjYzBhMB0GA1UdDgQWBBR3uww8YpVvGl3QkvNVkQvX -jwvQWjAfBgNVHSMEGDAWgBR3uww8YpVvGl3QkvNVkQvXjwvQWjAPBgNVHRMBAf8E -BTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAfOEqp1f1 -RdvIDKr2/hHmYup138/ZEsEy8SQmKHZt70KF616i2QR0m3zb5VD0IU800Q2p3FSd -wdxmLyeROJggyjRdR5lVGhWcLCKYCh2tN7glxhmF2LdHWjsHVDrFKxJgk8Y8eDCG -cXr6tE981nWtfGwyP7TFGlk9rziyrfqi6VKlde0fGFliDQH1cKvBh1h9WnaS8zl4 -Kq25SkdBMg/mnJdJfsh+yteuWEGMLoy2ixjWYUodtgvvLMT8+r57VKLWt1tnX5WN -u8UVSXv26IKzFfXxc6rdgfRNxId2CCFP77VOXuFlG9IhRH8i6s+ZIV3Uv/gKZ2Nt -4TLuxt3gDsMTT37ucbi0DyILvEc1UvPGPT1dBNc3yM5W35Sx7Oc0t80eMQebYISS -aO9xGthcFzM1B2RR04cn1zb+X7UbuefvH7vfVp9FhJJ4eRS2gVOwvwGxiqeshmLR -8tOElLck8BUgvBN/XSw7zpPtf93GDsxQdymWyWuDnA7UZ7tH69k8dxugNxWzNBkg -4VuIbkHn0U3kaofsoLWE5j9Kl+xqbBnhy03qw5LeqlipFvKiuj+CyroFb6UEQ5iJ -smNM2cnITFKIrnITQT5HDSWzAUsL/8PBz+3YLmrwXtVo3m5/UGPWQz5hWljbuEc2 -Xhpr4CqdHWRwSMxYOkosajA85nlTNP1L+3k= +MIIGUTCCBDmgAwIBAgIUROzwAIHBoAT1lP4XR65lSC/C+uEwDQYJKoZIhvcNAQEL +BQAwga8xCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMREwDwYDVQQKDAhE +Qkh1Yi5pbzEnMCUGA1UECwweREJIdWIuaW8gQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +MSwwKgYDVQQDDCNEQkh1Yi5pbyBEb2NrZXIgRGV2ZWxvcG1lbnQgUm9vdCBDQTEk +MCIGCSqGSIb3DQEJARYVanVzdGluQHBvc3RncmVzcWwub3JnMB4XDTIxMDUwMjEx +MTk0MVoXDTMxMDUwMzExMTk0MVowga8xCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdF +bmdsYW5kMREwDwYDVQQKDAhEQkh1Yi5pbzEnMCUGA1UECwweREJIdWIuaW8gQ2Vy +dGlmaWNhdGUgQXV0aG9yaXR5MSwwKgYDVQQDDCNEQkh1Yi5pbyBEb2NrZXIgRGV2 +ZWxvcG1lbnQgUm9vdCBDQTEkMCIGCSqGSIb3DQEJARYVanVzdGluQHBvc3RncmVz +cWwub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx45dv4Ue1YZ8 +7NxY26n3ccMhmtifRatdyCV0XWIIe8zBYQ3R1qSGIDmrNjNSA2i+DVIcktEsWO+B +xPPGneI0NPv1sKnhWBpC93hVm0q8cCh07ud37BsYZEOu+j04Z3hZmJ+LBKhC9kJA +p8bsZPAJokF1ThHmfMCD8Cr0EntnZdRsY+uVpw0AsHvC2PHmQvs5f2K49R4SwVD6 +ehkKaM5qjb5e+TkeuIg16qKeIwyz0qiL41Z07+THw5JBbkVuThLrGQ721iydpxPR +3CJbRtJemNDdrZCEyvcgq8w6jRe519McmCUCEuYZy1rbodng5MOybUyvnLi5AwzA +EeDsHk18yF0P9JhVmPGg8bSswoscYQk3p821IMZpL4DFVLdA0nHdwZeZoD7fw0TV +p5h4oD5t0tsFR/N9cBEUvunwJ4P1WU1MstLrfQf4YVWzYOoZgl8nBf7zqoGwYN9t +NkTgr4fnWZM8rZTzm93Mpr2nZ2r/7hMzadfrQFPRgR4BYFrZzMutUisLqMG5qMdJ +4/z3qRP6+Gwr8cZjRJw7Pv6dDJes/uq1PHdJ8c4pYR+GGmpT2rM8jHX2n8C2vJFG +x19BEjNaqhY34zonTAA/WrFYcrGamzojqIyRBEcc572E0HWShC053HlMmjMHSukh +6uwQ3U6x2ABAqP76qGaj89skELSi6RkCAwEAAaNjMGEwHQYDVR0OBBYEFEEaetsv +IE5eIq5vENoM+zTX/VkgMB8GA1UdIwQYMBaAFEEaetsvIE5eIq5vENoM+zTX/Vkg +MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUA +A4ICAQAjZKP5sTXPEXdzv65XCBsEj8kVR6SDs3WTVCU/gU2Lylqe/gB0kKRh2C9K +/DafSfsEYx0qwHXt4qRlTU7ih87CY+QnCw5IBaye0wVCofc1FqjP6T7RC7QNhni8 +mUzeAl9eOf6Idex1wzEhgk+lulrJ3igHczLfR+layr8RLY7De9pO23xPIQoV23Yo +/kYJicKBKOs6U/tM4nzoZsiB9yEUIdnOkF8SGWBbYVMOkxt8CYtChHGqJFeEveuc +5uY5Ot1iPrAPVP30JeVpGu6TQmFWNjXo18eqj/lmw5G1iSAAxSfIeHb1njFlw/++ +irpAnICe6ggSSi8IgEeuwlZfNtTAGjXpqU3xFKvv6vg9Y7D4UlA1ln/Xd2P1Ea7t +Yy0UhBs6a4SbEm7Au4m7SwEMA+ImGcbUacgiLX/EDLqUjM02WtwNeXq3dK4bIbo5 +DhvKvYg11LQT1A1XJQopMFRMo6YNnsWXxy3MWq3l6GAqxmet+vslTAuOUdorS/5t +0yhQo1JtjcxZV7m+7TcwvFs+oeseaBXiLHkHM9P5TKsTJ9vKQuohEc0o1+YS+TqA +Oie7rmViMy8+IKE9pFGNjo9KBtRshqDpz9C5z8X4WDpM7lB+EcFKIMbz0P4vPIcZ +KDeX5COGCBbVnqBR7+MD+jU5k0376ShF+BAM3Ob9qF09aw0vMg== -----END CERTIFICATE----- diff --git a/src/certs/public.cert.pem b/src/certs/public.cert.pem index 7360c47f05..c27afb5138 100644 --- a/src/certs/public.cert.pem +++ b/src/certs/public.cert.pem @@ -1,54 +1,54 @@ -----BEGIN CERTIFICATE----- -MIIEmjCCAoKgAwIBAgIQPY6Csi7n3qtvWzrSOevs9jANBgkqhkiG9w0BAQsFADCB +MIIEmjCCAoKgAwIBAgIQRKcXCIHx/VM6mM4J+w/BnTANBgkqhkiG9w0BAQsFADCB ijELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxETAPBgNVBAoMCERCSHVi LmlvMScwJQYDVQQLDB5EQkh1Yi5pbyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxLTAr -BgNVBAMMJERCSHViLmlvIERFVkVMT1BNRU5UIEludGVybWVkaWF0ZSBDQTAeFw0x -OTA1MDMwODQ4MzFaFw0yMTA1MDMwODQ4MzFaMD8xHjAcBgNVBAoTFURCIEJyb3dz +BgNVBAMMJERCSHViLmlvIERFVkVMT1BNRU5UIEludGVybWVkaWF0ZSBDQTAeFw0y +MTA1MDIxMzM0MjFaFw0yNjA1MDIxMzM0MjFaMD8xHjAcBgNVBAoTFURCIEJyb3dz ZXIgZm9yIFNRTGl0ZTEdMBsGA1UEAwwUcHVibGljQGRiNHMuZGJodWIuaW8wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCh/LexJv5lntYnvTEx1NA57YL5 -+jLVimLziI4GBr7aoNqOix5npjdQY28TilQwAe2Xz6cggP9TyBHZzKVUMnBqDrs6 -xb/EjveMkB/Xb/E3NLTF5ql2C2FRG/X5x17A2sCSGq00/ApnC4CJC1Q2xXFdwa1Z -JYZrG9HELNiE8FMOSb9AejQfHyIxnz+/fbeH5D+uWZIGgpjGKinpHnSCouL5TTTL -90BdtINyfqn5IM+ywZYQVGRmszU6QCg9ci3YA14pIptBfSO5Qh1Y/WcXRiGg9uGN -AyRVXW4HDDRxqkAz+23S+CQOG6RsIsBVCO7lgwhjqgJ0JqTVs8SNJQIzYkyNAgMB +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtS1Ik94JMX6bZJArL6xPddEZv +yhAyv5BFKSJwm+NjvGQNR0guAZSeWRBVn/pQLvfGQnY+DkX7CQ5Mp6jJARRMjM8+ +MQXkbsoZ3kyFTrMjoezEIoiNI7ndyAwauk1Hh2VfjQ6Ce2FMfFGYZk48dd3m4bvr +nPgdcDnnBFIQ6Np/W76bHSUhkNRivcFyGgWWBCKYlLmMBviN7an9D4zBex7LhL37 +FFCrGgo9vs0qLtX8m5Chtdlvj18CVOvYgSGvqRIj5y2peF+jAgbtyTtWmnT9iqK3 +cBudd2PiWk1l4SvEcR1+ULsyw4LReSin4aHrpZ45WLLBsQICTtcPlqSVrr+tAgMB AAGjRjBEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHwYDVR0j -BBgwFoAUzl/NZNsCDfwlRFDAZBt/2KfiH+UwDQYJKoZIhvcNAQELBQADggIBAL9U -S7kCHXdeSyiykS2Fj94qpwNCWXXDqitiO0m0u1redSXtYOD/rOn+ZeBfop4PcWrh -y7hPsi6RKAvpwUdp+xTCIczRV5n1Nxw4U0O5xNqbRxuJdG2CCtE3kbPFnQ9XppyX -XmQG6mxSA7UeiUiraCG0zEqp/gGqo5DULb9HrzRN1Kba+E4gyC30MsfNV1M+TrgK -H62afCEdmUAZKUoSpDKsaBBiDHndL4yaapxrFX+A8+Cf21ECVPdj+M3UoW48TTr8 -UH2rpJ2ajhV+v/tYOmN8OZAoZuKQ/FT6n7vURf0tKErvYnDDxoxTHWMgUBNzJhPV -17GzfRrM07uBwJ3HpDL457EpfWjBTt9GLWGrhT0v/7DZ0NxG8ty+RzKGvfSWUJWR -Hat6VJlTn8d81GIE7GAScO1823+4rldVzyqdlQhvmzQN044n1r+AAmKi7GdgIWi6 -KdRphZIivppzq0HFghVtFVTTkKWCvef14z6R+Sd4MmLHphOtdQsBYQCbHqf4V+8J -cT+0+jXc/uqibrLNEAmMCHUfI10qqKoaDTTGy/Q/sof3Us+9VW/liSmlnKGl6m3o -XuBmqD7kMGm29eETr2A35Q7JyZQ2eb1bUAC8K3HusR4eUUYiOigaauMDCFbllHY8 -8rs8Eah6chQyfviFadiGHHwQVW2rXclAXPMgDd6O +BBgwFoAUzl/NZNsCDfwlRFDAZBt/2KfiH+UwDQYJKoZIhvcNAQELBQADggIBAA16 +XYqgzJFZjcrYC2lhpOEgmwlavBMwEP4e/ly37+PbsirIak4bNVyY0zw6tEZCF55r +Rij2LNgaxFJnrZrWdP7yFua9wzf4wQOd+dLLHE9K8E4mAAz8wuof+C0J9nljmD66 +6p3HH6X5TrDaMBILQB4moWrjgGBfey2DufFd8w05M1vPIWisZiUN6gkrAImhGLBt +aXEnCKY5Kby4+SHv2ks+yk7U/cDIOOSwQU2Sgc2gaUM3joofsab5JsChyQrQbEDd +yIM1PtpvZCvyTjlrBb1ic+TlRgDtRCDOEBL7uHgaHJp1s+XZ0axLx9U+qYuBS0P9 +qDTxpewB3JSLZfUu4noeW5Oe9MhiRky7tPTAADehjeuYYWiCBtL1F73x21MUoey9 ++yCnHuWOrr6iMlG7R2Joa+KPZZ1RnMdaH42/DxYzB5rEymqvNQQvwsQJ1KIb3gVp +72AHYXiIbcw0EtDU2Js6K6KfNd14wQmBcyIhfY6NT3GUrFuVamWLiEQZh8H6fBn+ +iSv3QeDF1TJxJ8G88BJbwm+gAsQTL4oyVzZSAFvuGwE1ODmNLm8J52jzsuduTWeb +30/dBeFXL/TC6xw8BsXMjP92CDTI9RM/rpe+b0m+StEOp27k8i6qg/ozTCpdf4dH +XOjJ0KVw3giAvF8+p6WiZnm2UJPqS9hVP9QDBsZR -----END CERTIFICATE----- -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- From 1955cb13b483fa66849bce152f302fe6817bfadc Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Mon, 3 May 2021 00:08:53 +1000 Subject: [PATCH 09/10] Update version number for 3.12.2 --- installer/windows/variables.wxi | 2 +- src/app.plist | 6 +++--- src/version.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/windows/variables.wxi b/installer/windows/variables.wxi index 33a34fa231..7bb5f5e8a1 100644 --- a/installer/windows/variables.wxi +++ b/installer/windows/variables.wxi @@ -3,7 +3,7 @@ - +