secure URLs

also apply minor updates to tools/mxe-get
This commit is contained in:
Viktor Szakats 2019-04-29 21:34:04 +00:00 committed by Tony Theodore
parent 551966ffeb
commit 42cf496ae2
13 changed files with 34 additions and 28 deletions

View File

@ -97,7 +97,7 @@
and is <a href="#used-by">used by several projects</a>
</li>
<li>
has <a href="http://pkg.mxe.cc/">pre-compiled binaries</a>
has <a href="https://pkg.mxe.cc/">pre-compiled binaries</a>
that <a href="https://github.com/zer0main/battleship">can be used
in Continuous Integration systems</a>
</li>
@ -342,7 +342,7 @@ exit</pre>
Instead of building MXE packages from source, you can
download precompiled packages. There are two options:
tar archives and Debian packages.
See <a href="http://pkg.mxe.cc/">pkg.mxe.cc</a>.
See <a href="https://pkg.mxe.cc/">pkg.mxe.cc</a>.
</p>
<h3 id="tutorial-4">Step 4: Environment Variables</h3>
@ -753,7 +753,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
<p>
You can install a precompiled MXE via Debian packages.
See <a href="http://pkg.mxe.cc/">pkg.mxe.cc</a>.
See <a href="https://pkg.mxe.cc/">pkg.mxe.cc</a>.
</p>
<h3 id="requirements-fedora">Fedora/Red Hat/Centos</h3>
@ -2939,7 +2939,7 @@ endef</pre>
<a href="https://github.com/mxe/mxe">Project on GitHub</a>
</li>
<li>
<a href="http://pkg.mxe.cc/">Binary distribution of packages</a>
<a href="https://pkg.mxe.cc/">Binary distribution of packages</a>
</li>
<li>
<a href="https://www.openhub.net/p/mxe">Entry on Open Hub</a>
@ -3013,7 +3013,7 @@ endef</pre>
Win32 ports of many free software packages
</li>
<li>
<a href="http://www.sandroid.org/imcross/">IMCROSS</a>
<a href="https://www.sandroid.org/imcross/">IMCROSS</a>
<br>
Another project with similar goal
</li>

View File

@ -85,7 +85,7 @@ running a Linux VM on Windows).
[cmake-generators]:https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html
[cmder]:http://cmder.net/
[cmder]:https://cmder.net/
[conemu]:https://conemu.github.io/
[git-win]:https://git-for-windows.github.io/
[msys2]:https://msys2.github.io/

View File

@ -3,7 +3,7 @@
See also article [cross-compile go code, including cgo][1]
by Dimitri John Ledkov.
[1]: http://blog.surgut.co.uk/2014/06/cross-compile-go-code-including-cgo.html
[1]: https://blog.surgut.co.uk/2014/06/cross-compile-go-code-including-cgo.html
Package `go-native` installs native Go 1.4. This version of Go
doesn't depend on Go installation.

View File

@ -93,7 +93,7 @@ define $(PKG)_BUILD_SHARED
echo 'echo "== Using MXE wrapper: $(PREFIX)/$(TARGET)/bin/luarocks"'; \
echo '# Creating a directory is an atomic operation, that is why'; \
echo '# it can be used as a mutex.'; \
echo '# See http://wiki.bash-hackers.org/howto/mutex'; \
echo '# See https://wiki.bash-hackers.org/howto/mutex'; \
echo 'while ( ! mkdir "$(PREFIX)/$(TARGET)/lib/luarocks/lock.dir" ); do'; \
echo ' echo "Waiting for $(PREFIX)/$(TARGET)/lib/luarocks/lock.dir to lock"'; \
echo ' sleep 5'; \

View File

