diff --git a/N_xorg-server-xdmcp.patch b/N_xorg-server-xdmcp.patch deleted file mode 100644 index 1815313..0000000 --- a/N_xorg-server-xdmcp.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: xorg-server-1.12.1/os/access.c -=================================================================== ---- xorg-server-1.12.1.orig/os/access.c -+++ xorg-server-1.12.1/os/access.c -@@ -714,7 +714,9 @@ DefineSelf(int fd) - - /* - * ignore 'localhost' entries as they're not useful -- * on the other end of the wire -+ * on the other end of the wire and because on hosts -+ * with shared home dirs they'll result in conflicting -+ * entries in ~/.Xauthority - */ - if (ifr->ifa_flags & IFF_LOOPBACK) - continue; -@@ -735,6 +737,14 @@ DefineSelf(int fd) - else if (family == FamilyInternet6 && - IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr)) - continue; -+ -+ /* Ignore IPv6 link local addresses (fe80::/10), because -+ * they need a scope identifier, which we have no way -+ * of telling to the other end. -+ */ -+ if (family == FamilyInternet6 && -+ IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr)) -+ continue; - #endif - XdmcpRegisterConnection(family, (char *) addr, len); - #if defined(IPv6) && defined(AF_INET6) diff --git a/n_tigervnc-dont-build-gtf.patch b/n_tigervnc-dont-build-gtf.patch deleted file mode 100644 index fae60ab..0000000 --- a/n_tigervnc-dont-build-gtf.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur xorg-server-1.13.0.orig/configure.ac xorg-server-1.13.0/configure.ac ---- xorg-server-1.13.0.orig/configure.ac 2012-09-06 00:45:08.000000000 +0300 -+++ xorg-server-1.13.0/configure.ac 2013-12-16 13:50:39.880775219 +0200 -@@ -2268,7 +2268,6 @@ - hw/xfree86/utils/Makefile - hw/xfree86/utils/man/Makefile - hw/xfree86/utils/cvt/Makefile --hw/xfree86/utils/gtf/Makefile - hw/dmx/config/Makefile - hw/dmx/config/man/Makefile - hw/dmx/doc/Makefile -diff -ur xorg-server-1.13.0.orig/hw/xfree86/modes/Makefile.am xorg-server-1.13.0/hw/xfree86/modes/Makefile.am ---- xorg-server-1.13.0.orig/hw/xfree86/modes/Makefile.am 2012-09-06 00:45:08.000000000 +0300 -+++ xorg-server-1.13.0/hw/xfree86/modes/Makefile.am 2013-12-16 13:46:37.130679730 +0200 -@@ -9,7 +9,6 @@ - xf86Crtc.h \ - xf86Cursors.c \ - xf86cvt.c \ -- xf86gtf.c \ - xf86DisplayIDModes.c \ - xf86EdidModes.c \ - xf86Modes.c \ -Only in xorg-server-1.13.0.orig/hw/xfree86/modes: xf86gtf.c -Only in xorg-server-1.13.0.orig/hw/xfree86/utils: gtf -diff -ur xorg-server-1.13.0.orig/hw/xfree86/utils/Makefile.am xorg-server-1.13.0/hw/xfree86/utils/Makefile.am ---- xorg-server-1.13.0.orig/hw/xfree86/utils/Makefile.am 2012-09-06 00:45:08.000000000 +0300 -+++ xorg-server-1.13.0/hw/xfree86/utils/Makefile.am 2013-12-16 13:46:24.175393782 +0200 -@@ -1,4 +1,3 @@ - SUBDIRS = \ -- gtf \ - cvt \ - man diff --git a/tigervnc.changes b/tigervnc.changes index 8b2f766..741744c 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Feb 24 13:00:22 UTC 2015 - msrb@suse.com + +- Fix build against X server 1.17.x. + * u_tigervnc-build-with-xserver-1.17.patch + +------------------------------------------------------------------- +Thu Feb 5 13:39:04 UTC 2015 - msrb@suse.com + +- Use xserver sources from xorg-x11-server-source. +- Drop no longer needed patches: + * N_xorg-server-xdmcp.patch + * n_tigervnc-dont-build-gtf.patch + ------------------------------------------------------------------- Fri Jan 9 12:50:45 UTC 2015 - msrb@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index c8f440a..84a9ee7 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -36,6 +36,7 @@ BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: nasm BuildRequires: xorg-x11-server-sdk +BuildRequires: xorg-x11-server-source BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xproto) @@ -91,7 +92,7 @@ Summary: A high-performance, platform-neutral implementation of VNC License: GPL-2.0 and MIT Group: System/X11/Servers/XF86_4 Source1: tigervnc-1.4.1.tar.gz -Source2: xorg-server-1.16.1.tar.bz2 +Source2: index.vnc Source3: vnc.xinetd Source4: 10-libvnc.conf Source5: vnc-server.firewall @@ -99,9 +100,6 @@ Source6: vnc-httpd.firewall Source7: vnc_inetd_httpd Source8: vnc.reg Source9: vncpasswd.arg -Source10: index.vnc - -# Tiger vnc patches Patch1: tigervnc-newfbsize.patch Patch2: tigervnc-clean-pressed-key-on-exit.patch Patch3: tigervnc-sf3495623.patch @@ -111,10 +109,7 @@ Patch6: n_tigervnc-date-time.patch Patch7: U_include-vencrypt-only-if-any-subtype-present.patch Patch8: u_tigervnc-use_preferred_mode.patch Patch9: u_tigervnc-cve-2014-8240.patch - -# Xserver patches -Patch20: N_xorg-server-xdmcp.patch -Patch21: n_tigervnc-dont-build-gtf.patch +Patch10: u_tigervnc-build-with-xserver-1.17.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -133,13 +128,8 @@ Group: System/X11/Servers/XF86_4 This is the TigerVNC implementation of Xvnc. %prep -%setup -T -b1 -b2 -cp -r ../xorg-server-*/* unix/xserver/ - -if [ -e unix/xserver/hw/xfree86/modes/xf86gtf.c -o -e unix/xserver/hw/xfree86/utils/gtf/gtf.c ]; then - echo "Files hw/xfree86/modes/xf86gtf hw/xfree86/utils/gtf/gtf.c have to be excluded from the xserver source tar ball (bnc#85566)." - exit 1 -fi +%setup -T -b1 +cp -r /usr/src/xserver/* unix/xserver/ %patch1 -p1 %patch2 -p1 @@ -150,11 +140,10 @@ fi %patch7 -p0 %patch8 -p0 %patch9 -p1 +%patch10 -p1 pushd unix/xserver patch -p1 < ../xserver116.patch -%patch20 -p1 -%patch21 -p1 popd %build @@ -207,6 +196,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/vnc/classes install -m755 VncViewer.jar $RPM_BUILD_ROOT%{_datadir}/vnc/classes popd +install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/vnc/classes install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc %ifnarch s390x install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf @@ -216,7 +206,6 @@ install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/servi install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg -install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes %if 0%{?suse_version} >= 1315 ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vncviewer.1.gz diff --git a/u_tigervnc-build-with-xserver-1.17.patch b/u_tigervnc-build-with-xserver-1.17.patch new file mode 100644 index 0000000..ef5c8c6 --- /dev/null +++ b/u_tigervnc-build-with-xserver-1.17.patch @@ -0,0 +1,52 @@ +Author: Michal Srb +Subject: Build with xserver 1.17.x. + +Do not use removed xalloc&xfree. +Add 1.17.x to supported list. + +Index: tigervnc-1.4.1/unix/xserver/hw/vnc/xorg-version.h +=================================================================== +--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/xorg-version.h ++++ tigervnc-1.4.1/unix/xserver/hw/vnc/xorg-version.h +@@ -48,8 +48,10 @@ + #define XORG 115 + #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000)) + #define XORG 116 ++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) ++#define XORG 117 + #else +-#error "X.Org newer than 1.16 is not supported" ++#error "X.Org newer than 1.17 is not supported" + #endif + + #endif +Index: tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc +=================================================================== +--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/xvnc.cc ++++ tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc +@@ -717,9 +717,9 @@ vfbInstallColormap(ColormapPtr pmap) + entries = pmap->pVisual->ColormapEntries; + pVisual = pmap->pVisual; + +- ppix = (Pixel *)xalloc(entries * sizeof(Pixel)); +- prgb = (xrgb *)xalloc(entries * sizeof(xrgb)); +- defs = (xColorItem *)xalloc(entries * sizeof(xColorItem)); ++ ppix = (Pixel *)malloc(entries * sizeof(Pixel)); ++ prgb = (xrgb *)malloc(entries * sizeof(xrgb)); ++ defs = (xColorItem *)malloc(entries * sizeof(xColorItem)); + + for (i = 0; i < entries; i++) ppix[i] = i; + /* XXX truecolor */ +@@ -738,9 +738,9 @@ vfbInstallColormap(ColormapPtr pmap) + } + (*pmap->pScreen->StoreColors)(pmap, entries, defs); + +- xfree(ppix); +- xfree(prgb); +- xfree(defs); ++ free(ppix); ++ free(prgb); ++ free(defs); + } + } + diff --git a/xorg-server-1.16.1.tar.bz2 b/xorg-server-1.16.1.tar.bz2 deleted file mode 100644 index bc1c3ab..0000000 --- a/xorg-server-1.16.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad7fa80413feeba7855ba2ec5d72bfbc3e191b7ec56c81291e7c9c0a3a9f881e -size 5829838