From 88628913fb91b03c1056940839b9ac44ae4c30c3a54a77693a62c851ac3931f4 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 7 Feb 2014 15:01:00 +0000 Subject: [PATCH] - Drop tigervnc-sf3492503.diff, tigervnc-sf3495623.diff and tigervnc-sf3495623.patch.old (not used and not needed). - Update tigervnc-sf3492352.diff and tigervnc-sf3495623.patch. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=14 --- tigervnc-sf3492503.patch | 62 ---------- tigervnc-sf3493012.patch | 143 ---------------------- tigervnc-sf3495623.patch | 253 +++------------------------------------ tigervnc.changes | 7 ++ tigervnc.spec | 4 + xorg-bug38185.patch | 54 --------- 6 files changed, 28 insertions(+), 495 deletions(-) delete mode 100644 tigervnc-sf3492503.patch delete mode 100644 tigervnc-sf3493012.patch delete mode 100644 xorg-bug38185.patch diff --git a/tigervnc-sf3492503.patch b/tigervnc-sf3492503.patch deleted file mode 100644 index 1a92c3a..0000000 --- a/tigervnc-sf3492503.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- o/configure.ac 2011-08-09 23:16:48.000000000 +0200 -+++ n/configure.ac 2012-02-24 00:50:00.998676744 +0100 -@@ -1,8 +1,8 @@ - dnl Process this file with autoconf to produce a configure script. --AC_PREREQ([2.57]) -+AC_PREREQ([2.68]) - - dnl Modify also RCVERSION variable when modifying release --AC_INIT([tigervnc], [1.1.0], [http://www.tigervnc.org]) -+AC_INIT([tigervnc],[1.1.0],[http://www.tigervnc.org]) - RCVERSION="1,1,0,0" - AC_SUBST([RCVERSION]) - -@@ -98,17 +98,17 @@ - SAVE_CPPFLAGS=${CPPFLAGS} - CPPFLAGS="${CPPFLAGS} ${GNUTLS_CFLAGS}" - AC_MSG_CHECKING([for GnuTLS library]) -- AC_LINK_IFELSE(AC_LANG_CALL([], gnutls_global_init), -+ AC_LINK_IFELSE([AC_LANG_CALL([], gnutls_global_init)], - [GNUTLS_LIBS=${GNUTLS_LDFLAGS} - AC_DEFINE(HAVE_GNUTLS, 1, [Is gnutls present? ]) - AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) - AC_MSG_CHECKING([for gnutls_transport_set_global_errno() function]) -- AC_LINK_IFELSE(AC_LANG_CALL([], gnutls_transport_set_global_errno), -+ AC_LINK_IFELSE([AC_LANG_CALL([], gnutls_transport_set_global_errno)], - AC_MSG_RESULT(yes), - [AC_DEFINE(HAVE_OLD_GNUTLS, 1, [Does gnutls lack the gnutls_transport_set_global_errno() function? ]) - AC_MSG_RESULT(no)]) - AC_MSG_CHECKING([for gnutls_x509_crt_print() function]) -- AC_LINK_IFELSE(AC_LANG_CALL([], gnutls_x509_crt_print), -+ AC_LINK_IFELSE([AC_LANG_CALL([], gnutls_x509_crt_print)], - [AC_DEFINE(HAVE_GNUTLS_X509_CRT_PRINT, 1, [Is the gnutls_x509_crt_print() function present? ]) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) -@@ -172,13 +172,10 @@ - dnl gethostbyname, inet_addr, htons etc. Check if it's necessary. - dnl NOTE: Did not want to use AC_SEARCH_LIBS which would add - dnl -lbsd to LIBS. We set INET_LIB instead. --AC_LANG_SAVE --AC_LANG_C - AC_CHECK_FUNC(gethostbyname,INET_LIB_REQ=,INET_LIB_REQ=yes) - if test "$INET_LIB_REQ" = yes; then - AC_CHECK_LIB(bsd,gethostbyname,INET_LIB=-lbsd,INET_LIB=) - fi --AC_LANG_RESTORE - AC_SUBST(INET_LIB) - - AC_CHECK_FUNC(setenv, AC_DEFINE([HAVE_SETENV], [1], [Is setenv() present?])) -@@ -240,7 +237,7 @@ - AC_CONFIG_FILES([makemacpkg:release/makemacpkg.in]) - AC_CONFIG_FILES([maketarball:release/maketarball.in]) - --AC_OUTPUT([ -+AC_CONFIG_FILES([ - Makefile - common/Makefile - common/os/Makefile -@@ -262,3 +259,4 @@ - win/resdefs.h - po/Makefile.in - ]) -+AC_OUTPUT diff --git a/tigervnc-sf3493012.patch b/tigervnc-sf3493012.patch deleted file mode 100644 index 6b83215..0000000 --- a/tigervnc-sf3493012.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- o/LICENCE.TXT 2011-08-09 23:16:48.000000000 +0200 -+++ n/LICENCE.TXT 2010-09-08 17:52:33.000000000 +0200 -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ - - The precise terms and conditions for copying, distribution and - modification follow. -- -- GNU GENERAL PUBLIC LICENSE -+ -+ GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -- -+ - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. -- -+ - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. -- -+ - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- Appendix: How to Apply These Terms to Your New Programs -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it -@@ -291,7 +291,7 @@ - the "copyright" line and a pointer to where the full notice is found. - - -- Copyright (C) 19yy -+ Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -303,17 +303,16 @@ - 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 program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -- USA. -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) 19yy name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -@@ -336,5 +335,5 @@ - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the --library. If this is what you want to do, use the GNU Library General -+library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. ---- o/unix/vncserver 2011-08-09 23:16:37.000000000 +0200 -+++ n/unix/vncserver 2012-03-01 22:35:29.692130619 +0100 -@@ -16,10 +16,9 @@ - # 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. -+# You should have received a copy of the GNU General Public License along -+# with this program; if not, write to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - # - - # diff --git a/tigervnc-sf3495623.patch b/tigervnc-sf3495623.patch index 3a2cf73..c4b5d08 100644 --- a/tigervnc-sf3495623.patch +++ b/tigervnc-sf3495623.patch @@ -1,242 +1,23 @@ -Tylko w o/common/network: Makefile -diff -aur o/common/network/Socket.h n/common/network/Socket.h ---- o/common/network/Socket.h 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/network/Socket.h 2012-03-01 15:36:05.274711896 +0100 -@@ -22,9 +22,9 @@ - #define __NETWORK_SOCKET_H__ - - #include --#include --#include --#include -+#include "../rdr/FdInStream.h" -+#include "../rdr/FdOutStream.h" -+#include "../rdr/Exception.h" - - namespace network { - -diff -aur o/common/network/TcpSocket.cxx n/common/network/TcpSocket.cxx ---- o/common/network/TcpSocket.cxx 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/network/TcpSocket.cxx 2012-03-01 15:47:39.684622379 +0100 -@@ -20,6 +20,9 @@ - #include - #endif - -+#include -+#include -+ - #ifdef WIN32 - //#include - #include -@@ -41,10 +44,10 @@ - #endif - - #include --#include --#include --#include --#include -+#include "../network/TcpSocket.h" -+#include "../os/net.h" -+#include "../rfb/util.h" -+#include "../rfb/LogWriter.h" - - #ifndef INADDR_NONE - #define INADDR_NONE ((unsigned long)-1) -@@ -53,6 +56,71 @@ - #define INADDR_LOOPBACK ((unsigned long)0x7F000001) - #endif - -+template < class P_T > -+class temporary_buffer:protected::std::pair < P_T *,::std::ptrdiff_t > -+{ -+public:typedef P_T -+ item_type; -+public:typedef class -+ temporary_buffer < -+ item_type > -+ itself, & -+ ref; -+ typedef itself const & -+ cref; -+public:typedef -+ class::std::pair < -+ item_type *,::std::ptrdiff_t > -+ inherited; -+public:typedef typename -+ inherited::second_type -+ size_type; -+public: -+temporary_buffer (::std::ptrdiff_t const &p_s = 01) -+:inherited (::std::get_temporary_buffer < item_type > (p_s)) -+ { -+ } -+private:temporary_buffer (cref); -+ ref -+ operator = (cref); -+public:~temporary_buffer () -+ { -+ ::std::return_temporary_buffer (inherited::first); -+ } -+public:size_type const & -+ size () const -+ { -+ return -+ inherited::second; -+ } -+public:item_type * const & -+ buffer () const -+ { -+ return -+ inherited::first; -+ } -+public:ref -+ clear () -+ { -+ inherited::second = size_type (); -+ return *this; -+ } -+protected:inherited & base () -+ { -+ return *this; -+ } -+protected:inherited const & -+ base () const -+ { -+ return * -+ this; -+ } -+public:void -+ swap (ref that) -+ { -+ ::std::swap (base (), that.base ()); -+}}; -+ - using namespace network; - using namespace rdr; - -@@ -433,8 +501,36 @@ +diff -ur tigervnc-1.3.0.orig/common/network/TcpSocket.cxx tigervnc-1.3.0/common/network/TcpSocket.cxx +--- tigervnc-1.3.0.orig/common/network/TcpSocket.cxx 2014-02-07 16:35:24.644388330 +0200 ++++ tigervnc-1.3.0/common/network/TcpSocket.cxx 2014-02-07 16:39:50.608078320 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -450,7 +451,10 @@ } void TcpListener::getMyAddresses(std::list* result) { - const hostent* addrs = gethostbyname(0); -- if (addrs == 0) -+ hostent a_he, *addrs; typedef ::temporary_buffer < char > tbuf; -+ tbuf a_hb ((BUFSIZ)); -+ { -+ tbuf a_hn ((BUFSIZ)); int a_herr; -+ typedef::std::numeric_limits < tbuf::size_type > tlp; -+ /* TASK: get host name */ -+ while (a_hn.size ()) -+ if (::gethostname (a_hn.buffer (), a_hn.size ())) -+ if (a_hn.size () <= tlp::max () >> 01) -+ if (ENAMETOOLONG == errno) -+ { -+ tbuf a_h1 (a_hn.size () << 01); -+ if (a_h1.size () > a_hn.size ()) a_hn.swap (a_h1); -+ else throw rdr::SystemException("gethostname", errorNumber); -+ } else throw rdr::SystemException("gethostname", errorNumber); -+ else throw rdr::SystemException("gethostname", errorNumber); -+ else break; -+ /* TASK: get host address */ -+ while -+ (::gethostbyname_r (a_hn. buffer (), &a_he, a_hb. buffer (), a_hb. size (), &addrs, &a_herr)) -+ if (ERANGE == errno) -+ if (a_hb .size () < tlp ::max () >> 01) -+ { -+ tbuf a_h1 (a_hb. size () << 01); -+ if (a_h1. size () > a_hb .size ()) a_hb. swap (a_h1); -+ else break; -+ } else break; -+ else throw rdr::SystemException("gethostbyname", errorNumber); -+ } -+ if (addrs != &a_he) ++ char hostname[HOST_NAME_MAX]; ++ if (gethostname(hostname, HOST_NAME_MAX) < 0) ++ throw rdr::SystemException("gethostname", errorNumber); ++ const hostent* addrs = gethostbyname(hostname); + if (addrs == 0) throw rdr::SystemException("gethostbyname", errorNumber); if (addrs->h_addrtype != AF_INET) - throw rdr::Exception("getMyAddresses: bad family"); -diff -aur o/common/network/TcpSocket.h n/common/network/TcpSocket.h ---- o/common/network/TcpSocket.h 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/network/TcpSocket.h 2012-03-01 15:35:15.950711772 +0100 -@@ -28,7 +28,7 @@ - #ifndef __NETWORK_TCP_SOCKET_H__ - #define __NETWORK_TCP_SOCKET_H__ - --#include -+#include "../network/Socket.h" - - #include - -diff -aur o/common/rdr/FdInStream.h n/common/rdr/FdInStream.h ---- o/common/rdr/FdInStream.h 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/rdr/FdInStream.h 2012-03-01 15:37:56.128712175 +0100 -@@ -23,7 +23,7 @@ - #ifndef __RDR_FDINSTREAM_H__ - #define __RDR_FDINSTREAM_H__ - --#include -+#include "../rdr/InStream.h" - - namespace rdr { - -diff -aur o/common/rdr/FdOutStream.h n/common/rdr/FdOutStream.h ---- o/common/rdr/FdOutStream.h 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/rdr/FdOutStream.h 2012-03-01 15:39:48.662712452 +0100 -@@ -23,7 +23,7 @@ - #ifndef __RDR_FDOUTSTREAM_H__ - #define __RDR_FDOUTSTREAM_H__ - --#include -+#include "../rdr/OutStream.h" - - namespace rdr { - -diff -aur o/common/rdr/InStream.h n/common/rdr/InStream.h ---- o/common/rdr/InStream.h 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/rdr/InStream.h 2012-03-01 15:38:39.737712279 +0100 -@@ -24,7 +24,7 @@ - #ifndef __RDR_INSTREAM_H__ - #define __RDR_INSTREAM_H__ - --#include -+#include "../rdr/types.h" - #include // for memcpy - - namespace rdr { -diff -aur o/common/rdr/OutStream.h n/common/rdr/OutStream.h ---- o/common/rdr/OutStream.h 2011-08-09 23:16:40.000000000 +0200 -+++ n/common/rdr/OutStream.h 2012-03-01 15:40:25.833712551 +0100 -@@ -24,7 +24,7 @@ - #ifndef __RDR_OUTSTREAM_H__ - #define __RDR_OUTSTREAM_H__ - --#include -+#include "../rdr/types.h" - #include // for memcpy - - namespace rdr { -diff -aur o/common/rfb/Configuration.h n/common/rfb/Configuration.h ---- o/common/rfb/Configuration.h 2011-08-09 23:16:44.000000000 +0200 -+++ n/common/rfb/Configuration.h 2012-03-01 15:43:33.825713012 +0100 -@@ -43,7 +43,7 @@ - #ifndef __RFB_CONFIGURATION_H__ - #define __RFB_CONFIGURATION_H__ - --#include -+#include "../rfb/util.h" - - namespace rfb { - class VoidParameter; -diff -aur o/common/rfb/LogWriter.h n/common/rfb/LogWriter.h ---- o/common/rfb/LogWriter.h 2011-08-09 23:16:44.000000000 +0200 -+++ n/common/rfb/LogWriter.h 2012-03-01 15:42:44.843712885 +0100 -@@ -22,8 +22,8 @@ - #define __RFB_LOG_WRITER_H__ - - #include --#include --#include -+#include "../rfb/Logger.h" -+#include "../rfb/Configuration.h" - - // Each log writer instance has a unique textual name, - // and is attached to a particular Log instance and diff --git a/tigervnc.changes b/tigervnc.changes index febbdb5..fe6b8d3 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 7 14:52:02 UTC 2014 - msrb@suse.com + +- Drop tigervnc-sf3492503.diff, tigervnc-sf3495623.diff and + tigervnc-sf3495623.patch.old (not used and not needed). +- Update tigervnc-sf3492352.diff and tigervnc-sf3495623.patch. + ------------------------------------------------------------------- Fri Jan 10 15:11:50 UTC 2014 - sndirsch@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index fa5ea84..adcd6a0 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -96,6 +96,8 @@ Source8: vnc.reg Patch1: u_tigervnc-1.3.0-fix-use-after-free.patch Patch2: tigervnc-newfbsize.patch Patch3: tigervnc-clean-pressed-key-on-exit.patch +Patch4: tigervnc-sf3492352.diff +Patch5: tigervnc-sf3495623.patch # Xserver patches Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch @@ -130,6 +132,8 @@ fi %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 pushd unix/xserver patch -p1 < ../xserver113.patch diff --git a/xorg-bug38185.patch b/xorg-bug38185.patch deleted file mode 100644 index cc0af82..0000000 --- a/xorg-bug38185.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -aur o/configure.ac n/configure.ac ---- o/configure.ac 2011-06-17 10:20:19.257000012 +0200 -+++ n/configure.ac 2011-06-17 10:05:40.696000013 +0200 -@@ -322,7 +322,7 @@ - old_CFLAGS="$CFLAGS" - CFLAGS="-mapcs-frame" - AC_COMPILE_IFELSE( -- AC_LANG_PROGRAM([[ ]]), -+ [AC_LANG_SOURCE([[ ]])], - ARM_BACKTRACE_CFLAGS="$CFLAGS", - ARM_BACKTRACE_CFLAGS="" - ) -@@ -749,7 +749,7 @@ - AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[ - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -framework Carbon" -- AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}], -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[char FSFindFolder(); int main() { FSFindFolder(); return 0;}]])], - [xorg_cv_Carbon_framework=yes], - [xorg_cv_Carbon_framework=no]) - LDFLAGS=$save_LDFLAGS]) -@@ -899,10 +899,12 @@ - - AC_MSG_CHECKING([for glibc...]) - AC_PREPROC_IFELSE([ -+AC_LANG_SOURCE([[ - #include - #ifndef __GLIBC__ - #error - #endif -+]]) - ], glibc=yes, glibc=no) - AC_MSG_RESULT([$glibc]) - -@@ -928,9 +930,10 @@ - fi - - AC_RUN_IFELSE([ -+AC_LANG_SOURCE([[ - #include - --int main(int argc, char *argv[[]]) { -+int main(int argc, char *argv[]) { - struct timespec tp; - - if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) -@@ -938,6 +941,7 @@ - else - return 1; - } -+]]) - ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], - [MONOTONIC_CLOCK="cross compiling"]) -