Hello community,
here is the log from the commit of package wine for openSUSE:Factory checked in
at 2017-03-04 16:38:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wine (Old)
and /work/SRC/openSUSE:Factory/.wine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine"
Sat Mar 4 16:38:09 2017 rev:221 rq:476875 version:2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/wine/wine.changes 2017-02-19
01:04:16.280278349 +0100
+++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2017-03-04
16:42:19.912312932 +0100
@@ -1,0 +2,12 @@
+Fri Mar 3 21:14:23 UTC 2017 - meiss...@suse.com
+
+- Update to 2.3 development snapshot
+ - Obsolete wineinstall script removed.
+ - More Direct3D command stream work.
+ - A few more Shader Model 5 instructions.
+ - Better underline rendering in DirectWrite.
+ - Improved ODBC support on 64-bit.
+ - Various bug fixes.
+- updated winetricks
+
+-------------------------------------------------------------------
Old:
----
wine-2.2.tar.xz
wine-2.2.tar.xz.sign
New:
----
wine-2.3.tar.xz
wine-2.3.tar.xz.sign
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wine.spec ++++++
--- /var/tmp/diff_new_pack.h0Jrsg/_old 2017-03-04 16:42:21.216128321 +0100
+++ /var/tmp/diff_new_pack.h0Jrsg/_new 2017-03-04 16:42:21.220127754 +0100
@@ -54,8 +54,8 @@
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(libudev)
-%define realver 2.2
-Version: 2.2
+%define realver 2.3
+Version: 2.3
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+
++++++ wine-2.2.tar.xz -> wine-2.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/wine/wine-2.2.tar.xz
/work/SRC/openSUSE:Factory/.wine.new/wine-2.3.tar.xz differ: char 26, line 1
++++++ winetricks ++++++
--- /var/tmp/diff_new_pack.h0Jrsg/_old 2017-03-04 16:42:21.376105669 +0100
+++ /var/tmp/diff_new_pack.h0Jrsg/_new 2017-03-04 16:42:21.380105102 +0100
@@ -27,9 +27,11 @@
# Uses the following non-POSIX system tools:
# - wine is used to execute Win32 apps except on Cygwin.
# - ar, cabextract, unrar, unzip, and 7z are needed by some verbs.
-# - aria2c, wget, or curl is needed for downloading.
-# - sha1sum or openssl is needed for verifying downloads.
-# - zenity is needed by the GUI, though it can limp along somewhat with
kdialog.
+# - aria2c, wget, curl, or fetch is needed for downloading.
+# - sha1sum, sha1, or shasum is needed for verifying downloads (or openssl for
OSX 10.5)
+# - Note: there is a transition to sha256 under way, which requires
+# - sha256sum, sha256, or shasum (OSX 10.5 does not support these, and is
considered deprecated)
+# - zenity is needed by the GUI, though it can limp along somewhat with
kdialog/xmessage.
# - xdg-open (if present) or open (for OS X) is used to open download pages
# for the user when downloads cannot be fully automated.
# - sudo is used to mount .iso images if the user cached them with -k option.
@@ -46,7 +48,7 @@
#
# Copyright:
# Copyright (C) 2007-2014 Dan Kegel <dank!kegel.com>
-# Copyright (C) 2008-2016 Austin English <austinenglish!gmail.com>
+# Copyright (C) 2008-2017 Austin English <austinenglish!gmail.com>
# Copyright (C) 2010-2011 Phil Blankenship <phillip.e.blankenship!gmail.com>
# Copyright (C) 2010-2015 Shannon VanWagner <shannon.vanwagner!gmail.com>
# Copyright (C) 2010 Belhorma Bendebiche <amro256!gmail.com>
@@ -560,7 +562,7 @@
winetricks_early_wine cmd.exe /c echo "%$1%"
}
-# get sha1sum string and set $_W_gotsum to it
+# get sha1sum string and set $_W_gotsha1um to it
w_get_sha1sum()
{
_W_sha1_file="$1"
@@ -569,25 +571,56 @@
# User is running winetricks from /dev/stdin
if [ -f "$_W_sha1_file" ] || [ -h "$_W_sha1_file" ]
then
- _W_gotsum=$($WINETRICKS_SHA1SUM < "$_W_sha1_file" | sed 's/(stdin)=
//;s/ .*//')
+ _W_gotsha1sum=$($WINETRICKS_SHA1SUM < "$_W_sha1_file" | sed
's/(stdin)= //;s/ .*//')
else
w_warn "$_W_sha1_file is not a regular file, not checking sha1sum"
return
fi
}
-# verify an sha1sum
+# get sha256sum string and set $_W_gotsha256sum to it
+w_get_sha256sum()
+{
+ _W_sha256_file="$1"
+
+ # See https://github.com/Winetricks/winetricks/issues/645
+ # User is running winetricks from /dev/stdin
+ if [ -f "$_W_sha256_file" ] || [ -h "$_W_sha256_file" ]
+ then
+ _W_gotsha256sum=$($WINETRICKS_SHA256SUM < "$_W_sha256_file" | sed
's/(stdin)= //;s/ .*//')
+ else
+ w_warn "$_W_sha256_file is not a regular file, not checking sha1sum"
+ return
+ fi
+}
+
+# verify a sha1sum
w_verify_sha1sum()
{
_W_vs_wantsum=$1
_W_vs_file=$2
w_get_sha1sum "$_W_vs_file"
- if [ "$_W_gotsum"x != "$_W_vs_wantsum"x ]
+ if [ "$_W_gotsha1sum"x != "$_W_vs_wantsum"x ]
then
w_die "sha1sum mismatch! Rename $_W_vs_file and try again."
fi
- unset _W_vs_wantsum _W_vs_file _W_gotsum
+ unset _W_vs_wantsum _W_vs_file _W_gotsha1sum
+}
+
+# verify a sha256sum
+w_verify_sha256sum()
+{
+ set -x
+ _W_vs_wantsum=$1
+ _W_vs_file=$2
+
+ w_get_sha256sum "$_W_vs_file"
+ if [ "$_W_gotsha256sum"x != "$_W_vs_wantsum"x ]
+ then
+ w_die "sha256sum mismatch! Rename $_W_vs_file and try again."
+ fi
+ unset _W_vs_wantsum _W_vs_file _W_gotsha256sum
}
# wget outputs progress messages that look like this:
@@ -803,6 +836,17 @@
_W_file=$(basename "$_W_url")
fi
+ # tr -d " " is for FreeBSD/OS X/Solaris return a leading space:
+ # See
https://stackoverflow.com/questions/30927590/wc-on-osx-return-includes-spaces/30927885#30927885
+ _W_sum_length="$(echo "$_W_sum" | tr -d "\n" | wc -c | tr -d " ")"
+ case "$_W_sum_length" in
+ 0) _W_shatype="none" ;;
+ 40) _W_shatype="sha1" ;;
+ 64) _W_shatype="sha256" ;;
+ # 128) sha512..
+ *) w_die "unsupported shasum..bug" ;;
+ esac
+
if echo "${_W_packagename}" | grep -q -e '\/-' -e '^-'; then
w_die "Invalid path ${_W_packagename} given"
else
@@ -843,12 +887,28 @@
fi
fi
# If checksum matches, declare success and exit loop
- w_get_sha1sum "$_W_cache/$_W_file"
- if [ "$_W_gotsum"x = "$_W_sum"x ]
- then
- checksum_ok=1
- break
- fi
+ case "$_W_shatype" in
+ none)
+ w_warn "No checksum provided, not verifying"
+ ;;
+ sha1)
+ w_get_sha1sum "$_W_cache/$_W_file"
+ if [ "$_W_gotsha1sum"x = "$_W_sum"x ]
+ then
+ checksum_ok=1
+ break
+ fi
+ ;;
+ sha256)
+ w_get_sha256sum "$_W_cache/$_W_file"
+ if [ "$_W_gotsha256sum"x = "$_W_sum"x ]
+ then
+ checksum_ok=1
+ break
+ fi
+ ;;
+ esac
+
if test ! "$WINETRICKS_CONTINUE_DOWNLOAD"
then
w_warn "Checksum for $_W_cache/$_W_file did not match,
retrying download"
@@ -942,6 +1002,16 @@
${_W_cookiejar:+--cookie "$_W_cookiejar"} \
${_W_agent:+--user-agent "$_W_agent"} \
"$_W_url"
+ elif [ "${WINETRICKS_DOWNLOADER}" = "fetch" ]
+ then
+ # Note: fetch does not support configurable retry count
+
+ # shellcheck disable=SC2086
+ $torify fetch \
+ -T "${WINETRICKS_DOWNLOADER_TIMEOUT}" \
+ -o "$_W_file" \
+ ${_W_agent:+--user-agent="$_W_agent"} \
+ "$_W_url"
else
w_die "Here be dragons"
fi
@@ -976,7 +1046,13 @@
if test "$_W_sum" && test ! "$checksum_ok"
then
- w_verify_sha1sum "$_W_sum" "$_W_cache/$_W_file"
+ case "$_W_shatype" in
+ none) w_warn "No checksum provided, not verifying" ;;
+ sha1) w_verify_sha1sum "$_W_sum" "$_W_cache/$_W_file" ;;
+ sha256) w_verify_sha256sum "$_W_sum" "$_W_cache/$_W_file" ;;
+ # 128) sha512..
+ *) w_die "unsupported shasum..bug" ;;
+ esac
fi
}
@@ -2618,22 +2694,24 @@
{
# shellcheck disable=SC2104
case "${WINETRICKS_DOWNLOADER}" in
- aria2c|curl|wget) : ;;
+ aria2c|curl|wget|fetch) : ;;
"") if [ -x "$(which aria2c 2>/dev/null)" ] ; then
WINETRICKS_DOWNLOADER="aria2c"
elif [ -x "$(which wget 2>/dev/null)" ] ; then
WINETRICKS_DOWNLOADER="wget"
elif [ -x "$(which curl 2>/dev/null)" ] ; then
WINETRICKS_DOWNLOADER="curl"
+ elif [ -x "$(which fetch 2>/dev/null)" ] ; then
+ WINETRICKS_DOWNLOADER="fetch"
else
w_die "Please install wget or aria2c (or, if those aren't
available, curl)"
fi
;;
- *) w_die "Invalid value ${WINETRICKS_DOWNLOADER} given for
WINETRICKS_DOWNLOADER. Possible values: aria2c, curl, wget"
+ *) w_die "Invalid value ${WINETRICKS_DOWNLOADER} given for
WINETRICKS_DOWNLOADER. Possible values: aria2c, curl, wget, fetch"
esac
- # Common values for aria2c/curl/wget
- # Number of retry attempts:
+ # Common values for aria2c/curl/fetch/wget
+ # Number of retry attempts (not supported by fetch):
WINETRICKS_DOWNLOADER_RETRIES=${WINETRICKS_DOWNLOADER_RETRIES:-3}
# Connection timeout time (in seconds):
WINETRICKS_DOWNLOADER_TIMEOUT=${WINETRICKS_DOWNLOADER_TIMEOUT:-15}
@@ -2690,6 +2768,9 @@
"$1" > /dev/null
cat "${stdout_tmpfile}"
rm "${stdout_tmpfile}"
+ elif [ "${WINETRICKS_DOWNLOADER}" = "fetch" ] ; then
+ # fetch does not support retry count
+ $torify fetch -o - -T "${WINETRICKS_DOWNLOADER_TIMEOUT}" "$1"
2>/dev/null
else
w_die "Please install aria2c, curl, or wget"
fi
@@ -2719,18 +2800,38 @@
}
winetricks_get_sha1sum_prog() {
- # Mac folks tend to not have sha1sum, but we can make do with openssl
- if [ -x "$(which sha1sum 2>/dev/null)" ]
- then
+ # Linux/Solaris:
+ if [ -x "$(which sha1sum 2>/dev/null)" ] ; then
WINETRICKS_SHA1SUM="sha1sum"
- elif [ -x "$(which openssl 2>/dev/null)" ]
- then
+ # FreeBSD/NetBSD:
+ elif [ -x "$(which sha1 2>/dev/null)" ] ; then
+ WINETRICKS_SHA1SUM="sha1"
+ # OSX 10.6+:
+ elif [ -x "$(which shasum 2>/dev/null)" ] ; then
+ WINETRICKS_SHA1SUM="shasum -a 1"
+ # OSX 10.5:
+ elif [ -x "$(which openssl 2>/dev/null)" ] ; then
WINETRICKS_SHA1SUM="openssl dgst -sha1"
else
w_die "No sha1sum utility available."
fi
}
+winetricks_get_sha256sum_prog() {
+ # Linux/Solaris:
+ if [ -x "$(which sha256sum 2>/dev/null)" ] ; then
+ WINETRICKS_SHA256SUM="sha256sum"
+ # FreeBSD/NetBSD:
+ elif [ -x "$(which sha256 2>/dev/null)" ] ; then
+ WINETRICKS_SHA256SUM="sha256"
+ # OSX (10.6+), 10.5 doesn't support at all:
https://stackoverflow.com/questions/7500691/rvm-sha256sum-nor-shasum-found
+ elif [ -x "$(which shasum 2>/dev/null)" ] ; then
+ WINETRICKS_SHA256SUM="shasum -a 256"
+ else
+ w_die "No sha256um utility available."
+ fi
+}
+
winetricks_get_platform()
{
if [ "${OS}" = "Windows_NT" ]
@@ -2775,10 +2876,13 @@
{
# 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
w_get_sha1sum "$0"
- echo "$WINETRICKS_VERSION - sha1sum: $_W_gotsum"
+ echo "$WINETRICKS_VERSION - sha1sum: $_W_gotsha1sum"
}
# Run a small wine command for internal use
@@ -4533,6 +4637,7 @@
WINETRICKS_SOURCEFORGE=http://downloads.sourceforge.net
winetricks_get_sha1sum_prog
+ winetricks_get_sha256sum_prog
winetricks_get_platform
@@ -8378,8 +8483,9 @@
# 2016-02-18 sha1sum: 45147a791e3f71bd67ead1622d9120060dd196e5
# 2016-03-11 sha1sum: 4f955f42984ae69d2f6078d3a3fe9fadc4a25e34
# 2016-10-11 sha1sum: bcb6a9d9a6f7781db3de3120a0c9dcd8118642d1
+ # 2017-02-19 sha1sum: 86eb79ea28ac3801887616cefee2d2b43522312a
- w_download
http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi
bcb6a9d9a6f7781db3de3120a0c9dcd8118642d1
+ 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
}
@@ -9591,7 +9697,6 @@
load_corefonts()
{
# FIXME: why is this commented out? Should be removed or enabled.
- #w_download ftp://ftp.fi.debian.org/gentoo/distfiles/andale32.exe
c4db8cbe42c566d12468f5fdad38c43721844c69
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
@@ -9608,12 +9713,6 @@
# files being present in the Windows font directory we use cabextract
# to obtain the files and register the fonts by hand.
- # Andale needs a FontSubstitutes entry
- # w_try_cabextract --directory="$W_TMP" "$W_CACHE"/corefonts/andale32.exe
-
- # Display EULA
- test x"$W_UNATTENDED_SLASH_Q" = x"" || w_try "$WINE"
"$W_CACHE"/corefonts/arial32.exe $W_UNATTENDED_SLASH_Q
-
w_try_cabextract -q --directory="$W_TMP" "$W_CACHE"/corefonts/arial32.exe
w_try cp -f "$W_TMP"/Arial*.TTF "$W_FONTSDIR_UNIX"
w_register_font Arial.TTF "Arial"
@@ -9869,7 +9968,7 @@
if test -f /usr/share/fonts/truetype/arphic/ukai.ttf
then
w_get_sha1sum /usr/share/fonts/truetype/arphic/ukai.ttf
- if [ "$_W_gotsum"x = "96e1121f89953e5169d3e2e7811569148f573985"x ]
+ if [ "$_W_gotsha1sum"x = "96e1121f89953e5169d3e2e7811569148f573985"x ]
then
w_die "Your installed ukai.ttf is known to be broken. Upgrade your
ttf-arphic font package!"
fi
@@ -9878,7 +9977,7 @@
if test -f /usr/share/fonts/truetype/arphic/uming.ttf
then
w_get_sha1sum /usr/share/fonts/truetype/arphic/uming.ttf
- if [ "$_W_gotsum"x = "2a4f4a69e343c21c24d044b2cb19fd4f0decc82c"x ]
+ if [ "$_W_gotsha1sum"x = "2a4f4a69e343c21c24d044b2cb19fd4f0decc82c"x ]
then
w_die "Your installed uming.ttf is known to be broken. Upgrade
your ttf-uming font package!"
fi
@@ -10605,7 +10704,7 @@
load_irfanview()
{
- w_download
http://download.betanews.com/download/967963863-1/iview444_setup.exe
d9675c2c4fce810134718b74b0c598957c8ebcf4
+ w_download
http://download.betanews.com/download/967963863-1/iview444_setup.exe
71b44cd3d14376bbb619b2fe8a632d29200385738dd186680e988ce32662b3d6
if w_workaround_wine_bug 657 "Installing mfc42"
then
w_call mfc42
