xtrans: Changes to 'debian-unstable'
ChangeLog | 460 +++++++++++++++++++++++++++++++++++++++
Xtrans.c | 284 +++++++++++-------------
Xtrans.h | 70 +-----
Xtransint.h | 137 ++++++-----
Xtranslcl.c | 472 +++++++++++++++++++---------------------
Xtranssock.c | 511 +++++++++++++++++++++-----------------------
Xtranstli.c | 637 +++++++++++++++++++++++++++----------------------------
Xtransutil.c | 102 ++++----
configure.ac | 69 +++--
debian/changelog | 8
debian/control | 6
debian/rules | 5
doc/.gitignore | 1
doc/Makefile.am | 61 -----
doc/xtrans.xml | 137 +++++------
docbook.am | 105 +++++++++
transport.c | 22 +
xtrans.m4 | 16 -
18 files changed, 1778 insertions(+), 1325 deletions(-)
New commits:
commit 8460362bfbddcadccb11697d441d168cccefb9b0
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 5 17:27:51 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index c2ce011..80f7ddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xtrans (1.2.7-1) UNRELEASED; urgency=low
+xtrans (1.2.7-1) unstable; urgency=low
* New upstream release.
* Drop dh_testroot from debian/rules clean.
* Bump xutils-dev, xmlto and xorg-sgml-doctools build-deps.
- -- Julien Cristau <jcristau@debian.org> Sat, 05 May 2012 16:51:43 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 05 May 2012 17:27:47 +0200
xtrans (1.2.6-2) unstable; urgency=low
commit 4f85c2cbcc73dc3c4bf19c3be55dc66d2eda3e78
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 5 17:21:32 2012 +0200
Bump xutils-dev, xmlto and xorg-sgml-doctools build-deps.
diff --git a/debian/changelog b/debian/changelog
index f2423c8..c2ce011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xtrans (1.2.7-1) UNRELEASED; urgency=low
* New upstream release.
* Drop dh_testroot from debian/rules clean.
+ * Bump xutils-dev, xmlto and xorg-sgml-doctools build-deps.
-- Julien Cristau <jcristau@debian.org> Sat, 05 May 2012 16:51:43 +0200
diff --git a/debian/control b/debian/control
index b0dbd79..695ae51 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,12 @@ Build-Depends:
debhelper (>= 5.0.0),
quilt,
automake,
- xutils-dev (>= 1:7.5+4),
+ xutils-dev (>= 1:7.6+2),
pkg-config,
# docs:
- xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
+ xmlto (>= 0.0.22),
+ xorg-sgml-doctools (>= 1:1.8),
+ w3m,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git
commit c6977aba3da81adc21a0cc7b474fdcfdffd658d1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 5 17:02:42 2012 +0200
Drop dh_testroot from debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 9929b4d..f2423c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xtrans (1.2.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop dh_testroot from debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Sat, 05 May 2012 16:51:43 +0200
diff --git a/debian/rules b/debian/rules
index 065407f..ce86daa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,18 +53,15 @@ build-stamp: build/config.status
clean: xsfclean
dh_testdir
- dh_testroot
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 $$(find -name Makefile.in)
+ find -name Makefile.in -delete
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
-
dh_clean
install: build
commit 7fbcb8f75346f09c9e0c1a357edc14d6becb661c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 5 16:53:18 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index ea88052..f1a486c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,463 @@
+commit 8ce5ecd33b05becc054dbd07f87e385165b6c979
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 22 20:04:07 2012 -0700
+
+ xtrans 1.2.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f8eea0bf256de59602790b6a7c7877b31520440f
+Author: Matt Dew <marcoz@osource.org>
+Date: Wed Jan 11 22:23:32 2012 -0700
+
+ informaltable cleanup
+
+ On certain tables, add top and bottom borders to table
+ header and a bottom border to the table. This matches
+ what those tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point,
+ IE, 1* -> 1.0* cleans up these build errors:
+ WARNING: table-layout="fixed" and column-width unspecified
+ => falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit 6086f6c1d0e0a1c9e590879acb2319dea0eb6e96
+Author: Robert Bragg <robert@linux.intel.com>
+Date: Mon Dec 12 00:30:43 2011 +0000
+
+ Xtranssock.c: avoid buffer overrun in SocketReopen
+
+ This function was constructing an address from a port string allocating
+ a buffer according to the size of the string but then later copying
+ the address according to sizeof(struct sockaddr).
+
+ This patch ensures that we allocate a struct sockaddr buffer with enough
+ space for the port string to be copied into sa_data[] and uses that
+ combined length to determine how much should be copied at the end of the
+ function.
+
+ This fixes a crash when using xwayland which uses ListenOnOpenFD() that
+ will call _XSERVTransReopenCOTSServer() with a short port string like
+ ":1".
+
+ Signed-off-by: Robert Bragg <robert@linux.intel.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a04a45cb94f7f569e6dd77df93258fa167d0a4ea
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Nov 30 18:40:46 2011 -0800
+
+ Remove unnecessary casts on malloc, calloc & free calls
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+
+commit a0bfb4fefd20b396e3d88eff0c60602fc436dad5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Nov 30 18:11:15 2011 -0800
+
+ Replace malloc(strlen)+strcpy with strdup
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+
+commit b89e1b45198c48996750b5da3d715c10f974243f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Nov 30 18:05:05 2011 -0800
+
+ Finish conversion to standard C allocation functions
+
+ Commit 4ac40cd5451 started this, by no longer special casing the
+ xserver to include it's former custom allocation functions, this
+ just takes the remaining #defines and pre-substitutes them into
+ the code.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ff992be7b05483f9a0586a27ee0edb6d99580b84
+Author: Alan Hourihane <alanh@fairlite.co.uk>
+Date: Thu Dec 1 12:04:22 2011 +0000
+
+ Fix some resource & memory leaks in libxtrans.
+
+ Signed-off-by: Alan Hourihane <alanh@vmware.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 29c9e101f7ad72556aa6b3dbc17d66a1ace9b2b1
+Author: Matt Dew <marcoz@osource.org>
+Date: Tue Oct 4 21:59:50 2011 -0600
+
+ Cleanup IDs and links in doc
+
+ 1 - fix the capitalization of the ID attributes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit 0f942e5f015cb3270e6f2e17c308bee894cb5fe3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 25 11:39:13 2011 -0700
+
+ Convert a bunch of sprintf calls to snprintf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit eb9a8904fbef61a57ff01c90627ead57055ed62b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 25 11:18:26 2011 -0700
+
+ Add const attributes to fix gcc -Wwrite-strings warnings
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4e610d4bbcf29cca9dc5dbad29ca820996aaa8c7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 25 10:59:45 2011 -0700
+
+ Fix warning: unused variable 'tmpport' with various configurations
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit a74c5d915c3095059356f83d1b845192e5c472c2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Sep 25 10:57:00 2011 -0700
+
+ Add _X_UNUSED attributes to silence unused parameter warnings
+
+ Not all the transport variants use all the arguments to every function,
+ but as long as one transport type needs it, they all get the args passed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 64f765de138cb9b757df315469b3136d32222ea2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Sep 24 00:04:40 2011 -0700
+
+ Mark __xtransname strings for debug messages as const char *
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit ea921932dae7049b231bead7f8f3f088d7beaf9e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 23 23:03:09 2011 -0700
+
+ Fix unused variable warnings
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c1968d10f97d62ac05d698822c2688151f70a9eb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 23 22:59:11 2011 -0700
+
+ Fix warning: ISO C90 forbids mixed declarations and code
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 225c45b3accab56fab361104a3d14b80f6cec954
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 23 22:57:56 2011 -0700
+
+ Fix printf format string warnings
+
+ Now that prmsg lets arguments types actually be checked, fix
+ the warnings found.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b1b69ce8e8e4fe0f190c8bd85b537309e71055c8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 23 22:35:03 2011 -0700
+
+ Convert PRMSG macro to prmsg inline function
+
+ Allows using varargs to have the correct number of arguments passed to
+ get rid of the many gcc warnings about variable printf format strings,
+ and to reduce the duplication from having 5 implementations of the
+ PRMSG macro depending on the debug options defined & output method used.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit cbdb434033da1725a69014cc6e4d89c691a6fd95
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Sep 24 07:43:07 2011 -0700
+
+ Fix warnings about static functions declared but never defined
+
+ Add #define XTRANS_TRANSPORT_C to transport.c and check for it
+ before making static function declarations and other bits needed
+ only when compiling the Xtrans code itself, not from other sources
+ that include the Xtransint.h header for the struct definitions.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit cf39d738086b0a7c668fb3720d64de8d711a1a97
+Author: Arvind Umrao <arvind.umrao@oracle.com>
+Date: Tue Sep 20 22:56:52 2011 +0530
+
+ Removing SUN specific code, let solaris create .X11-pipe with sticky bit on
+
+ Alan told me, named pipe support was added around Solaris 2.6 when that was a much better performing transport than Unix sockets on the Solaris kernels of the time. By Solaris 10, Unix sockets had been reimplemented in the kernel to be faster, so they became the default again. In Solaris 11, we don't even have named pipe support in the libxcb library that implements X client connection code now, so the named pipes would only be accessed by code with a different libX11 or a statically linked libX11 from Solaris 2.6-9
+
+ Signed-off-by: Arvind Umrao <arvind.umrao@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a477713b89686480cf59a9c75c0aaeeba2386d0a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 18:56:47 2011 -0400
+
+ specs: regroup <author> <editor> <othercredit> under authorgroup
+
+ Some elements are not displayed when outside authorgroup
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1ad48fb9bc18d0c7a8fbec1d2cd232877e945047
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 15:47:09 2011 -0400
+
+ specs: refactor copyright legal text for multi licensing
+
+ we can use <copyright> markup for the first holder
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bd93bf86fd914a9cc54e2bedec5b063e5a38b732
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 10:58:40 2011 -0400
+
+ doc: support multi licensed copyright notice and license text
+
+ For documentation having multiple licenses, the copyright and legalnotice
+ elements sequence cannot instantiated multiple times.
+ The copyright notice and license text are therefore coded inside a
+ legalnotice element. The role attribute on the paragraph is used to allow
+ styling of the copyright notice text which should not be italicized.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit eb9ec458b7fb5332f7ae7b8faf59443a9075ec60
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 22:54:41 2011 -0700
+
+ Strip trailing whitespace
+
+ Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 36174eb06e805fa51c9c2e9e914fdfad4a99f50f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 15:29:19 2011 -0400
+
+ docs: fix authors affiliation
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9b6c2473be2848ce0a4986ddaa59e5f5ef028bfc
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 16:37:24 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b5754cdf64f3396a5853413eda1943cf75ff3cbd
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 20f338c548e5fcb16650a4e2c25c2008c1fdac36
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8eb827af1b57ec52be183cddaf32257968c02878
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b710cdadc92fc212af361bee48f5af6333ec3e6d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 12 18:39:46 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 78d1f7d29145567e11b985042e917a435bef95f9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit e05d7abbcf880099058b699ac52f65edcac95582
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Apr 24 19:39:26 2011 -0700
+
+ Silence warnings when building with clang
+
+ /usr/X11/include/X11/Xtrans/Xtransint.h:349:12: error: unused function 'is_numeric' [-Werror,-Wunused-function]
+ static int is_numeric (
+ ^
+ /usr/X11/include/X11/Xtrans/Xtransint.h:354:12: error: unused function 'trans_mkdir' [-Werror,-Wunused-function]
+ static int trans_mkdir (
+ ^
+
+ In file included from /usr/X11/include/X11/Xtrans/transport.c:67:
+ ...
+ fatal error: too many errors emitted, stopping now [-ferror-limit=]
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 27ae0ad1406a33919ea9f76034495bca7cccf051
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew <marcoz@osource.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cc199c31465b258032bdb9083879699202db7ee9
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Feb 21 12:44:06 2011 -0500
+
+ Remove a decnet leftover
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 91620213d2bd75fe322df06c5b6f55b85a10e55a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Mar 15 15:47:08 2011 -0400
+
+ Remove K&R token pasting macros
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 4ac40cd5451983e6f62527700cdf9e2f8a29c013
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Mar 15 15:45:56 2011 -0400
+
+ Don't special-case allocation for the X server
+
+ xserver uses malloc/free directly now, don't route through the Xalloc
+ wrappers.
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 638caa2053330038c5ba5a5682ff02be6aa0faa6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:46 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am])
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit a26753b7b20cd5cadc1e7fa007cec063f39a49e8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:59:20 2010 -0800
+
+ doc: Correct column count in transport configuration table
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 59f57d1a19d4091fef115b9eafa139bf620332cb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 8 16:33:45 2010 -0800
diff --git a/debian/changelog b/debian/changelog
index 6f455be..9929b4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xtrans (1.2.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 05 May 2012 16:51:43 +0200
+
xtrans (1.2.6-2) unstable; urgency=low
[ Julien Cristau ]
commit 8ce5ecd33b05becc054dbd07f87e385165b6c979
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 20:04:07 2012 -0700
xtrans 1.2.7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5f1743c..3d11c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xtrans], [1.2.6],
+AC_INIT([xtrans], [1.2.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans])
AC_CONFIG_SRCDIR([Makefile.am])
commit f8eea0bf256de59602790b6a7c7877b31520440f
Author: Matt Dew <marcoz@osource.org>
Date: Wed Jan 11 22:23:32 2012 -0700
informaltable cleanup
On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.
the <?dbfo keep-together='always'> prevents tables from
splitting across pages. Useful for tiny tables.
Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/doc/xtrans.xml b/doc/xtrans.xml
index 82e95a4..12dbe3c 100644
--- a/doc/xtrans.xml
+++ b/doc/xtrans.xml
@@ -956,13 +956,14 @@ In X11R7 modular releases, these flags are set when running
<function>XTRANS_CONNECTION_FLAGS</function> macro from
<filename>xtrans.m4</filename>.
</para>
-<informaltable pgwide='0' frame='none'>
- <tgroup cols='3' align='left'>
- <colspec colname='define' align='center'/>
- <colspec colname='enable'/>
- <colspec colname='desc'/>
+
+<informaltable frame='topbot'>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='define' colwidth='1.0*' />
+ <colspec colname='enable' colwidth='2.0*' />
+ <colspec colname='desc' colwidth='2.0*'/>
<thead>
- <row>
+ <row rowsep='1'>
<entry><code>#define</code></entry>
<entry>configure flag</entry>
<entry>Description</entry>
@@ -1021,15 +1022,15 @@ In X11R7 modular releases, these flags are set when running
<chapter id='Transport_Specific_Definitions'>
<title>Transport Specific Definitions</title>
-<informaltable pgwide='0' frame='none'>
+<informaltable frame='all' colsep='1' rowsep='1'>
<tgroup cols='4' align='center'>
- <colspec colname='c1'/>
- <colspec colname='c2'/>
- <colspec colname='c3'/>
- <colspec colname='c4'/>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='1.0*'/>
+ <colspec colname='c3' colwidth='3.0*'/>
+ <colspec colname='c4' colwidth='2.0*'/>
<thead>
<row>
- <entry morerows="1" align='center'>Protocol Family</entry>
+ <entry morerows="1">Protocol Family</entry>
<entry namest="c2" nameend="c4" align='center'>Address Component</entry>
</row>
<row>
@@ -1040,34 +1041,34 @@ In X11R7 modular releases, these flags are set when running
</thead>
<tbody>
<row>
- <entry align='center'>Internet</entry>
- <entry align='center'>inet inet6 tcp udp</entry>
- <entry align='center'>name of an internet addressable host</entry>
- <entry align='center'>string containing the name of a service or a valid port number. Example: "xserver0", "7100"</entry>
+ <entry>Internet</entry>
+ <entry>inet inet6 tcp udp</entry>
+ <entry>name of an internet addressable host</entry>
+ <entry>string containing the name of a service or a valid port number. Example: "xserver0", "7100"</entry>
</row>
<row>
- <entry align='center'>DECnet</entry>
- <entry align='center'>decnet</entry>
- <entry align='center'>name of a DECnet addressable host</entry>
- <entry align='center'>string containing the complete name of the object. Example: "X$X0"</entry>
+ <entry>DECnet</entry>
+ <entry>decnet</entry>
+ <entry>name of a DECnet addressable host</entry>
+ <entry>string containing the complete name of the object. Example: "X$X0"</entry>
</row>
<row>
- <entry align='center'>NETware</entry>
- <entry align='center'>ipx</entry>
- <entry align='center'>name of a NETware addressable host</entry>
- <entry align='center'>Not sure of the specifics yet.</entry>
+ <entry>NETware</entry>
+ <entry>ipx</entry>
+ <entry>name of a NETware addressable host</entry>
+ <entry>Not sure of the specifics yet.</entry>
</row>
<row>
- <entry align='center'>OSI</entry>
- <entry align='center'>osi</entry>
- <entry align='center'>name of an OSI adressable host.</entry>
- <entry align='center'>Not sure of the specifics yet.</entry>
+ <entry>OSI</entry>
+ <entry>osi</entry>
+ <entry>name of an OSI adressable host.</entry>
+ <entry>Not sure of the specifics yet.</entry>
</row>
<row>
- <entry align='center'>Local</entry>
- <entry align='center'>local pts named sco isc</entry>
- <entry align='center'>(ignored)</entry>
- <entry align='center'>String containing the port name, ie "xserver0", "fontserver0".</entry>
+ <entry>Local</entry>
+ <entry>local pts named sco isc</entry>
+ <entry>(ignored)</entry>
+ <entry>String containing the port name, ie "xserver0", "fontserver0".</entry>
</row>
</tbody>
</tgroup>
commit 6086f6c1d0e0a1c9e590879acb2319dea0eb6e96
Author: Robert Bragg <robert@linux.intel.com>
Date: Mon Dec 12 00:30:43 2011 +0000
Xtranssock.c: avoid buffer overrun in SocketReopen
This function was constructing an address from a port string allocating
a buffer according to the size of the string but then later copying
the address according to sizeof(struct sockaddr).
This patch ensures that we allocate a struct sockaddr buffer with enough
space for the port string to be copied into sa_data[] and uses that
combined length to determine how much should be copied at the end of the
function.
This fixes a crash when using xwayland which uses ListenOnOpenFD() that
will call _XSERVTransReopenCOTSServer() with a short port string like
":1".
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Xtranssock.c b/Xtranssock.c
index 66f9862..dfa41cf 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -458,6 +458,7 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, char *port)
XtransConnInfo ciptr;
int portlen;
struct sockaddr *addr;
+ size_t addrlen;
prmsg (3,"SocketReopen(%d,%d,%s)\n", type, fd, port);
@@ -488,26 +489,27 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, char *port)
ciptr->fd = fd;
- if ((addr = calloc (1, portlen + 2)) == NULL) {
+ addrlen = portlen + offsetof(struct sockaddr, sa_data);
+ if ((addr = calloc (1, addrlen)) == NULL) {
prmsg (1, "SocketReopen: malloc(addr) failed\n");
free (ciptr);
return NULL;
}
ciptr->addr = (char *) addr;
- ciptr->addrlen = portlen + 2;
+ ciptr->addrlen = addrlen;
- if ((ciptr->peeraddr = calloc (1, portlen + 2)) == NULL) {
+ if ((ciptr->peeraddr = calloc (1, addrlen)) == NULL) {
prmsg (1, "SocketReopen: malloc(portaddr) failed\n");
free (addr);
free (ciptr);
return NULL;
}
- ciptr->peeraddrlen = portlen + 2;
+ ciptr->peeraddrlen = addrlen;
/* Initialize ciptr structure as if it were a normally-opened unix socket */
ciptr->flags = TRANS_LOCAL | TRANS_NOUNLINK;
#ifdef BSD44SOCKETS
- addr->sa_len = portlen + 1;
+ addr->sa_len = addrlen;
#endif
addr->sa_family = AF_UNIX;
#ifdef HAS_STRLCPY
@@ -516,7 +518,7 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, char *port)
strncpy(addr->sa_data, port, portlen);
#endif
ciptr->family = AF_UNIX;
- memcpy(ciptr->peeraddr, ciptr->addr, sizeof(struct sockaddr));
+ memcpy(ciptr->peeraddr, ciptr->addr, addrlen);
ciptr->port = rindex(addr->sa_data, ':');
if (ciptr->port == NULL) {
if (is_numeric(addr->sa_data)) {
commit a04a45cb94f7f569e6dd77df93258fa167d0a4ea
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 30 18:40:46 2011 -0800
Remove unnecessary casts on malloc, calloc & free calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
diff --git a/Xtrans.c b/Xtrans.c
index 97de39b..54e3bdc 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -143,7 +143,7 @@ TRANS(FreeConnInfo) (XtransConnInfo ciptr)
if (ciptr->port)
free (ciptr->port);
- free ((char *) ciptr);
+ free (ciptr);
}
@@ -939,7 +939,7 @@ TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
*familyp = ciptr->family;
*addrlenp = ciptr->addrlen;
- if ((*addrp = (Xtransaddr *) malloc (ciptr->addrlen)) == NULL)
+ if ((*addrp = malloc (ciptr->addrlen)) == NULL)
{
prmsg (1,"GetMyAddr: malloc failed\n");
return -1;
@@ -959,7 +959,7 @@ TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
*familyp = ciptr->family;
*addrlenp = ciptr->peeraddrlen;
- if ((*addrp = (Xtransaddr *) malloc (ciptr->peeraddrlen)) == NULL)
+ if ((*addrp = malloc (ciptr->peeraddrlen)) == NULL)
{
prmsg (1,"GetPeerAddr: malloc failed\n");
return -1;
@@ -1128,7 +1128,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
if (*count_ret > 0)
{
- if ((*ciptrs_ret = (XtransConnInfo *) malloc (
+ if ((*ciptrs_ret = malloc (
*count_ret * sizeof (XtransConnInfo))) == NULL)
{
return -1;
@@ -1226,7 +1226,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
if (*count_ret > 0)
{
- if ((*ciptrs_ret = (XtransConnInfo *) malloc (
+ if ((*ciptrs_ret = malloc (
*count_ret * sizeof (XtransConnInfo))) == NULL)
{
return -1;
diff --git a/Xtranslcl.c b/Xtranslcl.c
index 925ba01..5beef7c 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -152,7 +152,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path)
ciptr->family = AF_UNIX;
ciptr->addrlen = sizeof (struct sockaddr_un);
- if ((sunaddr = (struct sockaddr_un *) malloc (ciptr->addrlen)) == NULL)
+ if ((sunaddr = malloc (ciptr->addrlen)) == NULL)
{
prmsg(1,"FillAddrInfo: failed to allocate memory for addr\n");
return 0;
@@ -174,12 +174,11 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path)
ciptr->peeraddrlen = sizeof (struct sockaddr_un);
- if ((p_sunaddr = (struct sockaddr_un *) malloc (
- ciptr->peeraddrlen)) == NULL)
+ if ((p_sunaddr = malloc (ciptr->peeraddrlen)) == NULL)
{
prmsg(1,
"FillAddrInfo: failed to allocate memory for peer addr\n");
- free ((char *) sunaddr);
+ free (sunaddr);
ciptr->addr = NULL;
return 0;
@@ -613,7 +612,7 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->addrlen=ciptr->addrlen;
- if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
+ if( (newciptr->addr = malloc(newciptr->addrlen)) == NULL ) {
prmsg(1,"PTSAccept: failed to allocate memory for peer addr\n");
close(newfd);
*status = TRANS_ACCEPT_BAD_MALLOC;
@@ -623,7 +622,7 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
newciptr->peeraddrlen=sizeof(struct sockaddr_un);
- if( (sunaddr=(struct sockaddr_un *)malloc(newciptr->peeraddrlen)) == NULL ) {
+ if( (sunaddr = malloc(newciptr->peeraddrlen)) == NULL ) {
prmsg(1,"PTSAccept: failed to allocate memory for peer addr\n");
free(newciptr->addr);
close(newfd);
@@ -885,7 +884,7 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->family=ciptr->family;
newciptr->addrlen=ciptr->addrlen;
- if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
+ if( (newciptr->addr = malloc(newciptr->addrlen)) == NULL ) {
prmsg(1,
"NAMEDAccept: failed to allocate memory for pipe addr\n");
close(str.fd);
@@ -896,7 +895,7 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
newciptr->peeraddrlen=newciptr->addrlen;
- if( (newciptr->peeraddr=(char *)malloc(newciptr->peeraddrlen)) == NULL ) {
+ if( (newciptr->peeraddr = malloc(newciptr->peeraddrlen)) == NULL ) {
prmsg(1,
"NAMEDAccept: failed to allocate memory for peer addr\n");
free(newciptr->addr);
@@ -1223,7 +1222,7 @@ TRANS(SCOAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->addrlen=ciptr->addrlen;
- if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
+ if( (newciptr->addr = malloc(newciptr->addrlen)) == NULL ) {
prmsg(1,
"SCOAccept: failed to allocate memory for peer addr\n");
close(fd);
@@ -1237,7 +1236,7 @@ TRANS(SCOAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
#endif
newciptr->peeraddrlen=newciptr->addrlen;
- if( (newciptr->peeraddr=(char *)malloc(newciptr->peeraddrlen)) == NULL ) {
+ if( (newciptr->peeraddr = malloc(newciptr->peeraddrlen)) == NULL ) {
prmsg(1,
"SCOAccept: failed to allocate memory for peer addr\n");
free(newciptr->addr);
@@ -1811,7 +1810,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char *host, char *port)
*/
#endif /* X11_t */
- if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
+ if( (ciptr = calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
prmsg(1,"LocalOpenClient: calloc(1,%lu) failed\n",
sizeof(struct _XtransConnInfo));
@@ -1885,7 +1884,7 @@ TRANS(LocalOpenServer)(int type, char *protocol, char *host _X_UNUSED, char *por
*/
#endif /* X11_t */
- if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
+ if( (ciptr = calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
prmsg(1,"LocalOpenServer: calloc(1,%lu) failed\n",
sizeof(struct _XtransConnInfo));
@@ -1939,7 +1938,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, char *port)
prmsg(2,"LocalReopenServer(%d,%d,%d)\n", type, index, fd);
Reply to: