[Git][xorg-team/lib/libxrandr][debian-unstable] 12 commits: autogen.sh: use exec instead of waiting for configure to finish

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxrandr

Commits:

f26e07fa

by Peter Hutterer at 2017-01-26T11:59:25+10:00

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>

e0303d9c

by Emil Velikov at 2017-01-26T11:59:25+10:00

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>

5fb14f7a

by Mihail Konev at 2017-01-26T13:52:49+10:00

autogen: add default patch prefix

Signed-off-by: Mihail Konev <k.mvc@ya.ru>

87227e5f

by Tobias Stoeckmann at 2017-01-28T15:37:57+01:00

Fix memory leak on error paths

Introduced in commit a0df3e1c7728205e5c7650b2e6dce684139254a6 "Avoid out
of boundary accesses on illegal responses"

Signed-off-by: Julien Cristau <jcristau@debian.org>

08fab836

by Alan Coopersmith at 2018-11-19T22:35:01-08:00

Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

583d4f11

by Alan Coopersmith at 2018-12-07T19:48:28-08:00

Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2a03e8d0

by Alan Coopersmith at 2019-03-16T13:53:42-07:00

Add description of libXrandr to README.md

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

55dcda45

by Alan Coopersmith at 2019-03-16T13:54:20-07:00

libXrandr 1.5.2

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

50af5885

by Timo Aaltonen at 2021-02-09T13:21:27+02:00

Merge branch 'upstream-unstable' into debian-unstable

fa7a0006
by Timo Aaltonen at 2021-02-09T13:21:46+02:00
```
bump the version
```
a9c75ad6
by Timo Aaltonen at 2021-02-09T13:37:03+02:00
```
Migrate to debhelper-compat, bump to 13.
```
10a8d7d4
by Timo Aaltonen at 2021-08-25T13:18:43+03:00
```
control: Migrate to x11proto-dev.
```

Changes:

Makefile.am

@@ -35,3 +35,5 @@ ChangeLog:
  	$(CHANGELOG_CMD)
  dist-hook: ChangeLog INSTALL
++
 +EXTRA_DIST = README.md

README → README.md

  libXrandr - X Resize, Rotate and Reflection extension library
 +--------------------------------------------------------------
++
 +libXrandr is the libX11-based library for the X Resize, Rotate and
 +Reflection (RandR) extension.
  All questions regarding this software should be directed at the
  Xorg mailing list:
 -        http://lists.freedesktop.org/mailman/listinfo/xorg
+-
 -Please submit bug reports to the Xorg bugzilla:
+-
 -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 +  https://lists.x.org/mailman/listinfo/xorg
  The master development code repository can be found at:
 -        git://anongit.freedesktop.org/git/xorg/lib/libXrandr
 +  https://gitlab.freedesktop.org/xorg/lib/libXrandr
 -        http://cgit.freedesktop.org/xorg/lib/libXrandr
 +Please submit bug reports and requests to merge patches there.
  For patch submission instructions, see:
 -	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+-
 -For more information on the git code manager, see:
+-
 -        http://wiki.x.org/wiki/GitPage
 +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches

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 $?
++
 +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
 +    git config --local format.subjectPrefix "PATCH libXrandr"
  if test -z "$NOCONFIGURE"; then
 -    $srcdir/configure "$@"
 +    exec "$srcdir"/configure "$@"
  fi

configure.ac

@@ -29,8 +29,8 @@ AC_PREREQ([2.60])
  # digit in the version number to track changes which don't affect the
  # protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ #
 -AC_INIT([libXrandr], [1.5.1],
 -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrandr])
 +AC_INIT([libXrandr], [1.5.2],
 +        [https://gitlab.freedesktop.org/xorg/lib/libXrandr/issues], [libXrandr])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([config.h])

debian/changelog

 +libxrandr (2:1.5.2-1) UNRELEASED; urgency=medium
++
 +  * New upstream release.
 +  * Migrate to debhelper-compat, bump to 13.
 +  * control: Migrate to x11proto-dev.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 09 Feb 2021 13:21:35 +0200
++
  libxrandr (2:1.5.1-1) unstable; urgency=medium
    [ Andreas Boll ]

debian/compat deleted

-10

debian/control

@@ -3,11 +3,10 @@ Section: x11
  Priority: optional
  Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
  Build-Depends:
 - debhelper (>= 10),
 + debhelper-compat (= 13),
   libx11-dev (>= 1:0.99.2),
   libxext-dev (>= 1:0.99.1),
 - x11proto-randr-dev (>= 1.5),
 - x11proto-render-dev,
 + x11proto-dev,
   libxrender-dev (>= 1:0.9.0-2),
   pkg-config,
   quilt,
@@ -45,7 +44,7 @@ Depends:
   libxrandr2 (= ${binary:Version}),
   libx11-dev,
   libxext-dev,
 - x11proto-randr-dev (>= 1.4),
 + x11proto-dev,
   libxrender-dev,
  Description: X11 RandR extension library (development headers)
   libXrandr provides an X Window System client interface to the RandR

debian/rules

@@ -14,7 +14,7 @@ PACKAGE = libxrandr2
  	dh $@ --with quilt --builddirectory=build/
  override_dh_install:
 -	dh_install --fail-missing -XlibXrandr.la
 +	dh_install -XlibXrandr.la
  override_dh_strip:
  	dh_strip --dbgsym-migration="$(PACKAGE)-dbg (<< 2:1.5.1-1~)"

src/XrrCrtc.c

@@ -459,6 +459,7 @@ XRRGetCrtcTransform (Display	*dpy,
      e = extra;
      if (e + rep.pendingNbytesFilter > end) {
 +	XFree (attr);
  	XFree (extra);
  	return False;
+     }
@@ -468,6 +469,7 @@ XRRGetCrtcTransform (Display	*dpy,
      for (p = 0; p < rep.pendingNparamsFilter; p++) {
  	INT32	f;
  	if (e + 4 > end) {
 +	    XFree (attr);
  	    XFree (extra);
  	    return False;
+ 	}
@@ -478,6 +480,7 @@ XRRGetCrtcTransform (Display	*dpy,
      attr->pendingNparams = rep.pendingNparamsFilter;
      if (e + rep.currentNbytesFilter > end) {
 +	XFree (attr);
  	XFree (extra);
  	return False;
+     }
@@ -487,6 +490,7 @@ XRRGetCrtcTransform (Display	*dpy,
      for (p = 0; p < rep.currentNparamsFilter; p++) {
  	INT32	f;
  	if (e + 4 > end) {
 +	    XFree (attr);
  	    XFree (extra);
  	    return False;
+ 	}