.gitignore | 65
ChangeLog | 498
INSTALL | 229
Makefile.am | 23
Makefile.in | 706 -
README | 25
aclocal.m4 | 7855 -------------
autogen.sh | 12
config.guess | 1500 --
config.h.in | 55
config.sub | 1608 --
configure |21082 -------------------------------------
configure.ac | 121
debian/README.source | 73
debian/changelog | 111
debian/compat | 2
debian/control | 61
debian/copyright | 3
debian/libxres-dev.install | 7
debian/libxres-dev.manpages | 1
debian/libxres1.install | 2
debian/patches/autogen.sh-install | 22
debian/patches/series | 1
debian/rules | 108
debian/source/format | 1
debian/watch | 1
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 359
debian/xsfbs/xsfbs.sh | 907 -
depcomp | 530
include/X11/extensions/XRes.h | 89
install-sh | 323
ltmain.sh | 6871 ------------
man/.gitignore | 3
man/Makefile.am | 97
man/Makefile.in | 437
man/XRes.man | 85
man/XResQueryClientPixmapBytes.man | 1
man/XResQueryClientResources.man | 1
man/XResQueryClients.man | 1
man/XResQueryExtension.man | 1
man/XResQueryVersion.man | 1
missing | 360
mkinstalldirs | 158
src/.gitignore | 6
src/Makefile.am | 9
src/Makefile.in | 506
src/XRes.c | 272
48 files changed, 1337 insertions(+), 44002 deletions(-)
New commits:
commit 745dc17cdad12c2dc3962b4e2f566fa17fc7e93d
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Oct 21 20:33:50 2017 +0800
upload 2:1.2.0-1exp1 to experimental
diff --git a/debian/changelog b/debian/changelog
index 4f95403..7d4df65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxres (2:1.2.0-1exp1) UNRELEASED; urgency=medium
+libxres (2:1.2.0-1exp1) experimental; urgency=medium
* Team upload.
* New upstream release.
- applies debian patch bytes_overflow_64bit_upstream_0f5cfdc3136dd
* Standards-Version: 4.1.1
- -- Drew Parsons <dpars...@debian.org> Sat, 21 Oct 2017 19:49:21 +0800
+ -- Drew Parsons <dpars...@debian.org> Sat, 21 Oct 2017 20:32:25 +0800
libxres (2:1.0.7-3) unstable; urgency=medium
commit 04733d243e1cdc5c31aaeb1e7a430d7c744555e3
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Oct 21 20:29:57 2017 +0800
Standards-Version: 4.1.1
diff --git a/debian/changelog b/debian/changelog
index 4df5504..4f95403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxres (2:1.2.0-1exp1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
- applies debian patch bytes_overflow_64bit_upstream_0f5cfdc3136dd
+ * Standards-Version: 4.1.1
-- Drew Parsons <dpars...@debian.org> Sat, 21 Oct 2017 19:49:21 +0800
diff --git a/debian/control b/debian/control
index 071ac2a..feeb12d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 4.0.1
+Standards-Version: 4.1.1
Homepage: https://www.x.org
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxres
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxres.git
commit 071fcbc5ca82f03dbdd40e9242efda5ae8f94d64
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Oct 21 20:27:18 2017 +0800
update ChangeLog from upstream 1.2.0 tarball
diff --git a/ChangeLog b/ChangeLog
index bfd4c59..863ce32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,76 @@
-commit b51a7b0ccf0d5ccb53fbd5d34ed8fe57603d2604
+commit 84b9156c7833dfd91c65d33542420ff4fe226948
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Oct 11 11:11:01 2017 -0400
+
+ libXRes 1.2.0
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 1bc34457619c0d9b94ebd1cadac53366da20fbe3
+Author: Mihail Konev <k....@ya.ru>
+Date: Thu Jan 26 13:52:49 2017 +1000
+
+ autogen: add default patch prefix
+
+ Signed-off-by: Mihail Konev <k....@ya.ru>
+
+commit e5fbb99729d460eda477bf6e299728bc47542ccb
+Author: Emil Velikov <emil.l.veli...@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.veli...@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 16b2d184302d259a8481693285976045386fcc01
+Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net>
+ Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
+
+commit ae0ddaa9c960aee1b7845da01270b00177f95f3d
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
-Date: Thu May 30 17:51:12 2013 -0700
+Date: Fri Nov 22 23:22:36 2013 -0800
- libXres 1.0.7
+ 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.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
-commit ad156a716a324ee60362c8ba66a5ed8c835c219b
+commit 0f5cfdc3136dd8ef43800bda64f9d39e6b23b2e9
+Author: Julien Cristau <jcris...@debian.org>
+Date: Sun Jun 30 20:09:49 2013 +0200
+
+ Compute number of bytes correctly in XResQueryClientPixmapBytes
+
+ 64-bit servers send the upper 32-bit in bytes_overflow. We were
+ multiplying by 2^32 - 1 instead of 2^32 when putting things back
+ together.
+
+ Debian bug#621702
+
+ Reported-by: Kevin Ryde <use...@zip.com.au>
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit f468184963e53feda848853c4aefd0197b2cc116
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Apr 12 23:36:13 2013 -0700
@@ -19,7 +83,7 @@ Date: Fri Apr 12 23:36:13 2013 -0700
Reported-by: Ilja Van Sprundel <ivansprun...@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
-commit 3ec2db9eeb9ba8fb561802b0c4b8bf79e321b7a2
+commit b053d215b80e721f9afdc5794e4f3f4f2aee0141
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Apr 12 23:36:13 2013 -0700
@@ -32,7 +96,7 @@ Date: Fri Apr 12 23:36:13 2013 -0700
Reported-by: Ilja Van Sprundel <ivansprun...@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
-commit 95b352b0f4a1ab1bc254e78adbc73cd65223ded4
+commit 69457711050ac3a53859ef11790a7ac815cd7d94
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Apr 13 10:34:22 2013 -0700
@@ -42,7 +106,7 @@ Date: Sat Apr 13 10:34:22 2013 -0700
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
-commit d54acff47096cf52a9b8e018a26f7165e1092eb5
+commit 83e7693515369d57dcd11c2bb1f03563f51bc500
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Jan 18 23:06:20 2013 -0800
@@ -58,7 +122,61 @@ Date: Fri Jan 18 23:06:20 2013 -0800
the current minimum level required to build X.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
- (cherry picked from commit 83e7693515369d57dcd11c2bb1f03563f51bc500)
+
+commit d9324b7d07294bb18e4902596a1b8ee387188364
+Author: Colin Walters <walt...@verbum.org>
+Date: Wed Jan 4 17:37:06 2012 -0500
+
+ autogen.sh: Implement GNOME Build API
+
+ http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 6d1f115422cde2bfca4b69caa395345f3ac454e7
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Jan 15 14:28:48 2013 -0500
+
+ configure: Remove AM_MAINTAINER_MODE
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit f44f4e265ec3ab7ef87d6d7009ec079ba4c49336
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Apr 23 18:57:48 2012 -0700
+
+ Bump version to 1.1.99.0 to reflect addition of 1.2 API
+
+ As noted in configure.ac comment, we try to keep library version
+ based on the protocol version number, so since the protocol skipped
+ to 1.2, we'll do that with the library as well for simplicity's sake.
+
+ Sets resourceproto requirement to version 1.2.0 since there were no
+ intermediate/snapshot versions between 1.1.2 & 1.2.0.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 01fc6f81f0a2935741dd1114aa3fa267d8be9095
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
+Date: Wed Dec 15 13:48:09 2010 +0200
+
+ Implemented second part of XResource extension v1.2: XResQueryResourceBytes
+
+ Signed-off-by: Erkki Seppälä <erkki.sepp...@vincit.fi>
+ Reviewed-by: Rami Ylimäki <rami.ylim...@vincit.fi>
+ Reviewed-by: Tiago Vignatti <tiago.vigna...@nokia.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0f38938a27df1f865dcdda35f4d2ef191092ba42
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
+Date: Mon Nov 29 12:43:51 2010 +0200
+
+ Implemented first part of XResource extension v1.2: XResQueryClientIds
+
+ Signed-off-by: Erkki Seppälä <erkki.sepp...@vincit.fi>
+ Reviewed-by: Rami Ylimäki <rami.ylim...@vincit.fi>
+ Reviewed-by: Tiago Vignatti <tiago.vigna...@nokia.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit e6e0e02e4bf764fa58798540793bdeb44a60cc7f
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 06e110c99b206b01d9d16f998f48101d70156a3e
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Apr 13 10:34:22 2013 -0700
Use _XEatDataWords to avoid overflow of rep.length shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5e3703b..b829cc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,12 @@ XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XRES, [x11 >= 1.6] xext xextproto [resourceproto >= 1.2.0])
+# Check for _XEatDataWords function that may be patched into older Xlib release
+SAVE_LIBS="$LIBS"
+LIBS="$XRES_LIBS"
+AC_CHECK_FUNCS([_XEatDataWords])
+LIBS="$SAVE_LIBS"
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
commit 8a657e6ad9aa0e72ab979065dee0d2fe32ebe214
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu May 30 17:51:12 2013 -0700
libXres 1.0.7
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index b829cc1..5e3703b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,12 +50,6 @@ XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XRES, [x11 >= 1.6] xext xextproto [resourceproto >= 1.2.0])
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XRES_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
commit 087c1abc49413b229c15fecd18fd15c7655c03a2
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Apr 13 10:34:22 2013 -0700
Use _XEatDataWords to avoid overflow of rep.length shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5e3703b..b829cc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,12 @@ XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XRES, [x11 >= 1.6] xext xextproto [resourceproto >= 1.2.0])
+# Check for _XEatDataWords function that may be patched into older Xlib release
+SAVE_LIBS="$LIBS"
+LIBS="$XRES_LIBS"
+AC_CHECK_FUNCS([_XEatDataWords])
+LIBS="$SAVE_LIBS"
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
commit 6610845a037cedae4a4e55a8adee5dae410bdd91
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Oct 21 20:01:28 2017 +0800
refresh patches
bytes_overflow_64bit_upstream_0f5cfdc3136dd is applied upstream in
1.2.0
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 86e51a2..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd "$srcdir"
-
-autoreconf -v --install || exit 1
-cd "$ORIGDIR" || exit $?
-
-git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
- git config --local format.subjectPrefix "PATCH libXRes"
-
-if test -z "$NOCONFIGURE"; then
- exec "$srcdir"/configure "$@"
-fi
diff --git a/debian/changelog b/debian/changelog
index 25e193c..4df5504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxres (2:1.2.0-1exp1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ - applies debian patch bytes_overflow_64bit_upstream_0f5cfdc3136dd
-- Drew Parsons <dpars...@debian.org> Sat, 21 Oct 2017 19:49:21 +0800
diff --git a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
deleted file mode 100644
index 5e66dda..0000000
--- a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0f5cfdc3136dd8ef43800bda64f9d39e6b23b2e9 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcris...@debian.org>
-Date: Sun, 30 Jun 2013 20:09:49 +0200
-Subject: Compute number of bytes correctly in XResQueryClientPixmapBytes
-
-64-bit servers send the upper 32-bit in bytes_overflow. We were
-multiplying by 2^32 - 1 instead of 2^32 when putting things back
-together.
-
-Debian bug#621702
-
-Reported-by: Kevin Ryde <use...@zip.com.au>
-Signed-off-by: Julien Cristau <jcris...@debian.org>
-Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
-
-Index: libxres/src/XRes.c
-===================================================================
---- libxres.orig/src/XRes.c
-+++ libxres/src/XRes.c
-@@ -239,7 +239,7 @@ Status XResQueryClientPixmapBytes (
- }
-
- #ifdef LONG64
-- *bytes = (rep.bytes_overflow * 4294967295) + rep.bytes;
-+ *bytes = (rep.bytes_overflow * 4294967296UL) + rep.bytes;
- #else
- *bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes;
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 3c9a1a7..a45425d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
autogen.sh-install
-bytes_overflow_64bit_upstream_0f5cfdc3136dd
commit 2da3913abc3f90a8d1253e7546822a60f745180e
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Oct 21 19:55:14 2017 +0800
prepare for new upstream release
diff --git a/debian/changelog b/debian/changelog
index 27361ce..25e193c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxres (2:1.2.0-1exp1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Drew Parsons <dpars...@debian.org> Sat, 21 Oct 2017 19:49:21 +0800
+
libxres (2:1.0.7-3) unstable; urgency=medium
* Team upload.
commit 47f8ced17f5ef0a1f1539fd8837cd8f47aa0eb6e
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Apr 13 10:34:22 2013 -0700
Use _XEatDataWords to avoid overflow of rep.length shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5e3703b..b829cc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,12 @@ XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XRES, [x11 >= 1.6] xext xextproto [resourceproto >= 1.2.0])
+# Check for _XEatDataWords function that may be patched into older Xlib release
+SAVE_LIBS="$LIBS"
+LIBS="$XRES_LIBS"
+AC_CHECK_FUNCS([_XEatDataWords])
+LIBS="$SAVE_LIBS"
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
commit 84b9156c7833dfd91c65d33542420ff4fe226948
Author: Adam Jackson <a...@redhat.com>
Date: Wed Oct 11 11:11:01 2017 -0400
libXRes 1.2.0
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/configure.ac b/configure.ac
index b082de8..5e3703b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# digit in the version number to track changes which don't affect the
# protocol, so XRes version l.n.m corresponds to protocol version l.n
#
-AC_INIT([libXres], [1.1.99.0],
+AC_INIT([libXres], [1.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 4e3f982bb8a3ef4505788d7b40146c65f1887136
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 14:24:28 2017 +0800
upload 2:1.0.7-3 to unstable
diff --git a/debian/changelog b/debian/changelog
index 1de182d..27361ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxres (2:1.0.7-3) UNRELEASED; urgency=medium
+libxres (2:1.0.7-3) unstable; urgency=medium
* Team upload.
* Clean file cruft alongside dh_clean, not dh_autoclean
* Use debian patch to install autogen.sh (taken from upstream git repo)
* Use dh_missing --fail-missing to catch uninstalled files.
- -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800
+ -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 14:23:53 +0800
libxres (2:1.0.7-2) unstable; urgency=low
commit cdbd66251dcbff0fffee66295bd2715742a69369
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 14:08:59 2017 +0800
Use dh_missing --fail-missing to catch uninstalled files
dh_install --fail-missing is deprecated
diff --git a/debian/changelog b/debian/changelog
index 6b3cc6d..1de182d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ libxres (2:1.0.7-3) UNRELEASED; urgency=medium
* Team upload.
* Clean file cruft alongside dh_clean, not dh_autoclean
- * use debian patch to install autogen.sh (taken from upstream git repo)
+ * Use debian patch to install autogen.sh (taken from upstream git repo)
+ * Use dh_missing --fail-missing to catch uninstalled files.
-- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800
diff --git a/debian/rules b/debian/rules
index 5722357..5c8b448 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,4 +24,5 @@ override_dh_clean:
dh_clean
override_dh_install:
- dh_install --fail-missing --exclude=libXRes.la
+ dh_install --exclude=libXRes.la
+ dh_missing --fail-missing -XlibXRes.la
commit e92564376c4ec42c1b283af5cb9e9b89ae9e8521
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 14:00:52 2017 +0800
use debian patch to install autogen.sh
taken from upstream git repo
https://cgit.freedesktop.org/xorg/lib/libXRes/plain/autogen.sh
Also, refresh bytes-overflow patch (refresh line numbers)
diff --git a/debian/changelog b/debian/changelog
index 1ea4983..6b3cc6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxres (2:1.0.7-3) UNRELEASED; urgency=medium
* Team upload.
* Clean file cruft alongside dh_clean, not dh_autoclean
+ * use debian patch to install autogen.sh (taken from upstream git repo)
-- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800
diff --git a/debian/patches/autogen.sh-install
b/debian/patches/autogen.sh-install
new file mode 100644
index 0000000..9636330
--- /dev/null
+++ b/debian/patches/autogen.sh-install
@@ -0,0 +1,22 @@
+Index: libxres/autogen.sh
+===================================================================
+--- /dev/null
++++ libxres/autogen.sh
+@@ -0,0 +1,17 @@
++#! /bin/sh
++
++srcdir=`dirname "$0"`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd "$srcdir"
++
++autoreconf -v --install || exit 1
++cd "$ORIGDIR" || exit $?
++
++git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
++ git config --local format.subjectPrefix "PATCH libXRes"
++
++if test -z "$NOCONFIGURE"; then
++ exec "$srcdir"/configure "$@"
++fi
diff --git a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
index ee7b061..5e66dda 100644
--- a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
+++ b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
@@ -13,11 +13,11 @@ Reported-by: Kevin Ryde <use...@zip.com.au>
Signed-off-by: Julien Cristau <jcris...@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
-diff --git a/src/XRes.c b/src/XRes.c
-index 51e905f..89fab82 100644
---- a/src/XRes.c
-+++ b/src/XRes.c
-@@ -240,7 +240,7 @@ Status XResQueryClientPixmapBytes (
+Index: libxres/src/XRes.c
+===================================================================
+--- libxres.orig/src/XRes.c
++++ libxres/src/XRes.c
+@@ -239,7 +239,7 @@ Status XResQueryClientPixmapBytes (
}
#ifdef LONG64
@@ -26,6 +26,3 @@ index 51e905f..89fab82 100644
#else
*bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes;
#endif
---
-cgit v0.10.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 2a68bbe..3c9a1a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+autogen.sh-install
bytes_overflow_64bit_upstream_0f5cfdc3136dd
commit 185b4712570e7558b0e7da402f618a4323597650
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 13:03:52 2017 +0800
Clean file cruft alongside dh_clean, not dh_autoclean
diff --git a/debian/changelog b/debian/changelog
index bc0b3cc..1ea4983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxres (2:1.0.7-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Clean file cruft alongside dh_clean, not dh_autoclean
+
+ -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 13:03:01 +0800
+
libxres (2:1.0.7-2) unstable; urgency=low
* Team upload.
diff --git a/debian/rules b/debian/rules
index e08dfe9..5722357 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_configure:
$(confflags) \
$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
-override_dh_auto_clean:
+override_dh_clean:
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -21,7 +21,7 @@ override_dh_auto_clean:
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f src/config.h.in
find -name Makefile.in -delete
- dh_auto_clean
+ dh_clean
override_dh_install:
dh_install --fail-missing --exclude=libXRes.la
commit e2a32ca48c9248aa55d2fad218f3bc829513fbe4
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 00:27:19 2017 +0800
upload 2:1.0.7-2 to unstable
diff --git a/debian/changelog b/debian/changelog
index f8fabaa..bc0b3cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxres (2:1.0.7-2) UNRELEASED; urgency=low
+libxres (2:1.0.7-2) unstable; urgency=low
* Team upload.
-- team maintained, remove Drew Parsons as uploader.
@@ -12,13 +12,13 @@ libxres (2:1.0.7-2) UNRELEASED; urgency=low
* Standards-Version: 4.0.1
* debhelper compatibility level 10
* source format 3.0 (quilt)
- - remove debian/xsfbs, it's patch functionality is now standard
+ - remove debian/xsfbs, its patch functionality is now standard
* Apply upstream patch 0f5cfdc3136dd... to handle 64 bit byte overflow
Closes: #621702.
* Remove the libxres1-dbg package: debug symbols are now provided by
the libxres1-dbgsym package automatically generated by debhelper.
- -- Julien Cristau <jcris...@debian.org> Sun, 11 Aug 2013 16:11:52 +0200
+ -- Drew Parsons <dpars...@debian.org> Sun, 20 Aug 2017 00:26:33 +0800
libxres (2:1.0.7-1) unstable; urgency=low
commit cf0a625062f67e4d219c0b36eaa473f86f30a121
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 00:21:49 2017 +0800
Remove the libxres1-dbg package
debug symbols are now provided by the libxres1-dbgsym package
automatically generated by debhelper.
Also fix newline at end of debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index e07419c..f8fabaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ libxres (2:1.0.7-2) UNRELEASED; urgency=low
- remove debian/xsfbs, it's patch functionality is now standard
* Apply upstream patch 0f5cfdc3136dd... to handle 64 bit byte overflow
Closes: #621702.
+ * Remove the libxres1-dbg package: debug symbols are now provided by
+ the libxres1-dbgsym package automatically generated by debhelper.
-- Julien Cristau <jcris...@debian.org> Sun, 11 Aug 2013 16:11:52 +0200
diff --git a/debian/control b/debian/control
index 4077617..071ac2a 100644
--- a/debian/control
+++ b/debian/control
@@ -40,30 +40,6 @@ Description: X11 Resource extension library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXRes
-Package: libxres1-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends},
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxres1 (= ${binary:Version})
-Description: X11 Resource extension library (debug package)
- libXRes provides an X Window System client interface to the Resource
- extension to the X protocol.
- .
- The Resource extension allows for X clients to see and monitor the X resource
- usage of various clients (pixmaps, et al).
- .
- This package contains the debug versions of the library found in libxres1.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXRes
-
Package: libxres-dev
Section: libdevel
Architecture: any
diff --git a/debian/patches/series b/debian/patches/series
index d7a3c8f..2a68bbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-bytes_overflow_64bit_upstream_0f5cfdc3136dd
\ No newline at end of file
+bytes_overflow_64bit_upstream_0f5cfdc3136dd
commit 355474a2dd565b04f4113e5b753df690c27ce215
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 00:15:53 2017 +0800
remove autogen.sh
autoreconf is automatically called by dh
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 904cd67..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/debian/changelog b/debian/changelog
index 926b649..e07419c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxres (2:1.0.7-2) UNRELEASED; urgency=low
[ Drew Parsons ]
* Convert debian/rules build system to dh
+ - remove autogen.sh: autoreconf is automatically called by dh
* Standards-Version: 4.0.1
* debhelper compatibility level 10
* source format 3.0 (quilt)
commit 7e405aab4ae5e81264822c0712260818a9ab40c1
Author: Drew Parsons <dpars...@debian.org>
Date: Sun Aug 20 00:02:31 2017 +0800
Apply upstream patch to handle 64-bit byte overflow
Upstream commit 0f5cfdc3136dd8ef43800bda64f9d39e6b23b2e9
Closes: #621702.
diff --git a/debian/changelog b/debian/changelog
index 504dbc1..926b649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,13 @@ libxres (2:1.0.7-2) UNRELEASED; urgency=low
* Use dh_prep instead of dh_clean -k.
[ Drew Parsons ]
- * convert debian/rules build system to dh
+ * Convert debian/rules build system to dh
* Standards-Version: 4.0.1
* debhelper compatibility level 10
* source format 3.0 (quilt)
- remove debian/xsfbs, it's patch functionality is now standard
+ * Apply upstream patch 0f5cfdc3136dd... to handle 64 bit byte overflow
+ Closes: #621702.
-- Julien Cristau <jcris...@debian.org> Sun, 11 Aug 2013 16:11:52 +0200
diff --git a/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
new file mode 100644
index 0000000..ee7b061
--- /dev/null
+++ b/debian/patches/bytes_overflow_64bit_upstream_0f5cfdc3136dd
@@ -0,0 +1,31 @@
+From 0f5cfdc3136dd8ef43800bda64f9d39e6b23b2e9 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Sun, 30 Jun 2013 20:09:49 +0200
+Subject: Compute number of bytes correctly in XResQueryClientPixmapBytes
+
+64-bit servers send the upper 32-bit in bytes_overflow. We were
+multiplying by 2^32 - 1 instead of 2^32 when putting things back
+together.
+
+Debian bug#621702
+
+Reported-by: Kevin Ryde <use...@zip.com.au>
+Signed-off-by: Julien Cristau <jcris...@debian.org>
+Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+diff --git a/src/XRes.c b/src/XRes.c
+index 51e905f..89fab82 100644
+--- a/src/XRes.c
++++ b/src/XRes.c
+@@ -240,7 +240,7 @@ Status XResQueryClientPixmapBytes (
+ }
+
+ #ifdef LONG64
+- *bytes = (rep.bytes_overflow * 4294967295) + rep.bytes;
++ *bytes = (rep.bytes_overflow * 4294967296UL) + rep.bytes;
+ #else
+ *bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes;
+ #endif
+--
+cgit v0.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..d7a3c8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bytes_overflow_64bit_upstream_0f5cfdc3136dd
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c8104d7..e08dfe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,5 +23,5 @@ override_dh_auto_clean:
find -name Makefile.in -delete
dh_auto_clean
-override_dh_install
+override_dh_install:
dh_install --fail-missing --exclude=libXRes.la
commit f3c6d8e8a1c54770cef306de77139c17af1486ce
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Aug 19 23:47:49 2017 +0800
debian/control: Homepage: https://www.x.org
diff --git a/debian/control b/debian/control
index bdd919f..4077617 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5+4),
Standards-Version: 4.0.1
+Homepage: https://www.x.org
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxres
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxres.git
commit f3613a1d7f74367084f13499a6ef4273391956c1
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Aug 19 23:42:58 2017 +0800
Team maintained, remove Drew Parsons as uploader.
diff --git a/debian/changelog b/debian/changelog
index 566e8d4..504dbc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
libxres (2:1.0.7-2) UNRELEASED; urgency=low
+ * Team upload.
+ -- team maintained, remove Drew Parsons as uploader.
+
[ Julien Cristau ]
* Use dh_prep instead of dh_clean -k.
diff --git a/debian/control b/debian/control
index f112a50..bdd919f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxres
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
+Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
dpkg-dev (>= 1.16.1),
debhelper (>= 10),
commit abdafec2c56ccc5e3921e78298767c1adbc42483
Author: Drew Parsons <dpars...@debian.org>
Date: Sat Aug 19 23:40:01 2017 +0800
