[geany/geany-plugins] 601162: Windows installer: Install ca-certificates for UpdateChecker plugin

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sun, 25 Nov 2018 22:23:02 UTC
Commit:      60116231db908cbf3666d1df114f5859a63592e3
             https://github.com/geany/geany-plugins/commit/60116231db908cbf3666d1df114f5859a63592e3

Log Message:
-----------
Windows installer: Install ca-certificates for UpdateChecker plugin

For the UpdateChecker plugin we need the Let's Encrypt intermediate
certificate to properly validate TLS certificates when querying
geany.org for version check.


Modified Paths:
--------------
    build/geany-plugins.nsi
    build/gtk-bundle-from-msys2.sh

Modified: build/geany-plugins.nsi
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -318,6 +318,7 @@ Section Uninstall
 	RMDir /r "$INSTDIR\share\webkitgtk-1.0"
 	RMDir /r "$INSTDIR\share\webkitgtk-3.0"
 	RMDir /r "$INSTDIR\share\xml\dbus-1"
+	RMDir /r "$INSTDIR\ssl\certs"
 
 	FindFirst $0 $1 "$INSTDIR\share\locale\*"
 	loop:
@@ -351,6 +352,8 @@ Section Uninstall
 	RMDir "$INSTDIR\share\locale"
 	RMDir "$INSTDIR\share\xml"
 	RMDir "$INSTDIR\share"
+	RMDir "$INSTDIR\ssl\certs"
+	RMDir "$INSTDIR\ssl"
 	RMDir "$INSTDIR"
 
 	DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"


Modified: build/gtk-bundle-from-msys2.sh
7 lines changed, 5 insertions(+), 2 deletions(-)
===================================================================
@@ -23,6 +23,8 @@ gtkv="3"
 # gtkspell - for GeanyVC plugin
 # the rest is dependency-dependency
 packages="
+p11-kit
+ca-certificates
 ctags
 ctpl-git
 curl
@@ -66,7 +68,6 @@ nettle
 nghttp2
 openssl
 orc
-p11-kit
 readline
 rtmpdump-git
 sqlite3
@@ -253,7 +254,9 @@ cleanup_unnecessary_files() {
 	rm -rf share/readline
 	rm -rf share/zsh
 	# ssl: cleanup ssl files
-	rm -rf ssl
+	rm -rf ssl/*.cnf
+	rm -rf ssl/*.cnf.dist
+	rm -rf ssl/*.pem
 	# bin: cleanup binaries and libs (delete anything except *.dll and binaries we need)
 	find bin \
 		! -name '*.dll' \



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).