Browse Source

secure URLs

also apply minor updates to tools/mxe-get
tags/build-2019-06-02
Viktor Szakats 2 months ago
parent
commit
42cf496ae2

+ 5
- 5
docs/index.html View File

@@ -97,7 +97,7 @@
97 97
         and is <a href="#used-by">used by several projects</a>
98 98
     </li>
99 99
     <li>
100
-        has <a href="http://pkg.mxe.cc/">pre-compiled binaries</a>
100
+        has <a href="https://pkg.mxe.cc/">pre-compiled binaries</a>
101 101
         that <a href="https://github.com/zer0main/battleship">can be used
102 102
         in Continuous Integration systems</a>
103 103
     </li>
@@ -342,7 +342,7 @@ exit</pre>
342 342
     Instead of building MXE packages from source, you can
343 343
     download precompiled packages. There are two options:
344 344
     tar archives and Debian packages.
345
-    See <a href="http://pkg.mxe.cc/">pkg.mxe.cc</a>.
345
+    See <a href="https://pkg.mxe.cc/">pkg.mxe.cc</a>.
346 346
     </p>
347 347
 
348 348
     <h3 id="tutorial-4">Step 4: Environment Variables</h3>
@@ -753,7 +753,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
753 753
 
754 754
     <p>
755 755
     You can install a precompiled MXE via Debian packages.
756
-    See <a href="http://pkg.mxe.cc/">pkg.mxe.cc</a>.
756
+    See <a href="https://pkg.mxe.cc/">pkg.mxe.cc</a>.
757 757
     </p>
758 758
 
759 759
     <h3 id="requirements-fedora">Fedora/Red Hat/Centos</h3>
@@ -2939,7 +2939,7 @@ endef</pre>
2939 2939
         <a href="https://github.com/mxe/mxe">Project on GitHub</a>
2940 2940
     </li>
2941 2941
     <li>
2942
-        <a href="http://pkg.mxe.cc/">Binary distribution of packages</a>
2942
+        <a href="https://pkg.mxe.cc/">Binary distribution of packages</a>
2943 2943
     </li>
2944 2944
     <li>
2945 2945
         <a href="https://www.openhub.net/p/mxe">Entry on Open Hub</a>
@@ -3013,7 +3013,7 @@ endef</pre>
3013 3013
         Win32 ports of many free software packages
3014 3014
     </li>
3015 3015
     <li>
3016
-        <a href="http://www.sandroid.org/imcross/">IMCROSS</a>
3016
+        <a href="https://www.sandroid.org/imcross/">IMCROSS</a>
3017 3017
         <br>
3018 3018
         Another project with similar goal
3019 3019
     </li>

+ 1
- 1
plugins/examples/host-toolchain/README.md View File

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

+ 1
- 1
plugins/go/README.md View File

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

+ 1
- 1
plugins/luarocks/luarocks.mk View File

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

+ 3
- 3
src/exiv2.mk View File

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

+ 1
- 1
src/isl.mk View File

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

+ 2
- 2
src/libf2c.mk View File

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

+ 1
- 1
src/libgda.mk View File

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

+ 1
- 1
src/muparser.mk View File

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

+ 1
- 1
src/muparserx.mk View File

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

+ 1
- 1
tools/build-pkg.lua View File

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

+ 1
- 1
tools/make-shared-from-static View File

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

+ 15
- 9
tools/mxe-get View File

@@ -1,6 +1,6 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-# Copyright 2017 Viktor Szakats <https://vszakats.net/>
3
+# Copyright 2017-2019 Viktor Szakats <https://vszakats.net/>
4 4
 # This file is part of MXE. See LICENSE.md for licensing information.
5 5
 
6 6
 set -ue
@@ -27,12 +27,12 @@ Author: Viktor Szakats <https://vszakats.net/>"
27 27
 }
28 28
 
29 29
 mxe_curl() {
30
-  curl -fsS --connect-timeout 15 --retry 3 "$@"
30
+  curl -fsS --connect-timeout 15 -m 20 --retry 3 "$@"
31 31
 }
32 32
 
33 33
 mxe_get_pkg() {
34 34
 
35
-  if [[ "$1" =~ ^(mxe-(i686|x86\-64)-(w64|unknown)-(mingw32|linux-gnu)(\.shared|\.static)?)-(.*)$ ]]; then
35
+  if [[ "$1" =~ ^(mxe-(i686|x86-64)-(w64|unknown)-(mingw32|linux-gnu)(.shared|.static)?)-(.*)$ ]]; then
36 36
 
37 37
     repo="${BASH_REMATCH[1]}"  # mxe-x86-64-w64-mingw32.shared
38 38
     plat="${BASH_REMATCH[4]}"  # mingw32 | linux-gnu
@@ -81,7 +81,7 @@ mxe_get_pkg() {
81 81
             rm -f pack.bin
82 82
 
83 83
             for i in ${deps//,/}; do
84
-              mxe_get_pkg "$i"  # recurse
84
+              mxe_get_pkg "${i}"  # recurse
85 85
             done
86 86
           else
87 87
             echo "! Error: Download failed."
@@ -108,18 +108,21 @@ mkdir -p "${MXE_HOME}"
108 108
 (
109 109
   cd "${MXE_HOME}" || exit
110 110
 
111
-  base='http://pkg.mxe.cc/repos/apt/debian'  # APT root
111
+  base='https://pkg.mxe.cc/repos/apt/debian'  # APT root
112 112
   suid='D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB'  # Signer UID
113 113
 
114
-  alias gpg='gpg --batch --keyserver-options timeout=15 --keyid-format LONG'
114
+  alias gpg='gpg --batch --keyid-format LONG'
115 115
 
116 116
   echo "! Downloading and verifying MXE package list..."
117 117
   mxe_curl \
118 118
     -O "${base}/dists/wheezy/Release.gpg" \
119 119
     -O "${base}/dists/wheezy/Release"
120
-  mxe_curl \
121
-    "https://keyserver.ubuntu.com/pks/lookup?search=0x${suid}&op=get" \
122
-  | gpg --import --status-fd 1
120
+  (
121
+    set -x
122
+    mxe_curl \
123
+      "https://keyserver.ubuntu.com/pks/lookup?search=0x${suid}&op=get" \
124
+    | gpg --import --status-fd 1
125
+  )
123 126
   gpg --verify-options show-primary-uid-only --verify Release.gpg Release || exit 1
124 127
   mxe_curl \
125 128
     -O "${base}/dists/wheezy/main/binary-amd64/Packages.gz"
@@ -151,6 +154,9 @@ mkdir -p "${MXE_HOME}"
151 154
       -name '*.la' -o \
152 155
       -name '*.pc' -o \
153 156
       -name '*.cmake' -o \
157
+      -name '*.prf' -o \
158
+      -name '*.pri' -o \
159
+      -name '*.prl' -o \
154 160
       -name '*-config' | while IFS= read -r f; do
155 161
 
156 162
       sed "s|${ori}|${pwd}|" \

Loading…
Cancel
Save