[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libdmx][debian-unstable] 16 commits: Remove fallback for _XEatDataWords, require libX11 1.6 for it

Title: GitLab

Julien Cristau pushed to branch debian-unstable at X Strike Force / lib / libdmx

Commits:

11 changed files:

Changes:

  • ChangeLog
    1 
    +commit 6056db9a2fa8ad1ea55f8b8e2cbf5972408d612f
    2 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    3 
    +Date:   Sun May 13 17:42:34 2018 -0700
    4 
    +
    5 
    +    libdmx 1.1.4
    6 
    +
    7 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    8 
    +
    9 
    +commit d2f4332f40d911dcc2a1c658c4642448e6c439de
    10 
    +Author: Mihail Konev <k.mvc@ya.ru>
    11 
    +Date:   Thu Jan 26 13:52:49 2017 +1000
    12 
    +
    13 
    +    autogen: add default patch prefix
    14 
    +
    15 
    +    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
    16 
    +
    17 
    +commit c2e540b4b31dd749fba15dcad1c837e8c6dfdea7
    18 
    +Author: Emil Velikov <emil.l.velikov@gmail.com>
    19 
    +Date:   Mon Mar 9 12:00:52 2015 +0000
    20 
    +
    21 
    +    autogen.sh: use quoted string variables
    22 
    +
    23 
    +    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
    24 
    +    fall-outs, when they contain space.
    25 
    +
    26 
    +    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
    27 
    +    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    28 
    +    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    29 
    +
    30 
    +commit a979a146aec64b633bb7b7c3553a8fdee9096808
    31 
    +Author: Peter Hutterer <peter.hutterer@who-t.net>
    32 
    +Date:   Tue Jan 24 10:32:07 2017 +1000
    33 
    +
    34 
    +    autogen.sh: use exec instead of waiting for configure to finish
    35 
    +
    36 
    +    Syncs the invocation of configure with the one from the server.
    37 
    +
    38 
    +    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    39 
    +    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
    40 
    +
    41 
    +commit 9a036773d9a6a5e63a9f3c295432da09a150367b
    42 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    43 
    +Date:   Sat May 31 21:39:32 2014 -0700
    44 
    +
    45 
    +    autogen.sh: Honor NOCONFIGURE=1
    46 
    +
    47 
    +    See http://people.gnome.org/~walters/docs/build-api.txt
    48 
    +
    49 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    50 
    +
    51 
    +commit ac17738a88215a6f15e484b134f7d3c6dc21c13f
    52 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    53 
    +Date:   Sat May 31 21:38:41 2014 -0700
    54 
    +
    55 
    +    configure: Drop AM_MAINTAINER_MODE
    56 
    +
    57 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    58 
    +
    59 
    +commit e0715a0389874d257a39ed3399b4a512317be0da
    60 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    61 
    +Date:   Sun Dec 8 12:24:21 2013 -0800
    62 
    +
    63 
    +    Replace malloc(size); memset(...,0,size) with calloc
    64 
    +
    65 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    66 
    +    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    67 
    +
    68 
    +commit 78d267a0e0013d89a756cffe0e1dccb71945a0a4
    69 
    +Author: Michael Joost <mehl@michael-joost.de>
    70 
    +Date:   Mon Nov 18 16:11:26 2013 +0100
    71 
    +
    72 
    +    Remove fallback for _XEatDataWords, require libX11 1.6 for it
    73 
    +
    74 
    +    _XEatDataWords was orignally introduced with the May 2013 security
    75 
    +    patches, and in order to ease the process of delivering those,
    76 
    +    fallback versions of _XEatDataWords were included in the X extension
    77 
    +    library patches so they could be applied to older versions that didn't
    78 
    +    have libX11 1.6 yet.   Now that we're past that hurdle, we can drop
    79 
    +    the fallbacks and just require libX11 1.6 for building new versions
    80 
    +    of the extension libraries.
    81 
    +
    82 
    +    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    83 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    84 
    +
    1 85 
     commit 76e841968ceb69095eb0efcd435fc47440e86d2c
    2 86 
     Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    3 87 
     Date:   Tue May 28 16:45:02 2013 -0700

  • autogen.sh
    1 1 
     #! /bin/sh
    2 2
    3 
    -srcdir=`dirname $0`
    3 
    +srcdir=`dirname "$0"`
    4 4 
     test -z "$srcdir" && srcdir=.
    5 5
    6 6 
     ORIGDIR=`pwd`
    7 
    -cd $srcdir
    7 
    +cd "$srcdir"
    8 8
    9 9 
     autoreconf -v --install || exit 1
    10 
    -cd $ORIGDIR || exit $?
    10 
    +cd "$ORIGDIR" || exit $?
    11 11
    12 
    -$srcdir/configure --enable-maintainer-mode "$@"
    12 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    13 
    +    git config --local format.subjectPrefix "PATCH libdmx"
    14 
    +
    15 
    +if test -z "$NOCONFIGURE"; then
    16 
    +    exec "$srcdir"/configure "$@"
    17 
    +fi

  • configure.ac
    ... ... @@ -21,14 +21,13 @@
    21 21
    22 22 
     # Initialize Autoconf
    23 23 
     AC_PREREQ([2.60])
    24 
    -AC_INIT([libdmx], [1.1.3],
    24 
    +AC_INIT([libdmx], [1.1.4],
    25 25 
             [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
    26 26 
     AC_CONFIG_SRCDIR([Makefile.am])
    27 27 
     AC_CONFIG_HEADERS([config.h])
    28 28
    29 29 
     # Initialize Automake
    30 30 
     AM_INIT_AUTOMAKE([foreign dist-bzip2])
    31 
    -AM_MAINTAINER_MODE
    32 31
    33 32 
     # Initialize libtool
    34 33 
     AC_PROG_LIBTOOL
    ... ... @@ -41,14 +40,7 @@ XORG_DEFAULT_OPTIONS
    41 40 
     XORG_CHECK_MALLOC_ZERO
    42 41
    43 42 
     # Obtain compiler/linker options for depedencies
    44 
    -PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
    45 
    -
    46 
    -# Check for _XEatDataWords function that may be patched into older Xlib releases
    47 
    -SAVE_LIBS="$LIBS"
    48 
    -LIBS="$DMX_LIBS"
    49 
    -AC_CHECK_FUNCS([_XEatDataWords])
    50 
    -LIBS="$SAVE_LIBS"
    51 
    -
    43 
    +PKG_CHECK_MODULES(DMX, [x11 >= 1.6] xext xextproto [dmxproto >= 2.2.99.1])
    52 44
    53 45 
     AC_CONFIG_FILES([Makefile
    54 46 
     		src/Makefile

  • debian/README.source
    ... ... @@ -47,27 +47,3 @@ are involved:
    47 47 
       case, it appears directly in the .diff.gz.
    48 48 
     * Otherwise, the patch is added to debian/patches/ which is managed
    49 49 
       with quilt as documented in /usr/share/doc/quilt/README.source.
    50 
    -
    51 
    -quilt is actually invoked by the Debian X packaging through a larger
    52 
    -set of scripts called XSFBS. XSFBS brings some other X specific
    53 
    -features such as managing dependencies and conflicts due to the video
    54 
    -and input driver ABIs.
    55 
    -XSFBS itself is maintained in a separate repository at
    56 
    -  git://git.debian.org/pkg-xorg/xsfbs.git
    57 
    -and it is pulled inside the other Debian X repositories when needed.
    58 
    -
    59 
    -The XSFBS patching system requires a build dependency on quilt. Also
    60 
    -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
    61 
    -so that the XSFBS patching occurs before the actual build. So the
    62 
    -very first target of the build (likely the one running autoreconf)
    63 
    -should depend on $(STAMP_DIR)/patch. It should also not depend on
    64 
    -anything so that parallel builds are correctly supported (nothing
    65 
    -should probably run while patching is being done). And finally, the
    66 
    -clean target should depend on the xsfclean target so that patches
    67 
    -are unapplied on clean.
    68 
    -
    69 
    -When the upstream sources contain some DFSG-nonfree files, they are
    70 
    -listed in text files in debian/prune/ in the "debian-*" branch of
    71 
    -the Debian repository. XSFBS' scripts then take care of removing
    72 
    -these listed files during the build so as to generate a modified
    73 
    -DFSG-free .orig.tar.gz tarball.

  • debian/changelog
    1 
    +libdmx (1:1.1.4-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release
    4 
    +  * Let uscan verify tarball signatures.
    5 
    +  * Remove obsolete XSFBS section from README.source.
    6 
    +  * Remove Cyril from Uploaders.
    7 
    +  * Update upstream and packaging URLs.
    8 
    +  * Switch to dh.
    9 
    +
    10 
    + -- Julien Cristau <jcristau@debian.org>  Wed, 05 Sep 2018 15:11:21 +0200
    11 
    +
    1 12 
     libdmx (1:1.1.3-1) unstable; urgency=low
    2 13
    3 14 
       * New upstream release.

  • debian/control
    ... ... @@ -2,7 +2,6 @@ Source: libdmx
    2 2 
     Section: x11
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 
    -Uploaders: Cyril Brulebois <kibi@debian.org>
    6 5 
     Build-Depends:
    7 6 
      libx11-dev (>= 1:0.99.2),
    8 7 
      x11proto-dmx-dev (>= 1:2.2.99.1),
    ... ... @@ -16,8 +15,8 @@ Build-Depends:
    16 15 
     # misc:Pre-Depends
    17 16 
      debhelper (>= 8.1.3),
    18 17 
     Standards-Version: 3.9.3
    19 
    -Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdmx
    20 
    -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdmx.git
    18 
    +Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdmx.git
    19 
    +Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libdmx
    21 20
    22 21 
     Package: libdmx1
    23 22 
     Section: libs
    ... ... @@ -39,10 +38,10 @@ Description: X11 Distributed Multihead extension library
    39 38 
      and removing screens, input devices, et al.
    40 39 
      .
    41 40 
      More information about X.Org can be found at:
    42 
    - <URL:http://www.X.org>
    41 
    + <URL:https://www.X.org>
    43 42 
      .
    44 43 
      This module can be found at
    45 
    - git://anongit.freedesktop.org/git/xorg/lib/libdmx
    44 
    + https://gitlab.freedesktop.org/xorg/lib/libdmx
    46 45
    47 46 
     Package: libdmx1-dbg
    48 47 
     Section: debug
    ... ... @@ -69,10 +68,10 @@ Description: X11 Distributed Multihead library (debug package)
    69 68 
      Non-developers likely have little use for this package.
    70 69 
      .
    71 70 
      More information about X.Org can be found at:
    72 
    - <URL:http://www.X.org>
    71 
    + <URL:https://www.X.org>
    73 72 
      .
    74 73 
      This module can be found at
    75 
    - git://anongit.freedesktop.org/git/xorg/lib/libdmx
    74 
    + https://gitlab.freedesktop.org/xorg/lib/libdmx
    76 75
    77 76 
     Package: libdmx-dev
    78 77 
     Section: libdevel
    ... ... @@ -99,7 +98,7 @@ Description: X11 Distributed Multihead extension library (development headers)
    99 98 
      libdmx1.  Non-developers likely have little use for this package.
    100 99 
      .
    101 100 
      More information about X.Org can be found at:
    102 
    - <URL:http://www.X.org>
    101 
    + <URL:https://www.X.org>
    103 102 
      .
    104 103 
      This module can be found at
    105 
    - git://anongit.freedesktop.org/git/xorg/lib/libdmx
    104 
    + https://gitlab.freedesktop.org/xorg/lib/libdmx

  • debian/copyright
    1 1 
     This package was downloaded from
    2 
    -http://xorg.freedesktop.org/releases/individual/lib/
    2 
    +https://xorg.freedesktop.org/releases/individual/lib/
    3 3
    4 4 
     Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
    5 5

  • debian/rules
    ... ... @@ -25,24 +25,19 @@ else
    25 25 
     	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
    26 26 
     endif
    27 27
    28 
    -build: build-arch
    29 
    -build-indep:
    30 
    -build-arch: build-stamp
    31 
    -build-stamp:
    32 
    -	dh_testdir
    33 
    -	autoreconf -vfi
    34 
    -	mkdir -p build
    35 
    -	cd build && \
    36 
    -	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
    28 
    +%:
    29 
    +	dh $@ --with autoreconf --parallel --builddirectory=build
    30 
    +
    31 
    +override_dh_auto_configure:
    32 
    +	dh_auto_configure -- \
    33 
    +		--prefix=/usr --mandir=\$${prefix}/share/man \
    37 34 
     	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
    38 35 
     	             --infodir=\$${prefix}/share/info $(confflags) \
    39 36 
     		     --disable-silent-rules \
    40 37 
     		     $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
    41 
    -	cd build && $(MAKE)
    42 
    -	>$@
    43 38
    44 
    -clean:
    45 
    -	dh_testdir
    39 
    +override_dh_auto_clean:
    40 
    +	dh_auto_clean
    46 41 
     	rm -f build-stamp
    47 42 
     	rm -f config.cache config.log config.status
    48 43 
     	rm -f */config.cache */config.log */config.status
    ... ... @@ -52,37 +47,9 @@ clean:
    52 47 
     	rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure
    53 48 
     	rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
    54 49 
     	find -name Makefile.in -delete
    55 
    -	dh_clean
    56 50
    57 
    -install: build
    58 
    -	dh_testdir
    59 
    -	dh_testroot
    60 
    -	dh_clean -k
    61 
    -	dh_installdirs
    62 
    -	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
    51 
    +override_dh_install:
    52 
    +	dh_install --fail-missing -X.la
    63 53
    64 
    -# Build architecture-dependent files here.
    65 
    -binary-arch: build install
    66 
    -	dh_testdir
    67 
    -	dh_testroot
    68 
    -	dh_installdocs
    69 
    -	dh_install --sourcedir=debian/tmp --fail-missing -X.la
    70 
    -	dh_installchangelogs
    71 
    -	dh_link
    54 
    +override_dh_strip:
    72 55 
     	dh_strip --dbg-package=$(PACKAGE)-dbg
    73 
    -	dh_compress
    74 
    -	dh_fixperms
    75 
    -	dh_makeshlibs
    76 
    -	dh_shlibdeps
    77 
    -	dh_installdeb
    78 
    -	dh_gencontrol
    79 
    -	dh_md5sums
    80 
    -	dh_builddeb
    81 
    -
    82 
    -# Build architecture-independent files here.
    83 
    -binary-indep: build install
    84 
    -# Nothing to do
    85 
    -
    86 
    -binary: binary-indep binary-arch
    87 
    -.PHONY: build build-arch build-indep
    88 
    -.PHONY: clean binary-indep binary-arch binary install

  • debian/upstream/signing-key.asc
    1 
    +-----BEGIN PGP PUBLIC KEY BLOCK-----
    2 
    +
    3 
    +mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
    4 
    +Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
    5 
    +EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
    6 
    +a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
    7 
    +8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
    8 
    +Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
    9 
    +xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
    10 
    +CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
    11 
    +TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
    12 
    +ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRCgAoAhsDBgsJCAcD
    13 
    +AgYVCAIJCgsEFgIDAQIeAQIXgAUCWtvjngUJHaXqrgAKCRCi+54IHy0TDrCEAJ0W
    14 
    +P1TlJC6G/R7wFC8jiisY/NQxKQCgiap1UHuxTtn752MGuPe4lzibQXq0K0FsYW4g
    15 
    +Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQoAJgIb
    16 
    +AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJa2+OeBQkdpequAAoJEKL7nggfLRMO
    17 
    +G0MAn3mUvsWWPwTN1apiiC7tX1bleZ3iAKCLS83eKCU9U0faAc5xOl03KXTBzLQu
    18 
    +QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
    19 
    +BBMRCgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCWtvjmAUJHaXq
    20 
    +rgAKCRCi+54IHy0TDmAsAJ4ubyCVncwKtAGVIx9whDq7f6SxZgCfXAVWUqRR20c9
    21 
    +8J39lLTtcopZDfi5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
    22 
    +J4F0v/OoPz085soV8ytLj4HqCGk2Zamh1jSgliZwuk9m7V7Wgxx+nBJawpWDX/eK
    23 
    +LObErfDwQ4dfOFvjbXLQMmNnQNaUGIWLPP3l8GuBOHMq60Bu+TPgh627vUntL5RE
    24 
    +QEQqTXIzWC6U10QsDblLwIvdOVSdGF5xl/N1myXzSKvrsZwWtoFc8G9v9hcCjhtN
    25 
    +1sm9b7Ojc51iZXvcetcvPy5RA6AUW3yEExaedUdLnvIF9sjFYIfJWFVYh2AgavnG
    26 
    +re6fF+NV2v3zfx3wRT7H9//m4YIDYJmgZgyQccXegTwfGBIq3osAAwYH/1FiMUMM
    27 
    +ES5Ilz2nDqId+DCWECAU6wgvIFRcXrZWxDxB+ZrnmTCXoAD0xedpfOkRHp8XTVc/
    28 
    +9MU+wQ+lZRx2OQ6MJW0XGuFvHm94KZF/8HzWA2Ah7U4n0+3sLpk6zWceZq2zZNF0
    29 
    +yVTjwD98+xNK1Q9sP8aOKdtg8yMH3hisKR6rdW+mfX5q0Q8Gol2hZsFH/qyIhnPz
    30 
    +hXDknuOh8E5iMkzrejVXUEn++Yzj23XjP59SObLznVkyxI+kBI9qvVEPfFBDybjH
    31 
    +WqLcgRcCpXAzjizEi+/d31iDa2ErJHV4R42obecFqiPnoDtiX3IiP7z9fmxM4aWP
    32 
    +ZZRqvq+1ht5wkn+ISQQYEQIACQUCRpv6bwIbDAAKCRCi+54IHy0TDoLoAKCHYRpw
    33 
    +/XfyEunw1YL/uMZzl78qIQCdFVcXNbqD83qVhW4Ly7hyDL8o0aK5Ag0EUXnVIQEQ
    34 
    +AKHpjOmY056n0tsZoW9q5egsMcl5tKC8uimrhO05nnq+5/60/YedC++V9c9b/3/X
    35 
    +7O28LyBkAtBgD0xJZSDQ0DhTzKAp6AzjQtBvI68uinGwxSjT+oQpPMxqhA1I0kzo
    36 
    +EDCdEqV+HsVOAEdbAi/tP9bbdTDzwVc8MWDriamBUqc53Rb00Mffy9435UgTS4gA
    37 
    +hMwANhy6XZmOMBhITOzxFJUEDTDJtLbE0b1jPRQS7NHQgak1inmuvPMc3wAuoEcS
    38 
    +CSt1xupbYsBoXOjK5wC/eE1LIdZoRyW2OkT140DqDZ8zfRID860hnirnYgb09TPN
    39 
    +tj93pudUAUt6T9+tcLN4/rxhxHOwse66KGHO4bQ1rZ6mfco6SYd9V60cL6hC2eMe
    40 
    +cyxZliMu17lj7EX8lxUH+omIgHc7HGoyUR6V+WB60cxWj5v05zdeLeZ2aLBcPFhx
    41 
    +lfDESm8f4ezdJSDS1QZmC0P5h3RJfhhfmdBr8kHzr7111D1/O71Av1VV5FyJ9YxU
    42 
    +Sxp4IPuzK7JbbgVHcA6PvXrDzWUslmZgPADpKH4hTmG/NdCqhEXcufvY6s5yNksB
    43 
    +8X3ReNvuSSyfGnRz3kvtyK0XzC7KRX2PquLI6A8KJprHwZGqEB1NDG8b2iaYnghO
    44 
    +jyfIYEVQF3nGfaBwv4lrCPEoZSUaK8f/NQZjNU8NQyTnABEBAAGJAm4EGBEKAA8C
    45 
    +GwIFAlrb470FCRLIEBwCKcFdIAQZAQoABgUCUXnVIQAKCRDP3xSIKMZCp9bmD/90
    46 
    +50ke3bdx0zLPlUANoTu74vQT55f0a0cXgnrj15ey6Ln0S1seHadd0aF3lKpDwUOL
    47 
    +0YIQppDhLfWf9gEsQEKSPtHQgyKRbajvz8nEOi8Hz5ovrTqGCZp81XHVoiyEiCWu
    48 
    +XxeW7eyN4C8bjxbpiN0vaZ+sgMeMhXA5mwyKFs4m9JPpDe6kd2eaMO0zkcJCYjk0
    49 
    +RcNZiPohm6EmeesNbA2zJhXgo+hQHEByojIJ5ltWyy5Zacc9dfxVq9Wr3y+lXKd8
    50 
    +bMZiklsOPX0L+60yMoYjl1y9tVq5wDtf+iS3GvFLpIEOG4hoAT3hkeVvGp/Id8RM
    51 
    +j8trZn8AsMC1h2ElHaBKRMfIpJbVCpiW6VJ8H/+WedrjiaZO5E41sM2BvQUZK+2w
    52 
    +ExnzSIcOo+BR9LrSTEJ8WuxIZ9MVT5fhADOlO1QkRyv4ngdQsN4x/A6CCFV+YrEV
    53 
    +dZ+53zENoJe7LAtO1WAwJmng/swDK4mVrGwVO75zVWXL3iCuThQy0AssyoJdKiwD
    54 
    +j3SAtNJ2DcdLDG3ZD8sl3Ljbtkgy+MZciu6ezxT86Yv11WBa7dskewvrxKTHxOzr
    55 
    +epM31Bcz88H7xXA5oLs8n6Dq3jQOV46Z2xLxw3fXJ/koHyuwvi6fi7XKswl+mdJu
    56 
    +U8y7nAmLeSOgD4N3lkWrH2dOLjAGN9VgYI+yV6rn0gkQovueCB8tEw7nxACeNnR9
    57 
    +mrdd+VMF32hm6lu54QUhWiQAoJLzrvm3uK/HXyfDrNoGAjiyAj+3
    58 
    +=aAdc
    59 
    +-----END PGP PUBLIC KEY BLOCK-----

  • debian/watch
    1 1 
     #git=git://anongit.freedesktop.org/xorg/lib/libdmx
    2 2 
     version=3
    3 
    -http://xorg.freedesktop.org/releases/individual/lib/ libdmx-(.*)\.tar\.gz
    3 
    +opts=pgpsigurlmangle=s/$/.sig/ \
    4 
    +https://xorg.freedesktop.org/releases/individual/lib/ libdmx-(.*)\.tar\.gz

  • src/dmx.c
    ... ... @@ -86,19 +86,6 @@ static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,
    86 86
    87 87 
     static XEXT_GENERATE_CLOSE_DISPLAY(close_display, dmx_extension_info)
    88 88
    89 
    -#ifndef HAVE__XEATDATAWORDS
    90 
    -#include <X11/Xmd.h>  /* for LONG64 on 64-bit platforms */
    91 
    -
    92 
    -static inline void _XEatDataWords(Display *dpy, unsigned long n)
    93 
    -{
    94 
    -# ifndef LONG64
    95 
    -    if (n >= (ULONG_MAX >> 2))
    96 
    -        _XIOError(dpy);
    97 
    -# endif
    98 
    -    _XEatData (dpy, n << 2);
    99 
    -}
    100 
    -#endif
    101 
    -
    102 89
    103 90 
     /*****************************************************************************
    104 91 
      *                                                                           *
    ... ... @@ -453,8 +440,7 @@ Bool DMXAddScreen(Display *dpy, const char *displayName, unsigned int mask,
    453 440 
         req->length           += _DMXDumpScreenAttributes(dpy, mask, attr);
    454 441
    455 442 
         if (length) {
    456 
    -        char *buffer       = Xmalloc(paddedLength);
    457 
    -        memset(buffer, 0, paddedLength);
    443 
    +        char *buffer       = Xcalloc(paddedLength, 1);
    458 444 
             memcpy(buffer, displayName, length);
    459 445 
             Data32(dpy, buffer, paddedLength);
    460 446 
             Xfree(buffer);
    ... ... @@ -793,8 +779,7 @@ Bool DMXAddInput(Display *dpy, unsigned int mask, DMXInputAttributes *attr,
    793 779 
         req->length           += _DMXDumpInputAttributes(dpy, mask, attr);
    794 780
    795 781 
         if (length) {
    796 
    -        char *buffer       = Xmalloc(paddedLength);
    797 
    -        memset(buffer, 0, paddedLength);
    782 
    +        char *buffer       = Xcalloc(paddedLength, 1);
    798 783 
             memcpy(buffer, attr->name, paddedLength);
    799 784 
             Data32(dpy, buffer, paddedLength);
    800 785 
             Xfree(buffer);

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: