x11-xserver-utils: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit 19d392b8d7df924cd752b4f977878d6a7eebd83e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 19:26:44 2010 +0100
Add 03_iceauth_manpage_commands.patch. Documents iceauth commands more fully. Also fixes fd.o bug # 2354. Closes: #509837
Rescue patch by David Nusinow in a forgotten debian-experimental branch,
even though it needs to be refreshed.
diff --git a/debian/changelog b/debian/changelog
index de196bb..cb5393b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
+
+ [ David Nusinow ]
+ * Add 03_iceauth_manpage_commands.patch. Documents iceauth commands more
+ fully. Also fixes fd.o bug # 2354. Closes: #509837
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 19:28:04 +0100
+
x11-xserver-utils (7.6~1) experimental; urgency=low
* New upstream release candidate: X11R7.6 RC1.
diff --git a/debian/patches/03_iceauth_manpage_commands.patch b/debian/patches/03_iceauth_manpage_commands.patch
new file mode 100644
index 0000000..2d692d4
--- /dev/null
+++ b/debian/patches/03_iceauth_manpage_commands.patch
@@ -0,0 +1,112 @@
+From 3deeff7e94fc6400b8e5d4cfb32a5e95b22318bc Mon Sep 17 00:00:00 2001
+From: David Nusinow <dnusinow@debian.org>
+Date: Tue, 3 Feb 2009 21:35:30 -0500
+Subject: [PATCH] Make iceauth manpage describe commands. (fd.o bug#2354)
+
+---
+ iceauth.man | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 85 insertions(+), 1 deletions(-)
+
+diff --git a/iceauth/iceauth.man b/iceauth/iceauth.man
+index 6a8d32f..c967eb4 100644
+--- a/iceauth/iceauth.man
++++ b/iceauth/iceauth.man
+@@ -1,4 +1,4 @@
+-.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
++m.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
+ .\" Copyright 1994, 1998 The Open Group
+ .\"
+ .\" Permission to use, copy, modify, distribute, and sell this software and its
+@@ -39,5 +39,89 @@ used to extract authorization records from one machine and merge them in on
+ another (as is the case when using remote logins or granting access to
+ other users). Commands (described below) may be entered interactively,
+ on the \fIiceauth\fP command line, or in scripts.
++.SH OPTIONS
++.PP
++\fB\-f\fP \fIauthfile\fP Name of the authority file to use. Will default to
++ the file currently in use by the session.
++.PP
++\fB\-v\fP Turns on extra messages (verbose mode)
++.PP
++\fB\-q\fP Turns off extra messages (quiet mode)
++.PP
++\fB\-i\fP Ignore the locks on the authority file
++.PP
++\fB\-b\fP Break the locks on the authority file
++.PP
++\fB\-u\fP Print basic usage instructions
++.PP
++.SH USAGE
++.PP
++When \fIiceauth\fP is run it will allow the following set of commands
++to be entered interactively or in scripts.
++.PP
++\fB?\fP
++.PP
++List available commands.
++.PP
++\fBhelp\fP
++.PP
++Print help information. You may supply a command name to \fIhelp\fP to
++get specific information about it.
++.PP
++\fBinfo\fP
++.PP
++Print information about the entries in the authority file.
++.PP
++\fBlist\fP
++.PP
++List (print) entries in the authority file. You may specify optional
++modifiers as below to specify which entries are listed.
++.PP
++\fIlist\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
++\fInetid\fP ] [ \fIauthname\fP ]
++.PP
++\fBadd\fP
++.PP
++Add an entry to the authority file. This must be in the format
++.PP
++\fIadd\fP \fIprotocol_name\fP \fIprotocol_data\fP \fInetid\fP \fIauthname\fP \fIauthdata\fP
++.PP
++\fBremove\fP
++.PP
++Remove entries from the authority file.
++.PP
++\fIremove\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
++\fInetid\fP ] [ \fIauthname\fP ]
++.PP
++\fBextract\fP
++.PP
++Extract entries from the authority file in to a destination file. You
++must supply the path to the destination to this command as in the
++following format. Optional specifiers allow you to narrow which
++entries are extracted.
++.PP
++\fIextract\fP \fIfilename\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ]
++[ \fInetid\fP ] [ \fIauthname\fP ]
++.PP
++\fBmerge\fP
++.PP
++Merge entries from other files in to the authority file selected by the program. You may supply any number of file paths to this command as follows:
++.PP
++\fImerge\fP \fIfilename1\fP [ \fIfilename2\fP ] [ \fIfilename3\fP ] ...
++.PP
++\fBexit\fP
++.PP
++Save changes and exit the program.
++.PP
++\fBquit\fP
++.PP
++Abort changes and exit the program without saving.
++.PP
++\fBsource\fP
++.PP
++Read and execute commands from a file.
++.PP
++\fIsource\fP \fIfilename\fP
++.PP
+ .SH AUTHOR
+ Ralph Mor, X Consortium
+--
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 2044539..578bcfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_sessreg_implement_hostname_hashing.diff
+03_iceauth_manpage_commands.patch
diff --git a/sessreg/sessreg.c b/sessreg/sessreg.c
index 3dc2992..cfe7e86 100644
--- a/sessreg/sessreg.c
+++ b/sessreg/sessreg.c
@@ -93,6 +93,18 @@ static void set_utmpx (struct utmpx *u, const char *line, const char *user,
const char *host, Time_t date, int addp);
#endif
+#ifdef SYSV
+/* used for hashing ut_id */
+typedef unsigned long int ub4; /* unsigned 4-byte quantities */
+typedef unsigned char ub1; /* unsigned 1-byte quantities */
+
+#define hashsize(n) ((ub4)1<<(n))
+#define hashmask(n) (hashsize(n)-1)
+
+ub4 hash(register ub1 *k, register ub4 length, register ub4 initval);
+
+#endif
+
static int wflag, uflag, lflag;
static char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
@@ -404,21 +416,23 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int a
bzero (u->ut_name, sizeof (u->ut_name));
#ifdef SYSV
if (line) {
- int i;
/*
- * this is a bit crufty, but
- * follows the apparent conventions in
- * the ttys file. ut_id is only 4 bytes
- * long, and the last 4 bytes of the line
- * name are written into it, left justified.
+ * The ut_id is 4 bytes long. We make a hash of the line
+ * received, preceding it by ":" to prevent clashing with
+ * other ut_ids.
*/
- i = strlen (line);
- if (i >= sizeof (u->ut_id))
- i -= sizeof (u->ut_id);
- else
- i = 0;
- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id));
+ ub4 h;
+ u->ut_id[0]=':';
+ h = hash(line, strlen(line),0x9e3779b9);
+ h = (h & hashmask((sizeof(u->ut_id)-sizeof(char))*8));
+ (void) strncpy (u->ut_id + 1,(char *) &h, sizeof (u->ut_id)-sizeof(char));
} else
+ /*
+ * From utmp(5):
+ * Clearing ut_id may result in race conditions leading to corrupted
+ * utmp entries and and potential security holes.
+ */
+ /* TODO: CHECK this */
bzero (u->ut_id, sizeof (u->ut_id));
if (addp) {
u->ut_pid = getppid ();
@@ -662,3 +676,129 @@ findslot (char *line_name, char *host_name, int addp, int slot)
return freeslot;
}
#endif
+
+#ifdef SYSV
+/*
+--------------------------------------------------------------------
+mix -- mix 3 32-bit values reversibly.
+For every delta with one or two bits set, and the deltas of all three
+ high bits or all three low bits, whether the original value of a,b,c
+ is almost all zero or is uniformly distributed,
+* If mix() is run forward or backward, at least 32 bits in a,b,c
+ have at least 1/4 probability of changing.
+* If mix() is run forward, every bit of c will change between 1/3 and
+ 2/3 of the time. (Well, 22/100 and 78/100 for some 2-bit deltas.)
+mix() was built out of 36 single-cycle latency instructions in a
+ structure that could supported 2x parallelism, like so:
+ a -= b;
+ a -= c; x = (c>>13);
+ b -= c; a ^= x;
+ b -= a; x = (a<<8);
+ c -= a; b ^= x;
+ c -= b; x = (b>>13);
+ ...
+ Unfortunately, superscalar Pentiums and Sparcs can't take advantage
+ of that parallelism. They've also turned some of those single-cycle
+ latency instructions into multi-cycle latency instructions. Still,
+ this is the fastest good hash I could find. There were about 2^^68
+ to choose from. I only looked at a billion or so.
+--------------------------------------------------------------------
+*/
+#define mix(a,b,c) \
+{ \
+ a -= b; a -= c; a ^= (c>>13); \
+ b -= c; b -= a; b ^= (a<<8); \
+ c -= a; c -= b; c ^= (b>>13); \
+ a -= b; a -= c; a ^= (c>>12); \
+ b -= c; b -= a; b ^= (a<<16); \
+ c -= a; c -= b; c ^= (b>>5); \
+ a -= b; a -= c; a ^= (c>>3); \
+ b -= c; b -= a; b ^= (a<<10); \
+ c -= a; c -= b; c ^= (b>>15); \
+}
+
+/*
+--------------------------------------------------------------------
+hash() -- hash a variable-length key into a 32-bit value
+ k : the key (the unaligned variable-length array of bytes)
+ len : the length of the key, counting by bytes
+ initval : can be any 4-byte value
+Returns a 32-bit value. Every bit of the key affects every bit of
+the return value. Every 1-bit and 2-bit delta achieves avalanche.
+About 6*len+35 instructions.
+
+The best hash table sizes are powers of 2. There is no need to do
+mod a prime (mod is sooo slow!). If you need less than 32 bits,
+use a bitmask. For example, if you need only 10 bits, do
+ h = (h & hashmask(10));
+In which case, the hash table should have hashsize(10) elements.
+
+If you are hashing n strings (ub1 **)k, do it like this:
+ for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
+
+By Bob Jenkins, 1996. bob_jenkins@burtleburtle.net. You may use this
+code any way you wish, private, educational, or commercial. It's free.
+
+[On 27 May 2004, Bob Jenkins further clarified the above statement.
+
+ From: Bob Jenkins <bob_jenkins@burtleburtle.net>
+ Date: Thu, 27 May 2004 22:33:06 -0700
+ To: Margarita Manterola <marga@marga.com.ar>
+ Subject: Re: Hash function
+
+ The algorithm is public domain. I ask that I be referenced as the
+ source of the algorithm, but I can't enforce that, since being public
+ domain means I've reserved no rights at all.
+
+-- Branden Robinson, 2004-06-06]
+
+See http://burtleburtle.net/bob/hash/evahash.html
+Use for hash table lookup, or anything where one collision in 2^^32 is
+acceptable. Do NOT use for cryptographic purposes.
+--------------------------------------------------------------------
+*/
+
+ub4
+hash(register ub1 *k, register ub4 length, register ub4 initval)
+{
+ register ub4 a,b,c,len;
+
+ /* Set up the internal state */
+ len = length;
+ a = b = 0x9e3779b9; /* the golden ratio; an arbitrary value */
+ c = initval; /* the previous hash value */
+
+ /*---------------------------------------- handle most of the key */
+ while (len >= 12)
+ {
+ a += (k[0] +((ub4)k[1]<<8) +((ub4)k[2]<<16) +((ub4)k[3]<<24));
+ b += (k[4] +((ub4)k[5]<<8) +((ub4)k[6]<<16) +((ub4)k[7]<<24));
+ c += (k[8] +((ub4)k[9]<<8) +((ub4)k[10]<<16)+((ub4)k[11]<<24));
+ mix(a,b,c);
+ k += 12; len -= 12;
+ }
+
+ /*------------------------------------- handle the last 11 bytes */
+ c += length;
+ switch(len) /* all the case statements fall through */
+ {
+ case 11: c+=((ub4)k[10]<<24);
+ case 10: c+=((ub4)k[9]<<16);
+ case 9 : c+=((ub4)k[8]<<8);
+ /* the first byte of c is reserved for the length */
+ case 8 : b+=((ub4)k[7]<<24);
+ case 7 : b+=((ub4)k[6]<<16);
+ case 6 : b+=((ub4)k[5]<<8);
+ case 5 : b+=k[4];
+ case 4 : a+=((ub4)k[3]<<24);
+ case 3 : a+=((ub4)k[2]<<16);
+ case 2 : a+=((ub4)k[1]<<8);
+ case 1 : a+=k[0];
+ /* case 0: nothing left to add */
+ }
+ mix(a,b,c);
+ /*-------------------------------------------- report the result */
+ return c;
+}
+
+#endif
commit 15f7db48720e2d3c6db889e635f4f29b028169b9
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 19:16:59 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 74e0613..de196bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
+x11-xserver-utils (7.6~1) experimental; urgency=low
* New upstream release candidate: X11R7.6 RC1.
* iceauth 1.0.4
@@ -20,7 +20,7 @@ x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Switch from --list-missing to --fail-missing for additional safety.
- -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 18:02:37 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 19:16:48 +0100
x11-xserver-utils (7.5+2) unstable; urgency=low
commit e53fbbf4a2497f251b302c2647d9705c59399cb3
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 19:16:46 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index af2984e..74e0613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
upstream's COPYING files, thanks to Julien Cristau.
* Refresh debian/copyright accordingly.
* Bump xutils-dev build-dep for new macros.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 18:02:37 +0100
diff --git a/debian/rules b/debian/rules
index a856c7a..466ea3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp -Xrgb.txt --list-missing
+ dh_install --sourcedir=debian/tmp -Xrgb.txt --fail-missing
dh_installmenu
dh_installchangelogs
dh_link
commit b8e231033640a5eef02b69b113d323b89fcd7680
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 18:51:06 2010 +0100
Add libxcursor-dev build-dep.
diff --git a/debian/changelog b/debian/changelog
index 218abdc..af2984e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
* xrefresh 1.0.4
* xset 1.2.1
* xsetroot 1.1.0
+ * Add libxcursor-dev build-dep.
* xstdcmap 1.0.2
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
diff --git a/debian/control b/debian/control
index 0a387fd..ec98970 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt,
x11proto-input-dev (>= 1.4),
xutils-dev (>= 1:7.5+4),
+ libxcursor-dev,
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -25,7 +26,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
# (libxxf86misc-dev), (libxfontcache-dev)
# xsetmode: libxi-dev, libx11-dev
# xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (>= 1.4)
-# xsetroot: libxmuu-dev, libx11-dev, xbitmaps
+# xsetroot: libxmuu-dev, libx11-dev, xbitmaps, libxcursor-dev
# xstdcmap: libxmu-dev, libx11-dev
# xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
Standards-Version: 3.8.2
commit 24197854e8c95066ab5940e0229e85e540afe6b7
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 18:19:42 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index a505540..218abdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
* Refresh debian/copyright accordingly.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 18:02:37 +0100
diff --git a/debian/control b/debian/control
index f10e3b1..0a387fd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1),
libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0),
libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt,
- x11proto-input-dev (>= 1.4)
+ x11proto-input-dev (>= 1.4),
+ xutils-dev (>= 1:7.5+4),
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
commit fb59c5d7c67447642ef85c225daca92693d506e1
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 18:17:18 2010 +0100
Refresh debian/copyright accordingly.
diff --git a/debian/changelog b/debian/changelog
index 816a559..a505540 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x11-xserver-utils (7.6~1) UNRELEASED; urgency=low
* xstdcmap 1.0.2
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
+ * Refresh debian/copyright accordingly.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 18:02:37 +0100
diff --git a/debian/copyright b/debian/copyright
index a0f74a2..eec7f4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,132 +1,170 @@
The contents of this package were downloaded from
http://xorg.freedesktop.org/releases/individual/app/
+
It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr,
-xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap and xvidtune
-applications.
+xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
+applications
iceauth:
Copyright 1989, 1998 The Open Group
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
-
+
The above copyright notice and this permission notice 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
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.
-
+
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.
- * *
- * Original Author of "xauth" : Jim Fulton, MIT X Consortium
- * Modified into "iceauth" : Ralph Mor, X Consortium
- */
+
rgb:
- Copyright 1985, 1989, 1998 The Open Group
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.
-
- The above copyright notice and this permission notice 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 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.
-
- 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.
-
- Copyright 1994, 2008 Sun Microsystems, Inc. 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, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies of
- the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
-
- 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
- OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.
+ Copyright 1985, 1989, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice 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 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.
+
+ 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.
+
+ Copyright (c) 1994, 2008, 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.
sessreg:
- Copyright 1990, 1998 The Open Group
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.
-
- The above copyright notice and this permission notice 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 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.
-
- 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.
+ Copyright 1990, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice 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 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.
+
+ 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.
+
+ Copyright 2005 Sun Microsystems, Inc. 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.
xcmsdb:
- (c) Copyright 1990 Tektronix Inc.
- All Rights Reserved
-
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Tektronix not be used
- in advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.
-
- Tektronix disclaims all warranties with regard to this software, including
- all implied warranties of merchantability and fitness, in no event shall
- Tektronix be liable for any special, indirect or consequential damages or
- any damages whatsoever resulting from loss of use, data or profits,
- whether in an action of contract, negligence or other tortious action,
- arising out of or in connection with the use or performance of this
- software.
+ (c) Copyright 1990 Tektronix Inc.
+ All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Tektronix not be used
+ in advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.
+
+ Tektronix disclaims all warranties with regard to this software, including
+ all implied warranties of merchantability and fitness, in no event shall
+ Tektronix be liable for any special, indirect or consequential damages or
+ any damages whatsoever resulting from loss of use, data or profits,
+ whether in an action of contract, negligence or other tortious action,
+ arising out of or in connection with the use or performance of this
+ software.
+
+
+ Copyright 1993, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice 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 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.
+
+ 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
+ dealing in this Software without prior written authorization from the
+ The Open Group.
xgamma:
Copyright 1999 by The XFree86 Project, Inc.
@@ -155,8 +193,6 @@ xgamma:
other dealings in this Software without prior written authorization
from The XFree86 Project.
- Written by David Bateman
-
------------------------------------------------------------------------------
Copyright 2005 Red Hat, Inc.
@@ -179,10 +215,31 @@ xgamma:
PERFORMANCE OF THIS SOFTWARE.
xhost:
- Copyright 1985, 1986, 1987, 1998 The Open Group Copyright 2004 Sun Microsystems, Inc.
-
+ Copyright (c) 2004, 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.
+
+ Copyright 1985, 1986, 1987, 1998 The Open Group
+
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
@@ -192,7 +249,7 @@ xhost:
copyright notice(s) and this permission notice appear in all copies of
the Software and that both the above copyright notice(s) and this
permission notice appear in supporting documentation.
-
+
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
@@ -202,24 +259,48 @@ xhost:
FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+
Except as contained in this notice, the name of a copyright holder
shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
of the copyright holder.
+ X Window System is a trademark of The Open Group.
+
+
xmodmap:
+ Copyright (c) 1987, 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.
+
Copyright 1988, 1998 The Open Group
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
-
+
The above copyright notice and this permission notice 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.
@@ -227,7 +308,7 @@ xmodmap:
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.
-
+
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
@@ -237,7 +318,7 @@ xrandr:
Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
Copyright © 2002 Hewlett Packard Company, Inc.
Copyright © 2006 Intel Corporation
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that copyright
@@ -247,7 +328,7 @@ xrandr:
written prior permission. The copyright holders make no representations
about the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
-
+
THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -257,23 +338,23 @@ xrandr:
OF THIS SOFTWARE.
xrdb:
- COPYRIGHT 1987, 1991
- DIGITAL EQUIPMENT CORPORATION
- MAYNARD, MASSACHUSETTS
- MASSACHUSETTS INSTITUTE OF TECHNOLOGY
- CAMBRIDGE, MASSACHUSETTS
- ALL RIGHTS RESERVED.
-
+
+ COPYRIGHT 1987, 1991
+ DIGITAL EQUIPMENT CORPORATION
+ MAYNARD, MASSACHUSETTS
+ MASSACHUSETTS INSTITUTE OF TECHNOLOGY
+ CAMBRIDGE, MASSACHUSETTS
+ ALL RIGHTS RESERVED.
+
THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE FOR
ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
-
+
IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT RIGHTS,
APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN ADDITION TO THAT
SET FORTH ABOVE.
-
-
+
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, provided
that the above copyright notice appear in all copies and that both that
@@ -282,42 +363,69 @@ xrdb:
used in advertising or publicity pertaining to distribution of the software
without specific, written prior permission.
+ ----------------------------------------------------------------
+
+ Copyright 1991, Digital Equipment Corporation.
+ Copyright 1991, 1994, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice 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 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.
+
+ 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.
+
xrefresh:
Copyright 1987, 1988, 1998 The Open Group
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
-
+
The above copyright notice and this permission notice 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
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.
-
+
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.
-
-
+
+
Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
+
All Rights Reserved
-
- Permission to use, copy, modify, and distribute this software and its
Reply to: