diff -urw tigervnc-1.3.0/CMakeLists.txt tigervnc-svn/CMakeLists.txt --- tigervnc-1.3.0/CMakeLists.txt 2013-07-04 15:41:14.000000000 +0200 +++ tigervnc-svn/CMakeLists.txt 2013-08-06 13:31:16.277634127 +0200 @@ -18,10 +18,10 @@ include(CMakeMacroLibtoolFile) project(tigervnc) -set(VERSION 1.3.0) +set(VERSION 1.3.80) # The RC version must always be four comma-separated numbers -set(RCVERSION 1,3,0,0) +set(RCVERSION 1,3,80,0) # Installation paths set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin") diff -urw tigervnc-1.3.0/java/CMakeLists.txt tigervnc-svn/java/CMakeLists.txt --- tigervnc-1.3.0/java/CMakeLists.txt 2013-07-04 15:41:25.000000000 +0200 +++ tigervnc-svn/java/CMakeLists.txt 2013-08-06 13:30:27.710636652 +0200 @@ -2,7 +2,7 @@ project(tigervnc-java Java) if(NOT VERSION) - set(VERSION 1.3.0) + set(VERSION 1.3.80) endif() find_package(Java) diff -urw tigervnc-1.3.0/java/com/tigervnc/vncviewer/README tigervnc-svn/java/com/tigervnc/vncviewer/README --- tigervnc-1.3.0/java/com/tigervnc/vncviewer/README 2013-07-01 14:41:03.000000000 +0200 +++ tigervnc-svn/java/com/tigervnc/vncviewer/README 2013-08-06 13:30:31.344637133 +0200 @@ -12,7 +12,7 @@ Copyright (C) 2004-2005 Cendio AB Copyright (C) 2005 Martin Koegler Copyright (C) 2009 Pierre Ossman for Cendio AB - Copyright (C) 2009-2011 TigerVNC Team + Copyright (C) 2009-2013 TigerVNC Team All rights reserved. This software is distributed under the GNU General Public Licence as diff -urw tigervnc-1.3.0/java/com/tigervnc/vncviewer/VncViewer.java tigervnc-svn/java/com/tigervnc/vncviewer/VncViewer.java --- tigervnc-1.3.0/java/com/tigervnc/vncviewer/VncViewer.java 2013-07-01 14:41:03.000000000 +0200 +++ tigervnc-svn/java/com/tigervnc/vncviewer/VncViewer.java 2013-08-06 13:30:31.343637171 +0200 @@ -53,7 +53,7 @@ { public static final String aboutText = new String("TigerVNC Java Viewer v%s (%s)%n"+ "Built on %s at %s%n"+ - "Copyright (C) 1999-2012 TigerVNC Team and many others (see README.txt)%n"+ + "Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)%n"+ "See http://www.tigervnc.org for information on TigerVNC."); public static String version = null; diff -urw tigervnc-1.3.0/README.txt tigervnc-svn/README.txt --- tigervnc-1.3.0/README.txt 2013-07-01 14:42:07.000000000 +0200 +++ tigervnc-svn/README.txt 2013-08-06 13:31:16.277634127 +0200 @@ -34,7 +34,7 @@ Copyright (C) 2009-2011 D. R. Commander Copyright (C) 2009-2011 Pierre Ossman for Cendio AB Copyright (C) 2004, 2009-2011 Red Hat, Inc. - Copyright (C) 2009-2011 TigerVNC Team + Copyright (C) 2009-2013 TigerVNC Team All Rights Reserved. This software is distributed under the GNU General Public Licence as published diff -urw tigervnc-1.3.0/unix/xserver/hw/vnc/vncExtInit.cc tigervnc-svn/unix/xserver/hw/vnc/vncExtInit.cc --- tigervnc-1.3.0/unix/xserver/hw/vnc/vncExtInit.cc 2013-07-01 14:48:13.000000000 +0200 +++ tigervnc-svn/unix/xserver/hw/vnc/vncExtInit.cc 2013-08-06 13:30:46.572635678 +0200 @@ -1025,23 +1025,21 @@ rep.addrLen = qcTimeout ? strlen(qcAddress) : 0; rep.userLen = qcTimeout ? strlen(qcUsername) : 0; rep.opaqueId = (CARD32)(long)queryConnectId; - rep.length = ((rep.userLen + 3) >> 2) + ((rep.addrLen + 3) >> 2); + rep.length = (rep.userLen + rep.addrLen + 3) >> 2; if (client->swapped) { #if XORG < 112 int n; swaps(&rep.sequenceNumber, n); - swapl(&rep.addrLen, n); swapl(&rep.userLen, n); + swapl(&rep.addrLen, n); swapl(&rep.timeout, n); swapl(&rep.opaqueId, n); - swapl(&rep.length, n); #else swaps(&rep.sequenceNumber); - swapl(&rep.addrLen); swapl(&rep.userLen); + swapl(&rep.addrLen); swapl(&rep.timeout); swapl(&rep.opaqueId); - swapl(&rep.length); #endif } WriteToClient(client, sizeof(xVncExtGetQueryConnectReply), (char *)&rep); diff -urw tigervnc-1.3.0/unix/xserver/hw/vnc/xvnc.cc tigervnc-svn/unix/xserver/hw/vnc/xvnc.cc --- tigervnc-1.3.0/unix/xserver/hw/vnc/xvnc.cc 2013-07-04 15:41:20.000000000 +0200 +++ tigervnc-svn/unix/xserver/hw/vnc/xvnc.cc 2013-08-06 13:30:46.575635721 +0200 @@ -98,8 +98,8 @@ #define Xfree free #endif -#define XVNCVERSION "TigerVNC 1.3.0" -#define XVNCCOPYRIGHT ("Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" \ +#define XVNCVERSION "TigerVNC 1.3.80" +#define XVNCCOPYRIGHT ("Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)\n" \ "See http://www.tigervnc.org for information on TigerVNC.\n") diff -urw tigervnc-1.3.0/vncviewer/parameters.cxx tigervnc-svn/vncviewer/parameters.cxx --- tigervnc-1.3.0/vncviewer/parameters.cxx 2013-07-01 16:00:00.000000000 +0200 +++ tigervnc-svn/vncviewer/parameters.cxx 2013-08-06 13:31:12.248634436 +0200 @@ -523,8 +523,8 @@ /* Write parameters to file */ FILE* f = fopen(filepath, "w+"); if (!f) { - snprintf(write_error, sizeof(write_error), - "Failed to write configuration file, can't open %s", filepath); + snprintf(write_error, sizeof(filepath), "Failed to write configuration file, " + "can't open %s", filepath); throw Exception(write_error); } diff -urw tigervnc-1.3.0/vncviewer/vncviewer.cxx tigervnc-svn/vncviewer/vncviewer.cxx --- tigervnc-1.3.0/vncviewer/vncviewer.cxx 2013-07-01 14:42:05.000000000 +0200 +++ tigervnc-svn/vncviewer/vncviewer.cxx 2013-08-06 13:31:12.250634435 +0200 @@ -74,7 +74,7 @@ static const char aboutText[] = N_("TigerVNC Viewer %d-bit v%s (%s)\n" "%s\n" - "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\n" + "Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)\n" "See http://www.tigervnc.org for information on TigerVNC."); extern const char* buildTime; diff -urw tigervnc-1.3.0/vncviewer/vncviewer.rc.in tigervnc-svn/vncviewer/vncviewer.rc.in --- tigervnc-1.3.0/vncviewer/vncviewer.rc.in 2013-07-01 14:42:06.000000000 +0200 +++ tigervnc-svn/vncviewer/vncviewer.rc.in 2013-08-06 13:31:12.252634433 +0200 @@ -52,7 +52,7 @@ #endif VALUE "FileVersion", "@RCVERSION@\0" VALUE "InternalName", "vncviewer\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)\0" VALUE "LegalTrademarks", "TigerVNC\0" VALUE "OriginalFilename", "vncviewer.exe\0" VALUE "PrivateBuild", "\0" diff -urw tigervnc-1.3.0/win/vncconfig/vncconfig.rc tigervnc-svn/win/vncconfig/vncconfig.rc --- tigervnc-1.3.0/win/vncconfig/vncconfig.rc 2013-07-01 14:42:18.000000000 +0200 +++ tigervnc-svn/win/vncconfig/vncconfig.rc 2013-08-06 13:31:23.542632460 +0200 @@ -477,7 +477,7 @@ #endif VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "vncconfig\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)\0" VALUE "LegalTrademarks", "TigerVNC\0" VALUE "OriginalFilename", "vncconfig.exe\0" VALUE "PrivateBuild", "\0" diff -urw tigervnc-1.3.0/win/winvnc/winvnc.rc.in tigervnc-svn/win/winvnc/winvnc.rc.in --- tigervnc-1.3.0/win/winvnc/winvnc.rc.in 2013-07-01 14:42:08.000000000 +0200 +++ tigervnc-svn/win/winvnc/winvnc.rc.in 2013-08-06 13:31:16.286634229 +0200 @@ -86,7 +86,7 @@ #endif VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "winvnc\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt)\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)\0" VALUE "LegalTrademarks", "TigerVNC\0" VALUE "OriginalFilename", "winvnc4.exe\0" VALUE "PrivateBuild", "\0"