[85426] trunk/dports/x11
ryandesign at macports.org
ryandesign at macports.org
Thu Oct 13 10:16:15 PDT 2011
Revision: 85426
http://trac.macports.org/changeset/85426
Author: ryandesign at macports.org
Date: 2011-10-13 10:16:12 -0700 (Thu, 13 Oct 2011)
Log Message:
-----------
wine-devel, wine-crossover, wine-crossover-games: fix "Undefined symbols: _SSLCopyPeerCertificates" better on Tiger by using SSLGetPeerCertificates there instead (#31500); this means we don't need gnutls on Tiger either (#29909)
Modified Paths:
--------------
trunk/dports/x11/wine-crossover/Portfile
trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff
trunk/dports/x11/wine-crossover-games/Portfile
trunk/dports/x11/wine-crossover-games/files/patch-SSLCopyPeerCertificates.diff
trunk/dports/x11/wine-devel/Portfile
trunk/dports/x11/wine-devel/files/patch-SSLCopyPeerCertificates.diff
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2011-10-13 16:04:36 UTC (rev 85425)
+++ trunk/dports/x11/wine-crossover/Portfile 2011-10-13 17:16:12 UTC (rev 85426)
@@ -157,16 +157,8 @@
}
}
+# darwin 8
patchfiles-append patch-SSLCopyPeerCertificates.diff
-use_autoreconf yes
-platform darwin 8 {
- # Wine uses the Security framework on Leopard and up.
- # See http://bugs.winehq.org/show_bug.cgi?id=26643
- depends_lib-append port:gnutls
- archcheck.files-append lib/libgnutls.dylib
- configure.args-delete --without-gnutls
- configure.args-append --with-gnutls
-}
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
Modified: trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff
===================================================================
--- trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff 2011-10-13 16:04:36 UTC (rev 85425)
+++ trunk/dports/x11/wine-crossover/files/patch-SSLCopyPeerCertificates.diff 2011-10-13 17:16:12 UTC (rev 85426)
@@ -1,48 +1,26 @@
---- configure.ac.orig 2011-04-28 14:52:28.000000000 -0500
-+++ configure.ac 2011-10-09 08:25:51.000000000 -0500
-@@ -713,6 +713,10 @@
- LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
- dnl declare needed frameworks
- AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $SECURITYLIB"
-+ AC_CHECK_FUNCS(SSLCopyPeerCertificates)
-+ LIBS="$ac_save_LIBS"
- AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
- AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
- AC_SUBST(APPKITLIB,"-framework AppKit")
---- dlls/secur32/schannel.c.orig 2011-04-28 14:52:45.000000000 -0500
-+++ dlls/secur32/schannel.c 2011-10-09 08:29:57.000000000 -0500
-@@ -25,7 +25,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <limits.h>
--#ifdef HAVE_SECURITY_SECURITY_H
-+#if defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES)
- #include <Security/Security.h>
- #define GetCurrentThread GetCurrentThread_Mac
- #define LoadResource LoadResource_Mac
-@@ -48,7 +48,7 @@
+--- dlls/secur32/schannel.c.orig 2011-07-15 12:52:44.000000000 -0500
++++ dlls/secur32/schannel.c 2011-10-12 10:14:53.000000000 -0500
+@@ -858,7 +858,11 @@
- WINE_DEFAULT_DEBUG_CHANNEL(secur32);
+ TRACE("(%p/%p, %p)\n", s, s->context, cert);
--#ifdef HAVE_SECURITY_SECURITY_H
-+#if defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES)
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ status = SSLCopyPeerCertificates(s->context, &certs);
++#else
++ status = SSLGetPeerCertificates(s->context, &certs);
++#endif
+ if (status == noErr && certs)
+ {
+ SecCertificateRef mac_cert;
+@@ -883,7 +887,11 @@
+ CFRelease(certs);
+ }
+ else
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status);
++#else
++ WARN("SSLGetPeerCertificates failed: %ld\n", (long)status);
++#endif
- typedef void *schan_imp_transport;
- static int schan_pull(schan_imp_transport transport, void *buff, size_t *buff_len);
-@@ -3767,7 +3767,7 @@
- wine_dlclose(libgnutls_handle, NULL, 0);
+ return ret;
}
-
--#else /* HAVE_SECURITY_SECURITY_H || SONAME_LIBGNUTLS */
-+#else /* (HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) || SONAME_LIBGNUTLS */
-
- void SECUR32_initSchannelSP(void)
- {
-@@ -3776,4 +3776,4 @@
-
- void SECUR32_deinitSchannelSP(void) {}
-
--#endif /* HAVE_SECURITY_SECURITY_H || SONAME_LIBGNUTLS */
-+#endif /* (HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) || SONAME_LIBGNUTLS */
Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile 2011-10-13 16:04:36 UTC (rev 85425)
+++ trunk/dports/x11/wine-crossover-games/Portfile 2011-10-13 17:16:12 UTC (rev 85426)
@@ -159,16 +159,8 @@
}
}
+# darwin 8
patchfiles-append patch-SSLCopyPeerCertificates.diff
-use_autoreconf yes
-platform darwin 8 {
- # Wine uses the Security framework on Leopard and up.
- # See http://bugs.winehq.org/show_bug.cgi?id=26643
- depends_lib-append port:gnutls
- archcheck.files-append lib/libgnutls.dylib
- configure.args-delete --without-gnutls
- configure.args-append --with-gnutls
-}
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
Modified: trunk/dports/x11/wine-crossover-games/files/patch-SSLCopyPeerCertificates.diff
===================================================================
--- trunk/dports/x11/wine-crossover-games/files/patch-SSLCopyPeerCertificates.diff 2011-10-13 16:04:36 UTC (rev 85425)
+++ trunk/dports/x11/wine-crossover-games/files/patch-SSLCopyPeerCertificates.diff 2011-10-13 17:16:12 UTC (rev 85426)
@@ -1,48 +1,26 @@
---- configure.ac.orig 2011-04-28 14:52:28.000000000 -0500
-+++ configure.ac 2011-10-09 08:25:51.000000000 -0500
-@@ -713,6 +713,10 @@
- LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
- dnl declare needed frameworks
- AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $SECURITYLIB"
-+ AC_CHECK_FUNCS(SSLCopyPeerCertificates)
-+ LIBS="$ac_save_LIBS"
- AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
- AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
- AC_SUBST(APPKITLIB,"-framework AppKit")
---- dlls/secur32/schannel.c.orig 2011-04-28 14:52:45.000000000 -0500
-+++ dlls/secur32/schannel.c 2011-10-09 08:29:57.000000000 -0500
-@@ -25,7 +25,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <limits.h>
--#ifdef HAVE_SECURITY_SECURITY_H
-+#if defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES)
- #include <Security/Security.h>
- #define GetCurrentThread GetCurrentThread_Mac
- #define LoadResource LoadResource_Mac
-@@ -48,7 +48,7 @@
+--- dlls/secur32/schannel.c.orig 2011-07-15 12:52:44.000000000 -0500
++++ dlls/secur32/schannel.c 2011-10-12 10:14:53.000000000 -0500
+@@ -858,7 +858,11 @@
- WINE_DEFAULT_DEBUG_CHANNEL(secur32);
+ TRACE("(%p/%p, %p)\n", s, s->context, cert);
--#ifdef HAVE_SECURITY_SECURITY_H
-+#if defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES)
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ status = SSLCopyPeerCertificates(s->context, &certs);
++#else
++ status = SSLGetPeerCertificates(s->context, &certs);
++#endif
+ if (status == noErr && certs)
+ {
+ SecCertificateRef mac_cert;
+@@ -883,7 +887,11 @@
+ CFRelease(certs);
+ }
+ else
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status);
++#else
++ WARN("SSLGetPeerCertificates failed: %ld\n", (long)status);
++#endif
- typedef void *schan_imp_transport;
- static int schan_pull(schan_imp_transport transport, void *buff, size_t *buff_len);
-@@ -3767,7 +3767,7 @@
- wine_dlclose(libgnutls_handle, NULL, 0);
+ return ret;
}
-
--#else /* HAVE_SECURITY_SECURITY_H || SONAME_LIBGNUTLS */
-+#else /* (HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) || SONAME_LIBGNUTLS */
-
- void SECUR32_initSchannelSP(void)
- {
-@@ -3776,4 +3776,4 @@
-
- void SECUR32_deinitSchannelSP(void) {}
-
--#endif /* HAVE_SECURITY_SECURITY_H || SONAME_LIBGNUTLS */
-+#endif /* (HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) || SONAME_LIBGNUTLS */
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2011-10-13 16:04:36 UTC (rev 85425)
+++ trunk/dports/x11/wine-devel/Portfile 2011-10-13 17:16:12 UTC (rev 85426)
@@ -156,16 +156,8 @@
}
}
+# darwin 8
patchfiles-append patch-SSLCopyPeerCertificates.diff
-use_autoreconf yes
-platform darwin 8 {
- # Wine uses the Security framework on Leopard and up.
- # See http://bugs.winehq.org/show_bug.cgi?id=26643
- depends_lib-append port:gnutls
- archcheck.files-append lib/libgnutls.dylib
- configure.args-delete --without-gnutls
- configure.args-append --with-gnutls
-}
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
Modified: trunk/dports/x11/wine-devel/files/patch-SSLCopyPeerCertificates.diff
===================================================================
--- trunk/dports/x11/wine-devel/files/patch-SSLCopyPeerCertificates.diff 2011-10-13 16:04:36 UTC (rev 85425)
+++ trunk/dports/x11/wine-devel/files/patch-SSLCopyPeerCertificates.diff 2011-10-13 17:16:12 UTC (rev 85426)
@@ -1,82 +1,26 @@
---- configure.ac.orig 2011-09-23 12:46:51.000000000 -0500
-+++ configure.ac 2011-10-08 19:42:28.000000000 -0500
-@@ -711,6 +711,10 @@
- if test "$ac_cv_header_Security_Security_h" = "yes"
- then
- AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $SECURITYLIB"
-+ AC_CHECK_FUNCS(SSLCopyPeerCertificates)
-+ LIBS="$ac_save_LIBS"
- with_gnutls=${with_gnutls:-no}
- fi
- if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
---- dlls/secur32/schannel.c.orig 2011-09-23 12:46:51.000000000 -0500
-+++ dlls/secur32/schannel.c 2011-10-08 19:51:27.000000000 -0500
-@@ -33,7 +33,7 @@
+--- dlls/secur32/schannel_macosx.c.orig 2011-10-10 12:58:48.000000000 -0500
++++ dlls/secur32/schannel_macosx.c 2011-10-12 10:11:54.000000000 -0500
+@@ -680,7 +680,11 @@
- WINE_DEFAULT_DEBUG_CHANNEL(secur32);
+ TRACE("(%p/%p, %p)\n", s, s->context, cert);
--#if defined(SONAME_LIBGNUTLS) || defined (HAVE_SECURITY_SECURITY_H)
-+#if defined(SONAME_LIBGNUTLS) || (defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES))
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ status = SSLCopyPeerCertificates(s->context, &certs);
++#else
++ status = SSLGetPeerCertificates(s->context, &certs);
++#endif
+ if (status == noErr && certs)
+ {
+ SecCertificateRef mac_cert;
+@@ -705,7 +709,11 @@
+ CFRelease(certs);
+ }
+ else
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status);
++#else
++ WARN("SSLGetPeerCertificates failed: %ld\n", (long)status);
++#endif
- #define SCHAN_INVALID_HANDLE ~0UL
-
-@@ -1316,7 +1316,7 @@
- schan_imp_deinit();
+ return ret;
}
-
--#else /* SONAME_LIBGNUTLS || HAVE_SECURITY_SECURITY_H */
-+#else /* SONAME_LIBGNUTLS || (HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) */
-
- void SECUR32_initSchannelSP(void)
- {
-@@ -1325,4 +1325,4 @@
-
- void SECUR32_deinitSchannelSP(void) {}
-
--#endif /* SONAME_LIBGNUTLS || HAVE_SECURITY_SECURITY_H */
-+#endif /* SONAME_LIBGNUTLS || (HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) */
---- dlls/secur32/schannel_gnutls.c.orig 2011-09-23 12:46:51.000000000 -0500
-+++ dlls/secur32/schannel_gnutls.c 2011-10-08 19:50:15.000000000 -0500
-@@ -37,7 +37,7 @@
-
- WINE_DEFAULT_DEBUG_CHANNEL(secur32);
-
--#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H)
-+#if defined(SONAME_LIBGNUTLS) && !(defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES))
-
- static void *libgnutls_handle;
- #define MAKE_FUNCPTR(f) static typeof(f) * p##f
-@@ -459,4 +459,4 @@
- libgnutls_handle = NULL;
- }
-
--#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */
-+#endif /* SONAME_LIBGNUTLS && !(HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES) */
---- dlls/secur32/schannel_macosx.c.orig 2011-09-23 12:46:51.000000000 -0500
-+++ dlls/secur32/schannel_macosx.c 2011-10-08 19:49:33.000000000 -0500
-@@ -23,7 +23,7 @@
- #include "wine/port.h"
-
- #include <stdarg.h>
--#ifdef HAVE_SECURITY_SECURITY_H
-+#if defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES)
- #include <Security/Security.h>
- #define GetCurrentThread GetCurrentThread_Mac
- #define LoadResource LoadResource_Mac
-@@ -43,7 +43,7 @@
-
- WINE_DEFAULT_DEBUG_CHANNEL(secur32);
-
--#ifdef HAVE_SECURITY_SECURITY_H
-+#if defined(HAVE_SECURITY_SECURITY_H) && defined(HAVE_SSLCOPYPEERCERTIFICATES)
-
- struct mac_session {
- SSLContextRef context;
-@@ -786,4 +786,4 @@
- TRACE("()\n");
- }
-
--#endif /* HAVE_SECURITY_SECURITY_H */
-+#endif /* HAVE_SECURITY_SECURITY_H && HAVE_SSLCOPYPEERCERTIFICATES */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111013/1a10e177/attachment-0001.html>
More information about the macports-changes
mailing list