diff --git a/wine-2.3.tar.xz b/wine-2.3.tar.xz
deleted file mode 100644
index a1678b4..0000000
--- a/wine-2.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e
-size 18931732
diff --git a/wine-2.3.tar.xz.sign b/wine-2.3.tar.xz.sign
deleted file mode 100644
index c89b713..0000000
--- a/wine-2.3.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAli5z+0ACgkQzvrI6q8X
-UZ2Qsg//Wexnm0py2DKqFsj6u1SSQFJBuVSGKLuuycIUec5BZpyavIu+oIO4mQAx
-OKoantQtHCIzjA9jME7+EzPb21mpVk9+mw3cwuureSEpZQ9ZzXkxpug9l+vThUfU
-pILtx1N1EEzHy5Z0qgaxDX9mriwDQfy0Eiy2wAtdspRBcPYbYSWvIJp5iW9EBce5
-G6mHShkP2JI3854UrYf1tDZ6ywsxbzYNYnPS7QwtEWrSZijVHR1CfFuoY57/L5JB
-PV5G2UfX4Xz0IiPYzMrV3wAU6GdGPG/GhW96TVG+gMGImqcX1LLlHPkKAe0jt2MP
-xZyWHcmHGO8Z82Ptumm7jz1o4BzHyq5rZPjp/oc0MGi71Cmr2ThGlnuuP0GJ5273
-8pt77ZMO4xfIpNRhsss+8ZkF6B/Uwwki75rz9nv+1NBQZgxQrrELfshldYQMBovU
-Kobgk/nPRB6kFXaER0jCaVA9FwumV4ELA0LxqbIQLJTHTMOL0ne9hb87sC+mneIL
-3a1Cwqnv+/3qwQCaQUFB9npw+644FVHwU9oN8ZxcGdVIVZ0egf6WKxhQZXnGXmPq
-yCn/WFazDVn2sALtApBrWhjTSnH1EZ3LJ2nGrj9EB52YizKgO8W7H18xbdXL4PwZ
-MUVKQYBOMBI3yiwuAQqhJAJ5cnhG/U5bDxtRpXx3qfjOkt9M2NA=
-=f5Co
------END PGP SIGNATURE-----
diff --git a/wine-2.4.tar.xz b/wine-2.4.tar.xz
new file mode 100644
index 0000000..73f3e86
--- /dev/null
+++ b/wine-2.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e
+size 18953748
diff --git a/wine-2.4.tar.xz.sign b/wine-2.4.tar.xz.sign
new file mode 100644
index 0000000..1e1c619
--- /dev/null
+++ b/wine-2.4.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAljMRL8ACgkQzvrI6q8X
+UZ1JSQ/9GZxyhbKKE1cG5SdMiM9LdmFgsnfOkoCVv1BFVhmJ4D3XMjJNiCMLppy9
+2lf2MUhNQfiojIX0eZRF03ZOFACWR+EsCNL3I+9l0B/RuMI490zqhoVKOYI2zJyn
+ESyEgwoBGmyJ556nxrvAdtRvvbki3yDVLGYWv76NzyDsHXD0r6KaEC9fbFUdx0MH
+KmqWXPOgn5IjWoB65BOuB1H79W9m+OZrpseBZKAzF+ljEnD+YodV1OFxR3VDY9Vy
+j5mhKKGUOkdHaDopv2sA4DHRM46jr9X0saoq8/wvX8TsXsCnnDsGCHBIiqqr2sfY
+Z2UIl+2xsbggOwI7SgzNWhIvSoIQZrIAhNYiQmXDBfH/JzEO+/fmnnw2bjm4WiQ0
+sSYyY06B8YOVwu/XLDwywH4Y7m7Gk0iW1zCTQIz54aMTBGK3J5XXQJqhFbtnh0HP
+HWUDc0y+2Boshkmryj3R+2fuhbUpMD22A3+MJKi1ep1KHR0a+X+rsl9SO44zfdJN
+mSwO5p/URYd3o1Iy2SWikmTDjnehnlZZuOBBGCl2RDKETV69W2JvSDF8C+Ge2l6B
+SP6/LbUUMtLvlgdRv9IOuqE6JlUApw07Iw8NOLZCUvSKURoIJU1oS18R/mq6M7V0
+/5P8mVhsWDrPdQ5aSkjZveE4sCpvjC+5+36Sma0dEKR1IZw/8WI=
+=KxY2
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index e0aa635..3ee3d0a 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Mar 17 21:33:29 UTC 2017 - meissner@suse.com
+
+- Update to 2.4 development snapshot
+ - Built-in implementation of cryptographic hashes.
+ - Mono engine updated with upstream fixes.
+ - More Direct3D command stream work.
+ - Simulated bold and italic in DirectWrite.
+ - Improvements to the XML reader.
+ - Various bug fixes.
+- updated winetricks
+
-------------------------------------------------------------------
Mon Mar 6 07:54:19 UTC 2017 - meissner@suse.com
diff --git a/wine.spec b/wine.spec
index 347ef78..ad9dc08 100644
--- a/wine.spec
+++ b/wine.spec
@@ -54,8 +54,8 @@ BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(libudev)
-%define realver 2.3
-Version: 2.3
+%define realver 2.4
+Version: 2.4
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+
diff --git a/winetricks b/winetricks
index 28c5397..1f5c8c6 100644
--- a/winetricks
+++ b/winetricks
@@ -5,8 +5,8 @@
# This has to be right after the shebang, see: https://github.com/koalaman/shellcheck/issues/779
# Name of this version of winetricks (YYYYMMDD)
-# (This doesn't change often, use the sha1sum of the file when reporting problems)
-WINETRICKS_VERSION=20170207
+# (This doesn't change often, use the sha256sum of the file when reporting problems)
+WINETRICKS_VERSION=20170316
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
@@ -84,7 +84,7 @@ WINETRICKS_VERSION=20170207
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program. If not, see
-# .
+# .
#
#--------------------------------------------------------------------
# Coding standards:
@@ -1076,7 +1076,7 @@ w_open_folder()
# Usage: w_open_webpage url
w_open_webpage()
{
- # See http://www.dwheeler.com/essays/open-files-urls.html
+ # See https://www.dwheeler.com/essays/open-files-urls.html
for _W_cmd in xdg-open sdtwebclient cygstart open firefox true
do
_W_cmdpath=$(which $_W_cmd)
@@ -1689,7 +1689,7 @@ w_ahk_do()
if ! test -f "$W_CACHE/ahk/AutoHotkey.exe"
then
W_BROWSERAGENT=1 \
- w_download_to ahk http://www.autohotkey.com/download/AutoHotkey104805.zip b3981b13fbc45823131f69d125992d6330212f27
+ w_download_to ahk https://www.autohotkey.com/download/AutoHotkey104805.zip c8bf1c3dc4622559963b6626316ba1d083bb8a8af605f78382e371e5294d435a
w_try_unzip "$W_CACHE/ahk" "$W_CACHE/ahk/AutoHotkey104805.zip" AutoHotkey.exe AU3_Spy.exe
chmod +x "$W_CACHE/ahk/AutoHotkey.exe"
fi
@@ -2784,7 +2784,7 @@ winetricks_dl_warning() {
# Lookup own country via IP address only once (i.e. don't run this function for every download invocation)
if [ -z "$W_COUNTRY" ] ; then
- W_COUNTRY="$(winetricks_dl_url_to_stdout "http://ipinfo.io/$(winetricks_dl_url_to_stdout "http://ipinfo.io/ip")" | awk -F '"' '/country/{print $4}')"
+ W_COUNTRY="$(winetricks_dl_url_to_stdout "https://ipinfo.io/$(winetricks_dl_url_to_stdout "https://ipinfo.io/ip")" | awk -F '"' '/country/{print $4}')"
export W_COUNTRY
if [ -z "$W_COUNTRY" ] ; then
@@ -2877,19 +2877,17 @@ winetricks_print_version()
# Normally done by winetricks_init, but we don't want to set up the WINEPREFIX
# just to get the winetricks version:
- # FIXME: sha1/sha256
- winetricks_get_sha1sum_prog
- #winetricks_get_sha256sum_prog
+ winetricks_get_sha256sum_prog
- w_get_sha1sum "$0"
- echo "$WINETRICKS_VERSION - sha1sum: $_W_gotsha1sum"
+ w_get_sha256sum "$0"
+ echo "$WINETRICKS_VERSION - sha256sum: $_W_gotsha256sum"
}
# Run a small wine command for internal use
# Handy place to put small workarounds
winetricks_early_wine()
{
- # The sed works around http://bugs.winehq.org/show_bug.cgi?id=25838
+ # The sed works around https://bugs.winehq.org/show_bug.cgi?id=25838
# which unfortunately got released in wine-1.3.12
# We would like to use DISPLAY= to prevent virtual desktops from
# popping up, but that causes AutoHotKey's tray icon to not show up.
@@ -3935,10 +3933,10 @@ winetricks_die_if_user_not_dirowner()
}
# See
-# http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf (iso9660)
-# http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-167.pdf
+# https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf (iso9660)
+# https://www.ecma-international.org/publications/files/ECMA-ST/Ecma-167.pdf
# http://www.osta.org/specs/pdf/udf102.pdf
-# http://www.ecma-international.org/publications/techreports/E-TR-071.htm
+# https://www.ecma-international.org/publications/techreports/E-TR-071.htm
# Usage: read_bytes offset count device
winetricks_read_bytes()
@@ -4217,7 +4215,7 @@ winetricks_load_vcdmount()
fi
# FIXME: Use WMI to locate the drive named
# "ELBY CLONEDRIVE..." using WMI as described in
- # http://delphihaven.wordpress.com/2009/07/05/using-wmi-to-get-a-drive-friendly-name/
+ # https://delphihaven.wordpress.com/2009/07/05/using-wmi-to-get-a-drive-friendly-name/
}
winetricks_mount_cached_iso()
@@ -4526,7 +4524,7 @@ winetricks_set_wineprefix()
W_APPDATA_UNIX="$(w_pathconv -u "$W_APPDATA_WIN")"
# FIXME: get fonts path from SHGetFolderPath
- # See also http://blogs.msdn.com/oldnewthing/archive/2003/11/03/55532.aspx
+ # See also https://blogs.msdn.microsoft.com/oldnewthing/20031103-00/?p=41973/
W_FONTSDIR_WIN="c:\\windows\\Fonts"
# FIXME: just convert path from Windows to Unix?
@@ -4634,7 +4632,7 @@ winetricks_init()
# whether to use shared wineprefix (1) or unique wineprefix for each app (0)
WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-0}
- WINETRICKS_SOURCEFORGE=http://downloads.sourceforge.net
+ WINETRICKS_SOURCEFORGE=https://downloads.sourceforge.net
winetricks_get_sha1sum_prog
winetricks_get_sha256sum_prog
@@ -4644,7 +4642,7 @@ winetricks_init()
#---- Public Variables ----
# Where application installers are cached
- # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
+ # See https://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
# OSX: https://developer.apple.com/library/content/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html
if test -d "$HOME/Library"
@@ -4959,10 +4957,10 @@ winetricks_install_app()
helper_directx_dl()
{
# February 2010 DirectX 9c User Redistributable
- # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=0cef8180-e94a-4f56-b157-5ab8109cb4f5
+ # https://www.microsoft.com/en-us/download/details.aspx?id=9033
# FIXME: none of the verbs that use this will show download status right
# until file1 metadata is extended to handle common cache dir
- w_download_to directx9 http://download.microsoft.com/download/E/E/1/EE17FF74-6C45-4575-9CF4-7FC2597ACD18/directx_feb2010_redist.exe a97c820915dc20929e84b49646ec275760012a42
+ w_download_to directx9 https://download.microsoft.com/download/E/E/1/EE17FF74-6C45-4575-9CF4-7FC2597ACD18/directx_feb2010_redist.exe f6d191e89a963d7cca34f169d30f49eab99c1ed3bb92da73ec43617caaa1e93f
DIRECTX_NAME=directx_feb2010_redist.exe
}
@@ -4970,8 +4968,8 @@ helper_directx_dl()
helper_directx_Jun2010()
{
# June 2010 DirectX 9c User Redistributable
- # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=3b170b25-abab-4bc3-ae91-50ceb6d8fa8d
- w_download_to directx9 http://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe
+ # https://www.microsoft.com/en-us/download/details.aspx?id=8109
+ w_download_to directx9 https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe
DIRECTX_NAME=directx_Jun2010_redist.exe
}
@@ -5005,18 +5003,25 @@ helper_win2ksp4()
filename=$1
# http://www.microsoft.com/downloads/details.aspx?FamilyID=1001AAF1-749F-49F4-8010-297BD6CA33A0&displaylang=en
- w_download_to win2ksp4 http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE fadea6d94a014b039839fecc6e6a11c20afa4fa8
+ w_download_to win2ksp4 http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE 167bb78d4adc957cc39fb4902517e1f32b1e62092353be5f8fb9ee647642de7e
w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win2ksp4/W2KSP4_EN.EXE
}
-helper_xpsp3()
+helper_winxpsp3()
{
filename=$1
- # http://www.microsoft.com/en-us/download/details.aspx?id=24
- w_download_to xpsp3 http://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe c81472f7eeea2eca421e116cd4c03e2300ebfde4
+ # 2017/03/15: helper was renamed from winxpsp3 to winxpsp3, to match win2k/win7 service pack helpers
+ # To minimize user impact, renaming directory automagically.
+ # This could be removed after a transition period (1 year or so):
+ if [ -d "$W_CACHE/xpsp3" ] ; then
+ w_try mv "$W_CACHE/xpsp3" "$W_CACHE/winxpsp3"
+ fi
- w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
+ # https://www.microsoft.com/en-us/download/details.aspx?id=24
+ w_download_to winxpsp3 http://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
+
+ w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
}
helper_win7sp1()
@@ -5024,7 +5029,7 @@ helper_win7sp1()
filename=$1
# https://www.microsoft.com/en-us/download/details.aspx?id=5842
- w_download_to win7sp1 http://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe c3516bc5c9e69fee6d9ac4f981f5b95977a8a2fa
+ w_download_to win7sp1 https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe e5449839955a22fc4dd596291aff1433b998f9797e1c784232226aba1f8abd97
w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/win7sp1/windows6.1-KB976932-X86.exe
}
@@ -5038,26 +5043,12 @@ w_metadata adobeair dlls \
media="download" \
file1="AdobeAIRInstaller.exe" \
installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" \
- homepage="http://www.adobe.com/products/air/"
+ homepage="https://www.adobe.com/products/air/"
load_adobeair()
{
- # 2010-02-02: sha1sum 5c95f51a680f8c175a92755238127be4ad22c53b
- # 2010-02-20: sha1sum 6f03e723bd855abbe00eb8fdf22da54fb49c62db
- # 2010-07-29: 2.0.2 sha1sum 7b93aedaf48ad7854940e7a4e7d9394a255e888b
- # 2010-12-08: 2.5.1 sha1sum 2664207ca8e836f5070ee356064829a39785a92e
- # 2011-04-13: 2.6 sha1sum 3d9c2f9d8f3533424cfea84d61fcb9464278d9fc
- # 2011-10-26: 2.7 sha1sum dfa337d4b53e9d924356febc116450190fa183dd
- # 2014-03-01: 4.0 sha1sum 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57
- # http://helpx.adobe.com/en/flash-player/release-note/fp_12_air_4_release_notes.html
- # 2014-09-30: 15.0 sha1sum 46341f1358bc6e0b9ddeae3591662a2ac68dc360
- # 2014-11-24: 15.0.0.356 sha1sum c0e6b8b1ed5ffa282945d21b21f8a5e03febc904
- # 2015-11-06: 19.x sha1sum 3bc2a568204a3a9b59ca347ab49585f0c5fab279
- # 2015-12-27: 20.0 sha1sum 9c10b7be43771869c381c73197c9a0fcd1b727cf
- # 2015-12-29: 20.0.0.233 (had to check with strings on Adobe AIR.dll) sha1sum 7161fb8b47721485882f52720f8b41dbfe3b69d0
- # 2016-02-17: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha1sum 2fdd561556fe881c4e5538d4ee37f523871befd3
-
- w_download http://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 2fdd561556fe881c4e5538d4ee37f523871befd3
+ # 2017-3-14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
+ w_download https://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
}
@@ -5096,8 +5087,8 @@ w_metadata art2kmin dlls \
load_art2kmin()
{
- # See http://www.microsoft.com/downloads/details.aspx?familyid=d9ae78d9-9dc6-4b38-9fa6-2c745a175aed&displaylang=en
- w_download http://download.microsoft.com/download/D/2/A/D2A2FC8B-0447-491C-A5EF-E8AA3A74FB98/AccessRuntime.exe 571811b7536e97cf4e4e53bbf8260cddd69f9b2d
+ # See https://www.microsoft.com/en-us/download/details.aspx?id=4438
+ w_download https://download.microsoft.com/download/D/2/A/D2A2FC8B-0447-491C-A5EF-E8AA3A74FB98/AccessRuntime.exe a00a92fdc4ddc0dcf5d1964214a8d7e4c61bb036908a4b43b3700063eda9f4fb
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" AccessRuntime.exe $W_UNATTENDED_SLASH_Q
}
@@ -5125,12 +5116,12 @@ w_metadata avifil32 dlls \
publisher="Microsoft" \
year="2004" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/avifil32.dll"
load_avifil32()
{
- helper_xpsp3 i386/avifil32.dl_
+ helper_winxpsp3 i386/avifil32.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/avifil32.dl_
w_override_dlls native avifil32
@@ -5149,7 +5140,7 @@ w_metadata cabinet dlls \
load_cabinet()
{
# http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
- w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
+ w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
w_try_cabextract --directory="$W_TMP" "$W_CACHE/cabinet/$file1"
w_try cp "$W_TMP"/cabinet.dll "$W_SYSTEM32_DLLS"/cabinet.dll
@@ -5168,7 +5159,7 @@ w_metadata cmd dlls \
load_cmd()
{
- w_download http://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe ac6e28cfd12942e74aa08bddf7715705edb85b6b
+ w_download http://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe b5574b3516a724c2cba0d864162a3d1d684db1cf30de8db4b0e0ea6a1f6f1480
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/$file1" -F cmd.exe
w_override_dlls native,builtin cmd.exe
@@ -5186,11 +5177,13 @@ w_metadata comctl32 dlls \
load_comctl32()
{
+ # Microsoft has removed. Mirrors can be found at http://www.filewatcher.com/m/CC32inst.exe.587496-0.html
# 2011-01-17: http://www.microsoft.com/downloads/details.aspx?familyid=6f94d31a-d1e0-4658-a566-93af0d8d4a1e
- # 2012-08-11: w_download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde
+ # 2012-08-11: w_download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe d68c0cca721870aed39f5f2efd80dfb74f3db66d5f9a49e7578b18279edfa4a7
# 2016/01/07: w_download ftp://ftp.ie.debian.org/disk1/download.sourceforge.net/pub/sourceforge/p/po/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe
+ # 2017/03/12: w_download $WINETRICKS_SOURCEFORGE/project/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe
- w_download ftp://ftp.ie.debian.org/disk1/download.sourceforge.net/pub/sourceforge/p/po/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde cc32inst.exe
+ w_download $WINETRICKS_SOURCEFORGE/project/pocmin/Win%2095_98%20Controls/Win%2095_98%20Controls/CC32inst.exe d68c0cca721870aed39f5f2efd80dfb74f3db66d5f9a49e7578b18279edfa4a7
w_try "$WINE" "$W_CACHE"/comctl32/cc32inst.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q
w_try_unzip "$W_TMP" "$W_TMP"/comctl32.exe
@@ -5218,10 +5211,10 @@ w_metadata comctl32ocx dlls \
load_comctl32ocx()
{
- # http://www.microsoft.com/downloads/details.aspx?FamilyID=25437D98-51D0-41C1-BB14-64662F5F62FE
- w_download http://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe f52cf2034488235b37a1da837d1c40eb2a1bad84
+ # https://www.microsoft.com/en-us/download/details.aspx?id=10019
+ w_download https://download.microsoft.com/download/3/a/5/3a5925ac-e779-4b1c-bb01-af67dc2f96fc/VisualBasic6-KB896559-v1-ENU.exe c4d43fe4aea782d7d6c08c038778fe3635c7bae1b93fb1a7740c6644aabf567e
# More ActiveX controls. See https://support.microsoft.com/kb/297381
- w_download http://activex.microsoft.com/controls/vb6/mscomct2.cab 766f9ccf8849a04d757faee379da54d635c8ac71
+ w_download http://activex.microsoft.com/controls/vb6/mscomct2.cab a2efa44a8caff106c8101bd62eff8ed61732182afb8bc57e0ae563135acd2e13
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/comctl32ocx/VisualBasic6-KB896559-v1-ENU.exe
w_try cp "$W_TMP"/mscomctl.ocx "$W_SYSTEM32_DLLS"/mscomctl.ocx
@@ -5246,8 +5239,8 @@ w_metadata comdlg32ocx dlls \
load_comdlg32ocx()
{
- # By analogy with vb5 version in http://support.microsoft.com/kb/168917
- w_download http://activex.microsoft.com/controls/vb6/ComDlg32.cab d4f3e193c6180eccd73bad53a8500beb5b279cbf
+ # By analogy with vb5 version in https://support.microsoft.com/kb/168917
+ w_download http://activex.microsoft.com/controls/vb6/ComDlg32.cab 6a445b34a1a6a0ab302beb1663377d86203594ee83e4e4ee0b5d72aaf47cad97
w_try_cabextract --directory="$W_TMP" "$W_CACHE/comdlg32ocx/${file1}"
w_try cp "$W_TMP"/comdlg32.ocx "$W_SYSTEM32_DLLS"/comdlg32.ocx
w_try_regsvr comdlg32.ocx
@@ -5260,14 +5253,14 @@ w_metadata crypt32 dlls \
publisher="Microsoft" \
year="2004" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/crypt32.dll"
load_crypt32()
{
w_call msasn1
- helper_xpsp3 i386/crypt32.dl_
+ helper_winxpsp3 i386/crypt32.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/crypt32.dl_
w_override_dlls native crypt32
@@ -5286,12 +5279,12 @@ w_metadata binkw32 dlls \
load_binkw32()
{
# Mirror: http://www.dlldump.com/download-dll-files_new.php/dllfiles/B/binkw32.dll/1.0q/download.html
- # Sha1sum of the decompressed file: 613f81f82e12131e86ae60dd318941f40db2200f
+ # sha256sum of the decompressed file: 1fd7ef7873c8a3be7e2f127b306d0d24d7d88e20cf9188894eff87b5af0d495f
#
- # Zip sha1sum:
- # 2015-03-28: 991f77e8df513ccb8663dc4a2753fbf90338ef5c
- # 2015-12-27: 6a30900885390ef361dbb67444a7944143db36bf
- w_download http://www.down-dll.com/dll/b/__32-binkw32.dll3.0.0.0.zip 6a30900885390ef361dbb67444a7944143db36bf
+ # Zip sha256sum:
+ # 2015-12-27: 1d5efda8e4af796319b94034ba67b453cbbfddd81eb7d94fd059b40e237fa75d
+
+ w_download http://www.down-dll.com/dll/b/__32-binkw32.dll3.0.0.0.zip 1d5efda8e4af796319b94034ba67b453cbbfddd81eb7d94fd059b40e237fa75d
w_try_unzip "$W_TMP" "$W_CACHE"/binkw32/__32-binkw32.dll3.0.0.0.zip
w_try cp "$W_TMP"/binkw32.dll "$W_SYSTEM32_DLLS"/binkw32.dll
@@ -5686,12 +5679,12 @@ w_metadata dbghelp dlls \
publisher="Microsoft" \
year="2008" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dbghelp.dll"
load_dbghelp()
{
- helper_xpsp3 i386/dbghelp.dll
+ helper_winxpsp3 i386/dbghelp.dll
w_try cp -f "$W_TMP"/i386/dbghelp.dll "$W_SYSTEM32_DLLS"
@@ -5770,7 +5763,7 @@ w_metadata directmusic dlls \
load_directmusic()
{
-# Untested. Based off http://bugs.winehq.org/show_bug.cgi?id=4805 and http://bugs.winehq.org/show_bug.cgi?id=24911
+# Untested. Based off https://bugs.winehq.org/show_bug.cgi?id=4805 and https://bugs.winehq.org/show_bug.cgi?id=24911
w_call dsound
@@ -5860,7 +5853,7 @@ load_directx9()
# list down as soon as we can.
# Setting Windows version to win2k apparently crashes the installer on OS X.
- # See http://code.google.com/p/winezeug/issues/detail?id=71
+ # See https://code.google.com/p/winezeug/issues/detail?id=71
w_set_winver winxp
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -5946,7 +5939,7 @@ w_metadata dxsdk_nov2006 dlls \
load_dxsdk_nov2006()
{
- w_download http://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe 1e9cdbef391ebfbf781e6c87a375138d8c195c57
+ w_download https://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-6688058c3f00/dxsdk_aug2006.exe 1e9cdbef391ebfbf781e6c87a375138d8c195c57
# dxview.dll uses mfc42u while registering
w_call mfc42
@@ -5969,7 +5962,7 @@ w_metadata dxsdk_jun2010 dlls \
load_dxsdk_jun2010()
{
- w_download http://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe 8fe98c00fde0f524760bb9021f438bd7d9304a69
+ w_download https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe 8fe98c00fde0f524760bb9021f438bd7d9304a69
# Without dotnet20, install aborts halfway through
w_call dotnet20
@@ -6015,14 +6008,14 @@ load_dotnet11()
{
w_package_unsupported_win64
- # http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3
- w_download http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe 16a354a2207c4c8846b617cbc78f7b7c1856340e
+ # https://www.microsoft.com/en-us/download/details.aspx?id=26
+ w_download https://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe ba0e58ec93f2ffd54fc7c627eeca9502e11ab3c6fc85dcbeff113bd61d995bce
w_call remove_mono
w_call corefonts
w_call fontfix
- w_try w_try_cd "$W_CACHE/dotnet11"
+ w_try w_try_cd "$W_CACHE/$W_PACKAGE"
# Use builtin regsvcs.exe to work around https://bugs.winehq.org/show_bug.cgi?id=25120
if test $W_OPT_UNATTENDED
then
@@ -6072,13 +6065,13 @@ load_dotnet11sp1()
{
w_package_unsupported_win64
- w_download http://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 74a5b25d65a70b8ecd6a9c301a0aea10d8483a23
+ w_download https://download.microsoft.com/download/8/b/4/8b4addd8-e957-4dea-bdb8-c4e00af5b94b/NDP1.1sp1-KB867460-X86.exe 2c0a35409ff0873cfa28b70b8224e9aca2362241c1f0ed6f622fef8d4722fd9a
w_call remove_mono
w_call dotnet11
- w_try w_try_cd "$W_CACHE/dotnet11sp1"
- # Use builtin regsvcs.exe to work around http://bugs.winehq.org/show_bug.cgi?id=25120
+ w_try w_try_cd "$W_CACHE/$W_PACKAGE"
+ # Use builtin regsvcs.exe to work around https://bugs.winehq.org/show_bug.cgi?id=25120
if test $W_OPT_UNATTENDED
then
WINEDLLOVERRIDES="regsvcs.exe=b" w_ahk_do "
@@ -6129,13 +6122,13 @@ load_dotnet20()
w_package_unsupported_win64
# http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
- w_download http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe a3625c59d7a2995fb60877b5f5324892a1693b2a
+ w_download https://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe 46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71
w_call remove_mono
w_call fontfix
- # Recipe from http://bugs.winehq.org/show_bug.cgi?id=10467#c57
- # and http://bugs.winehq.org/show_bug.cgi?id=30845#c10
+ # Recipe from https://bugs.winehq.org/show_bug.cgi?id=10467#c57
+ # and https://bugs.winehq.org/show_bug.cgi?id=30845#c10
w_set_winver win2k
w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -6144,10 +6137,10 @@ load_dotnet20()
# We can't stop installing dotnet20 in win2k mode until Wine supports
# reparse/junction points
- # (see http://bugs.winehq.org/show_bug.cgi?id=10467#c57 )
+ # (see https://bugs.winehq.org/show_bug.cgi?id=10467#c57 )
# so for now just remove the bogus msvc*80.dll files it installs.
- # See also http://bugs.winehq.org/show_bug.cgi?id=16577
- # This affects Victoria 2 demo, see http://forum.paradoxplaza.com/forum/showthread.php?p=11523967
+ # See also https://bugs.winehq.org/show_bug.cgi?id=16577
+ # This affects Victoria 2 demo, see https://forum.paradoxplaza.com/forum/showthread.php?p=11523967
rm -f "$W_SYSTEM32_DLLS"/msvc?80.dll
W_NGEN_CMD="w_try $WINE $W_DRIVE_C/windows/Microsoft.NET/Framework/v2.0.50727/ngen.exe executequeueditems"
@@ -6173,8 +6166,8 @@ load_dotnet20sdk()
{
w_package_unsupported_win64
- # http://www.microsoft.com/en-us/download/details.aspx?id=19988
- w_download http://download.microsoft.com/download/c/4/b/c4b15d7d-6f37-4d5a-b9c6-8f07e7d46635/setup.exe 4e4b1072b5e65e855358e2028403f2dc52a62ab4
+ # https://www.microsoft.com/en-us/download/details.aspx?id=19988
+ w_download https://download.microsoft.com/download/c/4/b/c4b15d7d-6f37-4d5a-b9c6-8f07e7d46635/setup.exe 1d7337bfbb2c65f43c82d188688ce152af403bcb67a2cc2a3cc68a580ecd8200
w_call remove_mono
@@ -6245,7 +6238,7 @@ load_dotnet20sp1()
w_package_unsupported_win64
# FIXME: URL?
- w_download http://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe eef5a36924cdf0c02598ccf96aa4f60887a49840
+ w_download https://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe c36c3a1d074de32d53f371c665243196a7608652a2fc6be9520312d5ce560871
w_call remove_mono
@@ -6254,7 +6247,7 @@ load_dotnet20sp1()
WINEDLLOVERRIDES=
w_warn "Setting windows version so installer works"
# Stop services
- # Recipe from http://bugs.winehq.org/show_bug.cgi?id=16956
+ # Recipe from https://bugs.winehq.org/show_bug.cgi?id=16956
$WINESERVER -k
# Fight a race condition, see bug 16956 comment 43
w_set_winver win2k
@@ -6279,10 +6272,10 @@ load_dotnet20sp1()
# We can't stop installing dotnet20sp1 in win2k mode until Wine supports
# reparse/junction points
- # (see http://bugs.winehq.org/show_bug.cgi?id=10467#c57 )
+ # (see https://bugs.winehq.org/show_bug.cgi?id=10467#c57 )
# so for now just remove the bogus msvc*80.dll files it installs.
- # See also http://bugs.winehq.org/show_bug.cgi?id=16577
- # This affects Victoria 2 demo, see http://forum.paradoxplaza.com/forum/showthread.php?p=11523967
+ # See also https://bugs.winehq.org/show_bug.cgi?id=16577
+ # This affects Victoria 2 demo, see https://forum.paradoxplaza.com/forum/showthread.php?p=11523967
rm -f "$W_SYSTEM32_DLLS"/msvc?80.dll
w_unset_winver
@@ -6310,8 +6303,8 @@ load_dotnet20sp2()
{
w_package_unsupported_win64
- # http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F
- w_download http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 22d776d4d204863105a5db99e8b8888be23c61a7
+ # https://www.microsoft.com/en-us/download/details.aspx?id=1639
+ w_download https://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe 6e3f363366e7d0219b7cb269625a75d410a5c80d763cc3d73cf20841084e851f
w_call remove_mono
@@ -6373,8 +6366,8 @@ load_dotnet30()
{
w_package_unsupported_win64
- # http://msdn.microsoft.com/en-us/netframework/bb264589.aspx
- w_download http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039
+ # https://msdn.microsoft.com/en-us/netframework/bb264589.aspx
+ w_download http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe 6cf8921e00f52bbd888aa7a520a7bac47e818e2a850bcc44494c64d6cbfafdac
w_call remove_mono
@@ -6382,7 +6375,7 @@ load_dotnet30()
then
case $(cat /proc/sys/kernel/yama/ptrace_scope) in
0) ;;
- *) w_warn "If install fails, set /proc/sys/kernel/yama/ptrace_scope to 0. See http://bugs.winehq.org/show_bug.cgi?id=30410" ;;
+ *) w_warn "If install fails, set /proc/sys/kernel/yama/ptrace_scope to 0. See https://bugs.winehq.org/show_bug.cgi?id=30410" ;;
esac
fi
@@ -6444,9 +6437,9 @@ load_dotnet30sp1()
w_package_unsupported_win64
# FIXME: URL?
- w_download http://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 8d779e337920b097aa0c01859912950606e9fc12
- # Recipe from http://bugs.winehq.org/show_bug.cgi?id=25060#c10
- w_download http://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 5d332ebd1025e294adafe72030fe33db707b2c82 "XPSEP XP and Server 2003 32 bit.msi"
+ w_download https://download.microsoft.com/download/8/F/E/8FEEE89D-9E4F-4BA3-993E-0FFEA8E21E1B/NetFx30SP1_x86.exe 3100df4d4db3965ead9520c887a534115cf6fc7ba100abde45226958b865695b
+ # Recipe from https://bugs.winehq.org/show_bug.cgi?id=25060#c10
+ w_download https://download.microsoft.com/download/2/5/2/2526f55d-32bc-410f-be18-164ba67ae07d/XPSEP%20XP%20and%20Server%202003%2032%20bit.msi 630c86a202c40cbcd430701977d4f1fefa6151624ef9a4870040dff45e547dea "XPSEP XP and Server 2003 32 bit.msi"
w_call remove_mono
w_call dotnet30
@@ -6498,8 +6491,8 @@ load_dotnet35()
# This will fail later if cabextract isn't installed, so check/fail now:
w_try_cabextract -v >/dev/null
- # http://www.microsoft.com/downloads/details.aspx?FamilyId=333325FD-AE52-4E35-B531-508D977D32A6
- w_download http://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 0a271bb44531aadef902829f98dfad66e4a57586
+ # https://www.microsoft.com/en-us/download/details.aspx?id=21
+ w_download https://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 3e3a4104bad9a0c270ed5cbe8abb986de9afaf0281a98998bdbdc8eaab85c3b6
w_call remove_mono
@@ -6511,7 +6504,7 @@ load_dotnet35()
w_call msxml3
fi
- # See also http://blogs.msdn.com/astebner/archive/2008/07/17/8745415.aspx
+ # See also https://blogs.msdn.microsoft.com/astebner/2008/07/17/scenarios-where-net-framework-3-5-setup-tries-to-connect-to-the-internet-and-how-to-avoid-them/
w_try_cd "$W_TMP"
w_try_cabextract $W_UNATTENDED_DASH_Q "$W_CACHE"/dotnet35/dotnetfx35.exe
w_try_cd wcu/dotNetFramework
@@ -6549,8 +6542,8 @@ load_dotnet35sp1()
# The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now:
w_try_cabextract -v >/dev/null
- # http://www.microsoft.com/download/en/details.aspx?id=25150
- w_download http://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 3dce66bae0dd71284ac7a971baed07030a186918
+ # https://www.microsoft.com/en-us/download/details.aspx?id=25150
+ w_download https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 0582515bde321e072f8673e829e175ed2e7a53e803127c50253af76528e66bc1
w_call remove_mono
@@ -6559,7 +6552,7 @@ load_dotnet35sp1()
w_call dotnet20sp2
$WINESERVER -w
- # Work around hang in http://bugs.winehq.org/show_bug.cgi?id=25060#c19
+ # Work around hang in https://bugs.winehq.org/show_bug.cgi?id=25060#c19
WINEDLLOVERRIDES=ngen.exe,mscorsvw.exe=b
export WINEDLLOVERRIDES
@@ -6614,11 +6607,13 @@ load_dotnet40()
*) w_warn "dotnet40 does not yet fully work or install on wine. Caveat emptor." ;;
esac
- # http://www.microsoft.com/download/en/details.aspx?id=17718
- w_download http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe 58da3d74db353aad03588cbb5cea8234166d8b99
+ # https://www.microsoft.com/en-us/download/details.aspx?id=17718
+ w_download https://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe 65e064258f2e418816b304f646ff9e87af101e4c9552ab064bb74d281c38659f
w_call remove_mono
+ w_call winxp
+
w_try_cd "$W_CACHE/$W_PACKAGE"
WINEDLLOVERRIDES=fusion=b "$WINE" dotNetFx40_Full_x86_x64.exe ${W_OPT_UNATTENDED:+/q /c:"install.exe /q"} || true
@@ -6629,6 +6624,8 @@ load_dotnet40()
"$WINE" reg add "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full" /v Version /t REG_SZ /d "4.0.30319" /f
W_NGEN_CMD="$WINE $WINEPREFIX/drive_c/windows/Microsoft.NET/Framework/v4.0.30319/ngen.exe executequeueditems"
+
+ w_unset_winver
}
verify_dotnet40()
@@ -6657,8 +6654,8 @@ load_dotnet45()
# The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now:
w_try_cabextract -v >/dev/null
- # http://www.microsoft.com/download/en/details.aspx?id=17718
- w_download http://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe b2ff712ca0947040ca0b8e9bd7436a3c3524bb5d
+ # https://www.microsoft.com/en-us/download/details.aspx?id=17718
+ w_download https://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe a04d40e217b97326d46117d961ec4eda455e087b90637cb33dd6cc4a2c228d83
w_call remove_mono
@@ -6711,8 +6708,8 @@ load_dotnet452()
# The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now:
w_try_cabextract -v >/dev/null
- # http://www.microsoft.com/download/en/details.aspx?id=17718
- w_download http://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe 89f86f9522dc7a8a965facce839abb790a285a63
+ # https://www.microsoft.com/en-us/download/details.aspx?id=17718
+ w_download https://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe 6c2c589132e830a185c5f40f82042bee3022e721a216680bd9b3995ba86f3781
w_call remove_mono
@@ -6762,8 +6759,8 @@ load_dotnet46()
w_warn "This package may not work on a 64-bit installation"
fi
- # https://support.microsoft.com/en-us/kb/3045560
- w_download https://download.microsoft.com/download/C/3/A/C3A5200B-D33C-47E9-9D70-2F7C65DAAD94/NDP46-KB3045557-x86-x64-AllOS-ENU.exe 3049a85843eaf65e89e2336d5fe6e85e416797be
+ # https://support.microsoft.com/kb/3045560
+ w_download https://download.microsoft.com/download/C/3/A/C3A5200B-D33C-47E9-9D70-2F7C65DAAD94/NDP46-KB3045557-x86-x64-AllOS-ENU.exe b21d33135e67e3486b154b11f7961d8e1cfd7a603267fb60febb4a6feab5cf87
w_call remove_mono
@@ -6815,8 +6812,8 @@ load_dotnet461()
w_warn "This package may not work on a 64-bit installation"
fi
- # https://www.microsoft.com/en-au/download/details.aspx?id=49982
- w_download https://download.microsoft.com/download/E/4/1/E4173890-A24A-4936-9FC9-AF930FE3FA40/NDP461-KB3102436-x86-x64-AllOS-ENU.exe 83d048d171ff44a3cad9b422137656f585295866
+ # https://www.microsoft.com/en-us/download/details.aspx?id=49982
+ w_download https://download.microsoft.com/download/E/4/1/E4173890-A24A-4936-9FC9-AF930FE3FA40/NDP461-KB3102436-x86-x64-AllOS-ENU.exe beaa901e07347d056efe04e8961d5546c7518fab9246892178505a7ba631c301
w_call remove_mono
@@ -6864,11 +6861,11 @@ load_dotnet462()
if w_workaround_wine_bug 42170 "Running un-official repacked .NET 4.6.2 setup until the official version is fixed."
then
# Un-official slim version. See http://repacks.net/forum/viewtopic.php?t=7
- w_download http://repacks.net/uploads/dotNetFx462_Full_x86_x64_Slim.exe 1886c2b3b6eba37fcf79d59c9e5b100930150fda
+ w_download http://repacks.net/uploads/dotNetFx462_Full_x86_x64_Slim.exe 8f03c8a9b2f4666c3707abe2d70145f200cb2f0f3b792626e64d167d1ad0565f
file_package="dotNetFx462_Full_x86_x64_Slim.exe"
unattended_args="/ai /gm2"
else
- # Official version. See https://www.microsoft.com/en-au/download/details.aspx?id=53344
+ # Official version. See https://www.microsoft.com/en-us/download/details.aspx?id=53344
w_download https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe a70f856bda33d45ad0a8ad035f73092441715431
file_package="NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
unattended_args="/q /norestart"
@@ -6913,15 +6910,9 @@ w_metadata dotnet_verifier dlls \
load_dotnet_verifier()
{
# https://blogs.msdn.microsoft.com/astebner/2008/10/13/net-framework-setup-verification-tool-users-guide/
- # 2013/03/28: sha1sum 0eba832a0733cd47b7639463dd5a22a41e95ee6e # netfx_5F00_setupverifier_5F00_new.zip
- # 2014/01/23: sha1sum 8818f3460826145e2a66bb91727afa7cd531037b
- # 2014/11/22: sha1sum 47de0b849c4c3d354df23588c709108e7816d788
- # 2015/07/31: sha1sum 32f24526a5716737281dc260451b60a641b23c7e
- # 2015/12/27: sha1sum b9712da2943e057668f21f68c473657a205c5cb8
- # 2016/09/22: name change, to netfx_setupverifier_new_2015_12_18.zip
- # 2016/10/26: sha1sum 6eef0158dc637d186d4ab5eb13aee6ef577831b2, adds .NET Framework 4.6.{1,2} support
+ # 2016/10/26: sha256sum 1daf4b1b27669b65f613e17814da3c8342d3bfa9520a65a880c58d6a2a6e32b5, adds .NET Framework 4.6.{1,2} support
- w_download https://msdnshared.blob.core.windows.net/media/2016/10/netfx_setupverifier_new.zip 6eef0158dc637d186d4ab5eb13aee6ef577831b2 "${file1}"
+ w_download https://msdnshared.blob.core.windows.net/media/2016/10/netfx_setupverifier_new.zip 1daf4b1b27669b65f613e17814da3c8342d3bfa9520a65a880c58d6a2a6e32b5 "${file1}"
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try_unzip "$W_SYSTEM32_DLLS" netfx_setupverifier_new.zip netfx_setupverifier.exe
@@ -7002,7 +6993,7 @@ w_metadata flash dlls \
installed_file1="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_14_0_0_179_Plugin.exe" \
installed_file2="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/FlashUtil32_14_0_0_176_ActiveX.exe" \
installed_file3="$W_SYSTEM32_DLLS_WIN/Macromed/Flash/flashplayer_14_sa.exe" \
- homepage="http://www.adobe.com/products/flashplayer/"
+ homepage="https://www.adobe.com/products/flashplayer/"
load_flash()
{
@@ -7010,38 +7001,22 @@ load_flash()
# And as of June 24, 2013, Adobe Flash 10.3 won't even install for me,
# it tells you to go get a newer version!
# See
- # http://blogs.adobe.com/psirt/
- # http://get.adobe.com/de/flashplayer/otherversions/
+ # https://blogs.adobe.com/psirt/
+ # https://get.adobe.com/de/flashplayer/otherversions/
# Now, we install older versions by using zipfiles at
- # http://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html
+ # https://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html
# ActiveX plugin
- # 2013-03-28
- #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/11.6.602.180/install_flash_player_ax.exe 359f231d7007c17b419f777125e0f28fffc2e6a1
- # 2013-06-24
- # w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/11.7.700.224/install_flash_player_ax.exe fdadce901fc7da7a175f71cc8f1f2dd0db78ec8e
- # 2014-01-21
- #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/12.0.0.38/install_flash_player_ax.exe 8deb33bcbbbbecfcbcbeb0f861d2c7492599da2b
- # 2014-08-17
- #w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.176/install_flash_player_ax.exe 16231b509d8e689dc34ae36597d41c4fb1b3a67e
- # 2014-10-02
- w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 40df72ab2c22bcd4442aa35eb586000776129982
+ # 2014-10-02 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
+ w_download https://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 3958827058648cfe05fc6ee510685e8d93f995d3428c3eedbd6814704765672a
w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe
w_try_cd "$W_TMP"/fp_14.0.0.176_archive/14_0_r0_176
w_try "$WINE" flashplayer14_0r0_176_winax.exe ${W_OPT_UNATTENDED:+ /install}
# Mozilla / Firefox (NPAPI) plugin
- # 2013-03-28
- #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/11.6.602.180/install_flash_player.exe bf44990ade52aa92078495ec39035d8489ff6e05
- # 2013-06-24
- #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/11.7.700.224/install_flash_player.exe 9c519fd5a7202c43b5713f9f6b083d970810112e
- # 2014-01-21
- #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/12.0.0.43/install_flash_player.exe 5a68f7aa21c4217cf801a46616fe724d601f773a
- # 2014-08-17
- #w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.179/install_flash_player.exe 1d5725fd0d50eb1361213179ffae9ee24944755a
- # 2014-10-02
- w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.179_archive.zip b94860ca0eff3e1420c24f9647a5f9f5e610ce34
+ # 2014-10-02 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
+ w_download https://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.179_archive.zip 17496fd3c863c180aead953d7d4499dd36f997a9570abc2b92f55e4ea1d55d73
w_try_unzip "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.179_archive.zip fp_14.0.0.179_archive/14_0_r0_179/flashplayer14_0r0_179_win.exe
w_try_cd "$W_TMP"/fp_14.0.0.179_archive/14_0_r0_179
@@ -7049,29 +7024,27 @@ load_flash()
# Projector (standalone player)
# 2015-07-06
- w_download http://download.macromedia.com/pub/flashplayer/updaters/14/flashplayer_14_sa.exe 62e5bc2e88b50091847408b9d473ee4a6c185167
+ w_download https://download.macromedia.com/pub/flashplayer/updaters/14/flashplayer_14_sa.exe 8640c42e73dc44125045e17abd32412c48f3808a8393c94fc8281cf4b0d87bdc
# shellcheck disable=SC2154
w_try cp "${W_CACHE}/${W_PACKAGE}/${file3}" "$W_SYSTEM32_DLLS/Macromed/Flash"
# After updating the above, you should carry the following steps out by
- # hand to verify that plugin works. (Ideally you'd also do it on
- # wine-1.5.6 to make sure the new version still uses vcrun2005 and
- # not something newer.)
+ # hand to verify that plugin works.
# rm -rf ~/.cache/winetricks/flash
# w_try_cd ~/winetricks/src
# rm -rf ~/.wine
# sh winetricks -q flash ie7
- # w_try_cd ~/".wine/drive_c/Program Files/Internet Explorer"
- # wine iexplore.exe http://www.adobe.com/software/flash/about
+ # cd "~/.wine/drive_c/Program Files/Internet Explorer"
+ # wine iexplore.exe https://www.adobe.com/software/flash/about
# Verify that the version of Flash shows up and that you're not prompted
# to install Flash again
#
# w_try_cd ~/winetricks/src
# rm -rf ~/.wine
# sh winetricks -q flash firefox
- # w_try_cd ~/.wine/drive_c/Program\ Files/Mozilla\ Firefox
- # wine firefox.exe http://www.adobe.com/software/flash/about
+ # cd "~/.wine/drive_c/Program Files/Mozilla Firefox"
+ # wine firefox.exe https://www.adobe.com/software/flash/about
# Verify that the version of Flash shows up and that you're not prompted
# to install Flash again
}
@@ -7088,7 +7061,7 @@ w_metadata gdiplus dlls \
load_gdiplus()
{
- # gdiplus has changed in win7. See http://bugs.winehq.org/show_bug.cgi?id=32163#c3
+ # gdiplus has changed in win7. See https://bugs.winehq.org/show_bug.cgi?id=32163#c3
helper_win7sp1 x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll
w_try cp "$W_TMP/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.17514_none_72d18a4386696c80/gdiplus.dll" "$W_SYSTEM32_DLLS/gdiplus.dll"
@@ -7129,7 +7102,7 @@ w_metadata glidewrapper dlls \
load_glidewrapper()
{
- w_download http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe 7a9d60a18b660473742b476465e9aea7bd5ab6f8
+ w_download http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe 3c4185bd7eac9bd50e0727a7b5165ec8273230455480cf94358e1bbd35921b69
w_try_cd "$W_CACHE/$W_PACKAGE"
# The installer opens its README in a web browser, really annoying when doing make check/test:
@@ -7170,7 +7143,7 @@ load_gfw()
{
# http://www.microsoft.com/games/en-us/live/pages/livejoin.aspx
# http://www.next-gen.biz/features/should-games-for-windows-live-die
- w_download http://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe 6f9e0ba052c68c8b51bb0e3ce6024d0e1c7b20b2
+ w_download https://download.microsoft.com/download/5/5/8/55846E20-4A46-4EF8-B272-7F988BC9090A/gfwlivesetupmin.exe b14609508e2f8dba0886ded84e2817ad532ebfa31f8a6d4be2e6a5a03a9d7c23
# FIXME: Depends on .NET 20, but is it really needed? For now, skip it.
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -7191,7 +7164,7 @@ w_metadata glut dlls \
load_glut()
{
- w_download http://press.liacs.nl/researchdownloads/glut.win32/glut-3.7.6-bin.zip fb4731885c05b3cf2c79e85aabe8fc9949616ef4
+ w_download http://press.liacs.nl/researchdownloads/glut.win32/glut-3.7.6-bin.zip 788e97653bfd527afbdc69e1b7c6bcf9cb45f33d13ddf9d676dc070da92f80d4
# FreeBSD unzip rm -rf's inside the target directory before extracting:
w_try_unzip "$W_TMP" "$W_CACHE"/glut/glut-3.7.6-bin.zip
w_try mv "$W_TMP/glut-3.7.6-bin" "$W_DRIVE_C"
@@ -7211,7 +7184,7 @@ w_metadata gmdls dlls \
load_gmdls()
{
- w_download_to directx8 http://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe ea2345f602741343e97a5ece5d1d2c3cc44296c3
+ w_download_to directx8 http://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe 5ddc1a8e204381254dc5d65f406584787155983adf245a75000dcd0d2efb04c6
w_try_unzip "$W_TMP" "$W_CACHE"/directx8/DX81Redist.exe "*/*/DirectX.cab"
w_try_cabextract -d "$W_TMP" -F gm16.dls "$W_TMP"/*/*/DirectX.cab
@@ -7253,7 +7226,7 @@ w_metadata dirac dlls \
load_dirac()
{
- w_download $WINETRICKS_SOURCEFORGE/dirac/DiracDirectShowFilter-1.0.2.exe c912d30a8fa500c7841444559feb1f49301611c4
+ w_download $WINETRICKS_SOURCEFORGE/dirac/DiracDirectShowFilter-1.0.2.exe 7257de4be940405637bb5d11c1179f7db86f165f21fc0ba24f42a9ecbc55fe20
# Avoid mfc90 not found error. (DiracSplitter-libschroedinger.ax needs mfc90 to register itself, I think.)
w_call vcrun2008
@@ -7294,11 +7267,11 @@ w_metadata ffdshow dlls \
media="download" \
file1="ffdshow_beta7_rev3154_20091209.exe" \
installed_file1="$W_PROGRAMS_X86_WIN/ffdshow/ff_liba52.dll" \
- homepage="http://ffdshow-tryout.sourceforge.net"
+ homepage="https://ffdshow-tryout.sourceforge.io/"
load_ffdshow()
{
- w_download $WINETRICKS_SOURCEFORGE/ffdshow-tryout/ffdshow_beta7_rev3154_20091209.exe 8534c31489e51df70ee9583438d6211e6f0696d0
+ w_download $WINETRICKS_SOURCEFORGE/ffdshow-tryout/ffdshow_beta7_rev3154_20091209.exe 86fb22e9a79a1c83340a99fd5722974a4d03948109d404a383c4334fab8f8860
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" ffdshow_beta7_rev3154_20091209.exe $W_UNATTENDED_SLASH_SILENT
}
@@ -7334,11 +7307,11 @@ w_metadata icodecs dlls \
load_icodecs()
{
# Note: this codec is insecure, see
- # http://support.microsoft.com/kb/954157
+ # https://support.microsoft.com/kb/954157
# Original source, ftp://download.intel.com/support/createshare/camerapack/codinstl.exe, had same checksum
# 2010-11-14: http://codec.alshow.co.kr/Down/codinstl.exe
# 2014-04-11: http://www.cucusoft.com/codecdownload/codinstl.exe (linked from http://www.cucusoft.com/codec.asp)
- w_download "http://www.cucusoft.com/codecdownload/codinstl.exe" 2c5d64f472abe3f601ce352dcca75b4f02996f8a
+ w_download "http://www.cucusoft.com/codecdownload/codinstl.exe" 0979d43568111cadf0b3bf43cd8d746ac3de505759c14f381592b4f8439f6c95
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -7362,8 +7335,8 @@ load_icodecs()
"
# Work around bug in codec's installer?
- # http://support.britannica.com/other/touchthesky/win/issues/TSTUw_150.htm
- # http://appdb.winehq.org/objectManager.php?sClass=version&iId=7091
+ # https://support.britannica.com/other/touchthesky/win/issues/TSTUw_150.htm
+ # https://appdb.winehq.org/objectManager.php?sClass=version&iId=7091
w_try_regsvr ir50_32.dll
}
@@ -7381,10 +7354,10 @@ load_jet40()
{
w_call mdac27
w_call wsh57
- # http://support.microsoft.com/kb/239114
- # See also http://bugs.winehq.org/show_bug.cgi?id=6085
+ # https://support.microsoft.com/kb/239114
+ # See also https://bugs.winehq.org/show_bug.cgi?id=6085
# FIXME: "failed with error 2"
- w_download http://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe 8cd25342030857969ede2d8fcc34f3f7bcc2d6d4
+ w_download https://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe b060246cd499085a31f15873689d5fa7df817e407c8261a5c71fa6b9f7042560
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" jet40sp8_9xnt.exe $W_UNATTENDED_SLASH_Q
}
@@ -7403,7 +7376,7 @@ load_ie8_kb2936068()
{
w_call ie8
- w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 1bdeb741085b8f1ef6efc83f8615121373107347
+ w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 8bda23c78cdcd9d01c364a01c6d639dfb2d11550a5521b8a81c808c1a2b1824e
if [ $W_UNATTENDED_SLASH_Q ]
then
@@ -7430,12 +7403,12 @@ w_metadata kde apps \
media="download" \
file1="kdewin-installer-gui-1.0.0.exe" \
installed_exe1="$W_PROGRAMS_WIN/kde/etc/installer.ini" \
- homepage="http://windows.kde.org" \
+ homepage="https://community.kde.org/Windows" \
unattended="no"
load_kde()
{
- w_download http://mirrors.mit.edu/kde/stable/kdewin/installer/kdewin-installer-gui-1.0.0.exe 0d798facb7fbf11529e7ecd067e875d76adb9d78
+ w_download http://mirrors.mit.edu/kde/stable/kdewin/installer/kdewin-installer-gui-1.0.0.exe 6bc5e0cc9e3418c08b6545300f68de0652ac297cbcdc81fd0ebe04f5934006f5
mkdir -p "$W_PROGRAMS_UNIX/kde"
w_try cp "$W_CACHE/kde/${file1}" "$W_PROGRAMS_UNIX/kde"
w_try_cd "$W_PROGRAMS_UNIX/kde"
@@ -7457,7 +7430,7 @@ w_metadata kindle apps \
load_kindle()
{
- w_download http://kindleforpc.amazon.com/44025/KindleForPC-installer-1.16.44025.exe c57d0a7d8cd5f1c3020536edf336c3187f3e051f
+ w_download http://kindleforpc.amazon.com/44025/KindleForPC-installer-1.16.44025.exe 2655fa8be7b8f4659276c46ef9f3fede847135bf6e5c1de136c9de7af6cac1e2
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
@@ -7509,7 +7482,7 @@ load_mdac27()
fi
# http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en
- w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
+ w_download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe 36d2a3099e6286ae3fab181a502a95fbd825fa5ddb30bf09b345abc7f1f620b4
load_native_mdac
w_set_winver nt40
w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -7529,8 +7502,8 @@ w_metadata mdac28 dlls \
load_mdac28()
{
- # http://www.microsoft.com/downloads/en/details.aspx?familyid=78cac895-efc2-4f8e-a9e0-3a1afbd5922e
- w_download http://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 4fbc272c79da59e38818924d8575accb0af776fb
+ # https://www.microsoft.com/en-us/download/details.aspx?id=5793
+ w_download https://download.microsoft.com/download/4/a/a/4aafff19-9d21-4d35-ae81-02c48dcbbbff/MDAC_TYP.EXE 157ebae46932cb9047b58aa849ac1885e8cbd2f218810cb83e57613b49c679d6
load_native_mdac
w_set_winver nt40
w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -7649,7 +7622,7 @@ w_metadata mfc40 dlls \
load_mfc40()
{
- w_download http://activex.microsoft.com/controls/vc/mfc40.cab 53c570e2c811674d6e4fa46cff5a3a04cd0ffc24
+ w_download http://activex.microsoft.com/controls/vc/mfc40.cab b15ffb8cbf99ddc63edf9bd5ee9d6c9dffdc851d7aec23670fb6d5af63d2287e
w_try_cabextract -d "$W_TMP" "$W_CACHE"/mfc40/mfc40.cab
w_try_cabextract -d "$W_SYSTEM32_DLLS" -F '*40.dll' "$W_TMP"/mfc40.exe
}
@@ -7667,7 +7640,7 @@ w_metadata mozillabuild apps \
load_mozillabuild()
{
- w_download http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe daba4bc03ae9014c68611fd36b05dcc4083c6fdb
+ w_download https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe d5ffe52fe634fb7ed02e61041cc183c3af92039ee74e794f7ae83a408e4cf3f5
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" MozillaBuildSetup-2.0.0.exe $W_UNATTENDED_SLASH_S
}
@@ -7679,12 +7652,12 @@ w_metadata msacm32 dlls \
publisher="Microsoft" \
year="2003" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/msacm32.dll"
load_msacm32()
{
- helper_xpsp3 i386/msacm32.dl_
+ helper_winxpsp3 i386/msacm32.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/msacm32.dl_
w_override_dlls native,builtin msacm32
}
@@ -7712,12 +7685,12 @@ w_metadata msctf dlls \
publisher="Microsoft" \
year="2003" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/msctf.dll"
load_msctf()
{
- helper_xpsp3 i386/msctf.dl_
+ helper_winxpsp3 i386/msctf.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/msctf.dl_
w_override_dlls native,builtin msctf
}
@@ -7734,19 +7707,19 @@ w_metadata msdxmocx dlls \
load_msdxmocx()
{
- # Previously at http://www.oldapps.com/windows_media_player.php?old_windows_media_player=3?download
+ # Previously at https://www.oldapps.com/windows_media_player.php?old_windows_media_player=3?download
# (2015/12/01) Iceweasel gave a security warning (!), but clamscan and virustotal.com report it as clean
#
# (2016/02/18) Since then, oldapps.com removed it. It's on a Finnish mirror, where it's been since 2001/10/20
# Found using http://www.filewatcher.com/m/mpfull.exe.3593680-0.html
- # The sha1sum is different. Perhaps Iceweasel was right. This one is also clean according to clamscan/virustotal.com
+ # The sha256sum is different. Perhaps Iceweasel was right. This one is also clean according to clamscan/virustotal.com
- # (2017/9/28) define.fi is down, these sites have mpfull.exe with the original sha1:
+ # (2017/9/28) define.fi is down, these sites have mpfull.exe with the original sha256:
# http://hell.pl/agnus/windows95/
# http://zerosky.oldos.org/win9x.html
# http://sdfox7.com/win95/
- w_download http://hell.pl/agnus/windows95/mpfull.exe 44aef252a660612a01ee13271d84d2da3885e58d
+ w_download http://hell.pl/agnus/windows95/mpfull.exe a39b2b9735cedd513fcb78f8634695d35073e9d7e865e536a0da6db38c7225e4
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/${file1}"
w_try_regsvr msdxm.ocx
@@ -7764,11 +7737,11 @@ w_metadata msflxgrd dlls \
load_msflxgrd()
{
- # http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
+ # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
# may 2011: f497c3b390cd80d5bcd1f13d5c0c68b206369aa7
# 2015/11/09: Removed from Microsoft.com, archive.org has an older copy:
- # 2015/11/09: 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
- w_download http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab 3d6c04e923781d4ce0d3ab62189b8de352ab25d5
+ # 2015/11/09: a0d374293ab9556a6eb7705efbca533ad8f20e6b9cb55f14f1ec5bb55552ec8d
+ w_download http://activex.microsoft.com/controls/vb6/MsFlxGrd.cab a0d374293ab9556a6eb7705efbca533ad8f20e6b9cb55f14f1ec5bb55552ec8d
w_try_cabextract --directory="$W_TMP" "$W_CACHE/msflxgrd/${file1}"
w_try cp -f "$W_TMP"/[Mm][Ss][Ff][Ll][Xx][Gg][Rr][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
@@ -7787,13 +7760,10 @@ w_metadata mshflxgd dlls \
load_mshflxgd()
{
- # http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
- # orig: 5f9c7a81022949bfe39b50f2bbd799c448bb7377
- # Jan 2009: 7ad74e589d5eefcee67fa14e65417281d237a6b6
- # May 2009: bd8aa796e16e5f213414af78931e0379d9cbe292
- # 2015/11/09: Removed from Microsoft.com, archive.org has the original copy:
- # 2015/11/09: 5f9c7a81022949bfe39b50f2bbd799c448bb7377
- w_download http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB 5f9c7a81022949bfe39b50f2bbd799c448bb7377
+ # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
+ # 2015/11/09: Removed from Microsoft.com, archive.org has the original copy: ccff83fd24a0e6d7611050c8cafcb1aede608b6a3d096fb7476ce302e569479a
+
+ w_download http://activex.microsoft.com/controls/vb6/MSHFLXGD.CAB ccff83fd24a0e6d7611050c8cafcb1aede608b6a3d096fb7476ce302e569479a
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/mshflxgd/MSHFLXGD.CAB
w_try cp -f "$W_TMP"/[Mm][Ss][Hh][Ff][Ll][Xx][Gg][Dd].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
@@ -7832,7 +7802,7 @@ load_msscript()
{
# http://msdn.microsoft.com/scripting/scriptcontrol/x86/sct10en.exe
# http://www.microsoft.com/downloads/details.aspx?familyid=d7e31492-2595-49e6-8c02-1426fec693ac
- w_download http://download.microsoft.com/download/d/2/a/d2a7430c-6d5b-48e9-96c4-3c751be7bffe/sct10en.exe fd9f2f23357ab11ae70682d6864f7e9f188adf2a
+ w_download http://download.microsoft.com/download/d/2/a/d2a7430c-6d5b-48e9-96c4-3c751be7bffe/sct10en.exe 9b6730c3070f252f5051e0cf6b99523b66730599d795a607efd40b7fb0e11efb
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msscript/sct10en.exe
w_try cp -f "$W_TMP"/msscript.ocx "$W_SYSTEM32_DLLS"
@@ -7851,7 +7821,7 @@ w_metadata msls31 dlls \
load_msls31()
{
# Needed by native RichEdit and Internet Explorer
- w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4fc3bf0dc96b5cf5ab26430fac1c33c5c50bd142
+ w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe 4c3516c0b5c2b76b88209b22e3bf1cb82d8e2de7116125e97e128952372eed6b
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msls31/InstMsiW.exe
w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS"
}
@@ -7868,13 +7838,13 @@ w_metadata msmask dlls \
load_msmask()
{
- # http://msdn.microsoft.com/en-us/library/11405hcf(VS.71).aspx
- # http://bugs.winehq.org/show_bug.cgi?id=2934
+ # https://msdn.microsoft.com/en-us/library/11405hcf(VS.71).aspx
+ # https://bugs.winehq.org/show_bug.cgi?id=2934
# old: 3c6b26f68053364ea2e09414b615dbebafb9d5c3
# May 2009: 30e55679e4a13fe4d9620404476f215f93239292
# 2015/11/09: Removed from microsoft.com, archive.org has an older copy:
- # 2015/11/09: bdd2bb3a32d18926a048f302aff18b1e6d250d9d
- w_download http://activex.microsoft.com/controls/vb6/MSMASK32.CAB bdd2bb3a32d18926a048f302aff18b1e6d250d9d
+ # 2015/11/09: 25e49bd2aa8f96ff3c1068fc0fa7ba87fe86d8d5999e3592919a4b03f0602d67
+ w_download http://activex.microsoft.com/controls/vb6/MSMASK32.CAB 25e49bd2aa8f96ff3c1068fc0fa7ba87fe86d8d5999e3592919a4b03f0602d67
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msmask/MSMASK32.CAB
w_try cp -f "$W_TMP"/[Mm][Ss][Mm][Aa][Ss][Kk]32.[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"/msmask32.ocx
w_try_regsvr msmask32.ocx
@@ -7913,7 +7883,7 @@ load_msxml3()
# Service Pack 5
#w_download http://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
# Service Pack 7
- w_download http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
+ w_download http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi f9c678f8217e9d4f9647e8a1f6d89a7c26a57b9e9e00d39f7487493dd7b4e36c
# It won't install on top of Wine's msxml3, which has a pretty high version number, so delete Wine's fake DLL
rm "$W_SYSTEM32_DLLS"/msxml3.dll
@@ -7934,12 +7904,12 @@ w_metadata msxml4 dlls \
load_msxml4()
{
- # MS06-071: http://www.microsoft.com/downloads/details.aspx?familyid=24B7D141-6CDF-4FC4-A91B-6F18FE6921D4
- # w_download http://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
- # MS07-042: http://www.microsoft.com/downloads/details.aspx?FamilyId=021E12F5-CB46-43DF-A2B8-185639BA2807
- # w_download http://download.microsoft.com/download/9/4/2/9422e6b6-08ee-49cb-9f05-6c6ee755389e/msxml4-KB936181-enu.exe 73d75d7b41f8a3d49f272e74d4f73bb5e82f1acf
- # SP3 (2009): http://www.microsoft.com/downloads/details.aspx?familyid=7F6C0CB4-7A5E-4790-A7CF-9E139E6819C0
- w_download http://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi aa70c5c1a7a069af824947bcda1d9893a895318b
+ # MS06-071: https://www.microsoft.com/en-us/download/details.aspx?id=11125
+ # w_download https://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
+ # MS07-042: https://www.microsoft.com/en-us/download/details.aspx?id=2386
+ # w_download https://download.microsoft.com/download/9/4/2/9422e6b6-08ee-49cb-9f05-6c6ee755389e/msxml4-KB936181-enu.exe 73d75d7b41f8a3d49f272e74d4f73bb5e82f1acf
+ # SP3 (2009): https://www.microsoft.com/en-us/download/details.aspx?id=15697
+ w_download https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi 47c2ae679c37815da9267c81fc3777de900ad2551c11c19c2840938b346d70bb
w_override_dlls native,builtin msxml4
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i msxml.msi $W_UNATTENDED_SLASH_Q
@@ -7958,12 +7928,12 @@ w_metadata msxml6 dlls \
load_msxml6()
{
# Service Pack 1
- # http://www.microsoft.com/downloads/details.aspx?familyid=D21C292C-368B-4CE1-9DAB-3E9827B70604
+ # https://www.microsoft.com/en-us/download/details.aspx?id=6276
if [ $W_ARCH = win64 ]
then
- w_download http://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x64.msi ca0c0814a9c7024583edb997296aad7cb0a3cbf7
+ w_download https://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x64.msi ca0c0814a9c7024583edb997296aad7cb0a3cbf7
else
- w_download http://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x86.msi 5125220e985b33c946bbf9f60e2b222c7570bfa2
+ w_download https://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x86.msi efa48f8cab5a89b8e667ed3e10dfb71bddc02923d0f3757bd93ffabe6fb6c598
fi
w_override_dlls native,builtin msxml6
rm -f "$W_SYSTEM32_DLLS/msxml6.dll"
@@ -8008,11 +7978,11 @@ w_metadata ogg dlls \
media="download" \
file1="opencodecs_0.85.17777.exe" \
installed_file1="$W_PROGRAMS_X86_WIN/Xiph.Org/Open Codecs/AxPlayer.dll" \
- homepage="http://xiph.org/dshow"
+ homepage="https://xiph.org/dshow"
load_ogg()
{
- w_download http://downloads.xiph.org/releases/oggdsf/opencodecs_0.85.17777.exe 386cf7cd29ffcbf8705eff8c8233de448ecf33ab
+ w_download http://downloads.xiph.org/releases/oggdsf/opencodecs_0.85.17777.exe fcec3cea637e806501aff447d902de3b5bfef226b629e43ab67e46dbb23f13e7
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
}
@@ -8033,7 +8003,7 @@ load_ollydbg110()
# The GUI is unreadable without having corefonts installed.
w_call corefonts
- w_download http://www.ollydbg.de/odbg110.zip 8403d8049a0841887c16cf64889596ad52b84da8
+ w_download http://www.ollydbg.de/odbg110.zip 73b1770f28893dab22196eb58d45ede8ddf5444009960ccc0107d09881a7cd1e
w_try_unzip "$W_DRIVE_C/ollydbg110" "$W_CACHE/$W_PACKAGE"/odbg110.zip
}
@@ -8053,7 +8023,7 @@ load_ollydbg200()
# The GUI is unreadable without having corefonts installed.
w_call corefonts
- w_download http://www.ollydbg.de/odbg200.zip 68e572d94a0555e8f14516b55b6b96b879900fe9
+ w_download http://www.ollydbg.de/odbg200.zip 93dfd6348323db33f2005fc1fb8ff795256ae91d464dd186adc29c4314ed647c
w_try_unzip "$W_DRIVE_C/ollydbg200" "$W_CACHE/$W_PACKAGE"/odbg200.zip
}
@@ -8073,7 +8043,7 @@ load_ollydbg201()
# The GUI is unreadable without having corefonts installed.
w_call corefonts
- w_download http://www.ollydbg.de/odbg201.zip d41fe77a2801d38476f20468ab61ddce14c3abb8
+ w_download http://www.ollydbg.de/odbg201.zip 29244e551be31f347db00503c512058086f55b43c93c1ae93729b15ce6e087a5
w_try_unzip "$W_DRIVE_C/ollydbg201" "$W_CACHE/$W_PACKAGE"/odbg201.zip
# ollydbg201 is affected by Wine bug 36012 if debug symbols are available.
@@ -8096,7 +8066,7 @@ w_metadata openwatcom apps \
load_openwatcom()
{
# 2016/03/11: upstream http://www.openwatcom.org appears to be dead (404)
- w_download "http://openwatcom.mirror.fr/open-watcom-c-win32-1.9.exe" 236ac33ebd463006be4ecd83d7ebea1c026eb55a
+ w_download "http://openwatcom.mirror.fr/open-watcom-c-win32-1.9.exe" 040c910aba304fdb5f39b8fe508cd3c772b1da1f91a58179fa0895e0b2bf190b
if [ $W_UNATTENDED_SLASH_Q ]
then
@@ -8132,8 +8102,8 @@ w_metadata pdh dlls \
load_pdh()
{
- # http://support.microsoft.com/kb/284996
- w_download http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e
+ # https://support.microsoft.com/kb/284996
+ w_download http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe 5506e34930badec5c27d4c325462530e4b06a4a9797a8f70089b39013b5dffae
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/pdh/pdhinst.exe
w_try_unzip "$W_TMP" "$W_TMP"/pdh.exe
@@ -8152,8 +8122,8 @@ w_metadata physx dlls \
load_physx()
{
- # Has a minor issue, see bug report http://bugs.winehq.org/show_bug.cgi?id=34167
- w_download http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 81e2d38e2356e807ad80cdf150ed5acfff839c8b
+ # Has a minor issue, see bug report https://bugs.winehq.org/show_bug.cgi?id=34167
+ w_download https://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi 0a022e28accf5851be9d6577487cdcd3d3a3e2a8a21a64456b72b415c217f03c
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i PhysX-9.14.0702-SystemSoftware.msi $W_UNATTENDED_SLASH_Q
}
@@ -8170,8 +8140,8 @@ w_metadata pngfilt dlls \
load_pngfilt()
{
- # http://www.microsoft.com/en-us/download/details.aspx?id=3907
- w_download http://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe 6f5db296ebf58e81c49bc667049a3f88a3f1ec3d
+ # https://www.microsoft.com/en-us/download/details.aspx?id=3907
+ w_download http://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe eb1b90677ee969b278494c6180d906af37eda6d20f760dc395350a2da91eb631
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F pngfilt.dll "$W_CACHE"/pngfilt/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe
w_try_regsvr pngfilt.dll
}
@@ -8232,8 +8202,8 @@ w_metadata quicktime72 dlls \
load_quicktime72()
{
- # https://support.apple.com/downloads/quicktime
- w_download http://appldnld.apple.com.edgesuite.net/content.info.apple.com/QuickTime/061-2915.20070710.pO94c/QuickTimeInstaller.exe bb89981f10cf21de57b9453e53cf81b9194271a9
+ # https://support.apple.com/kb/DL837
+ w_download http://appldnld.apple.com.edgesuite.net/content.info.apple.com/QuickTime/061-2915.20070710.pO94c/QuickTimeInstaller.exe a42b93531910bdf1539cc5ae3199ade5a1ca63fd4ac971df74c345d8e1ee6593
w_try_cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" "$file1" ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $W_UNATTENDED_SLASH_QN > /dev/null 2>&1
@@ -8241,7 +8211,7 @@ load_quicktime72()
if w_workaround_wine_bug 11681
then
# Following advice verified with test movies from
- # http://support.apple.com/kb/HT1425
+ # https://support.apple.com/kb/HT1425
# in QuickTimePlayer.
w_warn "In Quicktime preferences, check Advanced / Safe Mode (gdi), or movies won't play."
@@ -8269,8 +8239,8 @@ w_metadata quicktime76 dlls \
load_quicktime76()
{
- # http://www.apple.com/quicktime/download/
- w_download http://appldnld.apple.com/QuickTime/041-0025.20101207.Ptrqt/QuickTimeInstaller.exe 1eec8904f041d9e0ad3459788bdb690e45dbc38e
+ # https://support.apple.com/kb/DL837
+ w_download http://appldnld.apple.com/QuickTime/041-0025.20101207.Ptrqt/QuickTimeInstaller.exe c2dcda76ed55428e406ad7e6acdc84e804d30752a1380c313394c09bb3e27f56
w_try_cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" QuickTimeInstaller.exe ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $W_UNATTENDED_SLASH_QN > /dev/null 2>&1
@@ -8278,7 +8248,7 @@ load_quicktime76()
if w_workaround_wine_bug 11681
then
# Following advice verified with test movies from
- # http://support.apple.com/kb/HT1425
+ # https://support.apple.com/kb/HT1425
# in QuickTimePlayer.
w_warn "In Quicktime preferences, check Advanced / Safe Mode (gdi), or movies won't play."
@@ -8365,7 +8335,7 @@ load_riched30()
# msi 2, which just happens to come with riched30 version of riched20
# (though not with a corresponding riched32, which might be a problem)
# http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F
- w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
+ w_download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/riched30/InstMsiA.exe
w_try cp -f "$W_TMP"/riched20.dll "$W_SYSTEM32_DLLS"
w_try cp -f "$W_TMP"/msls31.dll "$W_SYSTEM32_DLLS"
@@ -8384,7 +8354,7 @@ w_metadata richtx32 dlls \
load_richtx32()
{
- w_download http://activex.microsoft.com/controls/vb6/richtx32.cab da404b566df3ad74fe687c39404a36c3e7cadc07
+ w_download http://activex.microsoft.com/controls/vb6/richtx32.cab bb75c45af3e7428f1ee5380d33175aa9f36a6a84f5a2d74927a1dbf0d4b7f938
w_try_cabextract "$W_CACHE"/richtx32/richtx32.cab -d "$W_SYSTEM32_DLLS" -F RichTx32.ocx
w_try_regsvr RichTx32.ocx
}
@@ -8401,8 +8371,8 @@ w_metadata sdl dlls \
load_sdl()
{
- # http://www.libsdl.org/download-1.2.php
- w_download http://www.libsdl.org/release/SDL-1.2.14-win32.zip d22c71d1c2bdf283548187c4b0bd7ef9d0c1fb23
+ # https://www.libsdl.org/download-1.2.php
+ w_download https://www.libsdl.org/release/SDL-1.2.14-win32.zip ce77838902891bf2e4378d4a910afef88aaaae4f833a49cfc9bb8dde11ff89a7
w_try_unzip "$W_SYSTEM32_DLLS" "$W_CACHE"/sdl/SDL-1.2.14-win32.zip SDL.dll
}
@@ -8419,7 +8389,7 @@ w_metadata secur32 dlls \
load_secur32()
{
# http://www.microsoft.com/downloads/details.aspx?familyid=c4e408d7-6716-4a12-ad3a-8029667f5c84
- w_download http://download.microsoft.com/download/6/9/5/69501788-B62F-44D8-933F-B6FAA576CA87/Windows2000-KB959426-x86-ENU.EXE bf930a4d2982165a0793465bb255d494ba5b4cf7
+ w_download http://download.microsoft.com/download/6/9/5/69501788-B62F-44D8-933F-B6FAA576CA87/Windows2000-KB959426-x86-ENU.EXE a150e8b8fc68164eed18f214ee0726d9b7eb6c4726aab91decd12627b045d68b
w_try_cabextract "$W_CACHE"/secur32/Windows2000-KB959426-x86-ENU.EXE -d "$W_SYSTEM32_DLLS" -F secur32.dll
w_override_dlls native,builtin secur32
}
@@ -8431,12 +8401,12 @@ w_metadata setupapi dlls \
publisher="Microsoft" \
year="2004" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/setupapi.dll"
load_setupapi()
{
- helper_xpsp3 i386/setupapi.dl_
+ helper_winxpsp3 i386/setupapi.dl_
w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_TMP"/i386/setupapi.dl_
w_override_dlls native,builtin setupapi
@@ -8447,45 +8417,16 @@ load_setupapi()
w_metadata shockwave dlls \
title="Shockwave" \
publisher="Adobe" \
- year="2010" \
+ year="2017" \
media="download" \
file1="sw_lic_full_installer.msi" \
installed_file1="$W_SYSTEM32_DLLS_WIN/Adobe/Shockwave 12/shockwave_Projector_Loader.dcr"
load_shockwave() {
- # Not silent enough, use MSI instead
- #w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/Shockwave_Installer_Full.exe 840e34e9b067cf247bfa9092665b8966158f38e3
- #w_try "$WINE" "$W_CACHE"/Shockwave_Installer_Full.exe $W_UNATTENDED_SLASH_S
- # old sha1sum: 6a91a9da4b54c3fdc97130a15e1a173117e5f4ff
- # 2009-07-31 sha1sum: 0bb506ef67a268e8d3fb6c7ce556320ee10b9da5
- # 2009-12-13 sha1sum: d35649883bf13cb1a86f5650e1050d15533ac0f4
- # 2010-01-23 sha1sum: 4a837d238c28c5f345d73f105711f20c6d059273
- # 2010-05-15 sha1sum: bdce02afc82233801e84137e78c2c5fe574db253
- # 2010-09-02 sha1sum: fed20eccc29fec2f64162b7265343514d43884bc
- # 2010-11-03 sha1sum: 2ff28665543e80f3bd4ff1933ac05ec9314aaac6
- # 2011-02-03 sha1sum: e71ddc4fa42662208b2f52c1bd34a40e7775ad75
- # 2011-06-13 sha1sum: 7fd6cc61bb20d0bef654a44f4501a5a65b55b0c9
- # 2011-11-10 sha1sum: b55974b471c516f13fb032424247c07390baf380
- # 2012-03-07 sha1sum: 3b10f645ba1a6815fa97924a6bde4eda3177ff68
- # 2012-04-26 sha1sum: 48b1a44b2c12c486916d641f3b4e20abffb3d6e4
- # 2012-08-08 sha1sum: 3c4d531ccf0bb5788f1c197c63e9c0aa89885ee6
- # 2013-06-15 sha1sum: 9c02499deaf567bde7d827493705e5680833d02e
- # 2014-01-22 sha1sum: c8f1b2c137a1373d591f7c1d48db9c6baa961caf
- # 2014-02-26 sha1sum: ae2855b729bfaedc766f3addd8c2b74eac576909
- # 2014-04-15 sha1sum: c2ea56450fb4a5bac66cb7d70e3b522431521787
- # 2014-05-21 sha1sum: d95d1a14ee264235b29e093105bd2baa8b06eb12
- # 2014-11-22 sha1sum: 644d3228654ded798eabe40e7044b96b90e742f6
- # 2015-03-30 sha1sum: 9f2d4d929e7210ae9fb633881127b21586ffd8ce
- # 2015-04-27 sha1sum: 244e6a5c5fa2dd26c136bc5b402f6cad588763d7
- # 2015-08-02 sha1sum: e2efa2eb7db0a6de08905cd61bb3efcf58fda994
- # 2015-11-09 sha1sum: d13420a6fdc4f8d9c45c5ee6767974f0f0054cdc
- # 2015-12-27 sha1sum: 3ac6d85e54dffb2940c89fc10e63363a47ec96d0
- # 2016-02-18 sha1sum: 45147a791e3f71bd67ead1622d9120060dd196e5
- # 2016-03-11 sha1sum: 4f955f42984ae69d2f6078d3a3fe9fadc4a25e34
- # 2016-10-11 sha1sum: bcb6a9d9a6f7781db3de3120a0c9dcd8118642d1
- # 2017-02-19 sha1sum: 86eb79ea28ac3801887616cefee2d2b43522312a
+ # 2017-03-12 sha256sum: 39715a84b1d85347066fbf89a3af9f5e612b59402093b055cd423bd30a7f637d
+ # 2017-03-15 sha256sum: 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
+ w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 58f2152bf726d52f08fb41f904c62ff00fdf748c8ce413e8c8547da3a21922ba
- w_download https://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 86eb79ea28ac3801887616cefee2d2b43522312a
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
}
@@ -8502,8 +8443,8 @@ w_metadata speechsdk dlls \
load_speechsdk()
{
- # http://www.microsoft.com/download/en/details.aspx?id=10121
- w_download http://download.microsoft.com/download/B/4/3/B4314928-7B71-4336-9DE7-6FA4CF00B7B3/SpeechSDK51.exe f69efaee8eb47f8c7863693e8b8265a3c12c4f51
+ # https://www.microsoft.com/en-us/download/details.aspx?id=10121
+ w_download https://download.microsoft.com/download/B/4/3/B4314928-7B71-4336-9DE7-6FA4CF00B7B3/SpeechSDK51.exe 520aa5d1a72dc6f41dc9b8b88603228ffd5d5d6f696224fc237ec4828fe7f6e0
w_try_unzip "$W_TMP" "$W_CACHE"/speechsdk/SpeechSDK51.exe
@@ -8528,9 +8469,9 @@ w_metadata tabctl32 dlls \
load_tabctl32()
{
- # http://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
+ # https://msdn.microsoft.com/en-us/library/aa240864(VS.60).aspx
# Nov 2012: tabctl32
- w_download http://activex.microsoft.com/controls/vb6/TABCTL32.CAB beca51d05924a5466ab80eb0f8d0cdf8bc1ac697
+ w_download http://activex.microsoft.com/controls/vb6/TABCTL32.CAB d2a7bdacf74de95146384578d0f08ccefb2defb0081b3d42d34fdcee7ea4cc68
w_try_cabextract --directory="$W_TMP" "$W_CACHE/tabctl32/${file1}"
w_try cp -f "$W_TMP"/[Tt][Aa][Bb][Cc][Tt][Ll][3][2].[Oo][Cc][Xx] "$W_SYSTEM32_DLLS"
@@ -8544,12 +8485,12 @@ w_metadata updspapi dlls \
publisher="Microsoft" \
year="2004" \
media="download" \
- file1="../xpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
+ file1="../winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/updspapi.dll"
load_updspapi()
{
- helper_xpsp3 i386/update/updspapi.dll
+ helper_winxpsp3 i386/update/updspapi.dll
w_try cp -f "$W_TMP"/i386/update/updspapi.dll "$W_SYSTEM32_DLLS"
w_override_dlls native,builtin updspapi
@@ -8569,7 +8510,7 @@ load_usp10()
{
# https://en.wikipedia.org/wiki/Uniscribe
# http://www.microsoft.com/downloads/details.aspx?familyid=cebbacd8-c094-4255-b702-de3bb768148f
- w_download_to msi2 http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
+ w_download_to msi2 http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe 536e4c8385d7d250fd5702a6868d1ed004692136eefad22252d0dac15f02563a
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/msi2/InstMsiA.exe
w_try cp -f "$W_TMP"/usp10.dll "$W_SYSTEM32_DLLS"
w_override_dlls native,builtin usp10
@@ -8591,7 +8532,7 @@ load_vb2run()
# See ftp://ftp.microsoft.com/Softlib/index.txt
# 2014/05/31: Microsoft FTP is down ftp://$ftp_microsoft_com/Softlib/MSLFILES/VBRUN200.EXE
# 2015/08/10: chatnfiles is down, conradshome.com is up (and has a LOT of old MS installers archived!)
- w_download http://www.conradshome.com/win31/archive/softlib/vbrun200.exe ac0568b73ee375408778e9b505df995f79ab907e
+ w_download https://www.conradshome.com/win31/archive/softlib/vbrun200.exe 4b0811d8fdcac1fd9411786c9119dc8d98d0540948211bdbc1ac682fbe5c0228
w_try_unzip "$W_TMP" "$W_CACHE"/vb2run/VBRUN200.EXE
w_try cp -f "$W_TMP/VBRUN200.DLL" "$W_SYSTEM32_DLLS"
}
@@ -8608,8 +8549,8 @@ w_metadata vb3run dlls \
load_vb3run()
{
- # See http://support.microsoft.com/kb/196285
- w_download http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.exe 518fcfefde9bf680695cadd06512efadc5ac2aa7
+ # See https://support.microsoft.com/kb/196285
+ w_download https://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.exe 3ca3ad6332f83b5c2b86e4758afa400150f07ae66ce8b850d8f9d6bcd47ad4cd
w_try_unzip "$W_TMP" "$W_CACHE"/vb3run/vb3run.exe
w_try cp -f "$W_TMP/Vbrun300.dll" "$W_SYSTEM32_DLLS"
}
@@ -8626,8 +8567,8 @@ w_metadata vb4run dlls \
load_vb4run()
{
- # See http://support.microsoft.com/kb/196286
- w_download http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4run.exe 83e968063272e97bfffd628a73bf0ff5f8e1023b
+ # See https://support.microsoft.com/kb/196286
+ w_download https://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4run.exe 40931308b5a137f9ce3e9da9b43f4ca6688e18b523687cfea8be6cdffa3153fb
w_try_unzip "$W_TMP" "$W_CACHE"/vb4run/vb4run.exe
w_try cp -f "$W_TMP/Vb40032.dll" "$W_SYSTEM32_DLLS"
w_try cp -f "$W_TMP/Vb40016.dll" "$W_SYSTEM32_DLLS"
@@ -8645,7 +8586,7 @@ w_metadata vb5run dlls \
load_vb5run()
{
- w_download http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe 28bfaf09b8ac32cf5ffa81252f3e2fadcb3a8f27
+ w_download https://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe b5f8ea5b9d8b30822a2be2cdcb89cda99ec0149832659ad81f45360daa6e6965
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msvbvm50.exe $W_UNATTENDED_SLASH_Q
}
@@ -8662,10 +8603,10 @@ w_metadata vb6run dlls \
load_vb6run()
{
- # http://support.microsoft.com/kb/290887
+ # https://support.microsoft.com/kb/290887
if test ! -f "$W_CACHE"/vb6run/vbrun60sp6.exe
then
- w_download http://download.microsoft.com/download/5/a/d/5ad868a0-8ecd-4bb0-a882-fe53eb7ef348/VB6.0-KB290887-X86.exe 73ef177008005675134d2f02c6f580515ab0d842
+ w_download https://download.microsoft.com/download/5/a/d/5ad868a0-8ecd-4bb0-a882-fe53eb7ef348/VB6.0-KB290887-X86.exe 467b5a10c369865f2021d379fc0933cb382146b702bbca4bcb703fc86f4322bb
w_try "$WINE" "$W_CACHE"/vb6run/VB6.0-KB290887-X86.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q
if test ! -f "$W_TMP"/vbrun60sp6.exe
@@ -8697,7 +8638,7 @@ load_vb6run()
winetricks_vcrun6_helper() {
if test ! -f "$W_CACHE"/vcrun6/vcredist.exe
then
- w_download_to vcrun6 http://download.microsoft.com/download/vc60pro/Update/2/W9XNT4/EN-US/VC6RedistSetup_deu.exe a8c4dd33e281c166488846a10edf97ff0ce37044
+ w_download_to vcrun6 https://download.microsoft.com/download/vc60pro/Update/2/W9XNT4/EN-US/VC6RedistSetup_deu.exe c2eb91d9c4448d50e46a32fecbcc3b418706d002beab9b5f4981de552098cee7
w_try "$WINE" "$W_CACHE"/vcrun6/vc6redistsetup_deu.exe "/T:$W_TMP_WIN" /c $W_UNATTENDED_SLASH_Q
if test ! -f "$W_TMP"/vcredist.exe
@@ -8786,7 +8727,7 @@ w_metadata vcrun6sp6 dlls \
load_vcrun6sp6()
{
- w_download http://download.microsoft.com/download/1/9/f/19fe4660-5792-4683-99e0-8d48c22eed74/Vs6sp6.exe 2292437a8967349261c810ae8b456592eeb76620
+ w_download https://download.microsoft.com/download/1/9/f/19fe4660-5792-4683-99e0-8d48c22eed74/Vs6sp6.exe 7fa1d1778824b55a5fceb02f45c399b5d4e4dce7403661e67e587b5f455edbf3
# No EULA is presented when passing command-line extraction arguments,
# so we'll simplify extraction with cabextract.
@@ -8830,7 +8771,7 @@ load_vcrun2003()
# Sadly, I know of no Microsoft URL for these
echo "Installing BZFlag (which comes with the Visual C++ 2003 runtimes)"
# winetricks-test can't handle ${file1} in url since it does a raw parsing :/
- w_download https://sourceforge.net/projects/bzflag/files/bzedit%20win32/1.6.5/BZEditW32_1.6.5.exe bdd1b32c4202fd77e6513fd507c8236888b09121
+ w_download https://sourceforge.net/projects/bzflag/files/bzedit%20win32/1.6.5/BZEditW32_1.6.5.exe 84d1bda5dbf814742898a2e1c0e4bc793e9bc1fba4b7a93d59a7ef12bd0fd802
w_try "$WINE" "$W_CACHE/vcrun2003/${file1}" $W_UNATTENDED_SLASH_S
w_try cp "$W_PROGRAMS_X86_UNIX/BZEdit1.6.5"/m*71* "$W_SYSTEM32_DLLS"
}
@@ -8855,9 +8796,9 @@ w_metadata vcrun2005 dlls \
load_vcrun2005()
{
# June 2011 security update, see
- # http://www.microsoft.com/technet/security/bulletin/MS11-025.mspx or
- # http://support.microsoft.com/kb/2538242
- w_download http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE b8fab0bb7f62a24ddfe77b19cd9a1451abd7b847
+ # https://technet.microsoft.com/library/security/ms11-025 or
+ # https://support.microsoft.com/kb/2538242
+ w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29
w_try_cd "$W_CACHE/$W_PACKAGE"
w_override_dlls native,builtin atl80 msvcm80 msvcp80 msvcr80 vcomp
@@ -8877,9 +8818,9 @@ w_metadata vcrun2008 dlls \
load_vcrun2008()
{
# June 2011 security update, see
- # http://www.microsoft.com/technet/security/bulletin/MS11-025.mspx or
- # http://support.microsoft.com/kb/2538242
- w_download http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 470640aa4bb7db8e69196b5edb0010933569e98d
+ # https://technet.microsoft.com/library/security/ms11-025 or
+ # https://support.microsoft.com/kb/2538242
+ w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 6b3e4c51c6c0e5f68c8a72b497445af3dbf976394cbb62aa23569065c28deeb6
w_override_dlls native,builtin atl90 msvcm90 msvcp90 msvcr90 vcomp90
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_Q
@@ -8887,8 +8828,8 @@ load_vcrun2008()
case "$W_ARCH" in
win64)
# Also install the 64-bit version
- # 2016/11/15: a7c83077b8a28d409e36316d2d7321fa0ccdb7e8
- w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe a7c83077b8a28d409e36316d2d7321fa0ccdb7e8
+ # 2016/11/15: b811f2c047a3e828517c234bd4aa4883e1ec591d88fad21289ae68a6915a6665
+ w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe b811f2c047a3e828517c234bd4aa4883e1ec591d88fad21289ae68a6915a6665
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
rm -f "$W_TMP"/* # Avoid permission error
@@ -8921,8 +8862,8 @@ w_metadata vcrun2010 dlls \
load_vcrun2010()
{
- # See http://www.microsoft.com/downloads/details.aspx?FamilyID=a7b7a05e-6de6-4d3a-a423-37bf0912db84
- w_download http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 372d9c1670343d3fb252209ba210d4dc4d67d358
+ # See https://www.microsoft.com/en-us/download/details.aspx?id=5555
+ w_download https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe 8162b2d665ca52884507ede19549e99939ce4ea4a638c537fa653539819138c8
w_override_dlls native,builtin msvcp100 msvcr100 vcomp100 atl100
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -8931,8 +8872,8 @@ load_vcrun2010()
case "$W_ARCH" in
win64)
# Also install the 64-bit version
- # http://www.microsoft.com/en-us/download/details.aspx?id=13523
- w_download http://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe 027d0c2749ec5eb21b031f46aee14c905206f482
+ # https://www.microsoft.com/en-us/download/details.aspx?id=13523
+ w_download https://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe c6cd2d3f0b11dc2a604ffdc4dd97861a83b77e21709ba71b962a47759c93f4c8
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
w_try_cabextract --directory="$W_TMP" vcredist_x64.exe -F '*.cab'
@@ -8962,8 +8903,8 @@ w_metadata vcrun2012 dlls \
load_vcrun2012()
{
- # http://www.microsoft.com/download/details.aspx?id=30679
- w_download http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe 96b377a27ac5445328cbaae210fc4f0aaa750d3f
+ # https://www.microsoft.com/en-us/download/details.aspx?id=30679
+ w_download https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe b924ad8062eaf4e70437c8be50fa612162795ff0839479546ce907ffa8d6e386
w_override_dlls native,builtin atl110 msvcp110 msvcr110 vcomp110
w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -8972,8 +8913,8 @@ load_vcrun2012()
case "$W_ARCH" in
win64)
# Also install the 64-bit version
- # 2015/10/19: 1a5d93dddbc431ab27b1da711cd3370891542797
- w_download http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe 1a5d93dddbc431ab27b1da711cd3370891542797
+ # 2015/10/19: 681be3e5ba9fd3da02c09d7e565adfa078640ed66a0d58583efad2c1e3cc4064
+ w_download https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe 681be3e5ba9fd3da02c09d7e565adfa078640ed66a0d58583efad2c1e3cc4064
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
rm -f "$W_TMP"/* # Avoid permission error
@@ -9005,10 +8946,10 @@ w_metadata vcrun2013 dlls \
load_vcrun2013()
{
- # http://www.microsoft.com/en-us/download/details.aspx?id=40784
+ # https://www.microsoft.com/en-us/download/details.aspx?id=40784
# 2014/07/26: 18f81495bc5e6b293c69c28b0ac088a96debbab2
- # 2015/01/14: df7f0a73bfa077e483e51bfb97f5e2eceedfb6a3
- w_download http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe df7f0a73bfa077e483e51bfb97f5e2eceedfb6a3
+ # 2015/01/14: a22895e55b26202eae166838edbe2ea6aad00d7ea600c11f8a31ede5cbce2048
+ w_download https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe a22895e55b26202eae166838edbe2ea6aad00d7ea600c11f8a31ede5cbce2048
w_override_dlls native,builtin atl120 msvcp120 msvcr120 vcomp120
w_try_cd "$W_CACHE"/"$W_PACKAGE"
@@ -9017,8 +8958,8 @@ load_vcrun2013()
case "$W_ARCH" in
win64)
# Also install the 64-bit version
- # 2015/10/19: 8bf41ba9eef02d30635a10433817dbb6886da5a2
- w_download http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe 8bf41ba9eef02d30635a10433817dbb6886da5a2
+ # 2015/10/19: e554425243e3e8ca1cd5fe550db41e6fa58a007c74fad400274b128452f38fb8
+ w_download https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe e554425243e3e8ca1cd5fe550db41e6fa58a007c74fad400274b128452f38fb8
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
rm -f "$W_TMP"/* # Avoid permission error
@@ -9050,8 +8991,8 @@ w_metadata vcrun2015 dlls \
load_vcrun2015()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=48145
- # 2015/10/12: bfb74e498c44d3a103ca3aa2831763fb417134d1
- w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe bfb74e498c44d3a103ca3aa2831763fb417134d1
+ # 2015/10/12: fdd1e1f0dcae2d0aa0720895eff33b927d13076e64464bb7c7e5843b7667cd14
+ w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe fdd1e1f0dcae2d0aa0720895eff33b927d13076e64464bb7c7e5843b7667cd14
if w_workaround_wine_bug 37781
then
@@ -9068,8 +9009,8 @@ load_vcrun2015()
case "$W_ARCH" in
win64)
# Also install the 64-bit version
- # 2015/10/12: 3155cb0f146b927fcc30647c1a904cd162548c8c
- w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe 3155cb0f146b927fcc30647c1a904cd162548c8c
+ # 2015/10/12: 5eea714e1f22f1875c1cb7b1738b0c0b1f02aec5ecb95f0fdb1c5171c6cd93a3
+ w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe 5eea714e1f22f1875c1cb7b1738b0c0b1f02aec5ecb95f0fdb1c5171c6cd93a3
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
rm -f "$W_TMP"/* # Avoid permission error
@@ -9122,8 +9063,8 @@ load_vjrun20()
w_call dotnet20
- # See http://www.microsoft.com/downloads/details.aspx?FamilyId=E9D87F37-2ADC-4C32-95B3-B5E3A21BAB2C
- w_download http://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe 80a098e36b90d159da915aebfbfbacf35f302bd8
+ # See https://www.microsoft.com/en-us/download/details.aspx?id=18084
+ w_download https://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe cf8f3dd4ad41453a302870b74de1c6489e7ed255ad3f652ce4af0b424a933b41
w_try_cd "$W_CACHE"/"$W_PACKAGE"
w_try "$WINE" vjredist.exe ${W_OPT_UNATTENDED:+ /q /C:"install $W_UNATTENDED_SLASH_QNT"}
}
@@ -9143,7 +9084,7 @@ load_windowscodecs()
# Separate 32/64-bit installers:
if [ "$W_ARCH" = "win32" ] ; then
# https://www.microsoft.com/en-us/download/details.aspx?id=32
- w_download http://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 53c18652ac2f8a51303deb48a1b7abbdb1db427f
+ w_download https://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99387d4f/wic_x86_enu.exe 196868b09d87ae04e4ab42b4a3e0abbb160500e8ff13deb38e2956ee854868b1
EXE="wic_x86_enu.exe"
elif [ "$W_ARCH" = "win64" ] ; then
# https://www.microsoft.com/en-us/download/details.aspx?id=1385
@@ -9174,8 +9115,8 @@ load_windowscodecs()
w_set_winver winxp
# Always run the WIC installer in passive mode.
- # See http://bugs.winehq.org/show_bug.cgi?id=16876 and
- # http://bugs.winehq.org/show_bug.cgi?id=23232
+ # See https://bugs.winehq.org/show_bug.cgi?id=16876 and
+ # https://bugs.winehq.org/show_bug.cgi?id=23232
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try $TASKSET "$WINE" "$EXE" /passive
@@ -9238,7 +9179,7 @@ load_wmi()
w_set_winver win98
w_override_dlls native,builtin wbemprox wmiutils
- # Note: there is a crash in the background towards the end, doesn't seem to hurt; see http://bugs.winehq.org/show_bug.cgi?id=7920
+ # Note: there is a crash in the background towards the end, doesn't seem to hurt; see https://bugs.winehq.org/show_bug.cgi?id=7920
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" wmi9x.exe $W_UNATTENDED_SLASH_S
w_unset_winver
@@ -9258,7 +9199,7 @@ load_wmv9vcm()
{
# https://www.microsoft.com/en-us/download/details.aspx?id=39486
# See also https://www.microsoft.com/en-us/download/details.aspx?id=6191
- w_download https://download.microsoft.com/download/2/8/D/28DA9C3E-6DA2-456F-BD33-1F937EB6E0FF/WindowsServer2003-WindowsMedia-KB2845142-x86-ENU.exe 0ace94c09bfab15410db3a15ffa42370891266de
+ w_download https://download.microsoft.com/download/2/8/D/28DA9C3E-6DA2-456F-BD33-1F937EB6E0FF/WindowsServer2003-WindowsMedia-KB2845142-x86-ENU.exe 51e11691339c1c817b12f92e613145ffcd7b6f7e869d994cc8dbc4591b24f155
w_try_cabextract --directory="$W_TMP" "$W_CACHE/$W_PACKAGE/$file1"
w_try cp -f "$W_TMP"/wm64/wmv9vcm.dll "$W_SYSTEM32_DLLS"
@@ -9285,8 +9226,8 @@ w_metadata wsh56js dlls \
load_wsh56js()
{
# This installs JScript 5.6 (but not VBScript)
- # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=16dd21a1-c4ee-4eca-8b80-7bd1dfefb4f8&DisplayLang=en
- w_download http://download.microsoft.com/download/b/c/3/bc3a0c36-fada-497d-a3de-8b0139766f3b/Windows2000-KB917344-56-x86-enu.exe add5f74c5bd4da6cfae47f8306de213ec6ed52c8
+ # See also https://www.microsoft.com/en-us/download/details.aspx?id=12364
+ w_download https://download.microsoft.com/download/b/c/3/bc3a0c36-fada-497d-a3de-8b0139766f3b/Windows2000-KB917344-56-x86-enu.exe d6d6c2ac2d2a095b0f0650a9a2e81e8943579699662b5cdbf872649038788c51
w_try_cd "$W_CACHE/$W_PACKAGE"
w_override_dlls native,builtin jscript
@@ -9309,7 +9250,7 @@ load_wsh56vb()
{
# This installs VBScript 5.6 (but not JScript)
# See also http://www.microsoft.com/downloads/details.aspx?familyid=4F728263-83A3-464B-BCC0-54E63714BC75
- w_download http://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 48f14a93db33caff271da0c93f334971f9d7cb22
+ w_download http://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 792a36d629e01cb474a434761e8cd33211c19ff84f5aa52f0d41111e054ecaac
w_try_cd "$W_CACHE/$W_PACKAGE"
w_override_dlls native,builtin vbscript
@@ -9330,8 +9271,8 @@ w_metadata wsh57 dlls \
load_wsh57()
{
- # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=47809025-D896-482E-A0D6-524E7E844D81&displaylang=en
- w_download http://download.microsoft.com/download/4/4/d/44de8a9e-630d-4c10-9f17-b9b34d3f6417/scripten.exe b15c6a834b7029e2dfed22127cf905b06857e6f5
+ # See also https://www.microsoft.com/en-us/download/details.aspx?id=8247
+ w_download https://download.microsoft.com/download/4/4/d/44de8a9e-630d-4c10-9f17-b9b34d3f6417/scripten.exe 63c781b9e50bfd55f10700eb70b5c571a9bedfd8d35af29f6a22a77550df5e7b
w_try_cabextract -d "$W_SYSTEM32_DLLS" "$W_CACHE"/wsh57/scripten.exe
@@ -9525,7 +9466,7 @@ w_metadata xna31 dlls \
load_xna31()
{
w_call dotnet20sp2
- w_download http://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi bdd33b677c9576a63ff2a6f65e12c0563cc116e6
+ w_download https://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi bdd33b677c9576a63ff2a6f65e12c0563cc116e6
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec $W_UNATTENDED_SLASH_QUIET /i "$file1"
}
@@ -9551,8 +9492,8 @@ load_xna40()
export COMPlus_OnlyUseLatestCLR=1
w_call dotnet40
- # http://www.microsoft.com/en-us/download/details.aspx?id=20914
- w_download http://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi 49efdc29f65fc8263c196338552c7009fc96c5de
+ # https://www.microsoft.com/en-us/download/details.aspx?id=20914
+ w_download https://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi e6c41d692ebcba854dad4b1c52bb7ddd05926bad3105595d6596b8bab01c25e7
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec $W_UNATTENDED_SLASH_QUIET /i "$file1"
}
@@ -9630,8 +9571,8 @@ w_metadata cambria fonts \
load_cambria()
{
- # http://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to consolas http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
+ # https://www.microsoft.com/en-us/download/details.aspx?id=13
+ w_download_to consolas https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe
w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CAMBRIA*.TT*' "$W_TMP"/ppviewer.cab
w_register_font cambria.ttc "Cambria"
@@ -9652,8 +9593,8 @@ w_metadata constantia fonts \
load_constantia()
{
- # http://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download_to consolas http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
+ # https://www.microsoft.com/en-us/download/details.aspx?id=13
+ w_download_to consolas https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe
w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CONSTAN*.TTF' "$W_TMP"/ppviewer.cab
w_register_font constan.ttf "Constantia"
@@ -9674,8 +9615,8 @@ w_metadata consolas fonts \
load_consolas()
{
- # http://www.microsoft.com/en-us/download/details.aspx?id=13
- w_download http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
+ # https://www.microsoft.com/en-us/download/details.aspx?id=13
+ w_download https://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe ab48a8ebac88219c84f293c6c1e81f1a0f420da6
w_try_cabextract -d "$W_TMP" -L -F ppviewer.cab "$W_CACHE"/consolas/PowerPointViewer.exe
w_try_cabextract -d "$W_FONTSDIR_UNIX" -L -F 'CONSOL*.TTF' "$W_TMP"/ppviewer.cab
w_register_font consola.ttf "Consoleas"
@@ -9697,16 +9638,16 @@ w_metadata corefonts fonts \
load_corefonts()
{
# FIXME: why is this commented out? Should be removed or enabled.
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a
- w_download ftp://ftp.fi.debian.org/gentoo/distfiles/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f
+ w_download https://mirrors.kernel.org/gentoo/distfiles/arial32.exe 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6
+ w_download https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8
+ w_download https://mirrors.kernel.org/gentoo/distfiles/comic32.exe 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e
+ w_download https://mirrors.kernel.org/gentoo/distfiles/courie32.exe bb511d861655dde879ae552eb86b134d6fae67cb58502e6ff73ec5d9151f3384
+ w_download https://mirrors.kernel.org/gentoo/distfiles/georgi32.exe 2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690013f20cd42e930301
+ w_download https://mirrors.kernel.org/gentoo/distfiles/impact32.exe 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb
+ w_download https://mirrors.kernel.org/gentoo/distfiles/times32.exe db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab
+ w_download https://mirrors.kernel.org/gentoo/distfiles/trebuc32.exe 5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9
+ w_download https://mirrors.kernel.org/gentoo/distfiles/verdan32.exe c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96
+ w_download https://mirrors.kernel.org/gentoo/distfiles/webdin32.exe 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a
# Natively installed versions of these fonts will cause the installers
# to exit silently. Because there are apps out there that depend on the
@@ -9797,15 +9738,15 @@ load_droid()
# but the fonts are no longer in master. Using an older commit instead:
DROID_URL='https://github.com/android/platform_frameworks_base/blob/feef9887e8f8eb6f64fc1b4552c02efb5755cdc1/data/fonts/'
- do_droid DroidSans-Bold.ttf "Droid Sans Bold" 560e4bcafdebaf29645fbf92633a2ae0d2f9801f
- do_droid DroidSansFallback.ttf "Droid Sans Fallback" c5e4f11e2f1d0b84e5f268a7ebfd28b54dc6bcdc
- do_droid DroidSansJapanese.ttf "Droid Sans Japanese" b3a248c11692aa88a30eb25df425b8910fe05dc5
- do_droid DroidSansMono.ttf "Droid Sans Mono" 133fb6cf26ea073b456fb557b94ce8c46143b117
- do_droid DroidSans.ttf "Droid Sans" 62f2841f61e4be66a0303cd1567ed2d300b4e31c
- do_droid DroidSerif-BoldItalic.ttf "Droid Serif Bold Italic" 41ce5fef1bd0164caed6958885d7285c841c95f1
- do_droid DroidSerif-Bold.ttf "Droid Serif Bold" 2775e9b8e96a3e9593acb5cf6923abb2e6008187
- do_droid DroidSerif-Italic.ttf "Droid Serif Italic" e91cc6c1ae9a6699683bcee024551cb58d1be790
- do_droid DroidSerif-Regular.ttf "Droid Serif" a689ce25a4063cf501c12d616f832f2235b5b93b
+ do_droid DroidSans-Bold.ttf "Droid Sans Bold" 2f529a3e60c007979d95d29794c3660694217fb882429fb33919d2245fe969e9
+ do_droid DroidSansFallback.ttf "Droid Sans Fallback" 05d71b179ef97b82cf1bb91cef290c600a510f77f39b4964359e3ef88378c79d
+ do_droid DroidSansJapanese.ttf "Droid Sans Japanese" 935867c21b8484c959170e62879460ae9363eae91f9b35e4519d24080e2eac30
+ do_droid DroidSansMono.ttf "Droid Sans Mono" 12b552de765dc1265d64f9f5566649930dde4dba07da0251d9f92801e70a1047
+ do_droid DroidSans.ttf "Droid Sans" f51b88945f4c1b236f44b8d55a2d304316869127e95248c435c23f1e4142a7db
+ do_droid DroidSerif-BoldItalic.ttf "Droid Serif Bold Italic" 3fdf15b911c04317e5881ae1e4b9faefcdc4bf4cfb60223597d5c9455c3e4156
+ do_droid DroidSerif-Bold.ttf "Droid Serif Bold" d28533eed8368f047eb5f57a88a91ba2ffc8b69a2dec5e50fe3f0c11ae3f4d8e
+ do_droid DroidSerif-Italic.ttf "Droid Serif Italic" 8a55a4823886234792991dd304dfa1fa120ae99483ec6c2255597d7d913b9a55
+ do_droid DroidSerif-Regular.ttf "Droid Serif" 22aea9471bea5bce1ec3bf7136c84f075b3d11cf09dffdc3dba05e570094cbde
}
#----------------------------------------------------------------
@@ -9820,8 +9761,8 @@ w_metadata eufonts fonts \
load_eufonts()
{
- # https://www.microsoft.com/downloads/details.aspx?FamilyID=0ec6f335-c3de-44c5-a13d-a1e7cea5ddea&displaylang=en
- w_download http://download.microsoft.com/download/a/1/8/a180e21e-9c2b-4b54-9c32-bf7fd7429970/EUupdate.EXE 9b076c40cb63aa0d8512aa8e610ba11d3466e441
+ # https://www.microsoft.com/en-us/download/details.aspx?id=16083
+ w_download https://download.microsoft.com/download/a/1/8/a180e21e-9c2b-4b54-9c32-bf7fd7429970/EUupdate.EXE 9b076c40cb63aa0d8512aa8e610ba11d3466e441
w_try_cabextract -q --directory="$W_TMP" "$W_CACHE"/eufonts/EUupdate.EXE
w_try cp -f "$W_TMP"/*.ttf "$W_FONTSDIR_UNIX"
@@ -9853,7 +9794,7 @@ load_fakechinese()
{
w_call wenquanyi
# Loads Wenquanyi fonts and sets aliases for Microsoft Chinese fonts
- # Reference : http://en.wikipedia.org/wiki/List_of_Microsoft_Windows_fonts
+ # Reference : https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_fonts
w_register_font_replacement "Microsoft JhengHei" "WenQuanYi Micro Hei"
w_register_font_replacement "Microsoft YaHei" "WenQuanYi Micro Hei"
@@ -9963,7 +9904,7 @@ w_metadata fontfix settings \
load_fontfix()
{
# Some versions of ukai.ttf and uming.ttf crash .NET and Picasa
- # See http://bugs.winehq.org/show_bug.cgi?id=7098#c9
+ # See https://bugs.winehq.org/show_bug.cgi?id=7098#c9
# Very unlikely to still be around, so downgrade to fatal warning
if test -f /usr/share/fonts/truetype/arphic/ukai.ttf
then
@@ -10033,17 +9974,17 @@ w_metadata liberation fonts \
load_liberation()
{
- # http://www.redhat.com/promo/fonts/
+ # https://www.redhat.com/en/about/blog/liberation-fonts
case $(uname -s) in
SunOS|Solaris)
echo "If you get 'ERROR: Certificate verification error for fedorahosted.org: unable to get local issuer certificate':"
echo "Then you need to add Verisign root certificates to your local keystore."
- echo "OpenSolaris users, see: http://www.linuxtopia.org/online_books/opensolaris_2008/SYSADV1/html/swmgrpatchtasks-14.html"
+ echo "OpenSolaris users, see: https://www.linuxtopia.org/online_books/opensolaris_2008/SYSADV1/html/swmgrpatchtasks-14.html"
echo "Or edit winetricks's download function, and add '--no-check-certificate' to the command."
;;
esac
- w_download https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz 097882c92e3260742a3dc3bf033792120d8635a3
+ w_download https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz 0e0d0957c85b758561a3d4aef4ebcd2c39959e5328429d96ae106249d83531a1
w_try_cd "$W_TMP"
# FIXME: w_try doesn't work here, presumably because of the pipe?
gunzip -dc "$W_CACHE/$W_PACKAGE/$file1" | tar -xf -
@@ -10087,7 +10028,7 @@ w_metadata opensymbol fonts \
publisher="OpenOffice.org" \
year="2016" \
media="download" \
- file1="fonts-opensymbol_102.6+LibO4.3.3-2+deb8u5_all.deb" \
+ file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u8_all.deb" \
installed_file1="$W_FONTSDIR_WIN/opens___.ttf"
load_opensymbol()
@@ -10095,7 +10036,7 @@ load_opensymbol()
# The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org.
# Need to w_download Debian since I can't find a standalone download from OpenOffice
# Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB.
- w_download http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.6+LibO4.3.3-2+deb8u5_all.deb b683e6304c58fdbb5c31443609a3398c71a3fcf0
+ w_download http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u8_all.deb 3b7ad433cf8944789be1f1b7cf14aed5c2f9dab26f04824eebea2a3a8544a777
w_try_cd "$W_TMP"
w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz
@@ -10144,8 +10085,8 @@ w_metadata takao fonts \
load_takao()
{
# The Takao font provides Japanese glyphs. May also be needed with fakejapanese function above.
- # See http://launchpad.net/takao-fonts for project page
- w_download http://launchpad.net/takao-fonts/trunk/003.02.01/+download/takao-fonts-ttf-003.02.01.zip 4f636d5c7c1bc16b96ea723adb16838cfb6df059
+ # See https://launchpad.net/takao-fonts for project page
+ w_download https://launchpad.net/takao-fonts/trunk/003.02.01/+download/takao-fonts-ttf-003.02.01.zip 4f636d5c7c1bc16b96ea723adb16838cfb6df059
cp -f "$W_CACHE"/takao/takao-fonts-ttf-003.02.01.zip "$W_TMP"
w_try_unzip "$W_TMP" "$W_TMP"/takao-fonts-ttf-003.02.01.zip
w_try cp -f "$W_TMP"/takao-fonts-ttf-003.02.01/*.ttf "$W_FONTSDIR_UNIX"
@@ -10196,7 +10137,7 @@ load_wenquanyi()
{
# See http://wenq.org/enindex.cgi
# Donate at http://wenq.org/enindex.cgi?Download(en)#MicroHei_Beta if you want to help support free CJK font development
- w_download $WINETRICKS_SOURCEFORGE/wqy/wqy-microhei-0.2.0-beta.tar.gz 28023041b22b6368bcfae076de68109b81e77976
+ w_download $WINETRICKS_SOURCEFORGE/wqy/wqy-microhei-0.2.0-beta.tar.gz 2802ac8023aa36a66ea6e7445854e3a078d377ffff42169341bd237871f7213e
w_try_cd "$W_TMP/"
gunzip -dc "$W_CACHE/wenquanyi/wqy-microhei-0.2.0-beta.tar.gz" | tar -xf -
w_try mv wqy-microhei/wqy-microhei.ttc "$W_FONTSDIR_UNIX"
@@ -10258,11 +10199,11 @@ w_metadata 3m_library apps \
media="download" \
file1="3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/3M(TM) Cloud Library PC App/3MCloudLibrary.exe" \
- homepage="http://www.3m.com/us/library/eBook/index.html"
+ homepage="https://www.3m.com/us/library/eBook/index.html"
load_3m_library()
{
- w_download http://www.3m.com/us/library/eBook/docs/3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe 810dc5f6b74ab7b34893288ee44ef7dc563a4ee7
+ w_download https://www.3m.com/us/library/eBook/docs/3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe 810dc5f6b74ab7b34893288ee44ef7dc563a4ee7
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" 3M-TM-Cloud-Library-PC-App-LIVE-Installer-1.51.735677.exe $W_UNATTENDED_SLASH_S
}
@@ -10279,7 +10220,7 @@ w_metadata 7zip apps \
load_7zip()
{
- w_download http://www.7-zip.org/a/7z1602.exe a86f0726019ca84d1de1b036033d888d4538b2a9
+ w_download http://www.7-zip.org/a/7z1602.exe 629ce3c424bd884e74aed6b7d87d8f0d75274fb87143b8d6360c5eec41d5f865
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "${file1}" $W_UNATTENDED_SLASH_S
}
@@ -10296,7 +10237,7 @@ w_metadata abiword apps \
load_abiword()
{
- w_download http://www.abisource.com/downloads/abiword/2.8.6/Windows/abiword-setup-2.8.6.exe a91acd3f60e842d23556032d34f1600602768318
+ w_download https://www.abisource.com/downloads/abiword/2.8.6/Windows/abiword-setup-2.8.6.exe f85c7f32044bbb4d31f1672c86951e35319f8e89fbd6c01ab4c19e960efd9ff8
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" abiword-setup-2.8.6.exe $W_UNATTENDED_SLASH_S
}
@@ -10310,11 +10251,11 @@ w_metadata adobe_diged apps \
media="download" \
file1="setup.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Adobe/Adobe Digital Editions/digitaleditions.exe" \
- homepage="http://www.adobe.com/products/digitaleditions/"
+ homepage="https://www.adobe.com/solutions/ebook/digital-editions.html"
load_adobe_diged()
{
- w_download http://kb2.adobe.com/cps/403/kb403051/attachments/setup.exe 4c79685408fa6ca12ef8bb0e0eaa4a846e21f915
+ w_download https://kb2.adobe.com/cps/403/kb403051/attachments/setup.exe 4ebe0fcefbe68900ca6bf499432030c9f8eb8828f8cb5a7e1fd1a16c0eba918e
# NSIS installer
w_try "$WINE" "$W_CACHE/$W_PACKAGE/setup.exe" ${W_OPT_UNATTENDED:+ /S}
}
@@ -10328,11 +10269,11 @@ w_metadata adobe_diged4 apps \
media="download" \
file1="ADE_4.5_Installer.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Adobe/Adobe Digital Editions 4.5/DigitalEditions.exe" \
- homepage="http://www.adobe.com/products/digitaleditions/"
+ homepage="https://www.adobe.com/solutions/ebook/digital-editions.html"
load_adobe_diged4()
{
- w_download http://download.adobe.com/pub/adobe/digitaleditions/ADE_4.5_Installer.exe
+ w_download https://download.adobe.com/pub/adobe/digitaleditions/ADE_4.5_Installer.exe
if w_workaround_wine_bug 32323
then
@@ -10433,7 +10374,7 @@ w_metadata autohotkey apps \
load_autohotkey()
{
W_BROWSERAGENT=1 \
- w_download http://www.autohotkey.com/download/AutoHotkey104805_Install.exe 13e5a9ca6d5b7705f1cd02560c3af4d38b1904fc
+ w_download https://www.autohotkey.com/download/AutoHotkey104805_Install.exe 4311c3e7c29ed2d67f415138360210bc2f55ff78758b20b003b91d775ee207b9
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" AutoHotkey104805_Install.exe $W_UNATTENDED_SLASH_S
}
@@ -10450,7 +10391,7 @@ w_metadata cmake apps \
load_cmake()
{
- w_download http://www.cmake.org/files/v2.8/cmake-2.8.11.2-win32-x86.exe d79af5715c0ad48d78bb731cce93b5ad89b16512
+ w_download https://www.cmake.org/files/v2.8/cmake-2.8.11.2-win32-x86.exe cb6a7df8fd6f2eca66512279991f3c2349e3f788477c3be8eaa362d46c21dbf0
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" cmake-2.8.11.2-win32-x86.exe $W_UNATTENDED_SLASH_S
}
@@ -10467,7 +10408,7 @@ w_metadata colorprofile apps \
load_colorprofile()
{
- w_download http://download.microsoft.com/download/whistler/hwdev1/1.0/wxp/en-us/ColorProfile.exe 6b72836b32b343c82d0760dff5cb51c2f47170eb
+ w_download https://download.microsoft.com/download/whistler/hwdev1/1.0/wxp/en-us/ColorProfile.exe d04ac910acdd97abd663f559bebc6440d8d68664bf977ec586035247d7b0f728
w_try_unzip "$W_TMP" "$W_CACHE"/colorprofile/ColorProfile.exe
# It's in system32 for both win32/win64
@@ -10487,9 +10428,9 @@ w_metadata controlpad apps \
load_controlpad()
{
- # http://msdn.microsoft.com/en-us/library/ms968493.aspx
+ # https://msdn.microsoft.com/en-us/library/ms968493.aspx
w_call wsh57
- w_download http://download.microsoft.com/download/activexcontrolpad/install/4.0.0.950/win98mexp/en-us/setuppad.exe 8921e0f52507ca6a373c94d222777c750fb48af7
+ w_download https://download.microsoft.com/download/activexcontrolpad/install/4.0.0.950/win98mexp/en-us/setuppad.exe eab94091ac391f9bbc8e355a1d231e6a08b8dbbb0f6539245b7f0c58d94f420c
w_try_cabextract --directory="$W_TMP" "$W_CACHE"/controlpad/setuppad.exe
echo "If setup says 'Unable to start DDE ...', press Ignore"
@@ -10515,7 +10456,7 @@ w_metadata controlspy apps \
load_controlspy()
{
- w_download http://download.microsoft.com/download/a/3/1/a315b133-03a8-4845-b428-ec585369b285/ControlSpy.msi efe33701f78b5853ba73353f028b777b4c849e77
+ w_download http://download.microsoft.com/download/a/3/1/a315b133-03a8-4845-b428-ec585369b285/ControlSpy.msi d9127634dd47580be93c768263ddf37a3a75fd65a545e87ddb9602906a035845
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i ControlSpy.msi ${W_UNATTENDED_SLASH_QB}
}
@@ -10566,7 +10507,7 @@ w_metadata emu8086 apps \
load_emu8086()
{
- w_download http://www.emu8086.com/files/emu8086v408r11.zip aa71b46ee9259e5b31a300c820277e551969da7b
+ w_download http://www.emu8086.com/files/emu8086v408r11.zip d56d6e42fe170c52df5abd6002b1e8fef0b840eb8d8807d77819fe1fc2e17afd
w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE/$file1"
w_try "$WINE" "$W_TMP/Setup.exe" $W_UNATTENDED_SLASH_SILENT
}
@@ -10596,9 +10537,9 @@ load_ev3()
w_call dotnet40
# 2016-02-18: LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe 855c914d9a3cf0f4793a046872658fd661389671
- # 2016-03-22: LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe f4f077befd837e8f5716dbd134dc6828d6c4cc77
+ # 2016-03-22: LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe c47341f08242f0f6f01996530e7c93bda2d666747ada60ab93fa773a55d40a19
- w_download http://esd.lego.com.edgesuite.net/digitaldelivery/mindstorms/6ecda7c2-1189-4816-b2dd-440e22d65814/public/LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe f4f077befd837e8f5716dbd134dc6828d6c4cc77
+ w_download http://esd.lego.com.edgesuite.net/digitaldelivery/mindstorms/6ecda7c2-1189-4816-b2dd-440e22d65814/public/LMS-EV3-WIN32-ENUS-01-02-01-full-setup.exe c47341f08242f0f6f01996530e7c93bda2d666747ada60ab93fa773a55d40a19
if [ $W_UNATTENDED_SLASH_Q ]
then
@@ -10633,7 +10574,7 @@ w_metadata firefox apps \
load_firefox()
{
- w_download "https://download.mozilla.org/?product=firefox-51.0-SSL&os=win&lang=en-US" c4cd6800990f39550abb1af07faf1e6072243d65 "$file1"
+ w_download "https://download.mozilla.org/?product=firefox-51.0-SSL&os=win&lang=en-US" 05fa9ae012eca560f42d593e75eb37045a54e4978b665b51f6a61e4a2d376eb8 "$file1"
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ -ms}
}
@@ -10651,7 +10592,7 @@ w_metadata fontxplorer apps \
load_fontxplorer()
{
- w_download http://www.moonsoftware.com/files/legacy/Font_Xplorer_122_Free.exe 22feb63be28730cbfad5458b139464490a25a68d
+ w_download http://www.moonsoftware.com/files/legacy/Font_Xplorer_122_Free.exe e3a53841c133e2ecfeb75c7ea277e23011317bb031f8caf423b7e9b7f92d85e0
w_try_cd "$W_CACHE/fontxplorer"
w_try "$WINE" Font_Xplorer_122_Free.exe $W_UNATTENDED_SLASH_S
@@ -10669,7 +10610,7 @@ w_metadata foobar2000 apps \
load_foobar2000()
{
- w_download_manual http://www.foobar2000.org/download foobar2000_v1.3.12.exe 9ea5c70f662c8bf3db6f02dbb20109fd05580f6c
+ w_download_manual https://www.foobar2000.org/download foobar2000_v1.3.12.exe 9ea5c70f662c8bf3db6f02dbb20109fd05580f6c
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S
}
@@ -10686,7 +10627,7 @@ w_metadata iceweasel apps \
load_iceweasel()
{
- w_download https://ftp.gnu.org/gnu/gnuzilla/31.7.0/icecat-31.7.0.en-US.win32.zip cf52a728c1af29065b7dc7bdddc9265a79eb5328
+ w_download https://ftp.gnu.org/gnu/gnuzilla/31.7.0/icecat-31.7.0.en-US.win32.zip 27d10e63ab9ea4e6995c235b92258b379f79433a06a12e4ad16811801cf81e36
w_try_unzip "${W_PROGRAMS_X86_UNIX}" "${W_CACHE}/${W_PACKAGE}/${file1}"
}
@@ -10775,7 +10716,7 @@ load_ie6()
{
w_package_unsupported_win64
- w_download http://download.oldapps.com/Internet_Explorer/ie60.exe 8e483db28ff01a7cabd39147ab6c59753ea1f533
+ w_download http://download.oldapps.com/Internet_Explorer/ie60.exe e34e0557d939e7e83185f5354403df99c92a3f3ff80f5ee0c75f6843eaa6efb2
w_try_cd "$W_TMP"
"$WINE" "$W_CACHE/$W_PACKAGE/$file1"
@@ -10803,14 +10744,14 @@ load_ie6()
# The installer doesn't want to install iexplore.exe in XP mode.
w_set_winver win2k
- # Workaround http://bugs.winehq.org/show_bug.cgi?id=21009
- # See also http://code.google.com/p/winezeug/issues/detail?id=78
+ # Workaround https://bugs.winehq.org/show_bug.cgi?id=21009
+ # See also https://code.google.com/p/winezeug/issues/detail?id=78
rm -f "$W_SYSTEM32_DLLS"/browseui.dll "$W_SYSTEM32_DLLS"/inseng.dll
# Otherwise regsvr32 crashes later
rm -f "$W_SYSTEM32_DLLS"/inetcpl.cpl
- # Work around http://bugs.winehq.org/show_bug.cgi?id=25432
+ # Work around https://bugs.winehq.org/show_bug.cgi?id=25432
w_try_cabextract -F inseng.dll "$W_TMP/IE 6.0 Full/ACTSETUP.CAB"
mv inseng.dll "$W_SYSTEM32_DLLS"
w_override_dlls native inseng
@@ -10893,9 +10834,9 @@ load_ie7()
mv "$W_SYSTEM32_DLLS"/$dll.dll "$W_SYSTEM32_DLLS"/$dll.dll.bak
done
- # See http://bugs.winehq.org/show_bug.cgi?id=16013
+ # See https://bugs.winehq.org/show_bug.cgi?id=16013
# Find instructions to create this file in dlls/wintrust/tests/crypt.c
- w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
+ w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat 5d18ab44fc289100ccf4b51cf614cc2d36f7ca053e557e2ba973811293c97d38
# Put a dummy catalog file in place
mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
@@ -10911,7 +10852,7 @@ load_ie7()
fi
# Install
- w_download http://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573AD86D9/IE7-WindowsXP-x86-enu.exe d39b89c360fbaa9706b5181ae4718100687a5326
+ w_download https://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573AD86D9/IE7-WindowsXP-x86-enu.exe bf5c325bbe3f4174869b2a8ff75f92833e7f7debe64777ed0faf293c7725cbef
w_try_cd "$W_CACHE/$W_PACKAGE"
# IE7 requies winxp to install:
@@ -10958,7 +10899,7 @@ load_ie7()
;;
*)
w_warn "Starting ie7. To start it later, use the command \"$WINE\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore'"
- "$WINE" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore" http://www.microsoft.com/windows/internet-explorer/ie7/ > /dev/null 2>&1 &
+ "$WINE" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore" https://www.microsoft.com/windows/internet-explorer/ie7/ > /dev/null 2>&1 &
;;
esac
}
@@ -10975,6 +10916,9 @@ w_metadata ie8 dlls \
load_ie8()
{
+ # Bundled in Windows 7, so refuses to install. Works with XP:
+ w_call winxp
+
# Unregister Wine IE
if grep -q -i "wine placeholder" "$W_PROGRAMS_X86_UNIX/Internet Explorer/iexplore.exe"
#if [ ! -f "$W_SYSTEM32_DLLS"/plugin.ocx ]
@@ -11005,15 +10949,15 @@ load_ie8()
mv "$W_SYSTEM32_DLLS"/$dll.dll "$W_SYSTEM32_DLLS"/$dll.dll.bak
done
- # See http://bugs.winehq.org/show_bug.cgi?id=16013
+ # See https://bugs.winehq.org/show_bug.cgi?id=16013
# Find instructions to create this file in dlls/wintrust/tests/crypt.c
- w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat ac8f50dd54d011f3bb1dd79240dae9378748449f
+ w_download https://github.com/Winetricks/winetricks/raw/master/files/winetest.cat 5d18ab44fc289100ccf4b51cf614cc2d36f7ca053e557e2ba973811293c97d38
# Put a dummy catalog file in place
mkdir -p "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}
w_try cp -f "$W_CACHE"/ie8/winetest.cat "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat
- w_download http://download.microsoft.com/download/C/C/0/CC0BD555-33DD-411E-936B-73AC6F95AE11/IE8-WindowsXP-x86-ENU.exe e489483e5001f95da04e1ebf3c664173baef3e26
+ w_download https://download.microsoft.com/download/C/C/0/CC0BD555-33DD-411E-936B-73AC6F95AE11/IE8-WindowsXP-x86-ENU.exe 5a2c6c82774bfe99b175f50a05b05bcd1fac7e9d0e54db2534049209f50cd6ef
if [ $W_UNATTENDED_SLASH_QUIET ]
then
quiet="$W_UNATTENDED_SLASH_QUIET /forcerestart"
@@ -11070,9 +11014,11 @@ _EOF_
;;
*)
w_warn "Starting ie8. To start it later, use the command \"$WINE\" '${W_PROGRAMS_WIN}\\\\Internet Explorer\\\\iexplore'"
- "$WINE" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore" http://www.microsoft.com/windows/internet-explorer > /dev/null 2>&1 &
+ "$WINE" "${W_PROGRAMS_WIN}\\Internet Explorer\\iexplore" https://www.microsoft.com/windows/internet-explorer > /dev/null 2>&1 &
;;
esac
+
+ w_unset_winver
}
#----------------------------------------------------------------
@@ -11088,7 +11034,7 @@ w_metadata kobo apps \
load_kobo()
{
- w_download http://download.kobobooks.com/desktop/1/KoboSetup.exe 31a5f5583edf4b716b9feacb857d2170104cabd9
+ w_download http://download.kobobooks.com/desktop/1/KoboSetup.exe 721e76c06820058422f06420400a0b1286662196d6178d70c4592fd8034704c4
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
}
@@ -11106,7 +11052,7 @@ w_metadata mingw apps \
load_mingw()
{
- w_download "$WINETRICKS_SOURCEFORGE/mingw/files/mingw-get-setup.exe" 66f1355f16ac1e328243e877880eb6e45e8b30e2
+ w_download "$WINETRICKS_SOURCEFORGE/mingw/files/mingw-get-setup.exe" aab27bd5547d35dc159288f3b5b8760f21b0cfec86e8f0032b49dd0410f232bc
w_try_cd "$W_CACHE/mingw"
w_try "$WINE" "$file1"
@@ -11125,11 +11071,11 @@ w_metadata mpc apps \
media="download" \
file1="MPC-HC.1.7.5.x86.exe" \
installed_file1="$W_PROGRAMS_X86_WIN/MPC-HC/mpc-hc.exe" \
- homepage="http://mpc-hc.sourceforge.net"
+ homepage="https://mpc-hc.sourceforge.io/"
load_mpc()
{
- w_download $WINETRICKS_SOURCEFORGE/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.5_x86/MPC-HC.1.7.5.x86.exe 39f90869929007ae0576ae30dca6cd22ed5a59c2
+ w_download $WINETRICKS_SOURCEFORGE/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.5_x86/MPC-HC.1.7.5.x86.exe 1d690da5b330f723aea4a294d478828395d321b59fc680f2b971e8b16b8bd33d
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" MPC-HC.1.7.5.x86.exe ${W_OPT_UNATTENDED:+ /VERYSILENT}
}
@@ -11150,7 +11096,7 @@ load_mspaint()
then
w_call mfc42
fi
- w_download http://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe f4e076b3867c2f08b6d258316aa0e11d6822b8d7
+ w_download http://download.microsoft.com/download/0/A/4/0A40DF5C-2BAE-4C63-802A-84C33B34AC98/WindowsXP-KB978706-x86-ENU.exe 93ed34ab6c0d01a323ce10992d1c1ca27d1996fef82f0864d83e7f5ac6f9b24b
w_try $WINE "$W_CACHE"/mspaint/WindowsXP-KB978706-x86-ENU.exe /q /x:"$W_TMP"/WindowsXP-KB978706-x86-ENU
w_try cp -f "$W_TMP"/WindowsXP-KB978706-x86-ENU/SP3GDR/mspaint.exe "$W_WINDIR_UNIX"/mspaint.exe
}
@@ -11200,18 +11146,23 @@ w_metadata nook apps \
media="download" \
file1="bndr2_setup_latest.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Barnes & Noble/BNDesktopReader/BNDReader.exe" \
- homepage="http://www.barnesandnoble.com/u/free-nook-apps/379002321/"
+ homepage="https://www.barnesandnoble.com/h/nook/apps"
load_nook()
{
# Dates from curl --head
- # 10 Feb 2011 sha1sum 4a06a529b93ed33c3518326d874b40d8d7b70e7a
- # 7 Oct 2011 sha1sum 3b0301bd55471cc47cced44501547411fac9fcea
- # 7 Mar 2012 sha1sum e7060a63b9b303ddd820de762d9df254e1c931bc
- w_download http://images.barnesandnoble.com/PResources/download/eReader2/bndr2_setup_latest.exe e7060a63b9b303ddd820de762d9df254e1c931bc
+ # 7 Mar 2012 sha256sum 436616d99f0e2351909ab53d910b505c7a3fca248876ebb835fd7bce4aad9720
+ w_download http://images.barnesandnoble.com/PResources/download/eReader2/bndr2_setup_latest.exe 436616d99f0e2351909ab53d910b505c7a3fca248876ebb835fd7bce4aad9720
w_try_cd "$W_CACHE/$W_PACKAGE"
+
+ # Exits with 199 for some reason..
"$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
- # normally has exit status 199?
+
+ status=$?
+ case $status in
+ 0|199) echo "Successfully installed $W_PACKAGE" ;;
+ *) w_die "Failed to install $W_PACKAGE" ;;
+ esac
}
#----------------------------------------------------------------
@@ -11226,7 +11177,7 @@ w_metadata npp apps \
load_npp()
{
- w_download https://notepad-plus-plus.org/repository/6.x/6.7.9.2/npp.6.7.9.2.Installer.exe 34574fb2e4e06ff941061bf444b57ce926ce23d7
+ w_download https://notepad-plus-plus.org/repository/6.x/6.7.9.2/npp.6.7.9.2.Installer.exe cecc981d56d759233b804fa77e70ed62e411aaee58dcb1e53b91909c99d29096
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "${file1}" $W_UNATTENDED_SLASH_S
}
@@ -11311,8 +11262,8 @@ load_office2007pro()
if test $W_OPT_UNATTENDED
then
# See
- # http://blogs.technet.com/b/office_resource_kit/archive/2009/01/29/configure-a-silent-install-of-the-2007-office-system-with-config-xml.aspx
- # http://www.symantec.com/connect/articles/office-2007-silent-installation-lessons-learned
+ # https://blogs.technet.microsoft.com/office_resource_kit/2009/01/29/configure-a-silent-install-of-the-2007-office-system-with-config-xml/
+ # https://www.symantec.com/connect/articles/office-2007-silent-installation-lessons-learned
cat > "$W_TMP"/config.xml <<__EOF__
@@ -11354,10 +11305,10 @@ load_picasa39()
# 2015/09/21: 55907fc84b1d9d6a450463869b16927f07737298
# 2016/01/02: b3f7e2ee168811cb1d924eb34afe2b0d8153f89f
- w_download http://dl.google.com/picasa/picasa39-setup.exe b3f7e2ee168811cb1d924eb34afe2b0d8153f89f
+ w_download https://dl.google.com/picasa/picasa39-setup.exe b3f7e2ee168811cb1d924eb34afe2b0d8153f89f
if w_workaround_wine_bug 29434 "Picasa 3.9 fails to authenticate with Google"
then
- w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See http://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
+ w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See https://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
fi
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -11401,7 +11352,7 @@ w_metadata protectionid apps \
load_protectionid()
{
- w_download http://pid.gamecopyworld.com/dl.php?f=ProtectionId.670.halloween.2015.rar a307e15f28d00959cffddd8fda073aac6df943c8 "$file1"
+ w_download https://pid.gamecopyworld.com/dl.php?f=ProtectionId.670.halloween.2015.rar a307e15f28d00959cffddd8fda073aac6df943c8 "$file1"
w_try_cd "$W_SYSTEM32_DLLS"
w_try_unrar "${W_CACHE}/${W_PACKAGE}/${file1}"
# ProtectionId.670.halloween.2015 has a different executable name than usual, this may need to be disabled on next update:
@@ -11422,8 +11373,8 @@ load_psdk2003()
{
w_call mfc42
- # http://www.microsoft.com/en-us/download/details.aspx?id=15656
- w_download http://download.microsoft.com/download/7/5/e/75ec7f04-4c8c-4f38-b582-966e76602643/5.2.3790.1830.15.PlatformSDK_Svr2003SP1_rtm.img
+ # https://www.microsoft.com/en-us/download/details.aspx?id=15656
+ w_download https://download.microsoft.com/download/7/5/e/75ec7f04-4c8c-4f38-b582-966e76602643/5.2.3790.1830.15.PlatformSDK_Svr2003SP1_rtm.img
# Unpack ISO (how handy that 7z can do this!)
# Only the windows version of 7z can handle .img files?
@@ -11451,17 +11402,17 @@ w_metadata psdkwin7 apps \
load_psdkwin7()
{
- # http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
+ # https://www.microsoft.com/en-us/download/details.aspx?id=3138
w_call dotnet20
w_call mfc42 # need mfc42u, or setup will abort
# don't have a working unattended recipe. Maybe we'll have to
# do an AutoHotKey script until Microsoft gets its act together:
- # http://social.msdn.microsoft.com/Forums/en-US/windowssdk/thread/c053b616-7d5b-405d-9841-ec465a8e21d5
- w_download http://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E505528CCCB7/winsdk_web.exe a01dcc67a38f461e80ea649edf1353f306582507
+ # https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/c053b616-7d5b-405d-9841-ec465a8e21d5/
+ w_download https://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E505528CCCB7/winsdk_web.exe bb0e3b5d8feb750b3164b657a046f76ff086887719e418f57ce88ada5e8990d5
w_try_cd "$W_CACHE/$W_PACKAGE"
if w_workaround_wine_bug 21596
then
- w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet. See http://bugs.winehq.org/show_bug.cgi?id=21596"
+ w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet. See https://bugs.winehq.org/show_bug.cgi?id=21596"
fi
w_try "$WINE" winsdk_web.exe
@@ -11501,17 +11452,17 @@ load_psdkwin71()
w_call dotnet20
w_call dotnet40
w_call mfc42 # need mfc42u, or setup will abort
- # http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
- w_download http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe a8717ebb20a69c7efa85232bcb9899b8b07f98cf
+ # https://www.microsoft.com/en-us/download/details.aspx?id=3138
+ w_download https://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe a8717ebb20a69c7efa85232bcb9899b8b07f98cf
if w_workaround_wine_bug 21596
then
- w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet. See http://bugs.winehq.org/show_bug.cgi?id=21596"
+ w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet. See https://bugs.winehq.org/show_bug.cgi?id=21596"
fi
# don't have a working unattended recipe. Maybe we'll have to
# do an AutoHotKey script until Microsoft gets its act together:
- # http://social.msdn.microsoft.com/Forums/en-US/windowssdk/thread/c053b616-7d5b-405d-9841-ec465a8e21d5
+ # https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/c053b616-7d5b-405d-9841-ec465a8e21d5/
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" winsdk_web.exe
@@ -11563,8 +11514,8 @@ w_metadata python26 dlls \
load_python26()
{
- w_download http://www.python.org/ftp/python/2.6.2/python-2.6.2.msi 2d1503b0e8b7e4c72a276d4d9027cf4856b208b8
- w_download $WINETRICKS_SOURCEFORGE/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe eca58f29b810d8e3e7951277ebb3e35ac35794a3
+ w_download https://www.python.org/ftp/python/2.6.2/python-2.6.2.msi c2276b398864b822c25a7c240cb12ddb178962afd2e12d602f1a961e31ad52ff
+ w_download $WINETRICKS_SOURCEFORGE/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe dc311bbdc5868e3dd139dfc46136221b7f55c5613a98a5a48fa725a6c681cd40
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" msiexec /i python-2.6.2.msi ALLUSERS=1 $W_UNATTENDED_SLASH_Q
@@ -11588,47 +11539,6 @@ load_python26()
#----------------------------------------------------------------
-w_metadata spotify apps \
- title="Spotify - All the music, all the time" \
- publisher="Spotify" \
- year="2011" \
- media="download" \
- file1="SpotifyInstaller.exe" \
- installed_exe1="c:/users/$LOGNAME/Application Data/Spotify/spotify.exe"
-
-load_spotify()
-{
- # 0.4.9 f26712b576baa1c78112a05474293deef39f7f62
- # 29 Apr 2011 0.4.10 4becb04f8ad08a3ff59d6830bf1d998fcca1815b
- # 7 may 2011 a3c7daecf1051c4aaab544e6b66753617c0706b1
- # updates too frequently to check checksum :-(
- w_download http://www.spotify.com/download/Spotify%20Installer.exe
-
- w_try_cd "$W_CACHE/$W_PACKAGE"
- # w_download doesn't handle renaming for us without a checksum, tsk.
- # And AutoHotKey thinks % is a variable reference.
- if test ! -f SpotifyInstaller.exe
- then
- cp Spotify%20Installer.exe SpotifyInstaller.exe
- fi
-
- # Install is silent by default, and always starts app
- # So all we have to do here is close app if we want unattended install
- w_ahk_do "
- SetTitleMatchMode, 2
- run SpotifyInstaller.exe
- WinWait, ahk_class SpotifyMainWindow
- if ( w_opt_unattended > 0 ) {
- WinClose
- }
- WinWaitClose
- sleep 1000
- Process, Close, SpotifyWebHelper.exe
- "
-}
-
-#----------------------------------------------------------------
-
w_metadata safari apps \
title="Safari" \
publisher="Apple" \
@@ -11639,11 +11549,11 @@ w_metadata safari apps \
load_safari()
{
- w_download http://appldnld.apple.com.edgesuite.net/content.info.apple.com/Safari5/061-7138.20100607.Y7U87/SafariSetup.exe e56d5d79d9cfbb85ac46ac78aa497d7f3d8dbc3d
+ w_download http://appldnld.apple.com.edgesuite.net/content.info.apple.com/Safari5/061-7138.20100607.Y7U87/SafariSetup.exe a5b44032fe9cd0ede8571023912c91b1dcca106ad6a65a822be9ebd405510939
if test $W_OPT_UNATTENDED
then
- w_warn "Safari's silent install is broken under Wine. See http://bugs.winehq.org/show_bug.cgi?id=23493. You should do a regular install if you want to use Safari."
+ w_warn "Safari's silent install is broken under Wine. See https://bugs.winehq.org/show_bug.cgi?id=23493. You should do a regular install if you want to use Safari."
fi
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -11662,7 +11572,7 @@ w_metadata sketchup apps \
load_sketchup()
{
- w_download http://dl.google.com/sketchup/GoogleSketchUpWEN.exe f0628e6f05241f91e4f36d6be3b8685a408ad12b
+ w_download https://dl.google.com/sketchup/GoogleSketchUpWEN.exe e50c1b36131d72437eb32a124a5208fad22dc22b843683cfb520e1ef172b8352
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -11712,8 +11622,8 @@ load_steam()
# 6 Jan 2015 e04aefe8bc894f11f211edec8e8a008abe0147d2
# 21 Jun 2015 0e8046d40c38d817338135ec73a5b217cc340cf5
# 29 Dec 2015 728e3c82fd57c68cbbdb64965719081ffee6272c
- # 28 Oct 2016 e930dbdb3bc638f772a8fcd92dbcd0919c924318
- w_download http://media.steampowered.com/client/installer/SteamSetup.exe e930dbdb3bc638f772a8fcd92dbcd0919c924318
+ # 28 Oct 2016 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad
+ w_download http://media.steampowered.com/client/installer/SteamSetup.exe 029f918a29b2b311711788e8a477c8de529c11d7dba3caf99cbbde5a983efdad
w_try_cd "$W_CACHE/$W_PACKAGE"
# Should be fixed in newer steam versions, since 2012. Commenting out for a while before removing in case users need to revert locally
@@ -11770,22 +11680,12 @@ w_metadata uplay apps \
load_uplay()
{
- # 4 June 2013 3.0.1 sha1sum fdb9e736b5b2211fb23b35d30d52deae6f4b32a4
- # 1 July 2013 3.1.0 sha1sum 21a7f469534dd1463eaaab6b2be2fa9084bceea2
- # 11 Nov 2013 4.0 sha1sum 52e287f9f78313e4713d2f070b15734410da0c5a
- # 26 Dec 2013 4.2 sha1sum ada2c11ee62eee19f8b1661bd974862e336623c6
- # 16 Feb 2014 ? sha1sum 19f98632ad1ff330c647f8ff1a3a15b44238c709
# Changes too frequently, don't check anymore
w_download http://static3.cdn.ubi.com/orbit/launcher_installer/UplayInstaller.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
# NSIS installer
w_try "$WINE" UplayInstaller.exe ${W_OPT_UNATTENDED:+ /S}
-
- if w_workaround_wine_bug 33673 "Installing gdiplus to work around slow navigation"
- then
- w_call gdiplus
- fi
}
#----------------------------------------------------------------
@@ -11810,7 +11710,7 @@ load_utorrent()
# 7 May 2011 sha1sum 2932c9ed1c1225e485f7e3dd2ed267aa7d568c80
# 14 May 2011 removed checksum, updates too quickly to track :-(
# 7 Mar 2012 sha1sum c6d9a80c02898139b17194d10293f17ecef054cb
- w_download_manual "http://www.oldapps.com/utorrent.php?old_utorrent=38" utorrent_2.2.1.exe c6d9a80c02898139b17194d10293f17ecef054cb
+ w_download_manual "https://www.oldapps.com/utorrent.php?old_utorrent=38" utorrent_2.2.1.exe c6d9a80c02898139b17194d10293f17ecef054cb
w_try cp -f "$W_CACHE/utorrent/$file1" "$W_WINDIR_UNIX"/utorrent.exe
}
@@ -11833,7 +11733,7 @@ load_utorrent3()
# 14 May: removed checksum, changes too often to track
# 7 Mar 2012: sha1sum 73ba69b5d0004239a709af5db57c88c9d9c8f7b2
# 28 Jun 2013: sha1sum d2408c8a09a2bd9704af39f818ec7ac9e9cca46e
- w_download http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/ d2408c8a09a2bd9704af39f818ec7ac9e9cca46e uTorrent.exe
+ w_download https://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/ d2408c8a09a2bd9704af39f818ec7ac9e9cca46e uTorrent.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
# If you don't use /PERFORMINSTALL, it just runs µTorrent
@@ -11860,12 +11760,13 @@ w_metadata vc2005express apps \
load_vc2005express()
{
- # Thanks to http://blogs.msdn.com/astebner/articles/551674.aspx for the recipe
+ # Thanks to https://blogs.msdn.microsoft.com/astebner/2006/03/14/how-to-create-an-installable-layout-for-visual-studio-2005-express-editions/
+ # for the recipe
w_call dotnet20
- # http://blogs.msdn.com/b/astebner/archive/2006/03/14/551674.aspx
- # http://go.microsoft.com/fwlink/?linkid=57034
- w_download http://download.microsoft.com/download/A/9/1/A91D6B2B-A798-47DF-9C7E-A97854B7DD18/VC.iso 1ae44e4eaf8c61c3a39e573fd6efd9889e940529
+ # https://blogs.msdn.microsoft.com/astebner/2006/03/14/how-to-create-an-installable-layout-for-visual-studio-2005-express-editions/
+ # https://go.microsoft.com/fwlink/?linkid=57034
+ w_download https://download.microsoft.com/download/A/9/1/A91D6B2B-A798-47DF-9C7E-A97854B7DD18/VC.iso 5ae700d0285d94ec6df23828c7dc9f5634cd250363bed72e486916af22ff9545
# Unpack ISO (how handy that 7z can do this!)
w_try_7z "$W_TMP" "$W_CACHE"/vc2005express/VC.iso
@@ -11901,12 +11802,12 @@ load_vc2005expresssp1()
{
w_call vc2005express
- # http://www.microsoft.com/downloads/details.aspx?FamilyId=7B0B0339-613A-46E6-AB4D-080D4D4A8C4E
+ # https://www.microsoft.com/en-us/download/details.aspx?id=804
if w_workaround_wine_bug 37375
then
w_warn "Installer currently fails"
fi
- w_download http://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe 8b9a0172efad64774aa122f29e093ad2043b308d
+ w_download https://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe a959d1ea52674b5338473be32a1370f9ec80df84629a2ed3471aa911b42d9e50
w_try $WINE "$W_CACHE"/vc2005expresssp1/VS80sp1-KB926748-X86-INTL.exe
}
@@ -11927,7 +11828,7 @@ load_vc2005trial()
# Without mfc42.dll, pidgen.dll won't load, and the app claims "A trial edition is already installed..."
w_call mfc42
- w_download http://download.microsoft.com/download/6/f/5/6f5f7a01-50bb-422d-8742-c099c8896969/En_vs_2005_vsts_180_Trial.img f66ae07618d67e693ca0524d3582208c20e07823
+ w_download https://download.microsoft.com/download/6/f/5/6f5f7a01-50bb-422d-8742-c099c8896969/En_vs_2005_vsts_180_Trial.img 3ae9f611c60c64d82e1fa9c94714aa6b6c10f6c2c05446e14b5afb5a257f86dc
# Unpack ISO (how handy that 7z can do this!)
# Only the windows version of 7z can handle .img files?
@@ -11938,7 +11839,7 @@ load_vc2005trial()
w_try_cd "$W_TMP"
# Sanity check...
- w_verify_sha1sum 15433993ab7573c5154dbea2dcb65450f2adbf5c vs/wcu/runmsi.exe
+ w_verify_sha256sum e1d5ddd4bad46c2efe8105f8d73bd62857f6218942d3b9ac5da0e1a6a0a217e0 vs/wcu/runmsi.exe
w_try_cd vs/Setup
w_ahk_do "
@@ -11982,12 +11883,12 @@ load_vc2008express()
w_call dotnet35
# This is the version without SP1 baked in. (SP1 requires dotnet35sp1, which doesn't work yet.)
- w_download http://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso 76c6d28274a67741da720744026ea991a70867d1
+ w_download https://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso 632318ef0df5bad58fcb99852bd251243610e7a4d84213c45b4f693605a13ead
# Unpack ISO
w_try_7z "$W_TMP" "$W_CACHE"/vc2008express/VS2008ExpressENUX1397868.iso
- # See also http://blogs.msdn.com/b/astebner/archive/2008/04/25/8425198.aspx
+ # See also https://blogs.msdn.microsoft.com/astebner/2008/04/25/a-simpler-way-to-silently-install-visual-studio-2008-express-editions-with-a-caveat/
w_try_cd "$W_TMP"/VCExpress
w_try "$WINE" setup.exe $W_UNATTENDED_SLASH_Q
}
@@ -12004,7 +11905,7 @@ w_metadata vc2010express apps \
load_vc2010express()
{
- w_download http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso adef5e361a1f64374f520b9a2d03c54ee43721c6
+ w_download https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
# Unpack ISO
w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso
@@ -12036,11 +11937,11 @@ w_metadata vlc apps \
media="download" \
file1="vlc-2.2.1-win32.exe" \
installed_file1="$W_PROGRAMS_X86_WIN/VideoLAN/VLC/vlc.exe" \
- homepage="http://www.videolan.org/vlc/"
+ homepage="https://www.videolan.org/vlc/"
load_vlc()
{
- w_download http://get.videolan.org/vlc/2.2.1/win32/vlc-2.2.1-win32.exe 4cbcea9764b6b657d2147645eeb5b973b642530e
+ w_download https://get.videolan.org/vlc/2.2.1/win32/vlc-2.2.1-win32.exe 2eaa3881b01a2464d2a155ad49cc78162571dececcef555400666c719a60794d
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ /S}
}
@@ -12058,10 +11959,10 @@ w_metadata winamp apps \
load_winamp()
{
- w_info "may send information while installing, see http://www.microsoft.com/security/portal/Threat/Encyclopedia/Entry.aspx?threatid=159633"
+ w_info "may send information while installing, see https://www.microsoft.com/security/portal/Threat/Encyclopedia/Entry.aspx?threatid=159633"
# 2014 winamp5621_full_emusic-7plus_en-us.exe afc172039db52fdc202114bec7bcf8b5bf2468bb
- w_download http://winampplugins.co.uk/Winamp/winamp5666_full_all_redux.exe 136314be0da42ed399b88a106cb1f43093e2c0c2
+ w_download https://winampplugins.co.uk/Winamp/winamp5666_full_all_redux.exe ea9a6ba81475d49876d0b8b300d93f28f7959b8e99ce4372dbde746567e14002
w_try_cd "$W_CACHE/$W_PACKAGE"
if test $W_OPT_UNATTENDED
then
@@ -12122,7 +12023,7 @@ load_wme9()
w_die "Installer doesn't support 64-bit architecture."
fi
# See also http://www.microsoft.com/downloads/details.aspx?FamilyID=5691ba02-e496-465a-bba9-b2f1182cdf24
- w_download http://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563199d47/WMEncoder.exe 7a3f8781f3e5705651992ef0150ee30bc1295116
+ w_download http://download.microsoft.com/download/8/1/f/81f9402f-efdd-439d-b2a4-089563199d47/WMEncoder.exe 19d1610d12b51c969f64703c4d3a76aae30dee526bae715381b5f3369f717d76
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" WMEncoder.exe $W_UNATTENDED_SLASH_Q
@@ -12135,10 +12036,10 @@ load_wm9codecs()
{
# Note: must install WMP9 or 10 first, or installer will complain and abort.
- # See http://www.microsoft.com/downloads/details.aspx?FamilyID=06fcaab7-dcc9-466b-b0c4-04db144bb601
+ # See https://www.microsoft.com/en-us/download/details.aspx?id=507
# Used by direct calls from load_wmp9, so we have to specify cache directory.
# http://birds.camden.rutgers.edu/
- w_download_to wm9codecs http://birds.camden.rutgers.edu/WM9Codecs9x.exe 8b76bdcbea0057eb12b7966edab4b942ddacc253
+ w_download_to wm9codecs http://birds.camden.rutgers.edu/WM9Codecs9x.exe f25adf6529745a772c4fdd955505e7fcdc598b8a031bb0ce7e5856da5e5fcc95
w_try_cd "$W_CACHE/wm9codecs"
w_set_winver win2k
w_try "$WINE" WM9Codecs9x.exe $W_UNATTENDED_SLASH_Q
@@ -12157,7 +12058,7 @@ load_wmp9()
w_skip_windows wmp9 && return
# Not really expected to work well yet; see
- # http://appdb.winehq.org/appview.php?versionId=1449
+ # https://appdb.winehq.org/appview.php?versionId=1449
if [ $W_ARCH = win64 ]
then
@@ -12168,8 +12069,8 @@ load_wmp9()
w_set_winver win2k
- # See also http://www.microsoft.com/windows/windowsmedia/player/9series/default.aspx
- w_download http://download.microsoft.com/download/1/b/c/1bc0b1a3-c839-4b36-8f3c-19847ba09299/MPSetup.exe 580536d10657fa3868de2869a3902d31a0de791b
+ # See also https://support.microsoft.com/en-us/help/18612/windows-media-player
+ w_download https://download.microsoft.com/download/1/b/c/1bc0b1a3-c839-4b36-8f3c-19847ba09299/MPSetup.exe 678c102847c18a92abf13c3fae404c3473a0770c871a046b45efe623c9938fc0
# remove builtin placeholders to allow update
rm -f "$W_SYSTEM32_DLLS"/wmvcore.dll "$W_SYSTEM32_DLLS"/wmp.dll
@@ -12209,15 +12110,15 @@ load_wmp10()
# FIXME: what versions of Windows are really bundled with wmp10?
w_skip_windows wmp10 && return
- # See http://appdb.winehq.org/appview.php?iVersionId=3212
+ # See https://appdb.winehq.org/appview.php?iVersionId=3212
w_call wsh57
- # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=b446ae53-3759-40cf-80d5-cde4bbe07999
- w_download http://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
+ # https://www.microsoft.com/en-us/download/details.aspx?id=20426
+ w_download https://download.microsoft.com/download/1/2/a/12a31f29-2fa9-4f50-b95d-e45ef7013f87/MP10Setup.exe c1e71784c530035916aad5b09fa002abfbb7569b75208dd79351f29c6d197e03
w_set_winver winxp
- # Crashes on exit, but otherwise ok; see http://bugs.winehq.org/show_bug.cgi?id=12633
+ # Crashes on exit, but otherwise ok; see https://bugs.winehq.org/show_bug.cgi?id=12633
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" MP10Setup.exe $W_UNATTENDED_SLASH_Q
@@ -12244,7 +12145,7 @@ w_metadata 3dmark2000 benchmarks \
load_3dmark2000()
{
- # http://www.futuremark.com/download/3dmark2000/
+ # https://www.futuremark.com/download/3dmark2000/
if ! test -f "$W_CACHE/$W_PACKAGE/3dmark2000_v11_100308.exe"
then
w_download http://www.ocinside.de/download/3dmark2000_v11_100308.exe b0400d59cfd45d8c8893d3d4edc58b6285ee1502
@@ -12296,7 +12197,7 @@ w_metadata 3dmark2001 benchmarks \
load_3dmark2001()
{
- # http://www.futuremark.com/download/3dmark2001/
+ # https://www.futuremark.com/download/3dmark2001/
if ! test -f "$W_CACHE/$W_PACKAGE"/3dmark2001se_330_100308.exe
then
w_download http://www.ocinside.de/download/3dmark2001se_330_100308.exe 643bacbcc1615bb4f46d3b045b1b8d78371a6b54
@@ -12344,7 +12245,7 @@ load_3dmark03()
# http://www.futuremark.com/benchmarks/3dmark03/download/
if ! test -f "$W_CACHE/$W_PACKAGE/3DMark03_v360_1901.exe"
then
- w_download_manual http://www.futuremark.com/download/3dmark03/ 3DMark03_v360_1901.exe 46a439101ddbbe3c9563b5e9651cb61b46ce0619
+ w_download_manual https://www.futuremark.com/download/3dmark03/ 3DMark03_v360_1901.exe 46a439101ddbbe3c9563b5e9651cb61b46ce0619
fi
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -12400,7 +12301,7 @@ w_metadata 3dmark05 benchmarks \
load_3dmark05()
{
- # http://www.futuremark.com/download/3dmark05/
+ # https://www.futuremark.com/download/3dmark05/
if ! test -f "$W_CACHE/$W_PACKAGE/3DMark05_v130_1901.exe"
then
w_download http://www.ocinside.de/download/3dmark05_v130_1901.exe 8ad6bc2917e22edf5fc95d1fa96cc82515093fb2
@@ -12447,7 +12348,7 @@ w_metadata 3dmark06 benchmarks \
load_3dmark06()
{
- w_download_manual http://www.futuremark.com/support/downloads 3DMark06_v121_installer.exe a125a4b0a5649f848292f38cf424c672d8142058
+ w_download_manual https://www.futuremark.com/support/downloads 3DMark06_v121_installer.exe a125a4b0a5649f848292f38cf424c672d8142058
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -12596,7 +12497,7 @@ w_metadata amnesia_tdd_demo games \
load_amnesia_tdd_demo()
{
- w_download_manual "http://www.amnesiagame.com/#demo" amnesia_tdd_demo_1.0.1.exe 0bf0bc6e9c8ea76f1c44582d9302a9b22d31d1b6
+ w_download_manual "https://www.amnesiagame.com/#demo" amnesia_tdd_demo_1.0.1.exe 0bf0bc6e9c8ea76f1c44582d9302a9b22d31d1b6
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -12854,7 +12755,7 @@ w_metadata avatar_demo games \
load_avatar_demo()
{
- w_download_manual http://www.fileplanet.com/207386/200000/fileinfo/Avatar:-The-Game-Demo Avatar_The_Game_Demo.exe 8d8e4c82312962706bd2620406d592db4f0fa9c1
+ w_download_manual https://www.fileplanet.com/207386/200000/fileinfo/Avatar:-The-Game-Demo Avatar_The_Game_Demo.exe 8d8e4c82312962706bd2620406d592db4f0fa9c1
if w_workaround_wine_bug 23094 "Installing Visual C++ 2005 runtime to avoid installer crash"
then
@@ -13118,7 +13019,7 @@ load_bfbc2()
if w_workaround_wine_bug 22961
then
# shellcheck disable=SC2016
- w_warn 'If the game says "No CD/DVD error", try "sudo mount -o remount,unhide,uid=$(uid -u)". See http://bugs.winehq.org/show_bug.cgi?id=22961 for more info.'
+ w_warn 'If the game says "No CD/DVD error", try "sudo mount -o remount,unhide,uid=$(uid -u)". See https://bugs.winehq.org/show_bug.cgi?id=22961 for more info.'
fi
}
@@ -13241,7 +13142,7 @@ w_metadata cnc_redalert3_demo games \
load_cnc_redalert3_demo()
{
- w_download_manual 'http://www.fileplanet.com/194888/190000/fileinfo/Command-&-Conquer:-Red-Alert-3-Demo' RedAlert3Demo.exe f909b87cc12e386a51be51ede708634348c8af48
+ w_download_manual 'https://www.fileplanet.com/194888/190000/fileinfo/Command-&-Conquer:-Red-Alert-3-Demo' RedAlert3Demo.exe f909b87cc12e386a51be51ede708634348c8af48
w_try_cd "$W_CACHE/$W_PACKAGE"
if test ! "$W_OPT_UNATTENDED"
@@ -13277,7 +13178,7 @@ load_cnc_redalert3_demo()
#----------------------------------------------------------------
-# http://appdb.winehq.org/objectManager.php?sClass=version&iId=9320
+# https://appdb.winehq.org/objectManager.php?sClass=version&iId=9320
w_metadata blobby_volley games \
title="Blobby Volley" \
publisher="Daniel Skoraszewsky" \
@@ -13288,7 +13189,7 @@ w_metadata blobby_volley games \
load_blobby_volley()
{
- w_download_manual http://www.chip.de/downloads/Blobby-Volley_12990993.html blobby.zip c7057c77a5009a88d9d877e17a63b5536ebeb177
+ w_download_manual https://www.chip.de/downloads/Blobby-Volley_12990993.html blobby.zip c7057c77a5009a88d9d877e17a63b5536ebeb177
w_try_unzip "$W_DRIVE_C/BlobbyVolley" "$W_CACHE/$W_PACKAGE"/blobby.zip
}
@@ -13306,7 +13207,7 @@ load_cim_demo()
{
# 29 Mar 2011 d40408b59bc0e6e33b564e9bbb55dbab6c44c630, Inno Setup installer
#w_download http://www.pcgamestore.com/games/cities-in-motion-nbsp/trial/cim-demo-1-0-8.exe d40408b59bc0e6e33b564e9bbb55dbab6c44c630
- w_download_manual http://www.fileplanet.com/218762/210000/fileinfo/Cities-in-Motion-Demo cim-demo-1-0-8.exe d40408b59bc0e6e33b564e9bbb55dbab6c44c630
+ w_download_manual https://www.fileplanet.com/218762/210000/fileinfo/Cities-in-Motion-Demo cim-demo-1-0-8.exe d40408b59bc0e6e33b564e9bbb55dbab6c44c630
w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" cim-demo-1-0-8.exe ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
}
@@ -13364,7 +13265,7 @@ load_cod_demo()
if w_workaround_wine_bug 21558
then
# Work around a buffer overflow - not really Wine's fault
- w_warn "If you get a buffer overflow error, set __GL_ExtensionStringVersion=17700 before starting Wine. See http://bugs.winehq.org/show_bug.cgi?id=21558."
+ w_warn "If you get a buffer overflow error, set __GL_ExtensionStringVersion=17700 before starting Wine. See https://bugs.winehq.org/show_bug.cgi?id=21558."
fi
}
@@ -13448,7 +13349,7 @@ load_cod1()
if w_workaround_wine_bug 21558
then
# Work around a buffer overflow - not really Wine's fault
- w_warn "If you get a buffer overflow error, set __GL_ExtensionStringVersion=17700 before starting Wine. See http://bugs.winehq.org/show_bug.cgi?id=21558"
+ w_warn "If you get a buffer overflow error, set __GL_ExtensionStringVersion=17700 before starting Wine. See https://bugs.winehq.org/show_bug.cgi?id=21558"
fi
w_warn "This game is copy-protected, and requires the real disc in a real drive to run."
}
@@ -13660,7 +13561,7 @@ w_metadata crayonphysics_demo games \
load_crayonphysics_demo()
{
- w_download http://crayonphysicsdeluxe.s3.amazonaws.com/crayon_release52demo.exe 4ffd64c630f69e7cf024ef946c2c64c8c4ce4eac
+ w_download https://crayonphysicsdeluxe.s3.amazonaws.com/crayon_release52demo.exe 4ffd64c630f69e7cf024ef946c2c64c8c4ce4eac
# Inno Setup installer
w_try "$WINE" "$W_CACHE/$W_PACKAGE/$file1" ${W_OPT_UNATTENDED:+ /sp- /silent /norestart}
}
@@ -13740,7 +13641,7 @@ w_metadata csi6_demo games \
load_csi6_demo()
{
- w_download_manual http://www.fileplanet.com/217175/download/CSI:-Fatal-Conspiracy-Demo CSI6_PC_Demo_05.exe 28473b4dc9760b659f24a397192b74d170b593bb
+ w_download_manual https://www.fileplanet.com/217175/download/CSI:-Fatal-Conspiracy-Demo CSI6_PC_Demo_05.exe 28473b4dc9760b659f24a397192b74d170b593bb
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -14421,7 +14322,7 @@ w_metadata demolition_company_demo games \
load_demolition_company_demo()
{
- w_download_manual http://www.demolitioncompany-thegame.com/demo.php DemolitionCompanyDemoENv2.exe
+ w_download_manual https://www.demolitioncompany-thegame.com/demo.php DemolitionCompanyDemoENv2.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -14596,10 +14497,10 @@ load_dragonage_ue()
if w_workaround_wine_bug 23081
then
- w_warn "If you still see flickering, try applying the patch from http://bugs.winehq.org/show_bug.cgi?id=23081"
+ w_warn "If you still see flickering, try applying the patch from https://bugs.winehq.org/show_bug.cgi?id=23081"
fi
- w_warn "To activate the additional content, visit http://social.bioware.com/redeem_code.php?path=/dragonage/pc/dlcactivate/en"
+ w_warn "To activate the additional content, visit https://social.bioware.com/redeem_code.php?path=/dragonage/pc/dlcactivate/en"
}
#----------------------------------------------------------------
@@ -14614,7 +14515,7 @@ w_metadata dragonage2_demo games \
load_dragonage2_demo()
{
- w_download http://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/dragonage2/demo/DragonAge2Demo_F93M2qCj_EnEsItPlRu.exe a94715cd7943533a3cf1d84d40e667b04e1abc2e
+ w_download https://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/dragonage2/demo/DragonAge2Demo_F93M2qCj_EnEsItPlRu.exe a94715cd7943533a3cf1d84d40e667b04e1abc2e
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -14850,7 +14751,7 @@ w_metadata fifa11_demo games \
load_fifa11_demo()
{
- # From http://www.ea.com/uk/football/news/fifa11-download-2
+ # From https://www.ea.com/uk/football/news/fifa11-download-2
w_download "http://static.cdn.ea.com/fifa/u/f/fifa11_pc_demo_NA.zip" c3a66284bffb985f31b11e477dade50c0d4cac52
w_try unzip -d "$W_TMP" "$W_CACHE/$W_PACKAGE/fifa11_pc_demo_NA.zip"
@@ -14950,7 +14851,7 @@ w_metadata hordesoforcs2_demo games \
load_hordesoforcs2_demo()
{
- w_download_manual http://www.fileplanet.com/216619/download/Hordes-of-Orcs-2-Demo HoO2Demo.exe 1ba26d35697e359f89a30915140e471fadc675da
+ w_download_manual https://www.fileplanet.com/216619/download/Hordes-of-Orcs-2-Demo HoO2Demo.exe 1ba26d35697e359f89a30915140e471fadc675da
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -15047,7 +14948,7 @@ load_mfsxde()
winwait, Flight Simulator X - End User License Agreement
controlclick, Button1, Flight Simulator X - End User License Agreement
winwait, Microsoft Flight Simulator X Product Activation Wizard
- ; Activate later, currently broken on Wine, see http://bugs.winehq.org/show_bug.cgi?id=25579
+ ; Activate later, currently broken on Wine, see https://bugs.winehq.org/show_bug.cgi?id=25579
controlclick, Button2, Microsoft Flight Simulator X Product Activation Wizard
sleep 1000
controlclick, Button5, Microsoft Flight Simulator X Product Activation Wizard
@@ -15093,7 +14994,7 @@ load_mfsx_demo()
winwait, Flight Simulator X - End User License Agreement
controlclick, Button1, Flight Simulator X - End User License Agreement
winwait, Microsoft Flight Simulator X Product Activation Wizard
- ; Activate later, currently broken on Wine, see http://bugs.winehq.org/show_bug.cgi?id=25579
+ ; Activate later, currently broken on Wine, see https://bugs.winehq.org/show_bug.cgi?id=25579
controlclick, Button2, Microsoft Flight Simulator X Product Activation Wizard
sleep 1000
controlclick, Button5, Microsoft Flight Simulator X Product Activation Wizard
@@ -15116,7 +15017,7 @@ w_metadata gothic4_demo games \
file1="ArcaniA_Gothic4_Demo_Setup.zip" \
installed_exe1="$W_PROGRAMS_X86_WIN/JoWooD Entertainment AG/ArcaniA - Gothic 4 Demo/Arcania.exe"
-# http://appdb.winehq.org/objectManager.php?sClass=version&iId=21507
+# https://appdb.winehq.org/objectManager.php?sClass=version&iId=21507
load_gothic4_demo()
{
@@ -15254,7 +15155,7 @@ w_metadata hegemonygold_demo games \
media="download" \
file1="HegemonyGoldInstaller.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Longbow Digital Arts/Hegemony Gold/Hegemony Gold.exe" \
- homepage="http://www.longbowgames.com/forums/topic/?id=2146" \
+ homepage="https://www.longbowgames.com/forums/topic/?id=2146" \
rating="bronze"
load_hegemonygold_demo()
@@ -15265,7 +15166,7 @@ load_hegemonygold_demo()
# 5 Nov 2011: 723c575ff5fff77941a1c786e28f46c094b8159c
# 8 Mar 2012: 36634314f571e345d082bdefe1150c76ef5610a7
- w_download "http://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 36634314f571e345d082bdefe1150c76ef5610a7 HegemonyGoldInstaller.exe
+ w_download "https://www.longbowgames.com/downloads/Hegemony%20Gold%20Installer.exe" 36634314f571e345d082bdefe1150c76ef5610a7 HegemonyGoldInstaller.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -15310,9 +15211,9 @@ w_metadata hegemony_demo games \
load_hegemony_demo()
{
# Oct 2010: d3d2aa020d38b594d112360ae40871662d35dea4
- # Nov 2010: 80cad805ad4bed0d3c493f2d9a40d06512c429a9 http://www.longbowgames.com/forums/topic/?id=2223&start=0#post22184
+ # Nov 2010: 80cad805ad4bed0d3c493f2d9a40d06512c429a9 https://www.longbowgames.com/forums/topic/?id=2223&start=0#post22184
# Feb 16 2011: 38e92e3e4d0f0d10393790bc37350a2094f60c37
- w_download "http://www.longbowgames.com/downloads/Hegemony%20Philip%20of%20Macedon%20Installer.exe" 38e92e3e4d0f0d10393790bc37350a2094f60c37 Hegemony_Philip_of_Macedon_Installer.exe
+ w_download "https://www.longbowgames.com/downloads/Hegemony%20Philip%20of%20Macedon%20Installer.exe" 38e92e3e4d0f0d10393790bc37350a2094f60c37 Hegemony_Philip_of_Macedon_Installer.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -15537,7 +15438,7 @@ w_metadata losthorizon_demo games \
load_losthorizon_demo()
{
- w_download_manual http://www.fileplanet.com/215704/download/Lost-Horizon-Demo Lost_Horizon_Demo_EN.exe
+ w_download_manual https://www.fileplanet.com/215704/download/Lost-Horizon-Demo Lost_Horizon_Demo_EN.exe
w_try_cd "$W_CACHE/$W_PACKAGE"
@@ -15965,7 +15866,7 @@ w_metadata maxmagicmarker_demo games \
load_maxmagicmarker_demo()
{
- w_download http://www.maxandthemagicmarker.com/maxdemo/max_demo_pc.zip 1a79c583ff40e7b2cf05d18a89a806fd6b88a5d1
+ w_download https://www.maxandthemagicmarker.com/maxdemo/max_demo_pc.zip 1a79c583ff40e7b2cf05d18a89a806fd6b88a5d1
w_try_unzip "$W_PROGRAMS_X86_UNIX/$W_PACKAGE" "$W_CACHE/$W_PACKAGE"/max_demo_pc.zip
# Work around bug in game?!
@@ -16090,7 +15991,7 @@ w_metadata mise games \
load_mise()
{
- w_download_manual "http://www.direct2drive.com/8241/product/Buy-The-Secret-of-Monkey-Island(R):-Special-Edition-Download" SecretOfMonkeyIslandSE_ddsetup.zip 2e32458698c9ec7ebce94ae5c57531a3fe1dbb9e
+ w_download_manual "https://www.direct2drive.com/8241/product/Buy-The-Secret-of-Monkey-Island(R):-Special-Edition-Download" SecretOfMonkeyIslandSE_ddsetup.zip 2e32458698c9ec7ebce94ae5c57531a3fe1dbb9e
mkdir -p "$W_TMP/$W_PACKAGE"
w_try_cd "$W_TMP/$W_PACKAGE"
@@ -16271,11 +16172,11 @@ w_metadata njcwp_trial apps \
media="download" \
file1="njcwp.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Chinese WP/njstar.exe" \
- homepage="http://www.njstar.com/cms/njstar-chinese-word-processor"
+ homepage="https://www.njstar.com/cms/njstar-chinese-word-processor"
load_njcwp_trial()
{
- w_download http://www.njstar.com/download/njcwp.exe 006da155bad1ac4a73b953c98cb821eb7fd96507
+ w_download https://www.njstar.com/download/njcwp.exe 006da155bad1ac4a73b953c98cb821eb7fd96507
w_try_cd "$W_CACHE/$W_PACKAGE"
if test "$W_OPT_UNATTENDED"
then
@@ -16307,11 +16208,11 @@ w_metadata njjwp_trial apps \
media="download" \
file1="njjwp.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/NJStar Japanese WP/njstarj.exe" \
- homepage="http://www.njstar.com/cms/njstar-japanese-word-processor"
+ homepage="https://www.njstar.com/cms/njstar-japanese-word-processor"
load_njjwp_trial()
{
- w_download http://www.njstar.com/download/njjwp.exe 363d22e4ca7b79d0290a8ccdb0fa99169971d418
+ w_download https://www.njstar.com/download/njjwp.exe 363d22e4ca7b79d0290a8ccdb0fa99169971d418
w_try_cd "$W_CACHE/$W_PACKAGE"
if test "$W_OPT_UNATTENDED"
then
@@ -16415,7 +16316,7 @@ w_metadata plantsvszombies games \
load_plantsvszombies()
{
- w_download "http://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" c46979be135ef1c486144fa062466cdc51b740f5
+ w_download "https://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" c46979be135ef1c486144fa062466cdc51b740f5
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -16506,8 +16407,8 @@ w_metadata qq apps \
load_qq()
{
- w_download http://dldir1.qq.com/qqfile/qq/QQ8.0/16968/QQ8.0.exe ef92f3863113971c95a79aa75e601893d803826c
- w_download http://hillwoodhome.net/wine/QQ.tar.gz 08de45d3e5bb34b22e7c33e1163daec69742db58
+ w_download https://dldir1.qq.com/qqfile/qq/QQ8.0/16968/QQ8.0.exe 3af11db606ea9f8358db5c9eb12398da3464de020b7da7cbf3e13662ee33d228
+ w_download http://hillwoodhome.net/wine/QQ.tar.gz eb5cd6371eb75ec9e2fc0271199df05cbb9f38a60c2e81d5d8ac7daeb40aba62
if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username."
then
@@ -16562,7 +16463,7 @@ w_metadata qqintl apps \
load_qqintl()
{
- w_download http://dldir1.qq.com/qqfile/QQIntl/QQi_PC/QQIntl2.11.exe 030df82390e7962177fcef66fc1a0fd1a3ba4090
+ w_download https://dldir1.qq.com/qqfile/QQIntl/QQi_PC/QQIntl2.11.exe a08e5d8432ad41745cfe92479a9a0c3328a546c27f05486392ca7b77b1cb02a8
if w_workaround_wine_bug 33086 "Installing native riched20 to allow typing in username"
then
@@ -16925,7 +16826,7 @@ load_simsmed()
; Handle optional dialogs
; In Wine-1.3.16 and lower, before
- ; http://www.winehq.org/pipermail/wine-cvs/2011-March/076262.html,
+ ; https://www.winehq.org/pipermail/wine-cvs/2011-March/076262.html,
; wine didn't claim to already have .net 4 installed,
; and ran into bug 25535.
Loop
@@ -17123,7 +17024,7 @@ w_metadata splitsecond_demo games \
load_splitsecond_demo()
{
- w_download_manual http://www.fileplanet.com/212404/210000/fileinfo/Split/Second-Demo SplitSecondDemo_FilePlanet.exe 72b070712cfe951297263fae143521b45dae16b4
+ w_download_manual https://www.fileplanet.com/212404/210000/fileinfo/Split/Second-Demo SplitSecondDemo_FilePlanet.exe 72b070712cfe951297263fae143521b45dae16b4
if w_workaround_wine_bug 22774 "" 1.3.0
then
@@ -17282,7 +17183,7 @@ w_metadata starcraft2_demo games \
load_starcraft2_demo()
{
- w_download_manual http://www.fileplanet.com/217982/210000/fileinfo/Starcraft-2-Demo SC2-WingsOfLiberty-enUS-Demo-Installer.zip 4c06ad755fbde73f135a7359bf6bfdbd2c6eb00e
+ w_download_manual https://www.fileplanet.com/217982/210000/fileinfo/Starcraft-2-Demo SC2-WingsOfLiberty-enUS-Demo-Installer.zip 4c06ad755fbde73f135a7359bf6bfdbd2c6eb00e
w_try_cd "$W_TMP"
w_try_unzip . "$W_CACHE/$W_PACKAGE"/SC2-WingsOfLiberty-enUS-Demo-Installer.zip
@@ -17557,7 +17458,7 @@ w_metadata sammax301_demo games \
load_sammax301_demo()
{
- w_download_manual "http://www.fileplanet.com/211314/210000/fileinfo/Sam-&-Max:-Devil's-Playhouse---Episode-One-Demo" SamMax301_PC_Setup.exe 83f47b7f3a5074a6e29bdc9b4f1fd2c4471d9641
+ w_download_manual "https://www.fileplanet.com/211314/210000/fileinfo/Sam-&-Max:-Devil's-Playhouse---Episode-One-Demo" SamMax301_PC_Setup.exe 83f47b7f3a5074a6e29bdc9b4f1fd2c4471d9641
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -17595,7 +17496,7 @@ w_metadata sammax304_demo games \
load_sammax304_demo()
{
- w_download_manual "http://www.fileplanet.com/214770/210000/fileinfo/Sam-&-Max:-The-Devi's-Playhouse---Beyond-the-Alley-of-the-Dolls-Demo" SamMax304_PC_setup.exe 1a385a1f1e83770c973e6457b923b7a44bbe44d8
+ w_download_manual "https://www.fileplanet.com/214770/210000/fileinfo/Sam-&-Max:-The-Devi's-Playhouse---Beyond-the-Alley-of-the-Dolls-Demo" SamMax304_PC_setup.exe 1a385a1f1e83770c973e6457b923b7a44bbe44d8
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
@@ -17916,7 +17817,7 @@ w_metadata typingofthedead_demo games \
load_typingofthedead_demo()
{
- w_download "http://www.fileplanet.com/54947/50000/fileinfo/The-Typing-of-the-Dead-Demo" 96fe3edb2431210932af840e29c59bce6b7fc80f
+ w_download "https://www.fileplanet.com/54947/50000/fileinfo/The-Typing-of-the-Dead-Demo" 96fe3edb2431210932af840e29c59bce6b7fc80f
w_try_cd "$W_TMP"
w_try_unzip . "$W_CACHE/$W_PACKAGE/tod-demo.zip"
w_ahk_do "
@@ -18016,7 +17917,7 @@ load_wog()
if ! test -f "$W_CACHE/wog/WorldOfGooDemo.1.0.exe"
then
# Get temporary download location
- w_download "http://www.worldofgoo.com/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe"
+ w_download "https://www.worldofgoo.com/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe"
URL=$(grep WorldOfGooDemo.1.0.exe "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe" \
| sed 's,.*http,http,;s,".*,,')
w_try rm "$W_CACHE/wog/dl2.php?lk=demo&filename=WorldOfGooDemo.1.0.exe"
@@ -18764,7 +18665,7 @@ load_hosts()
# The services file is used map service names to network ports.
# Some apps depend on these files, but they're not implemented in Wine.
# Fortunately, empty files in the correct location satisfy those apps.
- # See http://bugs.winehq.org/show_bug.cgi?id=12076
+ # See https://bugs.winehq.org/show_bug.cgi?id=12076
# It's in system32 for both win32/win64
mkdir -p "$W_WINDIR_UNIX"/system32/drivers/etc
@@ -18871,7 +18772,7 @@ load_sandbox()
# Disable unixfs
# Unfortunately, when you run with a different version of Wine, Wine will recreate this key.
- # See http://bugs.winehq.org/show_bug.cgi?id=22450
+ # See https://bugs.winehq.org/show_bug.cgi?id=22450
"$WINE" regedit /d 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\Namespace\{9D20AAE8-0625-44B0-9CA7-71889C2254D9}'
# Disable recreation of the above key - or any updating of the registry - when running with a newer version of Wine.
@@ -19148,12 +19049,12 @@ load_win98()
# Really, we should support other values, since winetricks did
w_metadata winver= settings \
- title_uk="Поставити версію Windows за замовчуванням (winxp)" \
- title="Set Windows version to default (winxp)"
+ title_uk="Поставити версію Windows за замовчуванням (win7)" \
+ title="Set Windows version to default (win7)"
load_winver()
{
- w_set_winver winxp
+ w_set_winver win7
}
#----------------------------------------------------------------
diff --git a/winetricks.1 b/winetricks.1
index ae234d5..f3cf18a 100644
--- a/winetricks.1
+++ b/winetricks.1
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH WINETRICKS 1 "February 2017" "Winetricks 20170207" "Wine Package Manager"
+.TH WINETRICKS 1 "March 2017" "Winetricks 20170316" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS
@@ -153,7 +153,7 @@ This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
-See .
+See .
.SH BUGS
.PP
Bugs may be reported at