Last commit made on 2014-02-15
Get this branch:
git clone -b debian/squeeze https://git.launchpad.net/ubuntu/+source/xorg-server
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

23516e3... by Julien Cristau on 2013-12-17

Import patches-unapplied version 2:1.7.7-18 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: d52565eef2402f1b837eaffc3474e924e6d4aec5

New changelog entries:
  * exa: only draw valid trapezoids
    Addresses CVE-2013-6424
  * CVE-2013-4396

d52565e... by Julien Cristau on 2013-04-12

Import patches-unapplied version 2:1.7.7-16 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: 6242ca647caf2bf759fce7a1f29c55061f0d25ec

New changelog entries:
  * xfree86: fix flush input to work with Linux evdev devices. Avoids
    processing events sent when the server was inactive, potentially allowing
    a user to capture passwords. Addresses CVE-2013-1940.
  * Link against -lbsd on kfreebsd to get access to getpeereid() and make
    MIT-SHM work with non-world-accessible segments.

6242ca6... by Julien Cristau on 2011-10-29

Import patches-unapplied version 2:1.7.7-14 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: 75e02e995676fbff859fa37c9f73b214e4970966

New changelog entries:
  * GLX: add missing input sanitization (CVE-2010-4818). Also fix a couple
    swapping issues.
  * File disclosure vulnerability (CVE-2011-4028).
  * File permission change vulnerability (CVE-2011-4029).
  * xf86ScaleAxis: support for high resolution devices.

75e02e9... by Cyril Brulebois on 2011-02-18

Import patches-unapplied version 2:1.7.7-13 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: 70988c4fe675a005225c371c5b96df76f6690c97

New changelog entries:
  * bug script: Report KMS configuration files and their contents.
  * bug script: Keep only one lspci call (with proper filtering), which
    makes PCI IDs come back.
  * Merge from server-1.7-branch, fixing broken rotation with nvidia
    driver (Closes: #611619):
    - Revert "randr: check for virtual size limits before set crtc"
  * bug script: Report libGL-related diversions.

70988c4... by Cyril Brulebois on 2011-01-29

Import patches-unapplied version 2:1.7.7-12 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7c7cff15c9ce7894057e8d375df96b517546b34c

New changelog entries:
  * Cherry-pick this to fix crashes with MCE remotes (Closes: #609750):
    - mi: handle DGA subtypes when determining the master device.
  * Add 22-stop-searching-for-xf86config-files, cherry-picking the
    upstream commit below (which we can't do directly since it depends on
    a patch kept in the quilt series: 08-config-xorg-conf-d.diff), so that
    XF86Config-4 is no longer considered (Closes: #610453). Thanks,
    Bernhard R. Link!
    - Stop searching for XF86Config files
  * Improve bug script:
    - Stop reporting about roster and checksum for config file and server
      symlink, they are no longer used.
    - Replace printf with echo everywhere, it's slightly more readable and
      all lines are newline-terminated anyway.
    - Also use a “pecho” (pretty echo) function to underline some strings,
      making the output slightly more readable.
    - Fix listing xorg.conf.d's contents. Previously, that was only done
      if xorg.conf existed.
    - Check for local libraries by running ldd on the server.
    - Check for obsolete libraries in the same way (/usr/X11R6/lib might
      still exist in some cases, and be referenced in /etc/ld.so.conf, so
      using ldd is sufficient to find out, see #546836 for an example).

7c7cff1... by Cyril Brulebois on 2011-01-12

Import patches-unapplied version 2:1.7.7-11 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3ca2f55546a3e453fca777cfa7b4f5e4a538832f

New changelog entries:
  * Merge server-1.7-branch from upstream:
    - xfree86/modes: Take rotation into account when checking mode size
    - randr: check for virtual size limits before set crtc
    - EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug #24703).
    - Add EDID quirk for HP Compaq nc8430.
    - x86emu: Fix more mis-decoding of the data prefix
    - x86emu: fix jump_near_IMM to handle DATA: flag correctly.
    - Add and use SERVER_SYNC_*_VERSION
    - render: Fix byteswapping of gradient stops
  * Drop patch accordingly: 22-render-swap-stops.diff

3ca2f55... by Julien Cristau on 2010-12-01

Import patches-unapplied version 2:1.7.7-10 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0966cffe519c69a4df17da7515ff818490664c7c

New changelog entries:
  * render: Fix byteswapping of gradient stops
  * Cherry-pick from upstream:
    - Xi: reset the known properties at each server generation
    - xfree86: apply gamma settings on EnterVT.
    - xfree86: store the screen's gamma information on init.
    - fix screen number checks
  * Refresh patches.

0966cff... by Julien Cristau on 2010-11-11

Import patches-unapplied version 2:1.7.7-9 to debian/sid

Imported using git-ubuntu import.

Changelog parent: be2dca2964250a9f0bf1e96d93655339299782f7

New changelog entries:
  * The "Hello RHEL6" upload.
  * Stolen from RHEL6: only list the device mode in XIQueryDevice, not the
    proximity bit.
  * Cherry-pick a bunch more patches from upstream (most seen in RHEL6):
    - os: Return BadLength instead of disconnecting BigReq clients
    - dix: Default DPMS timeout values to match screensaver values
    - fix a sign problem with valuator data
    - Revert "dix: use the event mask of the grab for TryClientEvents."
    - rotation: fix cursor and overlap of one pixel
    - Xi: don't copy the modifier key count when copying device classes
    - randr: prevent an unnecessary screen resize with multiple displays
    - Change keyboard controls on slave keyboards
    - Don't coredump on "X -showopts"
    - xkb: Fix omissions in geometry initialization
    - ddc: Don't probe for DDC/CI or EEPROM

be2dca2... by Cyril Brulebois on 2010-10-10

Import patches-unapplied version 2:1.7.7-8 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 4085db063e457985d5abedfbb1a44b0e92ac158c

New changelog entries:
  * Pass --enable-xcsecurity to the main build to restore the XC-SECURITY
    extension, thanks to Stefan Fritsch's report (Closes: #599657).

4085db0... by Julien Cristau on 2010-09-20

Import patches-unapplied version 2:1.7.7-7 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f4fc92e1a02636538c18abd5798ff81dc19c5841

New changelog entries:
  * Use linux-any instead of a list of architecture names for restrictions of
    build-dependencies (closes: #594927).
  * Add a couple patches by Chris Wilson to avoid crashing in RandR if the
    driver changes the screen pixmap on resize.