<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c06be0058331d0acb685249cd577bdce1b7542fc">https://github.com/macports/macports-ports/commit/c06be0058331d0acb685249cd577bdce1b7542fc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c06be00 wine-devel: Update to 3.0-rc3
</span>c06be00 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c06be0058331d0acb685249cd577bdce1b7542fc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 26 16:22:27 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> wine-devel: Update to 3.0-rc3
</span>---
x11/wine-devel/Portfile | 10 +++-----
x11/wine-devel/files/CCCryptorCreateWithMode.patch | 30 ----------------------
x11/wine-devel/files/kCCAlgorithmAES.patch | 20 ---------------
3 files changed, 4 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/Portfile b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc90571..227831e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name wine-devel
conflicts wine wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0-rc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0-rc3
</span> set branch [lindex [split ${version} .] 0].0
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,9 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 36b4e439a69e0a7b8fb898dcfdda40c562a10e30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f6d07933d30247d8560c66f3ccea976cbb6f111c8a588a8874425f176abfc4a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19675444 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a8f50de5d135fd600d6ac8e69a0532bcd7710eb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e2fceb1fcfc21a075288e0d4b335fa8730d1014b4ea41deb6cf7d5e2e7eefc73 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19703140 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,10 +90,8 @@ depends_build port:bison \
</span> port:pkgconfig
patchfiles BOOL.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CCCryptorCreateWithMode.patch \
</span> cups_headers.patch \
fix-flicker.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kCCAlgorithmAES.patch \
</span> mach_machine.patch
# Wine requires the program specified in INSTALL to create intermediate
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/files/CCCryptorCreateWithMode.patch b/x11/wine-devel/files/CCCryptorCreateWithMode.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e779526..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/files/CCCryptorCreateWithMode.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.winehq.org/show_bug.cgi?id=44174
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.winehq.org/attachment.cgi?id=59939
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/bcrypt/bcrypt_main.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/bcrypt/bcrypt_main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CommonCrypto/CommonCryptor.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(SONAME_LIBGNUTLS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnutls/gnutls.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -766,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return BCryptDestroyHash( handle );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ULONG get_block_size( enum alg_id alg )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ULONG ret = 0, size = sizeof(ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -895,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HeapFree( GetProcessHeap(), 0, key );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return STATUS_SUCCESS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct key
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct object hdr;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/files/kCCAlgorithmAES.patch b/x11/wine-devel/files/kCCAlgorithmAES.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8c6297a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/files/kCCAlgorithmAES.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use the old name for kCCAlgorithmAES (kCCAlgorithmAES128) for compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with OS X 10.8 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/bcrypt/bcrypt_main.c.orig 2017-12-08 13:48:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/bcrypt/bcrypt_main.c 2017-12-15 00:32:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -913,13 +913,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key->ref_decrypt = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WARN( "CCCryptorCreateWithMode failed %d\n", status );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return STATUS_INTERNAL_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES128, ccNoPadding, iv,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WARN( "CCCryptorCreateWithMode failed %d\n", status );
</span></pre><pre style='margin:0'>
</pre>