@ -1,18 +1,18 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := exiv2
$(PKG)_WEBSITE := http://www.exiv2.org/
$(PKG)_WEBSITE := https://www.exiv2.org/
$(PKG)_DESCR := Exiv2
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.25
$(PKG)_CHECKSUM := c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
$(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION)
$(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://www.exiv2.org/releases/$($(PKG)_FILE)
$(PKG)_URL := https://www.exiv2.org/releases/$($(PKG)_FILE)
$(PKG)_DEPS := cc expat gettext mman-win32 zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.exiv2.org/download.html' | \
$(WGET) -q -O- 'https://www.exiv2.org/download.html' | \
grep 'href="exiv2-' | \
$(SED) -n 's,.*exiv2-\([0-9][^>]*\)\.tar.*,\1,p' | \
head -1

View File

@ -1,7 +1,7 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := isl
$(PKG)_WEBSITE := http://isl.gforge.inria.fr/
$(PKG)_WEBSITE := https://isl.gforge.inria.fr/
$(PKG)_DESCR := Integer Set Library
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.15

View File

@ -1,13 +1,13 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := libf2c
$(PKG)_WEBSITE := http://www.netlib.org/f2c/
$(PKG)_WEBSITE := https://www.netlib.org/f2c/
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1
$(PKG)_CHECKSUM := ca404070e9ce0a9aaa6a71fc7d5489d014ade952c5d6de7efb88de8e24f2e8e0
$(PKG)_SUBDIR :=
$(PKG)_FILE := $(PKG).zip
$(PKG)_URL := http://www.netlib.org/f2c/$($(PKG)_FILE)
$(PKG)_URL := https://www.netlib.org/f2c/$($(PKG)_FILE)
# $(PKG)_URL_2 was disabled in https://github.com/mxe/mxe/issues/1719
# because it has old version of the file.
# $(PKG)_URL_2 := https://netlib.sandia.gov/f2c/$($(PKG)_FILE)

View File

@ -1,7 +1,7 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := libgda
$(PKG)_WEBSITE := http://www.gnome-db.org/
$(PKG)_WEBSITE := https://www.gnome-db.org/
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.2.13
$(PKG)_CHECKSUM := 25b75951f8f38fd58a403389566a0aae2f83b39d4225bc3acf5f2d68895ab4c3

View File

@ -1,7 +1,7 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := muparser
$(PKG)_WEBSITE := http://beltoforion.de/article.php?a=muparser
$(PKG)_WEBSITE := https://beltoforion.de/article.php?a=muparser
$(PKG)_DESCR := muParser
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.2.5

View File

@ -1,7 +1,7 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := muparserx
$(PKG)_WEBSITE := http://beltoforion.de/article.php?a=muparserx
$(PKG)_WEBSITE := https://beltoforion.de/article.php?a=muparserx
$(PKG)_DESCR := muParserX
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.0.7

View File

@ -4,7 +4,7 @@
This file is part of MXE. See LICENSE.md for licensing information.
build-pkg, Build binary packages from MXE packages
Instructions: http://pkg.mxe.cc
Instructions: https://pkg.mxe.cc/
Requirements (see bootstrapped build below for non-debian systems):
MXE (https://mxe.cc/#requirements-debian)

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Taken from:
# http://hg.octave.org/mxe-octave/file/tip/tools/make-shared-from-static
# https://hg.octave.org/mxe-octave/file/tip/tools/make-shared-from-static
set -e

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright 2017 Viktor Szakats <https://vszakats.net/>
# Copyright 2017-2019 Viktor Szakats <https://vszakats.net/>
# This file is part of MXE. See LICENSE.md for licensing information.
set -ue
@ -27,12 +27,12 @@ Author: Viktor Szakats <https://vszakats.net/>"
}
mxe_curl() {
curl -fsS --connect-timeout 15 --retry 3 "$@"
curl -fsS --connect-timeout 15 -m 20 --retry 3 "$@"
}
mxe_get_pkg() {
if [[ "$1" =~ ^(mxe-(i686|x86\-64)-(w64|unknown)-(mingw32|linux-gnu)(\.shared|\.static)?)-(.*)$ ]]; then
if [[ "$1" =~ ^(mxe-(i686|x86-64)-(w64|unknown)-(mingw32|linux-gnu)(.shared|.static)?)-(.*)$ ]]; then
repo="${BASH_REMATCH[1]}" # mxe-x86-64-w64-mingw32.shared
plat="${BASH_REMATCH[4]}" # mingw32 | linux-gnu
@ -81,7 +81,7 @@ mxe_get_pkg() {
rm -f pack.bin
for i in ${deps//,/}; do
mxe_get_pkg "$i" # recurse
mxe_get_pkg "${i}" # recurse
done
else
echo "! Error: Download failed."
@ -108,18 +108,21 @@ mkdir -p "${MXE_HOME}"
(
cd "${MXE_HOME}" || exit
base='http://pkg.mxe.cc/repos/apt/debian' # APT root
base='https://pkg.mxe.cc/repos/apt/debian' # APT root
suid='D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB' # Signer UID
alias gpg='gpg --batch --keyserver-options timeout=15 --keyid-format LONG'
alias gpg='gpg --batch --keyid-format LONG'
echo "! Downloading and verifying MXE package list..."
mxe_curl \
-O "${base}/dists/wheezy/Release.gpg" \
-O "${base}/dists/wheezy/Release"
mxe_curl \
"https://keyserver.ubuntu.com/pks/lookup?search=0x${suid}&op=get" \
| gpg --import --status-fd 1
(
set -x
mxe_curl \
"https://keyserver.ubuntu.com/pks/lookup?search=0x${suid}&op=get" \
| gpg --import --status-fd 1
)
gpg --verify-options show-primary-uid-only --verify Release.gpg Release || exit 1
mxe_curl \
-O "${base}/dists/wheezy/main/binary-amd64/Packages.gz"
@ -151,6 +154,9 @@ mkdir -p "${MXE_HOME}"
-name '*.la' -o \
-name '*.pc' -o \
-name '*.cmake' -o \
-name '*.prf' -o \
-name '*.pri' -o \
-name '*.prl' -o \
-name '*-config' | while IFS= read -r f; do
sed "s|${ori}|${pwd}|" \