Michael Joost · Alan Coopersmith · Alan Coopersmith · Alan Coopersmith · Peter Hutterer · Emil Velikov
--- a/ChangeLog
+++ b/ChangeLog
+commit 6056db9a2fa8ad1ea55f8b8e2cbf5972408d612f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun May 13 17:42:34 2018 -0700
+
+    libdmx 1.1.4
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d2f4332f40d911dcc2a1c658c4642448e6c439de
+Author: Mihail Konev <k.mvc@ya.ru>
+Date:   Thu Jan 26 13:52:49 2017 +1000
+
+    autogen: add default patch prefix
+    
+    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+
+commit c2e540b4b31dd749fba15dcad1c837e8c6dfdea7
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date:   Mon Mar 9 12:00:52 2015 +0000
+
+    autogen.sh: use quoted string variables
+    
+    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+    fall-outs, when they contain space.
+    
+    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a979a146aec64b633bb7b7c3553a8fdee9096808
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jan 24 10:32:07 2017 +1000
+
+    autogen.sh: use exec instead of waiting for configure to finish
+    
+    Syncs the invocation of configure with the one from the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+
+commit 9a036773d9a6a5e63a9f3c295432da09a150367b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat May 31 21:39:32 2014 -0700
+
+    autogen.sh: Honor NOCONFIGURE=1
+    
+    See http://people.gnome.org/~walters/docs/build-api.txt
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ac17738a88215a6f15e484b134f7d3c6dc21c13f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat May 31 21:38:41 2014 -0700
+
+    configure: Drop AM_MAINTAINER_MODE
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e0715a0389874d257a39ed3399b4a512317be0da
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Dec 8 12:24:21 2013 -0800
+
+    Replace malloc(size); memset(...,0,size) with calloc
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 78d267a0e0013d89a756cffe0e1dccb71945a0a4
+Author: Michael Joost <mehl@michael-joost.de>
+Date:   Mon Nov 18 16:11:26 2013 +0100
+
+    Remove fallback for _XEatDataWords, require libX11 1.6 for it
+    
+    _XEatDataWords was orignally introduced with the May 2013 security
+    patches, and in order to ease the process of delivering those,
+    fallback versions of _XEatDataWords were included in the X extension
+    library patches so they could be applied to older versions that didn't
+    have libX11 1.6 yet.   Now that we're past that hurdle, we can drop
+    the fallbacks and just require libX11 1.6 for building new versions
+    of the extension libraries.
+    
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 76e841968ceb69095eb0efcd435fc47440e86d2c
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue May 28 16:45:02 2013 -0700

--- a/autogen.sh
+++ b/autogen.sh
 #! /bin/sh

-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.

 ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"

 autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?

-$srcdir/configure --enable-maintainer-mode "$@"
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
+    git config --local format.subjectPrefix "PATCH libdmx"
+
+if test -z "$NOCONFIGURE"; then
+    exec "$srcdir"/configure "$@"
+fi
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,13 @@

 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libdmx], [1.1.3],
