From 574f27776f3168d4240fe9c49a464e51e98e1066 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Jul 15 2014 12:33:15 +0000 Subject: Merge branch 'f19' into f20 --- diff --git a/tigervnc-ext-init.patch b/tigervnc-ext-init.patch deleted file mode 100644 index da52f05..0000000 --- a/tigervnc-ext-init.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc~ tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc ---- tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc~ 2014-07-09 12:27:54.624441987 +0100 -+++ tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc 2014-07-09 16:17:04.391345366 +0100 -@@ -90,9 +90,15 @@ vncSetup(pointer module, pointer opts, i - - static void vncExtensionInitWithParams(INITARGS) - { -+ static bool once = false; -+ - rfb::initStdIOLoggers(); - rfb::LogWriter::setLogParams("*:stderr:30"); -- rfb::Configuration::enableServerParams(); -+ -+ if (!once) { -+ rfb::Configuration::enableServerParams(); -+ once = true; -+ } - - for (int scr = 0; scr < screenInfo.numScreens; scr++) { - ScrnInfoPtr pScrn = xf86Screens[scr]; diff --git a/tigervnc-undo-fc23895.patch b/tigervnc-undo-fc23895.patch deleted file mode 100644 index a8cd7d5..0000000 --- a/tigervnc-undo-fc23895.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc.undo-fc23895 tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc ---- tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc.undo-fc23895 2013-07-01 13:41:24.000000000 +0100 -+++ tigervnc-1.3.0/unix/xserver/hw/vnc/xf86vncModule.cc 2014-07-09 11:02:00.737066640 +0100 -@@ -90,31 +90,26 @@ vncSetup(pointer module, pointer opts, i - - static void vncExtensionInitWithParams(INITARGS) - { -- static char once = 0; -+ rfb::initStdIOLoggers(); -+ rfb::LogWriter::setLogParams("*:stderr:30"); -+ rfb::Configuration::enableServerParams(); - -- if (!once) { -- once++; -- rfb::initStdIOLoggers(); -- rfb::LogWriter::setLogParams("*:stderr:30"); -- rfb::Configuration::enableServerParams(); -+ for (int scr = 0; scr < screenInfo.numScreens; scr++) { -+ ScrnInfoPtr pScrn = xf86Screens[scr]; - -- for (int scr = 0; scr < screenInfo.numScreens; scr++) { -- ScrnInfoPtr pScrn = xf86Screens[scr]; -- -- for (ParameterIterator i; i.param; i.next()) { -- const char *val; -+ for (ParameterIterator i; i.param; i.next()) { -+ const char *val; - #if XORG < 112 -- val = xf86FindOptionValue(pScrn->options, i.param->getName()); -+ val = xf86FindOptionValue(pScrn->options, i.param->getName()); - #else -- val = xf86FindOptionValue((XF86OptionPtr)pScrn->options, i.param->getName()); -+ val = xf86FindOptionValue((XF86OptionPtr)pScrn->options, i.param->getName()); - #endif -- if (val) -- i.param->setParam(val); -- } -+ if (val) -+ i.param->setParam(val); - } -- -- vncExtensionInit(); - } -+ -+ vncExtensionInit(); - } - } - diff --git a/tigervnc.spec b/tigervnc.spec index 23cb62f..e24e9df 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc Version: 1.3.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -53,6 +53,7 @@ Patch13: tigervnc-cursor.patch Patch14: tigervnc-CVE-2014-0011.patch Patch15: tigervnc-inputreset.patch Patch16: tigervnc-pointersync.patch +Patch17: tigervnc-xstartup.patch %description Virtual Network Computing (VNC) is a remote display system which @@ -190,11 +191,14 @@ popd %patch14 -p1 -b .CVE-2014-0011 # Input reset fixes from upstream (bug #1116956). -%patch15 -p1 -b .input-reset +%patch15 -p1 -b .inputreset # Keep pointer in sync when using module (upstream bug #152). %patch16 -p1 -b .pointersync +# Clearer xstartup file (bug #923655). +%patch17 -p1 -b .xstartup + %build %ifarch sparcv9 sparc64 s390 s390x export CFLAGS="$RPM_OPT_FLAGS -fPIC" @@ -367,6 +371,10 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Jul 15 2014 Tim Waugh 1.3.0-17 +- Actually apply patch for this earlier fix: + - Clearer xstartup file (bug #923655). + * Mon Jul 14 2014 Tim Waugh 1.3.0-16 - Input reset fixes from upstream (bug #1116956). diff --git a/tigervnc11-xorg113.patch b/tigervnc11-xorg113.patch deleted file mode 100644 index d5692e9..0000000 --- a/tigervnc11-xorg113.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -up xserver/hw/vnc/Makefile.am.xorg113 xserver/hw/vnc/Makefile.am ---- xserver/hw/vnc/Makefile.am.xorg113 2012-07-19 21:42:46.297455970 -0400 -+++ xserver/hw/vnc/Makefile.am 2012-07-19 21:19:22.526005528 -0400 -@@ -62,7 +62,7 @@ EXTRA_DIST = Xvnc.man - BUILT_SOURCES = $(nodist_Xvnc_SOURCES) - - fb.h: $(top_srcdir)/fb/fb.h -- cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h -+ cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h - - pixman.h: $(includedir)/pixman-1/pixman.h - cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h -diff -up xserver/hw/vnc/vncHooks.cc.xorg113 xserver/hw/vnc/vncHooks.cc ---- xserver/hw/vnc/vncHooks.cc.xorg113 2012-07-19 21:31:37.191820942 -0400 -+++ xserver/hw/vnc/vncHooks.cc 2012-07-19 21:36:00.327531293 -0400 -@@ -116,7 +116,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec - - // screen functions - --static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); -+static Bool vncHooksCloseScreen(ScreenPtr pScreen); - static Bool vncHooksCreateGC(GCPtr pGC); - static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, - RegionPtr pOldRegion); -@@ -133,7 +133,7 @@ static Bool vncHooksDisplayCursor( - DeviceIntPtr pDev, - #endif - ScreenPtr pScreen, CursorPtr cursor); --static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, -+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, - pointer pReadmask); - #ifdef RENDER - static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, -@@ -335,7 +335,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse - // CloseScreen - unwrap the screen functions and call the original CloseScreen - // function - --static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_) -+static Bool vncHooksCloseScreen(ScreenPtr pScreen_) - { - SCREEN_UNWRAP(pScreen_, CloseScreen); - -@@ -366,7 +366,7 @@ static Bool vncHooksCloseScreen(int i, S - - DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n")); - -- return (*pScreen->CloseScreen)(i, pScreen); -+ return (*pScreen->CloseScreen)(pScreen); - } - - // CreateGC - wrap the "GC funcs" -@@ -531,14 +531,14 @@ static Bool vncHooksDisplayCursor( - // BlockHandler - ignore any changes during the block handler - it's likely - // these are just drawing the cursor. - --static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, -+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, - pointer pReadmask) - { -- SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler); -+ SCREEN_UNWRAP(pScreen_, BlockHandler); - - vncHooksScreen->desktop->ignoreHooks(true); - -- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); -+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); - - vncHooksScreen->desktop->ignoreHooks(false); - -diff -up xserver/hw/vnc/xf86vncModule.cc.xorg113 xserver/hw/vnc/xf86vncModule.cc ---- xserver/hw/vnc/xf86vncModule.cc.xorg113 2012-07-19 21:19:27.558942606 -0400 -+++ xserver/hw/vnc/xf86vncModule.cc 2012-07-19 21:19:27.574942408 -0400 -@@ -53,8 +53,6 @@ ExtensionModule vncExt = - { - vncExtensionInitWithParams, - "VNC", -- NULL, -- NULL, - NULL - }; - -diff -up xserver/hw/vnc/xorg-version.h.xorg113 xserver/hw/vnc/xorg-version.h ---- xserver/hw/vnc/xorg-version.h.xorg113 2012-07-19 21:19:27.560942582 -0400 -+++ xserver/hw/vnc/xorg-version.h 2012-07-19 21:19:27.576942382 -0400 -@@ -40,6 +40,8 @@ - #define XORG 111 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000)) - #define XORG 112 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) -+#define XORG 113 - #else - #error "X.Org newer than 1.10 is not supported" - #endif -diff -up xserver/hw/vnc/xvnc.cc.xorg113 xserver/hw/vnc/xvnc.cc ---- xserver/hw/vnc/xvnc.cc.xorg113 2012-07-19 21:36:33.078121854 -0400 -+++ xserver/hw/vnc/xvnc.cc 2012-07-19 21:39:49.685663920 -0400 -@@ -267,7 +267,7 @@ OsVendorInit() - } - - void --OsVendorFatalError() -+OsVendorFatalError(const char *f, va_list args) - { - } - -@@ -1135,9 +1135,9 @@ static Bool vncRandRSetConfig (ScreenPtr - #endif - - static Bool --vfbCloseScreen(int index, ScreenPtr pScreen) -+vfbCloseScreen(ScreenPtr pScreen) - { -- vfbScreenInfoPtr pvfb = &vfbScreens[index]; -+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; - int i; - - pScreen->CloseScreen = pvfb->closeScreen; -@@ -1149,13 +1149,13 @@ vfbCloseScreen(int index, ScreenPtr pScr - for (i = 0; i < MAXSCREENS; i++) - InstalledMaps[i] = NULL; - -- return pScreen->CloseScreen(index, pScreen); -+ return pScreen->CloseScreen(pScreen); - } - - static Bool --vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) -+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) - { -- vfbScreenInfoPtr pvfb = &vfbScreens[index]; -+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; - int dpi; - int ret; - void *pbits; -@@ -1167,8 +1167,8 @@ vfbScreenInit(int index, ScreenPtr pScre - - pbits = vfbAllocateFramebufferMemory(&pvfb->fb); - if (!pbits) return FALSE; -- vncFbptr[index] = pbits; -- vncFbstride[index] = pvfb->fb.paddedWidth; -+ vncFbptr[pScreen->myNum] = pbits; -+ vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth; - - miSetPixmapDepths(); -