<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138607] trunk/dports/x11/tigervnc</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138607">138607</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-07-13 18:36:30 -0700 (Mon, 13 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>tigervnc: update to 1.5.0; fixes build failure (#45488); use out of source build (#47197); add build conflict with ivtools</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11tigervncPortfile">trunk/dports/x11/tigervnc/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11tigervncfilespatchCMakeListstxtdiff">trunk/dports/x11/tigervnc/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsx11tigervncfilespatchreleasemakemacappindiff">trunk/dports/x11/tigervnc/files/patch-release-makemacapp.in.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11tigervncfilespatchcommonfltkFLmacHdiff">trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff</a></li>
<li><a href="#trunkdportsx11tigervncfilespatchcommonfltksrcMakefilediff">trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff</a></li>
<li><a href="#trunkdportsx11tigervncfilespatchcommonfltksrcfilename_listcxxdiff">trunk/dports/x11/tigervnc/files/patch-common-fltk-src-filename_list.cxx.diff</a></li>
<li><a href="#trunkdportsx11tigervncfilespatchgnutls3diff">trunk/dports/x11/tigervnc/files/patch-gnutls-3.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11tigervncPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/tigervnc/Portfile (138606 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/Portfile 2015-07-14 00:51:04 UTC (rev 138606)
+++ trunk/dports/x11/tigervnc/Portfile 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx"> PortGroup conflicts_build 1.0
</span><ins>+PortGroup github 1.0
+PortGroup muniversal 1.0
</ins><span class="cx">
</span><del>-name tigervnc
</del><ins>+github.setup TigerVNC tigervnc 1.5.0 v
</ins><span class="cx"> conflicts vnc tightvnc
</span><del>-version 1.2.0
-revision 1
</del><span class="cx"> categories x11 vnc
</span><del>-maintainers nomaintainer
</del><ins>+maintainers ryandesign openmaintainer
</ins><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="lines">@@ -23,39 +23,41 @@
</span><span class="cx"> TigerVNC supports the latest X.Org X server.
</span><span class="cx">
</span><span class="cx"> homepage http://www.tigervnc.com/
</span><del>-master_sites sourceforge:project/${name}/${name}/${version}
</del><span class="cx">
</span><del>-checksums rmd160 c8f498c6812407bb1383b94234dcae8053a7d4f1 \
- sha256 6e0910f1ff1681bc8b52e7ea805e586b88b352c88f66e4c2cc31aa39c4a32f53
</del><ins>+checksums rmd160 4883df0ffc5b3d58e1a777b5f6164a3330529159 \
+ sha256 cfa7ad73653f0020ec595ea22441901a3baf1df1e205609b29ed71787527d2ba
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gettext \
</span><span class="cx"> port:gnutls \
</span><ins>+ path:lib/libfltk.dylib:fltk \
</ins><span class="cx"> port:jpeg \
</span><del>- port:Xft2 \
- port:xorg-libX11 \
- port:xorg-libXcursor \
- port:xorg-libXext \
- port:xorg-libXfixes \
- port:xorg-libXinerama \
</del><ins>+ port:libiconv \
</ins><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-common-fltk-FL-mac.H.diff \
- patch-common-fltk-src-filename_list.cxx.diff \
- patch-common-fltk-src-Makefile.diff \
- patch-gnutls-3.diff
</del><ins>+patchfiles patch-CMakeLists.txt.diff \
+ patch-release-makemacapp.in.diff
</ins><span class="cx">
</span><del>-# tigervnc includes its own copy of fltk and gets confused when the MacPorts
-# version is installed. Future versions of the tigervnc port will need the
-# MacPorts version fltk since the custom version has already been removed from
-# the tigervnc sources: http://sourceforge.net/p/tigervnc/code/4951/
-conflicts_build fltk fltk-devel
</del><ins>+# ivtools' OS/os.h shadows tigervnc's os/os.h on case-insensitive filesystems.
+if {[file exists ${prefix}/include/os/os.h]} {
+ conflicts_build-append ivtools
+}
</ins><span class="cx">
</span><del>-configure.args-append -DUSE_INCLUDED_FLTK=ON
</del><ins>+cmake.out_of_source yes
</ins><span class="cx">
</span><del>-post-destroot {
- xinstall -d ${destroot}${prefix}/share/doc
- move ${destroot}${prefix}/doc ${destroot}${prefix}/share/doc/${name}
</del><ins>+build.target dmg
</ins><span class="cx">
</span><del>- delete ${destroot}${prefix}/share/man
- move ${destroot}${prefix}/man ${destroot}${prefix}/share
</del><ins>+if {[variant_isset universal]} {
+ merger-post-destroot {
+ foreach arch ${universal_archs_to_use} {
+ copy "${build.dir}-${arch}/TigerVNC Viewer.app" ${destroot}-${arch}${applications_dir}
+ delete ${destroot}-${arch}${prefix}/bin/vncviewer
+ ln -s "${applications_dir}/TigerVNC Viewer.app/Contents/MacOS/TigerVNC Viewer" ${destroot}-${arch}${prefix}/bin/vncviewer
+ }
+ }
+} else {
+ post-destroot {
+ copy "${build.dir}/TigerVNC Viewer.app" ${destroot}${applications_dir}
+ delete ${destroot}${prefix}/bin/vncviewer
+ ln -s "${applications_dir}/TigerVNC Viewer.app/Contents/MacOS/TigerVNC Viewer" ${destroot}${prefix}/bin/vncviewer
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsx11tigervncfilespatchCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/tigervnc/files/patch-CMakeLists.txt.diff (0 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/x11/tigervnc/files/patch-CMakeLists.txt.diff 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- CMakeLists.txt.orig 2015-07-11 08:00:36.000000000 -0500
++++ CMakeLists.txt 2015-07-13 19:26:12.000000000 -0500
+@@ -28,7 +28,7 @@
+ set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
+ set(MAN_DIR "${DATA_DIR}/man")
+ set(LOCALE_DIR "${DATA_DIR}/locale")
+-set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
++set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}")
+
+ if(WIN32)
+ set(BIN_DIR "${CMAKE_INSTALL_PREFIX}")
</ins></span></pre></div>
<a id="trunkdportsx11tigervncfilespatchcommonfltkFLmacHdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff (138606 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff 2015-07-14 00:51:04 UTC (rev 138606)
+++ trunk/dports/x11/tigervnc/files/patch-common-fltk-FL-mac.H.diff 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- common/fltk/FL/mac.H.orig 2011-05-12 06:50:43.000000000 -0500
-+++ common/fltk/FL/mac.H 2012-09-05 18:57:31.000000000 -0500
-@@ -52,6 +52,12 @@
- #ifndef MAC_OS_X_VERSION_10_6
- #define MAC_OS_X_VERSION_10_6 1060
- #endif
-+#ifndef MAC_OS_X_VERSION_10_7
-+#define MAC_OS_X_VERSION_10_7 1070
-+#endif
-+#ifndef MAC_OS_X_VERSION_10_8
-+#define MAC_OS_X_VERSION_10_8 1080
-+#endif
-
- #if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program
-
</del></span></pre></div>
<a id="trunkdportsx11tigervncfilespatchcommonfltksrcMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff (138606 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff 2015-07-14 00:51:04 UTC (rev 138606)
+++ trunk/dports/x11/tigervnc/files/patch-common-fltk-src-Makefile.diff 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- common/fltk/src/Makefile.orig 2011-07-18 23:49:30.000000000 -0500
-+++ common/fltk/src/Makefile 2012-09-09 11:35:36.000000000 -0500
-@@ -355,7 +355,7 @@
- -install_name $(libdir)/$@ \
- -current_version 1.3.0 \
- -compatibility_version 1.3.0 \
-- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
-+ $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
- $(RM) libfltk_images.dylib
- $(LN) libfltk_images.1.3.dylib libfltk_images.dylib
-
</del></span></pre></div>
<a id="trunkdportsx11tigervncfilespatchcommonfltksrcfilename_listcxxdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/tigervnc/files/patch-common-fltk-src-filename_list.cxx.diff (138606 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/files/patch-common-fltk-src-filename_list.cxx.diff 2015-07-14 00:51:04 UTC (rev 138606)
+++ trunk/dports/x11/tigervnc/files/patch-common-fltk-src-filename_list.cxx.diff 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-OS X 10.8 support
-http://www.fltk.org/str.php?L2864
---- common/fltk/src/filename_list.cxx.orig 2011-01-05 10:50:10.000000000 -0600
-+++ common/fltk/src/filename_list.cxx 2012-08-14 04:23:22.000000000 -0500
-@@ -31,7 +22,9 @@
- #include <FL/fl_utf8.h>
- #include "flstring.h"
- #include <stdlib.h>
--
-+#ifdef __APPLE__
-+#include <FL/x.H>
-+#endif
-
- extern "C" {
- #ifndef HAVE_SCANDIR
-@@ -115,6 +108,12 @@
- int n = scandir(dirloc, list, 0, (int(*)(void*, void*))sort);
- #elif defined(__sgi)
- int n = scandir(dirloc, list, 0, sort);
-+#elif defined(__APPLE__)
-+# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-+ int n = scandir(dirloc, list, 0, (int(*)(const struct dirent**,const struct dirent**))sort);
-+# else
-+ int n = scandir(dirloc, list, 0, (int(*)(const void*,const void*))sort);
-+# endif
- #else
- // The vast majority of UNIX systems want the sort function to have this
- // prototype, most likely so that it can be passed to qsort without any
</del></span></pre></div>
<a id="trunkdportsx11tigervncfilespatchgnutls3diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/tigervnc/files/patch-gnutls-3.diff (138606 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/files/patch-gnutls-3.diff 2015-07-14 00:51:04 UTC (rev 138606)
+++ trunk/dports/x11/tigervnc/files/patch-gnutls-3.diff 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -1,334 +0,0 @@
</span><del>-gnutls 3 support
-http://tigervnc.svn.sourceforge.net/viewvc/tigervnc?view=revision&revision=4921
-http://tigervnc.svn.sourceforge.net/viewvc/tigervnc?view=revision&revision=4922
-Index: config.h.in
-===================================================================
---- config.h.in (revision 4920)
-+++ config.h.in (revision 4922)
-@@ -8,7 +8,8 @@
- #cmakedefine HAVE_STRCASECMP
- #cmakedefine HAVE_STRNCASECMP
- #cmakedefine HAVE_VSNPRINTF
--#cmakedefine HAVE_OLD_GNUTLS
-+#cmakedefine HAVE_GNUTLS_SET_GLOBAL_ERRNO
-+#cmakedefine HAVE_GNUTLS_SET_ERRNO
- #cmakedefine HAVE_GNUTLS_X509_CRT_PRINT
- #cmakedefine HAVE_GNUTLS_X509_CRT_T
- #cmakedefine HAVE_GNUTLS_DATUM_T
-Index: common/rdr/TLSInStream.h
-===================================================================
---- common/rdr/TLSInStream.h (revision 4920)
-+++ common/rdr/TLSInStream.h (revision 4922)
-@@ -41,6 +41,7 @@
- private:
- int overrun(int itemSize, int nItems, bool wait);
- int readTLS(U8* buf, int len, bool wait);
-+ static ssize_t pull(gnutls_transport_ptr str, void* data, size_t size);
-
- gnutls_session session;
- InStream* in;
-@@ -48,9 +49,6 @@
- int offset;
- U8* start;
- };
--
-- ssize_t gnutls_InStream_pull(gnutls_transport_ptr,void*, size_t);
--
- };
-
- #endif
-Index: common/rdr/TLSOutStream.cxx
-===================================================================
---- common/rdr/TLSOutStream.cxx (revision 4920)
-+++ common/rdr/TLSOutStream.cxx (revision 4922)
-@@ -25,27 +25,25 @@
- #include <rdr/Exception.h>
- #include <rdr/TLSException.h>
- #include <rdr/TLSOutStream.h>
-+#include <rdr/TLSErrno.h>
- #include <errno.h>
-
--#ifdef HAVE_OLD_GNUTLS
--#define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0)
--#endif
--
- #ifdef HAVE_GNUTLS
- using namespace rdr;
-
- enum { DEFAULT_BUF_SIZE = 16384 };
-
--ssize_t rdr::gnutls_OutStream_push(gnutls_transport_ptr str, const void* data,
-+ssize_t TLSOutStream::push(gnutls_transport_ptr str, const void* data,
- size_t size)
- {
-- OutStream* out = (OutStream*) str;
-+ TLSOutStream* self= (TLSOutStream*) str;
-+ OutStream *out = self->out;
-
- try {
- out->writeBytes(data, size);
- out->flush();
- } catch (Exception& e) {
-- gnutls_transport_set_global_errno(EINVAL);
-+ gnutls_errno_helper(self->session, EINVAL);
- return -1;
- }
-
-@@ -55,8 +53,14 @@
- TLSOutStream::TLSOutStream(OutStream* _out, gnutls_session _session)
- : session(_session), out(_out), bufSize(DEFAULT_BUF_SIZE), offset(0)
- {
-+ gnutls_transport_ptr recv, send;
-+
- ptr = start = new U8[bufSize];
- end = start + bufSize;
-+
-+ gnutls_transport_set_push_function(session, push);
-+ gnutls_transport_get_ptr2(session, &recv, &send);
-+ gnutls_transport_set_ptr2(session, recv, this);
- }
-
- TLSOutStream::~TLSOutStream()
-@@ -67,6 +71,8 @@
- } catch (Exception&) {
- }
- #endif
-+ gnutls_transport_set_push_function(session, NULL);
-+
- delete [] start;
- }
-
-Index: common/rdr/TLSOutStream.h
-===================================================================
---- common/rdr/TLSOutStream.h (revision 4920)
-+++ common/rdr/TLSOutStream.h (revision 4922)
-@@ -43,6 +43,7 @@
-
- private:
- int writeTLS(const U8* data, int length);
-+ static ssize_t push(gnutls_transport_ptr str, const void* data, size_t size);
-
- gnutls_session session;
- OutStream* out;
-@@ -50,8 +51,6 @@
- U8* start;
- int offset;
- };
--
-- ssize_t gnutls_OutStream_push(gnutls_transport_ptr, const void*, size_t);
- };
-
- #endif
-Index: common/rdr/TLSErrno.h
-===================================================================
---- common/rdr/TLSErrno.h (revision 0)
-+++ common/rdr/TLSErrno.h (revision 4922)
-@@ -0,0 +1,46 @@
-+/* Copyright (C) 2012 Pierre Ossman for Cendio AB
-+ *
-+ * This is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this software; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-+ * USA.
-+ */
-+
-+#ifndef __RDR_TLSERRNO_H__
-+#define __RDR_TLSERRNO_H__
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef HAVE_GNUTLS
-+
-+#include <errno.h>
-+
-+namespace rdr {
-+
-+ static inline void gnutls_errno_helper(gnutls_session session, int _errno)
-+ {
-+#if defined(HAVE_GNUTLS_SET_ERRNO)
-+ gnutls_transport_set_errno(session, _errno);
-+#elif defined(HAVE_GNUTLS_SET_GLOBAL_ERRNO)
-+ gnutls_transport_set_global_errno(_errno);
-+#else
-+ errno = _errno;
-+#endif
-+ }
-+};
-+
-+#endif
-+
-+#endif
-Index: common/rdr/TLSInStream.cxx
-===================================================================
---- common/rdr/TLSInStream.cxx (revision 4920)
-+++ common/rdr/TLSInStream.cxx (revision 4922)
-@@ -25,25 +25,22 @@
- #include <rdr/Exception.h>
- #include <rdr/TLSException.h>
- #include <rdr/TLSInStream.h>
-+#include <rdr/TLSErrno.h>
- #include <errno.h>
-
--#ifdef HAVE_OLD_GNUTLS
--#define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0)
--#endif
--
- #ifdef HAVE_GNUTLS
- using namespace rdr;
-
- enum { DEFAULT_BUF_SIZE = 16384 };
-
--ssize_t rdr::gnutls_InStream_pull(gnutls_transport_ptr str, void* data,
-- size_t size)
-+ssize_t TLSInStream::pull(gnutls_transport_ptr str, void* data, size_t size)
- {
-- InStream* in= (InStream*) str;
-+ TLSInStream* self= (TLSInStream*) str;
-+ InStream *in = self->in;
-
- try {
- if (!in->check(1, 1, false)) {
-- gnutls_transport_set_global_errno(EAGAIN);
-+ gnutls_errno_helper(self->session, EAGAIN);
- return -1;
- }
-
-@@ -53,7 +50,7 @@
- in->readBytes(data, size);
-
- } catch (Exception& e) {
-- gnutls_transport_set_global_errno(EINVAL);
-+ gnutls_errno_helper(self->session, EINVAL);
- return -1;
- }
-
-@@ -63,11 +60,19 @@
- TLSInStream::TLSInStream(InStream* _in, gnutls_session _session)
- : session(_session), in(_in), bufSize(DEFAULT_BUF_SIZE), offset(0)
- {
-+ gnutls_transport_ptr recv, send;
-+
- ptr = end = start = new U8[bufSize];
-+
-+ gnutls_transport_set_pull_function(session, pull);
-+ gnutls_transport_get_ptr2(session, &recv, &send);
-+ gnutls_transport_set_ptr2(session, this, send);
- }
-
- TLSInStream::~TLSInStream()
- {
-+ gnutls_transport_set_pull_function(session, NULL);
-+
- delete[] start;
- }
-
-Index: common/rfb/CSecurityTLS.cxx
-===================================================================
---- common/rfb/CSecurityTLS.cxx (revision 4920)
-+++ common/rfb/CSecurityTLS.cxx (revision 4922)
-@@ -188,20 +188,20 @@
- throw AuthFailureException("gnutls_set_default_priority failed");
-
- setParam();
--
-- gnutls_transport_set_pull_function(session, rdr::gnutls_InStream_pull);
-- gnutls_transport_set_push_function(session, rdr::gnutls_OutStream_push);
-- gnutls_transport_set_ptr2(session,
-- (gnutls_transport_ptr) is,
-- (gnutls_transport_ptr) os);
- }
-
-+ rdr::TLSInStream *tlsis = new rdr::TLSInStream(is, session);
-+ rdr::TLSOutStream *tlsos = new rdr::TLSOutStream(os, session);
-+
- int err;
- err = gnutls_handshake(session);
-- if (err != GNUTLS_E_SUCCESS && !gnutls_error_is_fatal(err))
-- return false;
--
- if (err != GNUTLS_E_SUCCESS) {
-+ delete tlsis;
-+ delete tlsos;
-+
-+ if (!gnutls_error_is_fatal(err))
-+ return false;
-+
- vlog.error("TLS Handshake failed: %s\n", gnutls_strerror (err));
- shutdown(false);
- throw AuthFailureException("TLS Handshake failed");
-@@ -209,8 +209,7 @@
-
- checkSession();
-
-- cc->setStreams(fis = new rdr::TLSInStream(is, session),
-- fos = new rdr::TLSOutStream(os, session));
-+ cc->setStreams(fis = tlsis, fos = tlsos);
-
- return true;
- }
-Index: common/rfb/SSecurityTLS.cxx
-===================================================================
---- common/rfb/SSecurityTLS.cxx (revision 4920)
-+++ common/rfb/SSecurityTLS.cxx (revision 4922)
-@@ -148,17 +148,19 @@
- throw;
- }
-
-- gnutls_transport_set_pull_function(session,rdr::gnutls_InStream_pull);
-- gnutls_transport_set_push_function(session,rdr::gnutls_OutStream_push);
-- gnutls_transport_set_ptr2(session,
-- (gnutls_transport_ptr)is,
-- (gnutls_transport_ptr)os);
- os->writeU8(1);
- os->flush();
- }
-
-+ rdr::TLSInStream *tlsis = new rdr::TLSInStream(is, session);
-+ rdr::TLSOutStream *tlsos = new rdr::TLSOutStream(os, session);
-+
- int err;
-- if ((err = gnutls_handshake(session)) != GNUTLS_E_SUCCESS) {
-+ err = gnutls_handshake(session);
-+ if (err != GNUTLS_E_SUCCESS) {
-+ delete tlsis;
-+ delete tlsos;
-+
- if (!gnutls_error_is_fatal(err)) {
- vlog.debug("Deferring completion of TLS handshake: %s", gnutls_strerror(err));
- return false;
-@@ -170,8 +172,7 @@
-
- vlog.debug("Handshake completed");
-
-- sc->setStreams(fis=new rdr::TLSInStream(is,session),
-- fos=new rdr::TLSOutStream(os,session));
-+ sc->setStreams(fis = tlsis, fos = tlsos);
-
- return true;
- }
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt (revision 4920)
-+++ CMakeLists.txt (revision 4922)
-@@ -356,7 +356,8 @@
- # system's version (if available) to perform this test.
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};-lz)
- endif()
-- check_function_exists(gnutls_transport_set_global_errno HAVE_OLD_GNUTLS)
-+ check_function_exists(gnutls_transport_set_errno HAVE_GNUTLS_SET_ERRNO)
-+ check_function_exists(gnutls_transport_set_global_errno HAVE_GNUTLS_SET_GLOBAL_ERRNO)
- check_function_exists(gnutls_x509_crt_print HAVE_GNUTLS_X509_CRT_PRINT)
- check_type_size(gnutls_x509_crt_t GNUTLS_X509_CRT_T)
- check_type_size(gnutls_datum_t GNUTLS_DATUM_T)
</del></span></pre></div>
<a id="trunkdportsx11tigervncfilespatchreleasemakemacappindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/tigervnc/files/patch-release-makemacapp.in.diff (0 => 138607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/tigervnc/files/patch-release-makemacapp.in.diff (rev 0)
+++ trunk/dports/x11/tigervnc/files/patch-release-makemacapp.in.diff 2015-07-14 01:36:30 UTC (rev 138607)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+--- release/makemacapp.in.orig 2015-07-11 08:00:36.000000000 -0500
++++ release/makemacapp.in 2015-07-13 20:02:54.000000000 -0500
+@@ -39,8 +39,7 @@
+ fi
+
+ umask 022
+-TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
+-APPROOT="$TMPDIR/dmg/TigerVNC Viewer $VERSION.app"
++APPROOT="./TigerVNC Viewer.app"
+ mkdir -p "$APPROOT/Contents/MacOS"
+ mkdir -p "$APPROOT/Contents/Resources"
+
+@@ -64,6 +63,8 @@
+ install -m 644 $SRCDIR/release/tigervnc.icns "$APPROOT/Contents/Resources/"
+ install -m 644 release/Info.plist "$APPROOT/Contents/"
+
++exit
++
+ install -m 644 $SRCDIR/LICENCE.TXT $TMPDIR/dmg/
+ install -m 644 $SRCDIR/README.txt $TMPDIR/dmg/
+
</ins></span></pre>
</div>
</div>
</body>
</html>