diff options
| author | Treeve Jelbert | 2019-02-03 16:10:11 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2019-02-03 16:10:11 +0100 |
| commit | a8bdd10b1a16700466b364c02ca7dd537adb3b2a (patch) | |
| tree | 2b16cd85e2b2af34e1156c149d55275351dc9eb4 /xorg-xserver/xorg-server | |
| parent | 0d6c02c7e7f048c5a50d492f36ae939c82e0d0aa (diff) | |
deprecate xorg-xserver/xorg-server [replaced by xserver]
Diffstat (limited to 'xorg-xserver/xorg-server')
24 files changed, 16 insertions, 1407 deletions
diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD index 90d8cae4b1..27ba77ddaf 100755 --- a/xorg-xserver/xorg-server/BUILD +++ b/xorg-xserver/xorg-server/BUILD @@ -1,28 +1 @@ -# fix for a gcc 4.2.0 regression -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052 -if [[ $(installed_version gcc) == "4.2.0" ]] ; then -CFLAGS="${CFLAGS/-Os/-O0}" -CXXFLAGS="${CXXFLAGS/-Os/-O0}" -CFLAGS="${CFLAGS/-O/-O0}" -CXXFLAGS="${CXXFLAGS/-O/-O0}" -CFLAGS="${CFLAGS/-O1/-O0}" -CXXFLAGS="${CXXFLAGS/-O1/-O0}" -CFLAGS="${CFLAGS/-O2/-O0}" -CXXFLAGS="${CXXFLAGS/-O2/-O0}" -CFLAGS="${CFLAGS/-O3/-O0}" -CXXFLAGS="${CXXFLAGS/-O3/-O0}" -fi && -VGC=$(installed_version gcc) && -VGC=${VGC%.?} && -if [[ "${VGC}" == "4.7" ]] || [[ "${VGC}" == "5.1" ]] ; then - CFLAGS+=" -Wno-error=array-bounds" -fi && -message CFLAGS=$CFLAGS -OPTS="${XORG_SERVER_OPTS} \ - --with-xkb-output=$TRACK_ROOT/var/lib/xkb \ - --with-fontrootdir=${TRACK_ROOT}/usr/share/fonts/X11 \ - --disable-secure-rpc \ - --disable-xwin \ - --enable-dbe \ - ${OPTS}" && -default_build +true diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE deleted file mode 100755 index 7b233cba43..0000000000 --- a/xorg-xserver/xorg-server/CONFIGURE +++ /dev/null @@ -1,178 +0,0 @@ -list_remove XORG_SERVER_OPTS "--enable-multibuffer" "--disable-multibuffer" -list_remove XORG_SERVER_OPTS "--enable-aiglx" "--disable-aiglx" - -. $GRIMOIRE/config_query_multi.function - -# for order see configure.ac -config_query_list XORG_SHA1 "Choose SHA1 implementation:" \ - nettle \ - libgcrypt \ - openssl && - -config_query XORG_XINITRC_XSESSION \ - "install a .desktop file that calls the user's .xinitrc?" \ - n && - -config_query_option XORG_SERVER_OPTS \ - "Build documentation?" \ - n \ - "--enable-docs" \ - "--disable-docs" && - -config_query_option XORG_SERVER_OPTS \ - "Build Glamor, for radeon?" \ - n \ - "--enable-glamor" \ - "--disable-glamor" && - -config_query_option XORG_SERVER_OPTS \ - "Build XRes extension?" \ - y \ - "--enable-xres" \ - "--disable-xres" && - -config_query_option XORG_SERVER_OPTS \ - "Build DPMS extension?" \ - y \ - "--enable-dpms" \ - "--disable-dpms" && - - -config_query_option XORG_SERVER_OPTS \ - "Build Record extension?" \ - y \ - "--enable-record" \ - "--disable-record" && - -config_query_option XORG_SERVER_OPTS \ - "Build XDMCP extension?" \ - y \ - "--enable-xdmcp" \ - "--disable-xdmcp" && - -config_query_option XORG_SERVER_OPTS \ - "Build XDM_Auth_1 extension?" \ - y \ - "--enable-xdm-auth-1" \ - "--disable-xdm-auth-1" && - -config_query_option XORG_SERVER_OPTS \ - "Build GLX extension?" \ - y \ - "--enable-glx" \ - "--disable-glx" && - -config_query_option XORG_SERVER_OPTS \ - "Build DRI extension?" \ - y \ - "--enable-dri" \ - "--disable-dri" && - -config_query_option XORG_SERVER_OPTS \ - "Build Security extension?" \ - y \ - "--enable-xcsecurity" \ - "--disable-xcsecurity" && - -config_query_option XORG_SERVER_OPTS \ - "Build X-ACE extension?" \ - y \ - "--enable-xace" \ - "--disable-xace" && - -config_query_option XORG_SERVER_OPTS \ - "Build Xorg server?" \ - y \ - "--enable-xorg" \ - "--disable-xorg" && - -config_query_option XORG_SERVER_OPTS \ - "Build Xvfb server?" \ - y \ - "--enable-xvfb" \ - "--disable-xvfb" && - -config_query_option XORG_SERVER_OPTS \ - "Build Xnest server?" \ - n \ - "--enable-xnest" \ - "--disable-xnest" && - -message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR} provides some advanced" \ - "${PROBLEM_COLOR}EXPERIMENTAL${DEFAULT_COLOR} options that may" \ - "${PROBLEM_COLOR}BREAK${DEFAULT_COLOR} the build or the final" \ - "executing of the server. So answer the following carefully" && - -config_query XORG_SERVER_ADVANCED "Do you wish the advanced options?" n && - -if [[ $XORG_SERVER_ADVANCED == y ]] ; then -config_query_option XORG_SERVER_OPTS \ - "Build kdrive servers (EXPERIMENTAL)?" \ - n \ - "--enable-kdrive" \ - "--disable-kdrive" && - -config_query_option XORG_SERVER_OPTS \ - "Build the kdrive Xephyr server (EXPERIMENTAL)?" \ - n \ - "--enable-xephyr" \ - "--disable-xephyr" && - -config_query_option XORG_SERVER_OPTS \ - "Build the kdrive Xsdl server (EXPERIMENTAL)?" \ - n \ - "--enable-xsdl" \ - "--disable-xsdl" && - -config_query_option XORG_SERVER_OPTS \ - "Build the kdrive Xfbdev server (EXPERIMENTAL)?" \ - n \ - "--enable-xfbdev" \ - "--disable-xfbdev" && - -config_query_option XORG_SERVER_OPTS \ - "Build the kdrive Xfake server (EXPERIMENTAL)?" \ - n \ - "--enable-xfake" \ - "--disable-xfake" && -# this tends to break stuff badly -config_query_option XORG_SERVER_OPTS \ - "Install Xorg server as owned by root with setuid bit (EXPERIMENTAL)?" \ - y \ - "--enable-install-setuid" \ - "--disable-install-setuid" && - -message "${QUERY_COLOR}Advanced options end here${DEFAULT_COLOR}" -fi -config_query_option XORG_SERVER_OPTS \ - "Enable Secure RPC?" \ - y \ - "--enable-secure-rpc" \ - "--disable-secure-rpc" && - -config_query_option XORG_SERVER_OPTS \ - "Build the xfree86 DDX utils?" \ - n \ - "--enable-xfree86-utils" \ - "--disable-xfree86-utils" && - - -message "${MESSAGE_COLOR}Note:" && -message "Default font search prefix is now /usr/share/fonts/X11 ." && -message "You might want to make sure you got no old font installs left in" && -message "/usr/lib/X11/fonts or instead have those paths set in xorg.conf ." && -message "$DEFAULT_COLOR" && - -persistent_remove XORG_SERVER_FONT_100DPI -persistent_remove XORG_SERVER_FONT_75DPI -persistent_remove XORG_SERVER_FONT_SPEEDO -persistent_remove XORG_SERVER_FONT_TYPE1 -persistent_remove XORG_SERVER_FONT_TTFOTF -persistent_remove XORG_SERVER_FONT_MISC - -persistent_remove XORG_SERVER_INPUT_DRIVER -persistent_remove XORG_SERVER_INPUT_OBSCURE -persistent_remove XORG_SERVER_VIDEO_DRIVER_COMMON -persistent_remove XORG_SERVER_VIDEO_DRIVER_UNCOMMON -persistent_remove XORG_SERVER_VIDEO_DRIVER_OBSCURE - diff --git a/xorg-xserver/xorg-server/CONFLICTS b/xorg-xserver/xorg-server/CONFLICTS index 445448a836..516ba846c8 100755 --- a/xorg-xserver/xorg-server/CONFLICTS +++ b/xorg-xserver/xorg-server/CONFLICTS @@ -1,3 +1 @@ -conflicts glamor -conflicts xf86-video-modesetting -conflicts xserver n +conflicts xorg-server y diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS deleted file mode 100755 index 6e8b00fdf9..0000000000 --- a/xorg-xserver/xorg-server/DEPENDS +++ /dev/null @@ -1,145 +0,0 @@ -. $GRIMOIRE/FUNCTIONS - -case "$XORG_SHA1" in - nettle) - depends nettle '--with-sha1=libnettle' - ;; - libgcrypt) - depends libgcrypt '--with-sha1=libgcrypt' - ;; - openssl) - depends SSL '--with-sha1=libcrypto' - ;; -esac && - -depends font-util && -depends xcb-util && -depends xcb-util-image && -depends xcb-util-wm && -depends xcb-util-keysyms && -depends xcb-util-renderutil && - -depends xorgproto && -# -## Check this every release as X.org likes to change things on us... -# -##Check this on updates -depends libxv "--enable-xv" && - -optional_depends libxinerama \ - "--enable-xinerama" \ - "--disable-xinerama" \ - "Multi screen support" && -## -optional_depends libselinux \ - "" \ - "" \ - "Enable SELinux support" && -optional_depends libxscrnsaver \ - "--enable-screensaver" \ - "--disable-screensaver" \ - "Build ScreenSaver extension" && -optional_depends libxvmc \ - "--enable-xvmc" \ - "--disable-xvmc" \ - "Enable support for XvMC" && - -optional_depends LOGIN-DAEMON \ - '--enable-systemd-logind' \ - '--disable-systemd-logind' \ - 'login daemon' && - -# -# May only select one: -# configure: error: Hotplugging through both libudev and hal not allowed -# -# hal is preferred by upstream: -# --enable-config-udev Build udev support (default: auto) -# --disable-config-hal Build HAL support (default: auto) -# -message "You can either use hal OR udev for hotplugging" && -message "but NOT both" && -optional_depends hal \ - "--enable-config-hal --disable-config-udev" \ - "--disable-config-hal " \ - "Enable HAL support" && - -if ! is_depends_enabled $SPELL hal; then - optional_depends DEVICE-MANAGER \ - "--enable-config-udev --disable-config-hal" \ - "--disable-config-udev" \ - "enable udev kernel config support" -fi && - -if is_depends_enabled $SPELL $(get_spell_provider $SPELL LOGIN-DAEMON) \ - || is_depends_enabled $SPELL hal; then - depends dbus -fi && - -optional_depends lbdmx \ - "--enable-dmx" \ - "--disable-dmx" \ - "Build DMX server" && -if is_depends_enabled $SPELL libdmx;then - depends -sub XAW7 libxaw && - depends libxt && - depends libxpm && - depends libxmu -fi && - - -if list_find "$XORG_SERVER_OPTS" "--enable-glamor"; then - depends libepoxy -fi && - -optional_depends wayland '--enable-xwayland' \ - '--disable-xwayland' \ - 'build Xwayland DDX' && -if is_depends_enabled $SPELL wayland;then - depends wayland-protocols -fi && -optional_depends libunwind '--enable-libunwind' '--disable-libunwind' 'debugging support' && - -depends freetype2 && -depends libxxf86dga "--enable-dga" && -depends libxcomposite "--enable-composite" && -depends libxxf86vm "--enable-xf86vidmode" && -depends libxi && -depends util-macros && -depends xinit && -depends xhost && -depends xauth && -depends pixman && -depends libxshmfence && - -depends libxkbui && -depends libxfont2 && -depends xtrans && -depends libxau && -depends libxkbfile && -depends libxdmcp && -depends libdrm && -depends libxres && -depends bison && -depends flex && -depends pkgconfig && -depends libtool && -depends AWK && -depends MESA && -depends smgl-gl_select && -depends rgb && -depends libpciaccess && -depends libxtst && - -message 'additional fonts are not needed, but can be installed indiviually' && - -message 'choose an input or video driver' && -message 'if these drivers are not suitable, choose from the xorg-drivers section' && - -suggest_depends xf86-input-evdev '' '' 'modern input drivers' && -suggest_depends xf86-input-synaptics '' '' 'modern input drivers' && -suggest_depends xf86-input-libinput '' '' 'modern input drivers' && -suggest_depends xf86-video-ati '' '' 'modern ATI drivers' && -suggest_depends xf86-video-amdgpu '' '' 'hardware accellerated AMD drivers' && -suggest_depends xf86-video-intel '' '' 'modern Intel drivers' && -suggest_depends xf86-video-nouveau '' '' 'modern NVidia drivers' diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS index bc030a1c2a..5f9f1edcc0 100755 --- a/xorg-xserver/xorg-server/DETAILS +++ b/xorg-xserver/xorg-server/DETAILS @@ -1,27 +1,8 @@ - SPELL=xorg-server - VERSION=1.20.1 - SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE - SOURCE2=$SOURCE.sig - SOURCE2_URL[0]=${SOURCE_URL[0]}.sig - SOURCE_GPG=xorg.gpg:$SOURCE.sig:UPSTREAM_KEY - SOURCE2_IGNORE=signature - SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" - WEB_SITE=https://xorg.freedesktop.org/ - ENTERED=20051125 - LICENSE[0]=XCL - SECURITY_PATCH=14 - SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)" + SPELL=xorg-server + VERSION=0 + PATCHLEVEL=9999 + SHORT="deprecated" cat << EOF -X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx), the core of the X -Window System. - -The X server accepts requests from client applications to create windows, -which are (normally rectangular) "virtual screens" that the client program -can draw into. - -Windows are then composed on the actual screen by the X server -(or by a separate composite manager) as directed by the window manager, -which usually communicates with the user via graphical controls such as buttons -and draggable titlebars and borders. +deprecated spell [replaced by xserver] EOF + diff --git a/xorg-xserver/xorg-server/DOWNLOAD b/xorg-xserver/xorg-server/DOWNLOAD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/xorg-xserver/xorg-server/DOWNLOAD @@ -0,0 +1 @@ +true diff --git a/xorg-xserver/xorg-server/EXPORTS b/xorg-xserver/xorg-server/EXPORTS deleted file mode 100755 index 16799e136f..0000000000 --- a/xorg-xserver/xorg-server/EXPORTS +++ /dev/null @@ -1 +0,0 @@ -XORG_SERVER_OPTS diff --git a/xorg-xserver/xorg-server/FINAL b/xorg-xserver/xorg-server/FINAL deleted file mode 100755 index 42199eb561..0000000000 --- a/xorg-xserver/xorg-server/FINAL +++ /dev/null @@ -1,13 +0,0 @@ -. $GRIMOIRE/FUNCTIONS && -message "${PROBLEM_COLOR}" -message "WARNING: if you have a path defined by RgbPath var in /etc/X11/xorg.conf" -message "-- remove it. Since xorg-server 1.5.0 RgbPath has been marked as obsolete" -message "and it's not used in xorg.conf anymore." -message "${DEFAULT_COLOR}" - -message "${MESSAGE_COLOR}If your mouse or keyboard stop working, then add\n" \ - "the following to /etc/X11/xorg.conf:\n" \ - "Section \"ServerFlags\"\n" \ - " Option \"AllowEmptyInput\" \"false\"\n" \ - "EndSection${DEFAULT_COLOR}" -glselect mesa diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index a1858e7904..7840504c01 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,809 +1,4 @@ -2018-12-19 Pavel Vinogradov <public@sourcemage.org> - * *SUB_DEPENDS: added XWAYLAND subdependency - -2018-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * PRE_BUILD, fix-CVE-2018-14665.patch: fix CVE-2018-14665 - * DETAILS: SECURITY_PATCH++ - -2018-08-30 Pavel Vinogradov <public@sourcemage.org> - * POST_RESURRECT, PRE_BUILD, REPAIR^all^POST_RESURRECT: added check - for smgl-gl_select availability - -2018-08-07 Pavel Vinogradov <public@sourcemage.org> - * DETAILS: version 1.20.1 - -2018-06-01 Treeve Jelbert <treeve@sourcemage.org> - * CONFLICTS: add xserver - -2018-05-10 Pavel Vinogradov <public@sourcemage.org> - * DETAILS: version 1.20.0, redundancy-- - -2018-02-10 Pavel Vinogradov <public@sourcemage.org> - * DEPENDS: libxfontcache is no longer needed - -2018-02-09 Pavel Vinogradov <public@sourcemage.org> - * DEPENDS: dropped evieext - -2018-02-06 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: use xorgproto - -2018-02-01 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: use MESA - -2017-12-21 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.6 - -2017-10-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: add flags to libunwind - * PROVIDES: add XSERVER - -2017-10-13 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.5 - SECURITY_PATCH++ fix CVE-2017-12176..CVE-2017-12187 - -2017-10-05 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.4 - SECURITY_PATCH++ fix CVE-2017-13721 & CVE-2017-13723 - -2017-04-06 Pavel Vinogradov <public@sourcemage.org> - * DEPENDS: added missing & - -2017-03-15 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.3 - * DEPENDS: add font-util - -2017-03-03 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.2 - * DETAILS: add gpg checking - SECURITY_PATCH++ fix CVE-2017-2624 - * PRE_BUILD: some install scripts are missing! - run autoreconf - -2017-01-12 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.1 - -2016-11-22 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: add wayland-protocols - -2016-11-16 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: add libxfont2 - -2016-11-15 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.19.0 - -2016-10-29 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.18.99.902 - : add gpg checking - * CONFIGURE: remove aiglx - -2016-07-20 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.18.4 - -2016-07-07 Thomas Orgis <sobukus@sourcemage.org> - * TRIGGERS: removed, mesalib triggers again - -2016-07-05 Treeve Jelbert <treeve@sourcemage.org> - * TRIGGERS: added, detect mesalib changes - -2016-07-02 Vlad Glagolev <stealth@sourcemage.org> - * DEPENDS: SHA1 implementation is chosen earlier in the file - -2016-04-14 Thomas Orgis <sobukus@sourcemage.org> - * SUB_DEPENDS: added XVFB - -2016-04-05 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.18.3 - -2016-03-12 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.18.2 - * xwayland-fix-a-crash-on-output-removal.patch: deleted - * Add-hybrid-full-size-empty-clip-mode-to-SetRootClip.patch: deleted - * PRE_BUILD: no upstream patches - -2016-03-02 Remko van der Vossen <wich@sourcemage.org> - * DEPENDS: don't force dbus dependency when it isn't needed - -2016-02-09 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.18.1 - PATCHLEVEL=1 - * UP_TRIGGERS: improve it - * CONFIGURE: remove obsolete option - * PRE_BUILD: apply upstream patches - * xwayland-fix-a-crash-on-output-removal.patch: added - * Add-hybrid-full-size-empty-clip-mode-to-SetRootClip.patch: added - -2015-11-10 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.18.0 - * DEPENDS: add LOGIN-DAEMON, xf86-video-amdgpu, dbus - remove obsolete config-dbus options - * CONFIGURE: remove obsolete options - -2015-10-31 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.17.4 - -2015-10-27 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.17.3 - -2015-06-17 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.17.2 - SECURITY_PATCH++ fix CVE-2015-3164 - * xorg-server-1.17.1-gcc5_fixes-1.patch: fr;ryrf - * PRE_BUILD: adjust - -2015-06-04 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS, CONFIGURE: simplify driver selection - instead of giving a vast list of optional drivers, suggest the most likely ones - any others can be installed individually if needed - likewise for fonts - * DEPENDS: remove font-cursor-misc. font-misc-misc, font-alias - * DEPENDS: xf86-video-nouveau, not xf86-video-nv - -2015-05-05 Thomas Orgis <sobukus@sourcemage.org> - * DEPENDS: on smgl-gl_select - -2015-04-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * PRE_BUILD, xorg-server-1.17.1-gcc5_fixes-1.patch: add patch from - LFS to fix build with gcc 5 - -2015-04-25 Vlad Glagolev <stealth@sourcemage.org> - * CONFIGURE: added selection of SHA1 implementation - * DEPENDS: fixed dependencies on a crypto library - -2015-04-22 Treeve Jelbert <treeve@sourcemage.org> - * UP_TRIGGERS: remove things which do not depend on xorg-server - * DEPENDS: libxinerama is optional - -2015-02-11 Vlad Glagolev <stealth@sourcemage.org> - * DEPENDS: UDEV -> DEVICE-MANAGER - -2015-02-11 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.17.1 - SECURITY_PATCH=9 fix CVE-2015-0255 - -2015-02-05 Pavel Vinogradov <vin.public@gmail.com> - * DEPENDS: added xcb-util-renderutil - -2015-02-05 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.17.0 - update description - * CONFLICTS: add xf86-video-modesetting, glamor - * CONFIGURE: delete obsolete options - * DEPENDS: presentproto is required - -2014-12-20 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.16.3 - CVE-2014-8092..8103 - -2014-12-12 Pol Vinogradov <vin.public@gmail.com> - * DEPENDS: removed gawk again - -2014-12-12 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.16.2.901 - SECURITY_PATCH++, fixes MANY CVE - -2014-11-11 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.16.2 - -2014-09-25 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.16.1 - * DEPENDS: now use mesalib - -2014-09-18 Pol Vinogradov <vin.public@gmail.com> - * PRE_SUB_DEPENDS, REPAIR*SUB_DEPENDS: fixed GLAMOR subdependency - -2014-08-27 Thomas Orgis <sobukus@sourcemage.org> - * DEPENDS: really needs mesalib-1x ... so actually the old mesalib - spell is obsolete, what's the plan? - -2014-08-24 Thomas Orgis <sobukus@sourcemage.org> - * DEPENDS: needs xcb cruft to build - -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: openssl => SSL - * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL - -2014-07-18 Sukneet Basuta <sukneet@sourcemage.org> - * CONFIGURE: missed an 'a' in 'disable-glamor' - -2014-07-17 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.16.0 - * CONFLICTS: added, for glamor - * CONFIGURE: query for glamor support - * SUB_DEPENDS, PRE_SUB_DEPENDS: add glamor support - * DEPENDS: add libepoxy, optional wayland, nettle - -2014-04-14 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: mesalib => MESALIB - -2014-04-14 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.15.1 - -2013-12-28 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.15.0 - * DEPENDS: add presentproto, dri3proto, libxshmfence - remove -force_depends usage - * BUILD, CONFIGURE: remove obsolete options - -2013-12-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * DETAILS: 1.14.5 - -2013-11-19 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.14.4 - SECURITY_PATCH++ fixes CVE-2013-4396 - -2013-10-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * PRE_BUILD, 0001-fix-buffer-overflow.patch: remove obsolete - patch that prevents PRE_BUILD from succeeding - * gl_select.patch: renew patch so PRE_BUILD succeeds - -2013-07-27 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: udev => UDEV - -2013-06-26 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.14.2 - -2013-04-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * DETAILS: version 1.14.1, this fixes CVE-2013-1940 - -2013-03-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * DETAILS: version 1.14.0 - * PRE_BUILD, 0001-fix-buffer-overflow.patch: fix off-by-one error - -2012-11-04 Vlad Glagolev <stealth@sourcemage.org> - * DEPENDS: added missing libxtst dependency - * REPAIR^all^SUB_DEPENDS: added - * {REPAIR^all^,}PRE_SUB_DEPENDS: added DRI extension subdependency check - * SUB_DEPENDS: added DRI extension subdependency; corrected actions for - DPMS; added missing `&&'s - -2012-08-27 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.12.4 - * gl_select.patch: updated - -2012-07-13 Treeve Jelbert <treeve@sourcemage.org> - * BUILD: generalise fix for gcc-4.7.x - -2012-07-12 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.12.3 - * gl_select.patch: updated - -2012-05-30 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.12.2 - -2012-05-27 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.12.1.902 - * gl_select.patch: updtae pathc - * BUILD: suppress errors with gcc-4.7.0 - -2012-04-16 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.12.1 - -2012-03-05 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.12.0 - -2012-02-16 Treeve Jelbert <treeve@sourcemage.org> - * DEPENDS: adjust depends for DMX - remove obsolete depends - -2012-01-28 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.11.4 - -2011-12-17 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.11.3 - -2011-11-05 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.11.2 - SECURITY_PATCH=5 - CVE-2011-4028: File disclosure vulnerability - CVE-2011-4029: File permission change vulnerability - * DEPENDS: if dmxproto is present, also need libdmx - option for libselinux is now xcsecurity, but does not work - * BUILD: force disable-secure-rpc - -2011-09-24 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.11.1 - -2011-08-27 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.11.0 - -2011-08-19 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.10.4 - -2011-07-08 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.10.3 - -2011-05-29 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.10.2 - -2011-05-15 Arjan Bouter <abouter@sourcemage.org> - * DEPENDS: fixed hal+dbus / udev hotplug options - -2011-04-16 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: 1.10.1 - * PRE_BUILD: remove sdksyms.c fix - -2011-03-18 Pol Vinogradov <vin.public@gmail.com> - * PRE_BUILD: added a workaround for error with sdksyms.c - -2011-03-10 Eric Sandall <sandalle@sourcemage.org> - * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing kdrive and xephyr - xephyr requires kdrive - -2011-02-27 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.10.0 - -2011-02-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * INSTALL: create /usr/share/xsessions if it is missing and - xinitrc.desktop is to be installed - -2011-02-05 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.9.4 - -2010-12-21 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.9.3 - -2010-11-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> - * INSTALL, CONFIGURE, startxinitrc, xinitrc.desktop: added optional - .desktop file that calls the user's .xinitrc - * DETAILS: PATCHLEVEL=1 - -2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> - * gl_select.patch: updated for glselect - -2010-10-18 Ladislav Hagara <hgr@vabo.cz> - * DEPENDS: removed xf86-video-i810 (has been removed form test already) - -2010-09-04 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.9.0 - SOURCE matches upstream posted SHA1 - * CONFIGURE: -multibuffer no longer an option remove query and from - XORG_SERVER_OPTS - * DEPENDS: Optionally depends on udev for configuration support - May only select udev xor (hal (preferred) or dbus) - -2010-06-26 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.8.1 - SOURCE matches upstream posted SHA1 - Requires DRI (mesalib) 7.8.0+ (currently development release) - * BUILD: fontdir -> fontrootdir - -2010-05-04 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.7.7 - SOURCE matches upstream posted SHA1 - -2010-03-24 Vlad Glagolev <stealth@sourcemage.org> - * [REPAIR^all^]EXPORTS: added, to provide XORG_SERVER_OPTS outside - -2010-03-17 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.7.6 - -2010-02-23 Arwed v. Merkatz <v.merkatz@gmx.net> - * PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: fixed DPMS sub - dependency to actually return 0 if it is available, otherwise always - recompiles xorg-server if something needs DPMS - -2010-02-17 Ladislav Hagara <hgr@vabo.cz> - * DETAILS: 1.7.5 - -2010-02-04 Ladislav Hagara <hgr@vabo.cz> - * CONFLICTS, UP_TRIGGERS: none provider of monolithic X now - -2010-01-07 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.7.4 - SOURCE matches upstream posted SHA1 - Removed PATCHLEVEL - -2009-12-16 Jaka Kranjc <lynxlynxlynx@sourcemage.org> - * CONFIGURE: fixed the ati driver name and changed the nvidia one to - the provider - NVIDIA - * DEPENDS: specify the grimoire for dependencies on z-rejected spells; - handle errors for the selective video driver choice - -2009-12-16 Thomas Orgis <sobukus@sourcemage.org> - * BUILD: Changed default font prefix to /usr/share/fonts/X11 . - * CONFIGURE: Added note about font paths. - * DETAILS: patchlevel - -2009-12-15 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.7.3 (bugfix for 1.7.2) - SOURCE matches upstream posted SHA1 - -2009-11-26 Vlad Glagolev <stealth@sourcemage.org> - * DEPENDS: force recordproto if record ext has been selected - -2009-10-27 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.7.1 - SOURCE matches upstream posted MD5 - -2009-10-14 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> - * DEPENDS: removed some depends as per Treeve's suggestion, - added xf86-video-nouveau to the list - * CONFIGURE: added xf86-video-nouveau to the list - -2009-10-10 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> - * DETAILS: updated spell to 1.7.0 - * DEPENDS: updated - * gl_select.diff: patch - -2009-08-01 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated to 1.6.3 - SOURCE matches upstream posted MD5 - -2009-07-09 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> - * DETAILS: updated spell to 1.6.2 - * BUILD: updated - * CONFIGURE: removed options - * DEPENDS: updated - -2009-04-25 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> - * REPAIR^all^PRE_SUB_DEPENDS: added - * PRE_SUB_DEPENDS: DPMS as sub_dependency - * SUB_DEPENDS: DPMS as sub_dependency - -2009-04-18 Eric Sandall <sandalle@sourcemage.org> - * DETAILS, BUILD, PRE_BUILD: MesaLib source is no longer required at build - -2009-04-15 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: updated spell to 1.6.1 - * xorg-server-mesa.patch: removed - * PRE_BUILD: removed the patch - * gl_select.patch: updated - -2009-04-01 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated MesaLib to 7.4 - SOURCE matches upstream posted MD5 - * CONFIGURE: Moved xf86-video-vga from common to uncommon (doesn't even build) - * DEPENDS: Moved xf86-video-vga from common to uncommon (doesn't even build) - -2009-02-28 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: updated spell to 1.6.0 - * BUILD: updated - * CONFIGURE: updated - * DEPENDS: updated - * PRE_BUILD: removed evdev patch, updated gl_select - * evdev-flush.patch: removed - * gl_select.patch: updated - -2009-02-20 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * FINAL: left this one out - -2009-02-10 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DEPENDS: added z-rej dependency, use NVIDIA provider - -2009-02-09 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * PRE_BUILD: use glselect function - * DEPENDS: no longer use smgl-gl_select, - added nvidia_legacy* and renamed ati_driver to ati-fglrx - * FINAL: use glselect - * POST_RESURRECT: restore mesa, add FUNCTIONS - * gl_select.patch: libwfb is always on - * REPAIR^all^POST_RESURRECT:: copy of POST_RESURRECT - -2009-02-08 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * PRE_BUILD: added smgl-gl_select patch, and run it before building, - apply a sed as per lynx^3 to fix drm if patch is applied it seems - * DEPENDS: added smgl-gl_select - * gl_select.patch: patch to modify some installation paths - * DETAILS: patchlevel++ - * FINAL: run smgl-gl_select -d - * CONFIGURE: removed the unknown options(configure complains) - -2009-01-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DEPENDS: no more XPrint - -2009-01-23 Eric Sandall <sandalle@sourcemage.org> - * DETAILS: Updated MesaLib to 7.3 - PATCHLEVEL++ - -2009-01-22 Ethan Grammatikidis <eekee57@fastmail.fm> - * DEPENDS: Added openssl; render/glyph.c requires openssl/sha.h - -2009-01-20 Ethan Grammatikidis <eekee57@fastmail.fm> - * CONFIGURE, PRE_BUILD: made George's patch optional because it - broke compilation for me. - -2009-01-18 George Sherwood <gsherwood@sourcemage.org> - * PRE_BUILD: Added patch - * xorg-server-mesa.patch: Added patch to fix Bug #14937 - -2008-11-20 George Sherwood <gsherwood@sourcemage.org> - * CONFIGURE: Add option to use build builtin bitmap fonts - -2008-11-18 Robin Cook <rcook@wyrms.net> - * PRE_BUILD: apply evdev patch to flush evdev keymap. - http://lists.freedesktop.org/archives/xorg/2008-November/040239.html - -2008-11-10 Eric Sandall <sandalle@sourcemage.org> - * FINAL: Add info for kbd/mouse drivers in 1.5.3 - -2008-11-06 Treeve Jelbert <treeve@sourcemage.org> - * DETAILS: version 1.5.3 - * PRE_BUILD: remove randr.patch - * randr.patch: deleted - -2008-10-14 Vlad Glagolev <stealth@sourcemage.org> - * INSTALL: removed -- not needed anymore (default_install) - * FINAL: removed deprecated comments; cleaned up - * UP_TRIGGERS: check_self every spell needed to be checked on casting X - include 1.4.2 in version list where every spell needed to be checked is - casted - -2008-10-13 Vlad Glagolev <stealth@sourcemage.org> - * UP_TRIGGERS: fixed up_triggerring if any local grimoires exist - -2008-10-11 Vlad Glagolev <stealth@sourcemage.org> - * DETAILS: updated spell to 1.5.2; removed useless XORG_VER; quoting - paths; cleaned up - -2008-10-09 Vlad Glagolev <stealth@sourcemage.org> - * DETAILS: updated spell to 1.5.1; use new mesalib (7.2) - * DEPENDS: added required libpciaccess - * BUILD: fixed dri path; removed forcing "--disable-xprint", cause - in DEPENDS it's optional - * FINAL: added RgbPath warning - -2008-09-19 Arjan Bouter <abouter@sourcemage.org> - * DEPENDS: made libxp+printproto optional - -2008-09-11 Thomas Orgis <sobukus@sourcemage.org> - * CONFIGURE, DEPENDS: reorder common video choices to be (hopefully) - a bit more consistent (similar hardware together), include Matrox - chips in common list instead of obscure (they're still produced... - prolly more common than S3 Trio64 or such...). - * DEPENDS: also add Matrox to sane drivers - -2008-09-09 Vlad Glagolev <stealth@sourcemage.org> - * PRE_BUILD: added randr.patch to try to fix the flickering issue from - http://thread.gmane.org/gmane.comp.freedesktop.xorg/30567 - * DETAILS: PATCHLEVEL=1 - -2008-09-04 Jaka Kranjc <lynxlynxlynx@sourcemage.org> - * UP_TRIGGERS: don't trigger spells we depend on - readded some spells to check_self, removed too many - don't use spell as a variable, bad things happen - -2008-08-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org> - * UP_TRIGGERS: fixed this braindead pos - don't fail if there's nothing to up_trigger - -2008-08-30 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: added xf86-video-intel, thanks Enqlave - * DEPENDS: added xf86-video-intel, thanks Enqlave - -2008-08-30 Vlad Glagolev <stealth@sourcemage.org> - * DETAILS: sync mesalib version with current - * UP_TRIGGERS: fixed weird syntax error (missing `then'): that's why - ";" rocks, and "\n" doesn't, cleaned up - -2008-08-29 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * UP_TRIGGERS: re-added with migration magic as well - -2008-08-28 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * UP_TRIGGERS: disabled for now, not needed - -2008-08-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: added a warning for the more advanced options - -2008-08-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: unlocking all the optional drivers now - * DEPENDS: runtime_depends_2 used in place of regular - -2008-07-13 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DEPENDS: changed some stuff and commented out some other stuff - * CONFIGURE: removed some stuff to DEPENDS/BUILD - * BUILD: forcing dbe - -2008-06-16 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: updated spell to 1.4.2 - mesalib upped to 7.0.3 - -2008-04-20 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: according to sobukus TLS means Thread Local Storage - -2008-04-13 Eric Sandall <sandalle@sourcemage.org> - * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing composite support - Bug #13360 - * CONFIGURE: Remove XWin option, only used for Cygwin anyways - Bug #13476 - * DEPENDS: Depends on libxfont built with fontcache support (Bug #13374) - * BUILD: Disable XWin (Bug #13476) - -2008-03-17 Eric Sandall <sandalle@sourcemage.org> - * CONFLICTS: Auto-conflicts with xorg as well - -2008-03-16 Eric Sandall <sandalle@sourcemage.org> - * CONFLICTS: Auto-conflicts with all prior monolithic X providers - -2008-01-04 Juuso Alasuutari <iuso@sourcemage.org> - * UP_TRIGGERS: Fixed loop constructs, fixes bug #14166. - -2007-12-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: updated spell to 1.4.0.90 - fixed long description wrap - * FINAL: ups... forgot to mention the removal of that hack atm - -2007-12-02 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * BUILD: correct some paths and fix XKB breakage - * PRE_BUILD: unpack into the SOURCE_DIRECTORY - * FINAL: add a hack to force rebuild of some spells AFTER - the cast - * UP_TRIGGERS: stuff needs to be rebuilt - * DETAILS: mesalib to 7.0.2 - -2007-11-23 Eric Sandall <sandalle@sourcemage.org> - * DEPENDS: Depends on libx11 - * PROVIDES: Does not provide X11-LIBS (libx11 does) - -2007-10-14 Ismael E. Luceno <ismael.luceno@gmail.com> - * DETAILS: updated description & short - -2007-09-09 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: version update - * DEPENDS: new depends pixman, hal and dbus - -2007-09-07 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * BUILD: added a fix for a gcc 4.2.0 regression - -2007-04-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: update to 1.3.0.0 - -2007-04-03 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: updato to 1.2.99.903 - -2007-03-21 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: update to 1.2.99.902 - -2007-02-01 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: version update to 1.2.0, PATCHLEVEL++ - * xorg-server-1.1.99.903-fixes-1.patch: removed - * PRE_BUILD: removed patch - * DEPENDS: dmx causing probs, added libxi - * BUILD: dmx causing probs - * CONFIGURE: minor fixups, enable/disable XInput - -2006-12-31 Thomas Orgis <sobukus@sourcemage.org> - * DETAILS, PRE_BUILD, xorg-server-1.1.99.903-fixes-1.patch: - first patchlevel, fixing Makefile stuff for including mipmap.c - -2006-12-03 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: update to 1.1.99.903 and 6.5.2 - -2006-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: update to 1.1.99.902 - -2006-10-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * INSTALL: no more bothering with libGLcore - -2006-10-21 Juuso Alasuutari <iuso@sourcemage.org> - * DEPENDS: Changed xorgcfg option default to 'n' (broken at - the moment), added question marks to prompts, other minor - verbal fixes. - -2006-10-18 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * INSTALL: minor fix - -2006-10-14 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * INSTALL: make it +x - * FINAL: add smgl-gl_select, removed and added a temp symlink hack - * DETAILS: version update and mesalib++ - * DEPENDS: removed depends on smgl-gl_select for now - * CONFIGURE: new options, old options - -2006-10-13 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DEPENDS: typo - -2006-10-12 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * INSTALL: making it multi GL Library compatible - * DETAILS: PATCHLEVEL++ - * DEPENDS: depend on smgl_gl-select - -2006-09-16 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: new version of mesalib 6.5.1, back to 6.5 - -2006-09-02 Eric Sandall <sandalle@sourcemage.org> - * DEPENDS: Disable xprint (breaks build) (Bug #12713) - -2006-08-27 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: update to 1.1.1, SECURITY_PATCH + - -2006-05-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: mark certain opitons as EXPERIMENTAL - * PROVIDES: removed XDAMAGE - * DEPENDS: make libxv non-optional for now bug #12140, - ups vars can't start with numbers #10866 - -2006-06-25 Eric Sandall <sandalle@sourcemage.org> - * DEPENDS: Depend on libxinerama if building DRI in XORG_SERVER_OPTS, - otherwise this is optional. - -2006-05-23 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: xorg 7.1 update - * PRE_BUILD: two patches less to apply - * CONFIGURE: added more options, forgot a " - * DEPENDS: added more options - -2006-05-06 Robin Cook <rcook@wyrms.net> - * DETAILS: +1 SECURITY_PATCH - * PRE_BUILD: apply patch xorg-server-1.0.x-mitri.diff - -2006-04-06 Pieter Lenaerts <e-type@cwazy.co.uk> - * CONFIGURE: corrected filename to be sourced - -2006-04-05 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: ups... wrongly renamed - -2006-03-30 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: added fonts, input drivers, video drivers, some cleanup - * DEPENDS: added fonts, input drivers, video drivers, some cleanup - -2006-03-22 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: SECURITY_PATCH=1, newer mesalib - * PRE_BUILD: apply patch - * xorg-server-1.0.1-geteuid.diff: added - * MesaLib-6.4.1.tar.bz2.sig: removed - -2006-03-12 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: sanitizing options - -2006-03-06 Karsten Behrmann <BearPerson@sourcemage.org> - * BUILD: (automated) remove unneeded old opts - -2006-03-05 Karsten Behrmann <BearPerson@sourcemage.org> - * CONFIGURE, BUILD: (automated) unify config_query_option variable name - -2006-03-02 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS: bad SOURCE2 URL was defined as SOURCE - * fontcache.c.includes.patch: added to fix buggy includes - * PRE_BUILD: apply patch - * DEPENDS: added basic fonts and rgb - -2006-02-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DEPENDS: removed profile and added some others - needed for a proper out of the box working Xorg - -2006-02-11 Robin Cook <rcook@wyrms.net> - * BUILD: added OPTS - -2006-01-23 Robin Cook <rcook@wyrms.net> - * DETAILS: added MesaLib as SOURCE2 - * PRE_BUILD: added to extract mesalib - * BUILD: added to put mesa source path to OPTS - * FINAL: added to delete mesalib source - -2005-12-23 Robin Cook <rcook@wyrms.net> - * PROVIDES: removed OPENGL as it doesn't - -2005-12-22 Robin Cook <rcook@wyrms.net> - * DETAILS: Updated VERSION to 1.0.1 - added XORG_VER - updated SOURCE, SOURCE_URL, and SOURCE_DIRECTORY - -2005-12-21 Robin Cook <rcook@wyrms.net> - * DEPENDS: added libmesa as could not get it to build without it even - with DIR & GLX sen to no. - added libxres - * PROVIDES: added - -2005-12-15 Robin Cook <rcook@wyrms.net> - * DETAILS: Updated VERSION to 1.0.0 - * DEPENDS: changed SECTION proto to proto-profile - * CONFIGURE: changed as kept hanging while casting - -2005-12-15 Robin Cook <rcook@wyrms.net> - * DETAILS: Updated SOURCE_URL to RC4 - -2005-12-15 Robin Cook <rcook@wyrms.net> - * DETAILS: Updated VERSION to 0.99.4 - converted SOURCEHASH to SOURCE_GPG - -2005-12-14 Robin Cook <rcook@wyrms.net> - * DETAILS: Updated SOURCE_URL - -2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * CONFIGURE: added tons of options - * DEPENDS: cosmetic fix - -2005-11-25 Karsten Behrmann <BearPerson@sourcemage.org> - * DEPENDS: auto-created or updated - -2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> - * DETAILS, HISTORY: created spell +2019-02-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0 + PATCHLEVEL=9999 + spell deprecated [replaced by xserver] diff --git a/xorg-xserver/xorg-server/INSTALL b/xorg-xserver/xorg-server/INSTALL index 2d8350f7ab..27ba77ddaf 100755 --- a/xorg-xserver/xorg-server/INSTALL +++ b/xorg-xserver/xorg-server/INSTALL @@ -1,8 +1 @@ -default_install && -if [[ $XORG_XINITRC_XSESSION == "y" ]]; then - install -m755 ${SCRIPT_DIRECTORY}/startxinitrc ${INSTALL_ROOT}/usr/bin && - if [[ ! -d ${INSTALL_ROOT}/usr/share/xsessions ]]; then - mkdir -p ${INSTALL_ROOT}/usr/share/xsessions || return 1 - fi && - install -m644 ${SCRIPT_DIRECTORY}/xinitrc.desktop ${INSTALL_ROOT}/usr/share/xsessions || return 1 -fi +true diff --git a/xorg-xserver/xorg-server/POST_RESURRECT b/xorg-xserver/xorg-server/POST_RESURRECT deleted file mode 100755 index b17d803915..0000000000 --- a/xorg-xserver/xorg-server/POST_RESURRECT +++ /dev/null @@ -1,4 +0,0 @@ -. "${GRIMOIRE}/FUNCTIONS" && -if spell_ok "smgl-gl_select"; then - glselect mesa -fi diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD index 77dcea15e7..27ba77ddaf 100755 --- a/xorg-xserver/xorg-server/PRE_BUILD +++ b/xorg-xserver/xorg-server/PRE_BUILD @@ -1,12 +1 @@ -default_pre_build && -cd "$SOURCE_DIRECTORY" && -if spell_ok "smgl-gl_select"; then - # required to build - glselect mesa && - # some install scripts are missing! - autoreconf -f -i --symlink && - patch -p1 < $SPELL_DIRECTORY/gl_select.patch -fi && - -patch -p1 < "$SPELL_DIRECTORY/fix-CVE-2018-14665.patch" - +true diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS deleted file mode 100755 index 7fd4fb6af4..0000000000 --- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS +++ /dev/null @@ -1,14 +0,0 @@ -case $THIS_SUB_DEPENDS in - XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;; - DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;; - DRI) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;; - GLAMOR) list_find "$XORG_SERVER_OPTS" "--enable-glamor" && return 0 ;; - KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && return 0 ;; -# Xephyr requires Kdrive and list_find returns true if at least one matches - XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && - list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;; - XVFB) list_find "$XORG_SERVER_OPTS" "--enable-xvfb" && return 0 ;; - XWAYLAND) is_depends_enabled $SPELL wayland ;; - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; - return 1;; -esac diff --git a/xorg-xserver/xorg-server/PROVIDES b/xorg-xserver/xorg-server/PROVIDES deleted file mode 100755 index f43e8070e8..0000000000 --- a/xorg-xserver/xorg-server/PROVIDES +++ /dev/null @@ -1,2 +0,0 @@ -X11-SERVER -XSERVER diff --git a/xorg-xserver/xorg-server/REPAIR^all^EXPORTS b/xorg-xserver/xorg-server/REPAIR^all^EXPORTS deleted file mode 100755 index 16799e136f..0000000000 --- a/xorg-xserver/xorg-server/REPAIR^all^EXPORTS +++ /dev/null @@ -1 +0,0 @@ -XORG_SERVER_OPTS diff --git a/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT b/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT deleted file mode 100755 index b17d803915..0000000000 --- a/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT +++ /dev/null @@ -1,4 +0,0 @@ -. "${GRIMOIRE}/FUNCTIONS" && -if spell_ok "smgl-gl_select"; then - glselect mesa -fi diff --git a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS deleted file mode 100755 index b75a433555..0000000000 --- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS +++ /dev/null @@ -1,14 +0,0 @@ -case $THIS_SUB_DEPENDS in - XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;; - DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;; - DRI) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;; - GLAMOR) list_find "$XORG_SERVER_OPTS" "--enable-glamor" && return 0 ;; - KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && return 0 ;; -# Xephyr requires Kdrive and list_find returns true if at least one matches - XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && - list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;; - XVFB) list_find "$XORG_SERVER_OPTS" "--enable-xvfb" && return 0 ;; - XWAYLAND) is_depends_enabled $SPELL wayland ;; - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; - return 1;; -esac diff --git a/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS b/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS deleted file mode 100755 index 4acd740d2a..0000000000 --- a/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS +++ /dev/null @@ -1,24 +0,0 @@ -case "$THIS_SUB_DEPENDS" in - XCOMPOSITE) message "${MESSAGE_COLOR}Composite extension required, forcing it.${DEFAULT_COLOR}" && - depends libxcomposite "--enable-composite" ;; - DPMS) message "${MESSAGE_COLOR}DPMS extension required, forcing it.${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-dpms" && - list_add XORG_SERVER_OPTS "--enable-dpms" ;; - DRI) message "${MESSAGE_COLOR}DRI extension required, forcing it.${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-dri" && - list_add XORG_SERVER_OPTS "--enable-dri" ;; - GLAMOR) message "${MESSAGE_COLOR}GLAMORI extension required, forcing it.${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-glamor" && - list_add XORG_SERVER_OPTS "--enable-glamor" ;; - KDRIVE) message "${MESSAGE_COLOR}Forcing Kdrive...${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-kdrive" && - list_add XORG_SERVER_OPTS "--enable-kdrive" ;; -# Xephyr requires Kdrive - XEPHYR) message "${MESSAGE_COLOR}Forcing Kdrive and Xephyr...${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-kdrive --disable-xephyr" && - list_add XORG_SERVER_OPTS "--enable-kdrive --enable-xephyr" ;; - XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}" && - depends wayland "--enable-xwayland" ;; - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; - return 1;; -esac diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS b/xorg-xserver/xorg-server/SUB_DEPENDS deleted file mode 100755 index 1e08a5b58c..0000000000 --- a/xorg-xserver/xorg-server/SUB_DEPENDS +++ /dev/null @@ -1,25 +0,0 @@ -case "$THIS_SUB_DEPENDS" in - XCOMPOSITE) message "${MESSAGE_COLOR}Composite extension required, forcing it.${DEFAULT_COLOR}" && - depends libxcomposite "--enable-composite" ;; - DPMS) message "${MESSAGE_COLOR}DPMS extension required, forcing it.${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-dpms" && - list_add XORG_SERVER_OPTS "--enable-dpms" ;; - DRI) message "${MESSAGE_COLOR}DRI extension required, forcing it.${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-dri" && - list_add XORG_SERVER_OPTS "--enable-dri" ;; - GLAMOR) message "${MESSAGE_COLOR}Glamor required, forcing it.${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-glamor" && - list_add XORG_SERVER_OPTS "--enable-glamor" ;; - KDRIVE) message "${MESSAGE_COLOR}Forcing Kdrive...${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-kdrive" && - list_add XORG_SERVER_OPTS "--enable-kdrive" ;; -# Xephyr requires Kdrive - XEPHYR) message "${MESSAGE_COLOR}Forcing Kdrive and Xephyr...${DEFAULT_COLOR}" && - list_remove XORG_SERVER_OPTS "--disable-kdrive --disable-xephyr" && - list_add XORG_SERVER_OPTS "--enable-kdrive --enable-xephyr" ;; - XVFB) list_add XORG_SERVER_OPTS "--enable-xvfb" ;; - XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}" && - depends wayland "--enable-xwayland" ;; - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; - return 1;; -esac diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS b/xorg-xserver/xorg-server/UP_TRIGGERS index 6f9bf38301..331aa7ed03 100755 --- a/xorg-xserver/xorg-server/UP_TRIGGERS +++ b/xorg-xserver/xorg-server/UP_TRIGGERS @@ -1,11 +1 @@ -local OLD_SPELL_VERSION="" -if spell_ok $SPELL; then - OLD_SPELL_VERSION="$(installed_version $SPELL)" - if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then - message "This is a possibly incompatible update of $SPELL..." - message "Figuring out what spells need to be recast, this may take a while." - for each in $(show_up_depends $SPELL 1); do - up_trigger $each check_self - done - fi -fi +up_trigger xserver cast_self diff --git a/xorg-xserver/xorg-server/fix-CVE-2018-14665.patch b/xorg-xserver/xorg-server/fix-CVE-2018-14665.patch deleted file mode 100644 index bfa7773e43..0000000000 --- a/xorg-xserver/xorg-server/fix-CVE-2018-14665.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index 6c25eda739719d11f0e4c2dcf59c2a06d2b9ac97..0f57efa86324bb933fe9e239b46f62d04a739d39 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -935,14 +935,18 @@ ddxProcessArgument(int argc, char **argv, int i) - /* First the options that are not allowed with elevated privileges */ - if (!strcmp(argv[i], "-modulepath")) { - CHECK_FOR_REQUIRED_ARGUMENT(); -- xf86CheckPrivs(argv[i], argv[i + 1]); -+ if (xf86PrivsElevated()) -+ FatalError("\nInvalid argument -modulepath " -+ "with elevated privileges\n"); - xf86ModulePath = argv[i + 1]; - xf86ModPathFrom = X_CMDLINE; - return 2; - } - if (!strcmp(argv[i], "-logfile")) { - CHECK_FOR_REQUIRED_ARGUMENT(); -- xf86CheckPrivs(argv[i], argv[i + 1]); -+ if (xf86PrivsElevated()) -+ FatalError("\nInvalid argument -logfile " -+ "with elevated privileges\n"); - xf86LogFile = argv[i + 1]; - xf86LogFileFrom = X_CMDLINE; - return 2; diff --git a/xorg-xserver/xorg-server/gl_select.patch b/xorg-xserver/xorg-server/gl_select.patch deleted file mode 100644 index fa7fb1b159..0000000000 --- a/xorg-xserver/xorg-server/gl_select.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f6b348700dcd99d4ab086a709e3309e610721822 Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> -Date: Sat, 12 Oct 2013 19:47:22 +0200 -Subject: [PATCH] gl_select - ---- - hw/xfree86/dixmods/Makefile.in | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/dixmods/Makefile.in b/hw/xfree86/dixmods/Makefile.in -index ce03745..ac0bee9 100644 ---- a/hw/xfree86/dixmods/Makefile.in -+++ b/hw/xfree86/dixmods/Makefile.in -@@ -515,7 +515,7 @@ module_LTLIBRARIES = libfb.la \ - libshadow.la - - extsmoduledir = $(moduledir)/extensions --extsmodule_LTLIBRARIES = $(GLXMODS) -+extsmodule_LTLIBRARIES = - AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ - INCLUDES = @XORG_INCS@ \ - -I$(top_srcdir)/hw/xfree86/loader \ -@@ -577,6 +577,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/.mesa" -+ @lst='$(GLXMODS)'; for r in $$lst; do \ -+ if test -f $$r; then \ -+ h=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) '$$r' '$(DESTDIR)$(extsmoduledir)/.mesa/'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/.mesa/"; \ -+ else :; fi; \ -+ done -+ - @list='$(extsmodule_LTLIBRARIES)'; test -n "$(extsmoduledir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -824,7 +833,7 @@ distdir: $(DISTFILES) - done - check-am: all-am - check: check-am --all-am: Makefile $(LTLIBRARIES) -+all-am: Makefile $(LTLIBRARIES) $(GLXMODS) - installdirs: - for dir in "$(DESTDIR)$(extsmoduledir)" "$(DESTDIR)$(moduledir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ --- -1.8.4.1 - diff --git a/xorg-xserver/xorg-server/startxinitrc b/xorg-xserver/xorg-server/startxinitrc deleted file mode 100755 index e1bf78c372..0000000000 --- a/xorg-xserver/xorg-server/startxinitrc +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -if [[ -f "${HOME}/.xinitrc" ]]; then - source ${HOME}/.xinitrc -fi diff --git a/xorg-xserver/xorg-server/xinitrc.desktop b/xorg-xserver/xorg-server/xinitrc.desktop deleted file mode 100644 index ca4e50447e..0000000000 --- a/xorg-xserver/xorg-server/xinitrc.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=xinitrc -Comment=This session starts the .xinitrc file -TryExec=startxinitrc -Exec=startxinitrc |