+AC_INIT([libdmx], [1.1.4],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE

 # Initialize libtool
 AC_PROG_LIBTOOL
@@ -41,14 +40,7 @@ XORG_DEFAULT_OPTIONS
 XORG_CHECK_MALLOC_ZERO

 # Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
-
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$DMX_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
+PKG_CHECK_MODULES(DMX, [x11 >= 1.6] xext xextproto [dmxproto >= 2.2.99.1])

 AC_CONFIG_FILES([Makefile
 		src/Makefile

--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
  case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
  with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
--- a/debian/changelog
+++ b/debian/changelog
+libdmx (1:1.1.4-1) unstable; urgency=medium
+
+  * New upstream release
+  * Let uscan verify tarball signatures.
+  * Remove obsolete XSFBS section from README.source.
+  * Remove Cyril from Uploaders.
+  * Update upstream and packaging URLs.
+  * Switch to dh.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 05 Sep 2018 15:11:21 +0200
+
 libdmx (1:1.1.3-1) unstable; urgency=low

  * New upstream release.

--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: libdmx
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends:
 libx11-dev (>= 1:0.99.2),
 x11proto-dmx-dev (>= 1:2.2.99.1),
@@ -16,8 +15,8 @@ Build-Depends:
 # misc:Pre-Depends
 debhelper (>= 8.1.3),
 Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdmx
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdmx.git
+Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdmx.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libdmx

 Package: libdmx1
 Section: libs
@@ -39,10 +38,10 @@ Description: X11 Distributed Multihead extension library
 and removing screens, input devices, et al.
 .
 More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
 .
 This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libdmx
+ https://gitlab.freedesktop.org/xorg/lib/libdmx

 Package: libdmx1-dbg
 Section: debug
@@ -69,10 +68,10 @@ Description: X11 Distributed Multihead library (debug package)
 Non-developers likely have little use for this package.
 .
 More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
 .
 This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libdmx
+ https://gitlab.freedesktop.org/xorg/lib/libdmx

 Package: libdmx-dev
 Section: libdevel
@@ -99,7 +98,7 @@ Description: X11 Distributed Multihead extension library (development headers)
 libdmx1.  Non-developers likely have little use for this package.
 .
 More information about X.Org can be found at:
- <URL:http://www.X.org>
+ <URL:https://www.X.org>
 .
 This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libdmx
+ https://gitlab.freedesktop.org/xorg/lib/libdmx
--- a/debian/copyright
+++ b/debian/copyright
 This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/lib/
+https://xorg.freedesktop.org/releases/individual/lib/

 Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.


--- a/debian/rules
+++ b/debian/rules
@@ -25,24 +25,19 @@ else
 	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif

-build: build-arch
-build-indep:
-build-arch: build-stamp
-build-stamp:
-	dh_testdir
-	autoreconf -vfi
-	mkdir -p build
-	cd build && \
-	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+%:
+	dh $@ --with autoreconf --parallel --builddirectory=build
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--prefix=/usr --mandir=\$${prefix}/share/man \
 	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             --infodir=\$${prefix}/share/info $(confflags) \
 		     --disable-silent-rules \
 		     $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
-	cd build && $(MAKE)
-	>$@

-clean:
-	dh_testdir
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f build-stamp
 	rm -f config.cache config.log config.status
 	rm -f */config.cache */config.log */config.status
@@ -52,37 +47,9 @@ clean:
 	rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure
 	rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
 	find -name Makefile.in -delete
-	dh_clean

-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+override_dh_install:
+	dh_install --fail-missing -X.la

-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp --fail-missing -X.la
-	dh_installchangelogs
-	dh_link
+override_dh_strip:
 	dh_strip --dbg-package=$(PACKAGE)-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep
-.PHONY: clean binary-indep binary-arch binary install
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
+Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
+EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
+a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
+8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
+Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
+xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
+CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
+TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
+ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRCgAoAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAUCWtvjngUJHaXqrgAKCRCi+54IHy0TDrCEAJ0W
+P1TlJC6G/R7wFC8jiisY/NQxKQCgiap1UHuxTtn752MGuPe4lzibQXq0K0FsYW4g
+Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQoAJgIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJa2+OeBQkdpequAAoJEKL7nggfLRMO
+G0MAn3mUvsWWPwTN1apiiC7tX1bleZ3iAKCLS83eKCU9U0faAc5xOl03KXTBzLQu
+QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
+BBMRCgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCWtvjmAUJHaXq
+rgAKCRCi+54IHy0TDmAsAJ4ubyCVncwKtAGVIx9whDq7f6SxZgCfXAVWUqRR20c9
+8J39lLTtcopZDfi5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
+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
+=aAdc
+-----END PGP PUBLIC KEY BLOCK-----
--- a/debian/watch
+++ b/debian/watch
 #git=git://anongit.freedesktop.org/xorg/lib/libdmx
 version=3
-http://xorg.freedesktop.org/releases/individual/lib/ libdmx-(.*)\.tar\.gz
+opts=pgpsigurlmangle=s/$/.sig/ \
+https://xorg.freedesktop.org/releases/individual/lib/ libdmx-(.*)\.tar\.gz
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -86,19 +86,6 @@ static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,

 static XEXT_GENERATE_CLOSE_DISPLAY(close_display, dmx_extension_info)

-#ifndef HAVE__XEATDATAWORDS
-#include <X11/Xmd.h>  /* for LONG64 on 64-bit platforms */
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
-    if (n >= (ULONG_MAX >> 2))
-        _XIOError(dpy);
-# endif
-    _XEatData (dpy, n << 2);
-}
-#endif
-

 /*****************************************************************************
 *                                                                           *
@@ -453,8 +440,7 @@ Bool DMXAddScreen(Display *dpy, const char *displayName, unsigned int mask,
    req->length           += _DMXDumpScreenAttributes(dpy, mask, attr);

    if (length) {
-        char *buffer       = Xmalloc(paddedLength);
-        memset(buffer, 0, paddedLength);
+        char *buffer       = Xcalloc(paddedLength, 1);
        memcpy(buffer, displayName, length);
        Data32(dpy, buffer, paddedLength);
        Xfree(buffer);
@@ -793,8 +779,7 @@ Bool DMXAddInput(Display *dpy, unsigned int mask, DMXInputAttributes *attr,
    req->length           += _DMXDumpInputAttributes(dpy, mask, attr);

    if (length) {
-        char *buffer       = Xmalloc(paddedLength);
-        memset(buffer, 0, paddedLength);
+        char *buffer       = Xcalloc(paddedLength, 1);
        memcpy(buffer, attr->name, paddedLength);
        Data32(dpy, buffer, paddedLength);
        Xfree(buffer);