]> source.dussan.org Git - tigervnc.git/commit
Major update of EL5 build
authorBrian P. Hinz <bphinz@users.sf.net>
Fri, 26 Dec 2014 04:51:36 +0000 (23:51 -0500)
committerBrian P. Hinz <bphinz@users.sf.net>
Fri, 26 Dec 2014 04:51:36 +0000 (23:51 -0500)
commit5aa7cfa17c6a535f05da216fb7fbd70e2c23c8d8
tree986a2ddf0d12ef8eefd789d911817e6acb9e6d7e
parent2b76d028b0253be7c4496840fcd2e0fb47c0794e
Major update of EL5 build

The patches required for the 2014-12-09 Xorg CVE advisory would not
have been feasible to back-port to the 1.7 version of Xorg that we
were previously using to built against for EL5 and the generic
binaries.  However, building the newer version of Xorg required
some fairly extensive re-tooling.  In a nutshell, here's what was
done:

 * The build is now done against Xorg X117R7, with all CVE patches
   (taken from debian sources) applied.  Note that this requires
   updating various packages beyond the versions readily available
   for EL5.  This included things like automake, autoconf, libtool,
   m4, and flex.  Wherever possible, the EL6 rpm was used unaltered.
   The most chalenging package to upgrade was libxml2, which was
   necessary to supply the python26-libxml2 requirement from mesa.

 * Mesa libGL is now supplied with the package, installed in the
   %{_libdir}/tigervnc directory.  The Xvnc binary is linked using
   an rpath so that we always link against our version of libGL.
   This was done to prevent linker errors with the generic binaries
   in the case where the distro supplied libGL is built with
   different options (in particular, kernel versions < 2.4.20 do
   not support glx-tls, so the generic binaries would likely break
   whenever used on newer distros that build libGL with glx-tls
   turned on by default).  Additionally, this allows swrast_dri.so
   to be bundled without worrying about overwriting the distro
   supplied library.

 * A static libsha1 is built for Xorg to link against.  The EL5
   version of libgcrypt does not satisfy Xorg's requirements,
   and linking against OpenSSL creates nearly a dozen runtime
   dependencies.
118 files changed:
contrib/packages/rpm/el5/SOURCES/16_CVE-2014-mult.diff [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/17_CVE-regressions.diff [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/25-no-hint-fedora.conf [deleted file]
contrib/packages/rpm/el5/SOURCES/30-aliases-fedora.conf [deleted file]
contrib/packages/rpm/el5/SOURCES/40-generic-fedora.conf [deleted file]
contrib/packages/rpm/el5/SOURCES/64-nonlatin-fedora.conf [deleted file]
contrib/packages/rpm/el5/SOURCES/75-blacklist-fedora.conf [deleted file]
contrib/packages/rpm/el5/SOURCES/FindX11.cmake
contrib/packages/rpm/el5/SOURCES/cve-2011-4818-extra.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/cve-2011-4818.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/dont-forward-keycode-0.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fc-cache.1 [deleted file]
contrib/packages/rpm/el5/SOURCES/fc-cat.1 [deleted file]
contrib/packages/rpm/el5/SOURCES/fc-list.1 [deleted file]
contrib/packages/rpm/el5/SOURCES/fc-match.1 [deleted file]
contrib/packages/rpm/el5/SOURCES/fetch_sources.sh [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-static-libs.patch
contrib/packages/rpm/el5/SOURCES/fltk-1.3.x-clipboard.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1.3.x-screen_num.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v2.3.0-modal.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v2.3.x-clipboard-osx.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v2.3.x-clipboard-win32.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v3.3.0-icons.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v3.3.x-clipboard-win32-fix.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v3.3.x-multihead.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v4.3.x-keyboard-win32.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v4.3.x-keyboard-x11.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v5.3.x-clipboard-x11.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v5.3.x-cursor.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v6.3.x-clipboard-x11.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/fltk-1_v6.3.x-keyboard-osx.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/freetype-2.3.11-CVE-2010-2527.patch [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/freetype-2.3.11-CVE-2012-5669.patch [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/freetype-2.3.11-axis-name-overflow.patch [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/freetype-2.3.11-more-demos.patch [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/intel-revert-vbl.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libX11-1.3.1-creategc-man-page.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libXt-1.0.2-libsm-fix.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libdrm-2.4.0-no-bc.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libdrm-make-dri-perms-okay.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libdrm-nouveau-better-relocs.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libdrm-nouveau-drop-rendering.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libdrm-nouveau-restart-pushbuf.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libdrm-page-flip.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/mesa-7.1-nukeglthread-debug.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/mesa-7.1-osmesa-version.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/mesa-7.6-glx13-app-warning.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/mesa-7.6-hush-vblank-warning.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/mesa-no-mach64.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/pixmap_v2.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/pthread-stubs.pc.in [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/tigervnc-2b76d02.patch [new file with mode: 0644]
contrib/packages/rpm/el5/SOURCES/tigervnc-ac-compatibility.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/tigervnc-static-fltk.patch
contrib/packages/rpm/el5/SOURCES/tigervnc-x0vncserver-static-libs-fix.patch
contrib/packages/rpm/el5/SOURCES/tigervnc-xorg-1.7.5-remove-copyisolatin1lowered.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.1.1-pam.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.4.99-pic-libxf86config.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.4.99-ssh-isnt-local.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.5.0-bg-none-root.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.5.0-projector-fb-size.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.5.1-mode-debug.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.0-displayfd.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.0-less-acpi-brokenness.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.1-nouveau.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.99-default-modes.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.99-hush-prerelease-warning.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.99-randr-error-debugging.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.6.99-right-of.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.0-glx-versioning.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.0-randr-gamma-restore.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.1-gamma-kdm-fix.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.1-glx14-swrast.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.1-libcrypto.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.1-multilib.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.3-no-free-on-abort.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-qxl-autoconfig.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-z-now.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-default-modes.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-deviceevent-coordinates-xinerama.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-export-dix-functions.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-export-more-dix-functions.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-no-connected-outputs.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-pointerkeys.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.6-randr-vt-switch.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-classic-default-mode.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-compresize-fix.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-ddc-probe-less.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-device-mode-list.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-dga-master-keyboard.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-event-mask-revert.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-exa-master.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-fix-randr-rotation.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-improve-mode-selection.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-int10-reserved-areas.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-lid-hack.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-make-ephyr-resize.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-modifier-keycount.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-postfix-DCE-PointerKeys.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-property-generation-reset.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-randr-cursor-dead-zones.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-randr-initial.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-release-xtest-on-phys-buttons.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-reset-unused-classes.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-sd-keyboard-controls.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-showopts-segv.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xephyr-24bpp.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xkb-geom-copy.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xkb-invalid-writes.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xkb-lockedPtrBtns-state-merge.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xkb-pointerkeys-on-master.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xkb-purge-includes.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xserver-1.7.7-xkb-rename-fakebutton.patch [deleted file]
contrib/packages/rpm/el5/SOURCES/xtrans-1.0.3-avoid-gethostname.patch [deleted file]
contrib/packages/rpm/el5/SPECS/tigervnc.spec