diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 43f5d82..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -vnc-4_1_2-unixsrc.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ff6e528 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vnc-4_1_3-unixsrc.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index b1cbf0f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vnc -# $Id: Makefile,v 1.1 2004/09/09 14:02:00 cvsdist Exp $ -NAME := vnc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 665d952..de11a95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz +a119f3c75ad2767c0588260e2abe39be vnc-4_1_3-unixsrc.tar.gz diff --git a/vnc-always_use_fb.patch b/vnc-always_use_fb.patch index b9e49d0..2d3ed27 100644 --- a/vnc-always_use_fb.patch +++ b/vnc-always_use_fb.patch @@ -63,7 +63,7 @@ -#endif } - #define XVNCVERSION "Free Edition 4.1.2" + #define XVNCVERSION "Free Edition 4.1.3" @@ -502,67 +491,6 @@ } #endif diff --git a/vnc-use-fb.patch b/vnc-use-fb.patch index ca71bb6..962f22e 100644 --- a/vnc-use-fb.patch +++ b/vnc-use-fb.patch @@ -29,7 +29,7 @@ diff -up vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.use-fb vnc- +#endif } - #define XVNCVERSION "Free Edition 4.1.2" + #define XVNCVERSION "Free Edition 4.1.3" @@ -482,7 +488,7 @@ CARD32 GetTimeInMillis() } #endif diff --git a/vnc-via.patch b/vnc-via.patch index 3bfbfb2..9ba79c3 100644 --- a/vnc-via.patch +++ b/vnc-via.patch @@ -131,7 +131,7 @@ diff -up vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx.via vnc-4_1_2-unixsrc/un + int main(int argc, char** argv) { - sprintf(aboutText, "VNC Viewer Free Edition 4.1.2 for X - built %s\n" + sprintf(aboutText, "VNC Viewer Free Edition 4.1.3 for X - built %s\n" @@ -190,8 +249,6 @@ int main(int argc, char** argv) usage(); } diff --git a/vnc-xorg.patch b/vnc-xorg.patch index ead9870..cf7e506 100644 --- a/vnc-xorg.patch +++ b/vnc-xorg.patch @@ -1,15 +1,16 @@ -diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc 2008-10-03 14:27:43.000000000 +0200 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac 2008-10-03 14:29:10.000000000 +0200 -@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.5.1, [https://b - RELEASE_DATE="23 September 2008" +diff -up vnc-4_1_3-unixsrc/common/javabin/index.vnc vnc-4_1_3-unixsrc/common/javabin/index +diff -up vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac +--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc 2009-01-26 17:52:43.000000000 +0100 ++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac 2009-01-26 17:53:04.000000000 +0100 +@@ -31,7 +31,6 @@ RELEASE_DATE="5 November 2008" + REMEMBER_REMEMBER="The Fifth of November" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) -AM_MAINTAINER_MODE dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. -@@ -1214,6 +1213,13 @@ if test "x$XVFB" = xyes; then +@@ -1215,6 +1214,13 @@ if test "x$XVFB" = xyes; then AC_SUBST([XVFB_SYS_LIBS]) fi @@ -23,7 +24,7 @@ diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_ dnl Xnest DDX -@@ -2178,6 +2184,7 @@ hw/dmx/input/Makefile +@@ -2179,6 +2185,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile @@ -31,9 +32,9 @@ diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_ hw/xgl/Makefile hw/xgl/egl/Makefile hw/xgl/egl/module/Makefile -diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc 2008-10-03 14:27:44.000000000 +0200 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2008-10-03 14:27:47.000000000 +0200 +diff -up vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am +--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc 2009-01-26 17:52:43.000000000 +0100 ++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2009-01-26 17:52:46.000000000 +0100 @@ -43,7 +43,8 @@ SUBDIRS = \ $(DMX_SUBDIRS) \ $(KDRIVE_SUBDIRS) \ @@ -44,9 +45,9 @@ diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint -diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc 2008-10-03 14:27:44.000000000 +0200 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2008-10-03 14:27:47.000000000 +0200 +diff -up vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c +--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc 2009-01-26 17:52:43.000000000 +0100 ++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2009-01-26 17:52:46.000000000 +0100 @@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); diff --git a/vnc.spec b/vnc.spec index 3570c82..d801501 100644 --- a/vnc.spec +++ b/vnc.spec @@ -1,9 +1,9 @@ -%define vnc_version 4_1_2 +%define vnc_version 4_1_3 Summary: A remote display system Name: vnc -Version: 4.1.2 -Release: 35%{?dist} +Version: 4.1.3 +Release: 1%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: Makefile.am @@ -332,6 +332,9 @@ fi %{_libdir}/librfb.so.* %changelog +* Mon Jan 26 2009 Adam Tkac 4.1.3-1 +- updated to 4.1.3 (CVE-2008-4770) + * Fri Oct 03 2008 Adam Tkac 4.1.2-35 - updated patches due rpm 4.6 (#465099) - build with -O2