diff --git a/docs/index.html b/docs/index.html index d2f3f18a..c473a573 100644 --- a/docs/index.html +++ b/docs/index.html @@ -97,7 +97,7 @@ and is used by several projects
  • - has pre-compiled binaries + has pre-compiled binaries that can be used in Continuous Integration systems
  • @@ -342,7 +342,7 @@ exit Instead of building MXE packages from source, you can download precompiled packages. There are two options: tar archives and Debian packages. - See pkg.mxe.cc. + See pkg.mxe.cc.

    Step 4: Environment Variables

    @@ -753,7 +753,7 @@ USE_OSGPLUGIN(<plugin2>)

    You can install a precompiled MXE via Debian packages. - See pkg.mxe.cc. + See pkg.mxe.cc.

    Fedora/Red Hat/Centos

    @@ -2939,7 +2939,7 @@ endef Project on GitHub
  • - Binary distribution of packages + Binary distribution of packages
  • Entry on Open Hub @@ -3013,7 +3013,7 @@ endef Win32 ports of many free software packages
  • - IMCROSS + IMCROSS
    Another project with similar goal
  • diff --git a/plugins/examples/host-toolchain/README.md b/plugins/examples/host-toolchain/README.md index 84ebc6e5..9b7b9983 100644 --- a/plugins/examples/host-toolchain/README.md +++ b/plugins/examples/host-toolchain/README.md @@ -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/ diff --git a/plugins/go/README.md b/plugins/go/README.md index 6d3c7ddd..10c3001e 100644 --- a/plugins/go/README.md +++ b/plugins/go/README.md @@ -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. diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk index a7563178..2821f524 100644 --- a/plugins/luarocks/luarocks.mk +++ b/plugins/luarocks/luarocks.mk @@ -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'; \ diff --git a/src/exiv2.mk b/src/exiv2.mk index e3341337..2b7ba36f 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -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 diff --git a/src/isl.mk b/src/isl.mk index 022e26b0..072618f8 100644 --- a/src/isl.mk +++ b/src/isl.mk @@ -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 diff --git a/src/libf2c.mk b/src/libf2c.mk index 0acad5a4..6edf5c56 100644 --- a/src/libf2c.mk +++ b/src/libf2c.mk @@ -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) diff --git a/src/libgda.mk b/src/libgda.mk index 0f5c164b..664396ec 100644 --- a/src/libgda.mk +++ b/src/libgda.mk @@ -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 diff --git a/src/muparser.mk b/src/muparser.mk index 169c4ba9..c94d8712 100644 --- a/src/muparser.mk +++ b/src/muparser.mk @@ -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 diff --git a/src/muparserx.mk b/src/muparserx.mk index 3506e544..529e7b05 100644 --- a/src/muparserx.mk +++ b/src/muparserx.mk @@ -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 diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index cc0e46b0..ed1b15af 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -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) diff --git a/tools/make-shared-from-static b/tools/make-shared-from-static index df18ead8..90926dff 100755 --- a/tools/make-shared-from-static +++ b/tools/make-shared-from-static @@ -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 diff --git a/tools/mxe-get b/tools/mxe-get index 6f5a764f..b9feec3a 100755 --- a/tools/mxe-get +++ b/tools/mxe-get @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2017 Viktor Szakats +# Copyright 2017-2019 Viktor Szakats # This file is part of MXE. See LICENSE.md for licensing information. set -ue @@ -27,12 +27,12 @@ Author: Viktor Szakats " } 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}|" \