debian/changelog | 15 ++++-
debian/compat | 2
debian/control | 54 -------------------
debian/rules | 153 ++++++-------------------------------------------------
src/FontNames.c | 2
5 files changed, 35 insertions(+), 191 deletions(-)
New commits:
commit 1fecfc90f80c3266aff0fb169aa98ce5eb06c95f
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 01:38:38 2016 +0100
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 384e8e6..50dd021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
+libx11 (2:1.6.4-1) unstable; urgency=medium
[ Andreas Boll ]
* New upstream release.
@@ -20,7 +20,7 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
* Drop libtool and automake build dependencies, debhelper takes
care of that for us now.
- -- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
+ -- Emilio Pozuelo Monfort <po...@debian.org> Tue, 06 Dec 2016 01:38:30 +0100
libx11 (2:1.6.3-1) unstable; urgency=medium
commit a96dcb65ef97af7ed5430a4c07a14fb1f07477e5
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 01:37:28 2016 +0100
Drop automake and libtool build-deps
diff --git a/debian/changelog b/debian/changelog
index 18c4418..384e8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
* Drop workaround for old tarballs not shipping some files.
* Switch to -dbgsym packages.
* Bump Standards-Version to 3.9.8, no changes.
+ * Drop libtool and automake build dependencies, debhelper takes
+ care of that for us now.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
diff --git a/debian/control b/debian/control
index 2145c0c..c77280f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,6 @@ Build-Depends:
x11proto-xf86bigfont-dev (>= 1.2.0),
libxcb1-dev (>= 1.11.1),
quilt,
- automake,
- libtool,
xutils-dev (>= 1:7.6+2),
# specs
xmlto,
commit a3c92ca143dcb46afe209c6c62f9638aa6c7c794
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 01:26:27 2016 +0100
Bump Standards-Version to 3.9.8, no changes
diff --git a/debian/changelog b/debian/changelog
index 4c1f38b..18c4418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
* Switch from old debhelper to dh.
* Drop workaround for old tarballs not shipping some files.
* Switch to -dbgsym packages.
+ * Bump Standards-Version to 3.9.8, no changes.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
diff --git a/debian/control b/debian/control
index 11be985..2145c0c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
xmlto,
xorg-sgml-doctools (>= 1:1.10),
w3m,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libx11.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libx11.git
commit 429d0b390baa8f967f7c2ac1c6c75932e1885d8a
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 01:25:41 2016 +0100
Switch to -dbgsym packages
diff --git a/debian/changelog b/debian/changelog
index a3651b7..4c1f38b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
* Bump debhelper compat to 10.
* Switch from old debhelper to dh.
* Drop workaround for old tarballs not shipping some files.
+ * Switch to -dbgsym packages.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
diff --git a/debian/control b/debian/control
index d8994fa..11be985 100644
--- a/debian/control
+++ b/debian/control
@@ -70,29 +70,6 @@ Description: X11 client-side library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libX11
-Package: libx11-6-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libx11-6 (= ${binary:Version}),
-Multi-Arch: same
-Description: X11 client-side library (debug package)
- This package provides a client interface to the X Window System, otherwise
- known as 'Xlib'. It provides a complete API for the basic functions of the
- window system.
- .
- This package contains the debug versions of the library found in libx11-6.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libX11
-
Package: libx11-dev
Section: libdevel
Architecture: any
@@ -144,31 +121,6 @@ Description: Xlib/XCB interface library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libX11
-Package: libx11-xcb1-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libx11-xcb1 (= ${binary:Version}),
-Multi-Arch: same
-Description: Xlib/XCB interface library (debug package)
- libX11-xcb provides functions needed by clients which take advantage of
- Xlib/XCB to mix calls to both Xlib and XCB over the same X connection.
- .
- This package contains the debug versions of the library found in
- libx11-xcb1. Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
- More information about XCB can be found at:
- <URL:https://xcb.freedesktop.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libX11
-
Package: libx11-xcb-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index 63b5654..7c90d63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,11 +25,6 @@ override_dh_install:
--exclude=usr/share/man/man3/XSetEventQueueOwner.3
dh_install --remaining-packages
-override_dh_strip:
- dh_strip -plibx11-6 --dbg-package=libx11-6-dbg
- dh_strip -plibx11-xcb1 --dbg-package=libx11-xcb1-dbg
- dh_strip -Nlibx11-6 -Nlibx11-xcb1
-
override_dh_makeshlibs:
dh_makeshlibs -s -plibx11-6 -V'libx11-6 (>= 2:1.6.0)'
--add-udeb=libx11-6-udeb -- -c4
dh_makeshlibs -s -Nlibx11-6 -- -c4
commit 7853120b37a94dc9533419a9669fe891d8f5ca82
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 01:24:34 2016 +0100
Drop workaround for old tarballs not shipping some files
diff --git a/debian/changelog b/debian/changelog
index a439505..a3651b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
security fix.
* Bump debhelper compat to 10.
* Switch from old debhelper to dh.
+ * Drop workaround for old tarballs not shipping some files.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
diff --git a/debian/rules b/debian/rules
index ad681e7..63b5654 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@ override_dh_auto_configure-indep: docflags = --enable-specs
--with-xmlto
override_dh_auto_configure-arch: docflags = --disable-specs
override_dh_auto_configure-indep override_dh_auto_configure-arch:
- # work around lack of these files in the tarball
- touch nls/km_KH.UTF-8/XLC_LOCALE.pre
- touch nls/sr_CS.UTF-8/XLC_LOCALE.pre
dh_auto_configure -- \
$(docflags) \
--without-fop
commit a827e899c4cb9faee061296eff3a0372d40b67e6
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 00:59:52 2016 +0100
Switch from old debhelper to dh
diff --git a/debian/changelog b/debian/changelog
index 4066add..a439505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
* Cherry-pick upstream commit 20a3f99 to plug a memory leak in the
security fix.
* Bump debhelper compat to 10.
+ * Switch from old debhelper to dh.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
diff --git a/debian/rules b/debian/rules
index 54b79dc..ad681e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,152 +1,41 @@
#!/usr/bin/make -f
-# debian/rules for the Debian libx11 package.
-# Copyright © 2004 Scott James Remnant <sc...@netsplit.com>
-# Copyright © 2005 Daniel Stone <dan...@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusi...@debian.org>
-# Copyright © 2006 Josh Triplett <j...@freedesktop.org>
-# Copyright © 2006 Jamey Sharp <sharp...@debian.org>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with quilt --builddirectory=build/
-include /usr/share/quilt/quilt.make
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-# This is for maintainer's convenience. It really should be always on option
-# but dh_install doesn't support --exclude-from <file>, and we leave out too
-# much crap to bother specifying it through --exclude arguments.
-# It alters dh_install call in binary_indep, as it is the first one called
-# from binary target.
-ifneq (,$(filter checkinstall,$(DEB_BUILD_OPTIONS)))
- dhinstallindepflags := --fail-missing
-else
- dhinstallindepflags := -i
-endif
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-configure: $(QUILT_STAMPFN)
- dh_testdir
- autoreconf -vfi
-
-build: build-indep
-build-indep: build-stamp
-build-indep: docflags = --enable-specs --with-xmlto
-build-arch: build-stamp
-build-arch: docflags = --disable-specs
-
-build-stamp: configure
- dh_testdir
+override_dh_auto_configure-indep: docflags = --enable-specs --with-xmlto
+override_dh_auto_configure-arch: docflags = --disable-specs
+override_dh_auto_configure-indep override_dh_auto_configure-arch:
# work around lack of these files in the tarball
touch nls/km_KH.UTF-8/XLC_LOCALE.pre
touch nls/sr_CS.UTF-8/XLC_LOCALE.pre
- mkdir -p build
- cd build && \
- ../configure \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ dh_auto_configure -- \
$(docflags) \
- --without-fop \
- --disable-silent-rules \
- $(confflags) \
- $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags
--export=configure)
- cd build && $(MAKE)
- >$@
-
-clean: unpatch
- dh_testdir
- rm -f build-stamp
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- rm -f aclocal.m4 compile config.guess config.sub configure
- rm -f m4/lt*.m4 m4/libtool.m4
- rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
- rm -f src/config.h.in test-driver
- find -name Makefile.in -delete
- dh_clean
-
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+ --without-fop
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+override_dh_installdocs:
+ dh_installdocs NEWS
-# Build architecture-dependent files here.
-binary-arch: build-stamp install
- dh_testdir
- dh_testroot
-
- dh_installdocs -s NEWS
+override_dh_install:
# Kill *.xml files, we don't need them:
find debian/tmp -name '*.xml' -delete
- # Using exclusions here allows libx11-dev.install to use wildcards
- # for headers, rather than listing every header other than this one.
dh_install -plibx11-dev \
--exclude=usr/include/X11/Xlib-xcb.h
- dh_install -Nlibx11-dev -s
- dh_installchangelogs -s
- dh_installman -s
- dh_lintian -s
- dh_link -s
+ dh_install -plibx11-doc \
+ --exclude=usr/include/X11/Xlib-xcb.h \
+ --exclude=usr/share/man/man3/XGetXCBConnection.3 \
+ --exclude=usr/share/man/man3/XSetEventQueueOwner.3
+ dh_install --remaining-packages
+
+override_dh_strip:
dh_strip -plibx11-6 --dbg-package=libx11-6-dbg
dh_strip -plibx11-xcb1 --dbg-package=libx11-xcb1-dbg
dh_strip -Nlibx11-6 -Nlibx11-xcb1
- dh_compress -s
- dh_fixperms -s
+
+override_dh_makeshlibs:
dh_makeshlibs -s -plibx11-6 -V'libx11-6 (>= 2:1.6.0)'
--add-udeb=libx11-6-udeb -- -c4
dh_makeshlibs -s -Nlibx11-6 -- -c4
- dh_shlibdeps -s
- dh_installdeb -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
# Build architecture-independent files here.
binary-indep: build-indep install
- dh_testdir
- dh_testroot
-
- dh_installdocs -i
- dh_installchangelogs -i NEWS
- # Using exclusions here allows libx11-6.install to use wildcards for
- # headers and manpages, rather than listing every header and manpage
- # other than these.
- dh_install -plibx11-doc \
- --exclude=usr/include/X11/Xlib-xcb.h \
- --exclude=usr/share/man/man3/XGetXCBConnection.3 \
- --exclude=usr/share/man/man3/XSetEventQueueOwner.3
- dh_install -i -Nlibx11-doc
- dh_link -i
- dh_installman -i
- dh_lintian -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch
-.PHONY: clean binary-indep binary-arch binary install
commit d4f45e93a192f1296720b387d62cdec9be12bc6e
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 19:34:41 2016 +0100
Bump debhelper compat to 10
diff --git a/debian/changelog b/debian/changelog
index ae35b39..4066add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
[ Emilio Pozuelo Monfort ]
* Cherry-pick upstream commit 20a3f99 to plug a memory leak in the
security fix.
+ * Bump debhelper compat to 10.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 02a5016..d8994fa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 10),
dpkg-dev (>= 1.16.0),
pkg-config,
xtrans-dev,
commit 420faaf6faf1c1b3ef676fadd0d8367d18b21327
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Sat Dec 3 19:47:26 2016 +0100
Add changelog entry for the cherry-pick
diff --git a/debian/changelog b/debian/changelog
index c4989dd..ae35b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ libx11 (2:1.6.4-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Update d/upstream/signing-key.asc with Matthieu Herrb's key.
+ [ Emilio Pozuelo Monfort ]
+ * Cherry-pick upstream commit 20a3f99 to plug a memory leak in the
+ security fix.
+
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:49:35 +0200
libx11 (2:1.6.3-1) unstable; urgency=medium
commit 9c8824040090e969d15736e1982737564045dff9
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 25 21:30:15 2016 +0200
Plug a memory leak
This was introduced in 8ea762f.
Reported-by: Julien Cristau <jcris...@debian.org>
Signed-off-by: Emilio Pozuelo Monfort <po...@debian.org>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/FontNames.c b/src/FontNames.c
index e55f338..3e23b5f 100644
--- a/src/FontNames.c
+++ b/src/FontNames.c
@@ -98,12 +98,14 @@ int *actualCount) /* RETURN */
*ch = '\0'; /* and replace with null-termination */
count++;
} else {
+ Xfree(ch);
Xfree(flist);
flist = NULL;
count = 0;
break;
}
} else {
+ Xfree(ch);
Xfree(flist);
flist = NULL;
count = 0;
