.gitignore | 70 A8Eq.c | 49 AA16.c | 51 AA32.c | 51 AA8.c | 51 Alloc.c | 79 AofA8.c | 51 Array.c | 247 ++ CA8.c | 48 ChangeLog | 275 +++ CmpKey.c | 49 DA16.c | 47 DA32.c | 45 DA8.c | 45 DAofA8.c | 50 DecKey.c | 49 Fill.c | 15 Flush.c | 9 GenKey.c | 74 INSTALL | 236 -- IncKey.c | 49 Key.c | 102 + Makefile.am | 64 RA16.c | 70 RA32.c | 70 RA8.c | 70 RAofA8.c | 73 RC16.c | 50 RC32.c | 54 RC8.c | 45 RHead.c | 46 RR.c | 42 RaA16.c | 51 RaA32.c | 51 RaA8.c | 51 RaAoA8.c | 51 Read.c | 244 ++ Unwrap.c | 5 WA16.c | 49 WA32.c | 49 WA8.c | 49 WAofA8.c | 49 WC16.c | 50 WC32.c | 53 WC8.c | 49 Whead.c | 64 Wrap.c | 5 Wrap.h | 4 Wraphelp.c | 5 Write.c | 151 + configure.ac | 28 debian/changelog | 13 debian/control | 4 debian/libxdmcp-dev.install | 3 debian/rules | 4 doc/.gitignore | 5 doc/Makefile.am | 64 doc/xdmcp.xml | 3895 ++++++++++++++++++++++++++++++++++++++++++++ include/X11/Xdmcp.h | 27 59 files changed, 5109 insertions(+), 2290 deletions(-)
New commits: commit 73dc5a850f90ae1e60e68b7f09431747ba32b1da Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:53:07 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 209fca5..df9e92e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low +libxdmcp (1:1.1.0-1) unstable; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. @@ -9,7 +9,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * Switch from --list-missing to --fail-missing for additional safety. * Exclude the .la file accordingly. - -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 + -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:53:01 +0100 libxdmcp (1:1.0.3-2) unstable; urgency=low commit 872e5a2eb456307593a302c3190abf7b75d19e09 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:52:58 2010 +0100 Exclude the .la file accordingly. diff --git a/debian/changelog b/debian/changelog index 7f51972..209fca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * Ship *.html, *.css, and *.txt from the doc directory. * Kill *.xml in the doc directory, no point in shipping them. * Switch from --list-missing to --fail-missing for additional safety. + * Exclude the .la file accordingly. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/rules b/debian/rules index f99de59..05b27c9 100755 --- a/debian/rules +++ b/debian/rules @@ -78,7 +78,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --fail-missing + dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXdmcp.la dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit bfd4b3c238272d6c1a237a4ac849c2f8213244a9 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:52:05 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index 4db23b2..7f51972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * Pass --with-xmlto and --without-fop, we want html and txt only. * Ship *.html, *.css, and *.txt from the doc directory. * Kill *.xml in the doc directory, no point in shipping them. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/rules b/debian/rules index 23b172a..f99de59 100755 --- a/debian/rules +++ b/debian/rules @@ -78,7 +78,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit e2d761783115d607aaf1030621c7b58afd7f8f3d Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:51:53 2010 +0100 Kill *.xml in the doc directory, no point in shipping them. diff --git a/debian/changelog b/debian/changelog index c0c36b3..4db23b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. * Pass --with-xmlto and --without-fop, we want html and txt only. * Ship *.html, *.css, and *.txt from the doc directory. + * Kill *.xml in the doc directory, no point in shipping them. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/rules b/debian/rules index 334adee..23b172a 100755 --- a/debian/rules +++ b/debian/rules @@ -70,6 +70,7 @@ install: build dh_installdirs cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + find debian/tmp/usr/share/doc/libXdmcp -name '*.xml' -delete # Build architecture-dependent files here. binary-arch: build install commit 329b64840014b2c465ad3e1afe45a7317f6e9e13 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:51:40 2010 +0100 Ship *.html, *.css, and *.txt from the doc directory. diff --git a/debian/changelog b/debian/changelog index 1375cc6..c0c36b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * Bump xutils-dev build-dep for new macros. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. * Pass --with-xmlto and --without-fop, we want html and txt only. + * Ship *.html, *.css, and *.txt from the doc directory. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/libxdmcp-dev.install b/debian/libxdmcp-dev.install index 8c807fc..9be6b38 100644 --- a/debian/libxdmcp-dev.install +++ b/debian/libxdmcp-dev.install @@ -2,3 +2,6 @@ usr/include/X11/* usr/lib/libXdmcp.a usr/lib/libXdmcp.so usr/lib/pkgconfig/xdmcp.pc +usr/share/doc/libXdmcp/*.html usr/share/doc/libxdmcp-dev +usr/share/doc/libXdmcp/*.css usr/share/doc/libxdmcp-dev +usr/share/doc/libXdmcp/*.txt usr/share/doc/libxdmcp-dev commit df483d80ec860c48264d07d8613679cdd708234f Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:45:49 2010 +0100 Pass --with-xmlto and --without-fop, we want html and txt only. diff --git a/debian/changelog b/debian/changelog index 39c0a6a..1375cc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. + * Pass --with-xmlto and --without-fop, we want html and txt only. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/rules b/debian/rules index 72add9b..334adee 100755 --- a/debian/rules +++ b/debian/rules @@ -42,6 +42,7 @@ build-stamp: cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ + --with-xmlto --without-fop \ CFLAGS="$(CFLAGS)" cd build && $(MAKE) >$@ commit ffaf8b07ad52ed6b8b3274c9d6c6bd4389073109 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:45:16 2010 +0100 Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. diff --git a/debian/changelog b/debian/changelog index 3ff2f89..39c0a6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. + * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/control b/debian/control index 45ece6d..ae6e5da 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,8 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5+4), +# doc: + xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxdmcp Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxdmcp.git commit b810c8bb1181b648b7b8397e34b5795bda401d2d Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:44:42 2010 +0100 Bump xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index 0d7d484..3ff2f89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump xutils-dev build-dep for new macros. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 diff --git a/debian/control b/debian/control index a1a89e0..45ece6d 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: x11proto-core-dev, automake, libtool, - xutils-dev (>= 1:7.5~1) + xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxdmcp Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxdmcp.git commit fb4218a2281142d7c70a6637d55939fb4c091147 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:44:25 2010 +0100 New upstream release. diff --git a/ChangeLog b/ChangeLog index 85804a2..1ebdd04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,278 @@ +commit 7db29ff43eb3cdcbfe77c35ecc78c7ca3ddba595 +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 29 15:13:16 2010 -0700 + + libXdmcp 1.1.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit fef4451fa3c55dcf81e7eee7ca001c57e301a150 +Author: Alan Coopersmith <[email protected]> +Date: Wed Oct 27 23:01:49 2010 -0700 + + Remove AC_PROG_CC & AC_PROG_INSTALL that XORG_DEFAULT_OPTIONS already call + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 21c9f93bb5200dda0bfdd05b928c19829f23d646 +Author: Gaetan Nadon <[email protected]> +Date: Tue Aug 3 15:28:51 2010 -0400 + + config: require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit adaf75c9aac6ca77b26379cc5e451728d9f1a78b +Author: Matt Dew <[email protected]> +Date: Sun Aug 1 14:23:18 2010 -0400 + + specs: replace troff source with docbook-xml source + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 39993ef6f48cb3f9ee0cb0cd4dcef0d643cda698 +Author: Alan Coopersmith <[email protected]> +Date: Fri May 7 19:21:42 2010 -0700 + + Replace comments pointing to non-public X Consortium defect reports + + Restored the original comments suggested by Paul Shearer of Sequent in the + patches he submitted with these fixes in the original X Consortium defect + reports from 1995, since modern readers can't refer to the referenced + bug reports in that old/closed bug db. + + 7328 Xdmcp: memory leak in XdmcpReadARRAYofARRAY8 when read fails + 7329 Xdmcp: XdmcpReadARRAY and XdmcpDisposeARRAY routines may free twice + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ea0e0d0e3d45eb5e71542af835194514a6f8801c +Author: Alan Coopersmith <[email protected]> +Date: Fri May 7 19:03:54 2010 -0700 + + Fix order of CPPFLAGS passed to lint/compile steps + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 996d92d2710f9dc740351f4d9cbe14af64569689 +Author: Mikhail Gusarov <[email protected]> +Date: Fri May 7 20:22:20 2010 +0000 + + Get rid of Xalloc/Xrealloc/Xfree from X server or Xlib + + alloc/realloc/free calls are encapsulated in libXdmcp, so + there is no need to wrap allocation functions even under Windows + + Signed-off-by: Mikhail Gusarov <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2a51e57425e1b4062a459a19b1860c9c9721d9ea +Author: Mikhail Gusarov <[email protected]> +Date: Fri May 7 20:06:52 2010 +0000 + + Nuke RCS tags + + Signed-off-by: Mikhail Gusarov <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 710d4a4298772cf06c22cce336622b33487b8b44 +Author: Mikhail Gusarov <[email protected]> +Date: Fri May 7 20:03:46 2010 +0000 + + Reshuffle functions to decrease amount of boilerplate + + It it a PitA to do anything with lot of nearly idenical code scattered + around in 30 files each containing 5-line function + + Signed-off-by: Mikhail Gusarov <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1b22d07fc1268e7c5343cccd562ab69a101baf91 +Author: Alan Coopersmith <[email protected]> +Date: Thu May 6 15:38:01 2010 -0700 + + Use stdint.h instead of limits.h for UINT*_MAX definitions + + While Solaris allows either one, C99 only requires them in stdint.h + and some platforms don't include them via limits.h + + Corrects tinderbox reported errors on Fedora 11 build machine: + + http://tinderbox.x.org/builds/2010-05-06-0019/logs/libXdmcp/#build + + AA32.c: In function 'XdmcpAllocARRAY32': + AA32.c:47: error: 'UINT8_MAX' undeclared (first use in this function) + + AA8.c: In function 'XdmcpAllocARRAY8': + AA8.c:47: error: 'UINT16_MAX' undeclared (first use in this function) + + Signed-off-by: Alan Coopersmith <[email protected]> + + Compiles clean on GNU/Linux AMD64 + Tested-by: Gaetan Nadon <[email protected]> + +commit 30e388a8284ed100893983178acb6b4e3ff2b815 +Author: Alan Coopersmith <[email protected]> +Date: Thu Apr 29 20:19:38 2010 -0700 + + Deal with lint warnings about implicit narrowing conversions + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + +commit 110078a137915f486a13e0445ee9ba5e1558c081 +Author: Alan Coopersmith <[email protected]> +Date: Thu Apr 29 19:57:46 2010 -0700 + + unifdef Lynx + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + +commit 5ea80e308026357aeee8b56230e85cb4d2e87631 +Author: Alan Coopersmith <[email protected]> +Date: Thu Apr 29 19:56:37 2010 -0700 + + XdmcpARRAY8Equal: Use memcmp instead of rolling our own + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + +commit 27b1aa82a3f0db7d20a303ba093d1ec52de39bff +Author: Alan Coopersmith <[email protected]> +Date: Thu Apr 29 19:51:25 2010 -0700 + + Constify function prototypes + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + +commit 482b19329fac5e311fe0423e58f3e8c573b66114 +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 16:50:34 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1c220fc14083ed8e1214329138d6ca548dad6dcc +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 14:53:48 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 7367f2efae9561d87cabaa6e1740355b0aeda86f +Author: Gaetan Nadon <[email protected]> +Date: Sat Mar 20 11:22:59 2010 -0400 + + make: remove unrequired -I${top_builddir}/include + + The -I${top_srcdir}/include in AM_CFLAGS is the correct one. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 2110b60cf122a624011ade8883af07b88bb2c2bb +Author: Gaetan Nadon <[email protected]> +Date: Tue Feb 16 10:37:21 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 7c1d4d862240a0b01eefbccf6b85e7a365e60ada +Author: Gaetan Nadon <[email protected]> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 3c0e64988dad80afe5633c62c29ab3d1c54d2d23 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit a4a69387d7d0783326fbbd2b7b202498325d5f96 +Author: Gaetan Nadon <[email protected]> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 748ea77263a40080e665adc742a7a9791b4293c0 +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 22:08:43 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 1ac333abaae4940467d2101d1080be9e46d90c78 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:19 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit c362c31e583215855458bc5cbb9ed1020157b1ad +Author: Gaetan Nadon <[email protected]> +Date: Sun Sep 27 16:28:37 2009 -0400 + + Makefile.am: do not include autogen.sh in distribution #24183 + + This is a private build script that should not be distributed + +commit d0f3336872147e925666aaf73b6c0c11aedc63c3 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 21 12:47:24 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <[email protected]> + commit 3a7e0bb1cec5975e9fcbddc6569e7ac1aea550e5 Author: Peter Hutterer <[email protected]> Date: Fri Aug 28 15:32:31 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 0504600..0d7d484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxdmcp (1:1.1.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 14:44:05 +0100 + libxdmcp (1:1.0.3-2) unstable; urgency=low [ Julien Cristau ] commit 96813e1f10c8383c8751a05496a7de97541f57b5 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 14:39:44 2010 +0100 Revert collateral damage in the previous commit. Those files shouldn't have been modified in that commit, and they would cause conflicts when merging from upstream. diff --git a/DA16.c b/DA16.c index c2b2d2b..021acce 100644 --- a/DA16.c +++ b/DA16.c @@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xdmcp.h> -#include <stdlib.h> void XdmcpDisposeARRAY16 (ARRAY16Ptr array) diff --git a/DA32.c b/DA32.c index f18ada9..37cc99a 100644 --- a/DA32.c +++ b/DA32.c @@ -34,7 +34,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xdmcp.h> -#include <stdlib.h> void XdmcpDisposeARRAY32 (ARRAY32Ptr array) diff --git a/DA8.c b/DA8.c index 7a705a9..dbcd635 100644 --- a/DA8.c +++ b/DA8.c @@ -34,7 +34,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xdmcp.h> -#include <stdlib.h> void XdmcpDisposeARRAY8 (ARRAY8Ptr array) diff --git a/Fill.c b/Fill.c index 7b21eae..dd26d8b 100644 --- a/Fill.c +++ b/Fill.c @@ -53,7 +53,6 @@ in this Software without prior written authorization from The Open Group. #endif /* !Lynx */ #endif #endif -#include <stdlib.h> int XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen) commit 7db29ff43eb3cdcbfe77c35ecc78c7ca3ddba595 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 29 15:13:16 2010 -0700 libXdmcp 1.1.0 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 7585365..5de378a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(libXdmcp, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXdmcp) +AC_INIT([libXdmcp], [1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdmcp]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit fef4451fa3c55dcf81e7eee7ca001c57e301a150 Author: Alan Coopersmith <[email protected]> Date: Wed Oct 27 23:01:49 2010 -0700 Remove AC_PROG_CC & AC_PROG_INSTALL that XORG_DEFAULT_OPTIONS already call Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 576fc2d..7585365 100644 --- a/configure.ac +++ b/configure.ac @@ -38,8 +38,6 @@ XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP XORG_CHECK_SGML_DOCTOOLS(1.5) -AC_PROG_CC -AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL commit 21c9f93bb5200dda0bfdd05b928c19829f23d646 Author: Gaetan Nadon <[email protected]> Date: Tue Aug 3 15:28:51 2010 -0400 config: require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index a49d9c2..576fc2d 100644 --- a/configure.ac +++ b/configure.ac @@ -28,10 +28,10 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS XORG_ENABLE_DOCS XORG_WITH_XMLTO(0.0.20) commit adaf75c9aac6ca77b26379cc5e451728d9f1a78b Author: Matt Dew <[email protected]> Date: Sun Aug 1 14:23:18 2010 -0400 specs: replace troff source with docbook-xml source Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index fd16ccc..c3b85aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=doc + lib_LTLIBRARIES = libXdmcp.la AM_CPPFLAGS = -I${top_srcdir}/include diff --git a/configure.ac b/configure.ac index 9582762..a49d9c2 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,10 @@ m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS +XORG_ENABLE_DOCS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) AC_PROG_CC AC_PROG_INSTALL @@ -61,4 +65,5 @@ XORG_WITH_LINT XORG_LINT_LIBRARY([Xdmcp]) AC_OUTPUT([Makefile + doc/Makefile xdmcp.pc]) diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..09b6a89 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,5 @@ +*.html +*.ps +*.pdf +*.txt +*.css diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..c2aa671 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,64 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +if ENABLE_DOCS +doc_sources = xdmcp.xml +dist_doc_DATA = $(doc_sources) + +if HAVE_XMLTO +doc_DATA = $(doc_sources:.xml=.html) + +if HAVE_FOP +doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) +endif + +if HAVE_XMLTO_TEXT +doc_DATA += $(doc_sources:.xml=.txt) +endif + +if HAVE_STYLESHEETS +XMLTO_FLAGS = -m $(XSL_STYLESHEET) + +doc_DATA += xorg.css +xorg.css: $(STYLESHEET_SRCDIR)/xorg.css + $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ +endif + +CLEANFILES = $(doc_DATA) + +SUFFIXES = .xml .ps .pdf .txt .html + +.xml.txt: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< + +.xml.html: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< + +.xml.pdf: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< + +.xml.ps: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< + +endif HAVE_XMLTO +endif ENABLE_DOCS diff --git a/doc/xdmcp.xml b/doc/xdmcp.xml new file mode 100644 index 0000000..22bccc6 --- /dev/null +++ b/doc/xdmcp.xml @@ -0,0 +1,3895 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";> + +<book id="xdmcp"> + +<bookinfo> + <title>X Display Manager Control Protocol</title> + <subtitle>X.Org Standard</subtitle> + <releaseinfo>Version 1.1</releaseinfo> + <authorgroup> + <author> + <firstname>Keith</firstname><surname>Packard</surname> + <affiliation><orgname> +X Consortium, +Laboratory for Computer Science, +Massachusetts Institute of Technology + </orgname></affiliation> + </author> + </authorgroup> + + <copyright><year>1989</year><holder>The Open Group</holder></copyright> + <copyright><year>2004</year><holder>The Open Group</holder></copyright> + <productnumber>X Version 11, Release 6.8</productnumber> + +<legalnotice> + + + +<para> +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +</para> +<para> +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. +</para> +<para> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +</para> +<para> +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. +</para> + +<para> +<emphasis remap='I'>X Window System</emphasis> is a trademark of The Open Group. +</para> +</legalnotice> +</bookinfo> + +<chapter id="TITLE"> +<title>TITLE</title> +<sect1 id="Purpose_and_Goals"> +<title>Purpose and Goals</title> +<!-- .XS --> +<!-- (SN Purpose and Goals --> +<!-- .XE --> +<para> +<!-- .LP --> +The purpose of the X Display Manager Control Protocol (XDMCP) +is to provide a uniform mechanism for an autonomous +display to request login service from a remote host. +By autonomous, we mean +the display consists of hardware and processes that are independent of any +particular host where login service is desired. (For example, the server +cannot simply be started by a +<function>fork/exec</function> +sequence on the host.) +An X terminal (screen, keyboard, mouse, processor, network interface) +is a prime example of an autonomous display. +</para> + +<para> +From the point of view of the end user, it is very important to make +autonomous displays as easy to use as traditional hardwired character +terminals. Specifically, you can typically just power on a hardwired +terminal and be greeted with a login prompt. The same should be possible +with autonomous displays. However, in a network environment with multiple +hosts, the end user may want to choose which host(s) to connect to. In an +environment with many displays and many hosts, a site administrator may want +to associate particular collections of hosts with particular displays. We +would like to support the following options: +</para> + +<itemizedlist> + <listitem> + <para> +The display has a single, fixed host to which it should connect. It should be +possible to power on the display and receive a login prompt, without user +intervention. + </para> + </listitem> + <listitem> + <para> +Any one of several hosts on a network or subnetwork may be acceptable +for accepting login from the display. +(For example, the user's file systems can be mounted onto +any such host, providing comparable environments.) It should be possible +for the display to broadcast to find such hosts and to have the display +either automatically choose a host or present the possible hosts to the +user for selection. + </para> + </listitem> + <listitem> + <para> +The display has a fixed set of hosts that it can connect to. It should be +possible for the display to have that set stored in RAM, but it should also be +possible for a site administrator to be able to maintain host sets for a +large number of displays using a centralized facility, without having to +interact (physically or electronically) with each individual display. +Particular hosts should be allowed to refuse login service, based on +whatever local criteria are desired. + </para> + </listitem> +</itemizedlist> + +<para> +The control protocol should be designed in such a way that it can be used over +a reasonable variety of communication transport layers. In fact, it is quite +desirable if every major network protocol family that supports the standard X +protocol is also capable of supporting XDMCP, because the end result of XDMCP -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
