Hello community, here is the log from the commit of package LibVNCServer for openSUSE:Factory checked in at Mon May 9 09:28:20 CEST 2011.
-------- --- LibVNCServer/LibVNCServer.changes 2010-10-08 16:04:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/LibVNCServer/LibVNCServer.changes 2011-05-06 23:06:30.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 6 21:00:48 UTC 2011 - [email protected] + +- Update to version 0.9.8 latest. + * Changes too long to list here, see NEWS +- Use system lzo library + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- LibVNCServer-0.9.7.tar.bz2 filetransfer-overflow.diff patch-libvnc-0215.l stack-check New: ---- LibVNCServer-0.9.8_git201104301110-overflow.patch LibVNCServer-0.9.8_git201104301110.tar.bz2 LibVNCServer-system-lzo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ LibVNCServer.spec ++++++ --- /var/tmp/diff_new_pack.GmOGgU/_old 2011-05-09 09:23:31.000000000 +0200 +++ /var/tmp/diff_new_pack.GmOGgU/_new 2011-05-09 09:23:31.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package LibVNCServer (Version 0.9.7) +# spec file for package LibVNCServer # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,21 +20,21 @@ Name: LibVNCServer BuildRequires: libavahi-devel libjpeg-devel slang-devel xorg-x11-devel +BuildRequires: lzo-devel License: GPLv2+ Group: Development/Libraries/X11 AutoReqProv: on -Version: 0.9.7 -Release: 8 +Version: 0.9.8_git201104301110 +Release: 1 Summary: VNC Development Library Url: http://libvncserver.sf.net/ Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch1: LibVNCServer-LINUX.diff -Patch2: filetransfer-overflow.diff -Patch5: patch-libvnc-0215.l -Patch6: stack-check Patch7: redef-keysym Patch10: dont-build-x11vnc +Patch11: LibVNCServer-system-lzo.patch +Patch12: LibVNCServer-0.9.8_git201104301110-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,17 +73,16 @@ #%setup -n libvncserver %setup -q %patch1 -%patch2 -p1 -%patch5 -p1 -%patch6 -p1 %patch7 -p1 -%patch10 -p1 +%patch10 +%patch11 -p1 +%patch12 # aclocal; autoheader; automake --add-missing --copy; autoconf # ./configure --enable-maintainer-mode # sh ./autogen.sh %build -%{?suse_update_config:%{suse_update_config -f}} +sh ./autogen.sh CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" \ %configure --disable-static --with-pic --enable-shared --with-gnu-ld %{__make} %{?jobs:-j%jobs} @@ -116,5 +115,6 @@ %dir /usr/include/rfb %{_libdir}/libvncclient.so %{_libdir}/libvncserver.so +%{_libdir}/pkgconfig/*.pc %changelog ++++++ LibVNCServer-0.9.8_git201104301110-overflow.patch ++++++ --- libvncserver/tightvnc-filetransfer/filetransfermsg.c.orig +++ libvncserver/tightvnc-filetransfer/filetransfermsg.c @@ -393,7 +393,7 @@ FileTransferMsg CreateFileDownloadZeroSizeDataMsg(unsigned long mTime) { FileTransferMsg fileDownloadZeroSizeDataMsg; - int length = sz_rfbFileDownloadDataMsg + sizeof(int); + int length = sz_rfbFileDownloadDataMsg + sizeof(unsigned long); rfbFileDownloadDataMsg *pFDD = NULL; char *pFollow = NULL; ++++++ LibVNCServer-system-lzo.patch ++++++ diff --git a/libvncclient/Makefile.am b/libvncclient/Makefile.am index 5dec749..0e0f823 100644 --- a/libvncclient/Makefile.am +++ b/libvncclient/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common -libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c tls.c +libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c tls.c +libvncclient_la_LIBADD= -llzo2 noinst_HEADERS=../common/lzodefs.h ../common/lzoconf.h ../common/minilzo.h tls.h diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index d424b04..5efafd4 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -59,7 +59,7 @@ #include <gcrypt.h> #endif -#include "minilzo.h" +#include <lzo/lzo1x.h> #include "tls.h" /* diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index 538617f..d567962 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -36,10 +36,11 @@ endif LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ stats.c corre.c hextile.c rre.c translate.c cutpaste.c \ httpd.c cursor.c font.c \ - draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ../common/minilzo.c ultra.c scale.c \ + draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ultra.c scale.c \ $(ZLIBSRCS) $(JPEGSRCS) $(TIGHTVNCFILETRANSFERSRCS) libvncserver_la_SOURCES=$(LIB_SRCS) +libvncserver_la_LIBADD= -llzo2 lib_LTLIBRARIES=libvncserver.la diff --git a/libvncserver/ultra.c b/libvncserver/ultra.c index 9485591..6895554 100644 --- a/libvncserver/ultra.c +++ b/libvncserver/ultra.c @@ -8,7 +8,7 @@ */ #include <rfb/rfb.h> -#include "minilzo.h" +#include <lzo/lzo1x.h> /* * cl->beforeEncBuf contains pixel data in the client's format. ++++++ dont-build-x11vnc ++++++ --- /var/tmp/diff_new_pack.GmOGgU/_old 2011-05-09 09:23:31.000000000 +0200 +++ /var/tmp/diff_new_pack.GmOGgU/_new 2011-05-09 09:23:31.000000000 +0200 @@ -1,9 +1,19 @@ -Index: LibVNCServer-0.9.7/configure.ac -=================================================================== ---- LibVNCServer-0.9.7.orig/configure.ac -+++ LibVNCServer-0.9.7/configure.ac -@@ -709,11 +709,11 @@ if test "x$uname_s" = "xHP-UX"; then - fi +--- configure.ac.orig ++++ configure.ac +@@ -745,9 +745,9 @@ AC_HEADER_STDC + AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h ws2tcpip.h]) + + # x11vnc only: +-if test "$build_x11vnc" = "yes"; then +- AC_CHECK_HEADERS([pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h]) +-fi ++#if test "$build_x11vnc" = "yes"; then ++#AC_CHECK_HEADERS([pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h]) ++#fi + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +@@ -792,9 +792,9 @@ fi AC_CHECK_FUNCS([ftime gethostbyname gethostname gettimeofday inet_ntoa memmove memset mmap mkfifo select socket strchr strcspn strdup strerror strstr]) # x11vnc only: @@ -16,9 +26,7 @@ # check, if shmget is in cygipc.a AC_CHECK_LIB(cygipc,shmget) - AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true") -@@ -761,9 +761,9 @@ AC_CONFIG_FILES([Makefile - LibVNCServer.spec]) +@@ -845,7 +845,7 @@ AC_CONFIG_FILES([Makefile # # x11vnc only: # @@ -27,17 +35,12 @@ # # NOTE: if you are using the LibVNCServer-X.Y.Z.tar.gz source # tarball and nevertheless want to run autoconf (i.e. aclocal, - # autoheader, automake, autoconf) AGAIN (perhaps you have a -@@ -772,10 +772,10 @@ if test "$build_x11vnc" = "yes"; then - # automake error messages like: - # - # configure.ac:690: required file `x11vnc/Makefile.in' not found - # -- AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile]) +@@ -871,7 +871,7 @@ if test "$build_x11vnc" = "yes"; then + done + echo "with-system-libvncserver: *NOTE* move them back manually to start over." + fi -fi -+# AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile]) +#fi AC_CONFIG_COMMANDS([chmod-libvncserver-config],[chmod a+x libvncserver-config]) AC_OUTPUT - chmod a+x ./libvncserver-config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
