BSD Commit Log Search

   merge libX11 1.8.10

   initial import of libX11-1.8.10

   merge libXt 1.3.1.

   initial import of libXt-1.3.1

   merge xkbprint 1.0.7.

   initial import of xkbprint-1.0.7

   initial import of fonttosfnt-1.2.4

   initial import of bdftopcf-1.1.2

   merge x11perf 1.7.0, xfs 1.2.2, xrandr 1.5.3, and xtrans 1.5.2.

   initial import of xtrans-1.5.2

   initial import of xrandr-1.5.3

   initial import of xfs-1.2.2

   initial import of xcmsdb-1.0.7

   initial import of x11perf-1.7.0

   merge xclipboard 1.1.5, xlogo 1.0.7, xmag 1.0.8, and xprop 1.2.8.

   initial import of xwud-1.0.7

   initial import of xprop-1.2.8

   initial import of xmag-1.0.8

   initial import of xlogo-1.0.7

   initial import of xclipboard-1.1.5

   merge libXcursor 1.2.3, libXi 1.8.2, libFS 1.0.10, libXfont2 2.0.7, and
   libXtst 1.2.5.

   initial import of libXtst-1.2.5

   initial import of libXi-1.8.2

   initial import of libXfont2-2.0.7

   initial import of libXcursor-1.2.3

   initial import of libFS-1.0.10

   Pull up following revision(s) (requested by mrg in ticket #1917):

        external/mit/xorg-server.old/dist/Xi/xiselectev.c: revision 1.2
        external/mit/xorg-server.old/dist/Xi/xiquerypointer.c: revision 1.2
        external/mit/xorg-server.old/dist/dix/property.c: revision 1.2
        external/mit/xorg-server.old/dist/Xi/xichangehierarchy.c: revision 1.3
        external/mit/xorg-server.old/dist/Xi/exevents.c: revision 1.3
        external/mit/xorg-server.old/dist/Xi/exevents.c: revision 1.4
        external/mit/xorg-server.old/dist/glx/glxcmds.c: revision 1.2
        external/mit/xorg-server.old/dist/dix/devices.c: revision 1.2
        external/mit/xorg-server.old/dist/randr/rrproperty.c: revision 1.3
        external/mit/xorg-server.old/dist/dix/devices.c: revision 1.3
        external/mit/xorg-server.old/dist/Xi/xipassivegrab.c: revision 1.2
        external/mit/xorg-server.old/dist/Xi/xiproperty.c: revision 1.3

   merge upstream change 8f454b793e1f13c99872c15f0eed1d7f3b823fe8:

   Subject: [PATCH] Xi: avoid integer truncation in length check of
    ProcXIChangeProperty

    [201 lines not shown]

   Pull up following revision(s) (requested by mrg in ticket #999):

        external/mit/xorg-server.old/dist/Xi/xiselectev.c: revision 1.2
        external/mit/xorg-server.old/dist/Xi/xiquerypointer.c: revision 1.2
        external/mit/xorg-server.old/dist/dix/property.c: revision 1.2
        external/mit/xorg-server.old/dist/Xi/xichangehierarchy.c: revision 1.3
        external/mit/xorg-server.old/dist/Xi/exevents.c: revision 1.3
        external/mit/xorg-server.old/dist/Xi/exevents.c: revision 1.4
        external/mit/xorg-server.old/dist/glx/glxcmds.c: revision 1.2
        external/mit/xorg-server.old/dist/dix/devices.c: revision 1.2
        external/mit/xorg-server.old/dist/randr/rrproperty.c: revision 1.3
        external/mit/xorg-server.old/dist/dix/devices.c: revision 1.3
        external/mit/xorg-server.old/dist/Xi/xipassivegrab.c: revision 1.2
        external/mit/xorg-server.old/dist/Xi/xiproperty.c: revision 1.3

   merge upstream change 8f454b793e1f13c99872c15f0eed1d7f3b823fe8:

   Subject: [PATCH] Xi: avoid integer truncation in length check of
    ProcXIChangeProperty

    [201 lines not shown]

   port xorg-server change 26769aa71fcbe0a8403b7fb13b7c9010cc07c3a8

   there are two chunks in this change, and while they apply fine to the old
   xorg-server 1.10 tree (unlike _most_), they do not build due to using new
   identifiers.

   the first chunk uses a new MASTER_ATTACHED argument to GetMaster(), which
   avoids finding paired devices.  the only answer it can give with the setup
   of already testing !IsMaster(other) is "other->u.master", so just use that
   directly instead if calling GetMaster().

   the second chunk uses a new single-line IsFloating() function, and if you
   expand it's use here to the full expression, it ends up just being:

        if (!IsMaster(dev) && dev->u.master)

   (which just happens to match the same line a few above, for the loop of
   not-off "devices".)


    [17 lines not shown]

   Apply patch, requested by mrg in ticket #1916:

        xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c
        xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
        xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c
        xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c
        xsrc/external/mit/xorg-server/dist/dix/devices.c
        xsrc/external/mit/xorg-server/dist/dix/enterleave.c
        xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
        xsrc/external/mit/xorg-server/dist/randr/rrproperty.c
        xsrc/external/mit/xorg-server/dist/randr/rrproviderproperty.c
        xsrc/external/mit/xorg-server/dist/xkb/xkb.c

   Update xorg-server to have various missing CVE fixes:
   CVE-2023-6377, CVE-2023-6478, CVE-2023-6816, CVE-2024-0229,
   CVE-2024-0408, CVE-2024-21885, CVE-2024-21886, CVE-2024-31080,
   CVE-2024-31081, CVE-2024-9632