xauth: Changes to 'upstream-unstable'
.gitignore | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
Makefile.am | 33 ++++++-------------------
configure.ac | 24 +++++++++---------
gethost.c | 23 ++++++++++++++++-
parsedpy.c | 3 ++
process.c | 5 ---
6 files changed, 113 insertions(+), 52 deletions(-)
New commits:
commit da552fc4c69a62b6227383452e56428cd5d696a0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 23 17:57:16 2010 -0700
xauth 1.0.5
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index f9332b3..c74914a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,10 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(xauth,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT([xauth],
+ [1.0.5],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xauth])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit eec190f060cd61b44e0e7029309f7db841c824b8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 23 07:33:02 2010 -0700
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Makefile.am b/Makefile.am
index 7f86726..813395a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,29 +51,11 @@ lint:
endif LINT
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index aae6505..f9332b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
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.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_TYPE_SIGNAL
commit 732922acd465f081f8cbd315aa687dd745da2337
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 23 07:29:53 2010 -0700
config: Remove unnecessary calls from configure.ac
AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 62729ca..aae6505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,9 +33,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
-
AC_TYPE_SIGNAL
AC_CHECK_HEADERS([net/errno.h])
@@ -44,8 +41,6 @@ AC_CHECK_FUNCS([strlcpy])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
-AC_SUBST(XAUTH_CFLAGS)
-AC_SUBST(XAUTH_LIBS)
# Transport selection macro from xtrans.m4
# Needed to set *CONN defines for gethost.c & parsedpy.c
commit 6eef00c1021930444e09d8334b06bbad83d7f2fb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:18 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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c03d9df..62729ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(xauth,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 4f6dea33200af6d42e29b43269d8ee389db1b98f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Aug 26 08:26:31 2010 -0700
Fix build failure resulting from previous commit on systems without strlcpy
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index a7d72e9..c03d9df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,11 +36,12 @@ XORG_DEFAULT_OPTIONS
AC_PROG_CC
AC_PROG_INSTALL
-
AC_TYPE_SIGNAL
AC_CHECK_HEADERS([net/errno.h])
+AC_CHECK_FUNCS([strlcpy])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
AC_SUBST(XAUTH_CFLAGS)
diff --git a/gethost.c b/gethost.c
index 6b36340..6612bc0 100644
--- a/gethost.c
+++ b/gethost.c
@@ -283,7 +283,13 @@ struct addrlist *get_address_info (
} else if(prefix == 0 && (strncmp (fulldpyname, "/tmp/launch", 11) == 0)) {
/* Use the bundle id (part preceding : in the basename) as our src id */
char *c;
+#ifdef HAVE_STRLCPY
strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+#else
+ strncpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+#endif
+
c = strchr(buf, ':');
/* In the legacy case with no bundle id, use the full path */
commit 135338af9a141d609e07e42208b9104465346ae4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Aug 25 18:23:26 2010 -0700
launchd: Properly support launchd sockets in xauth
What we had in place before was a hack that always used ':0'. This change
results in the bundle id being used to differentiate different connections.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/gethost.c b/gethost.c
index 3bfdb39..6b36340 100644
--- a/gethost.c
+++ b/gethost.c
@@ -280,7 +280,22 @@ struct addrlist *get_address_info (
src = buf;
len = strlen (buf);
}
- } else {
+ } else if(prefix == 0 && (strncmp (fulldpyname, "/tmp/launch", 11) == 0)) {
+ /* Use the bundle id (part preceding : in the basename) as our src id */
+ char *c;
+ strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+ c = strchr(buf, ':');
+
+ /* In the legacy case with no bundle id, use the full path */
+ if(c == buf) {
+ src = fulldpyname;
+ } else {
+ *c = '\0';
+ src = buf;
+ }
+
+ len = strlen(src);
+ } else {
src = fulldpyname;
len = prefix;
}
diff --git a/parsedpy.c b/parsedpy.c
index f3501c2..478874e 100644
--- a/parsedpy.c
+++ b/parsedpy.c
@@ -162,6 +162,9 @@ parse_displayname (char *displayname,
if (!host) return False;
+ if(strncmp (host, "/tmp/launch", 11) == 0) {
+ family = FamilyLocal;
+ }
/*
* get the display number; we know that there is something after the
diff --git a/process.c b/process.c
index 48a0df0..6964974 100644
--- a/process.c
+++ b/process.c
@@ -485,9 +485,6 @@ get_displayname_auth(char *displayname, AuthList **authl)
if (cp && strncmp (cp, "/unix:", 6) == 0)
prelen = (cp - displayname);
- if (strncmp (displayname, "/tmp/launch", 11) == 0)
- displayname = strrchr(displayname, '/') + 1;
-
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
&family, &host, &dpynum, &scrnum, &rest)) {
return False;
commit 96ea88d3aeae710d8fc04f23151d5b669c5e8a0c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Nov 26 09:19:52 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index f0d6f3f..7f86726 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
if LINT
commit 1eb55d8efd568c31e8bc9f1f7ab91558ceecfc06
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:08 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.
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index 0670168..f0d6f3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,9 +75,12 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
sed $(MAN_SUBSTS) < $< > $@
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
commit f326a1fe16f6717fb822228051a7fdfd30048cab
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:24 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.
diff --git a/configure.ac b/configure.ac
index 4d112a9..a7d72e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,15 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+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
AC_PROG_CC
AC_PROG_INSTALL
-XORG_DEFAULT_OPTIONS
AC_TYPE_SIGNAL
commit e3a895e81611d881e74fb5106319af513f78df07
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:38 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.
diff --git a/Makefile.am b/Makefile.am
index 9faf89b..0670168 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
if LINT
@@ -74,7 +74,6 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
commit b0f1523247680c9a6045c3a6296bf45d4106de1e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:15 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.
diff --git a/.gitignore b/.gitignore
index cbf2a13..879c075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,79 @@
-.deps
-Makefile
-Makefile.in
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-stamp-h1
-xauth
-xauth.1
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.o
-xauth-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for xauth
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
+xauth
commit b6c280336a6cf681917692933589d878e9984470
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:20 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 <jeremyhu@freedesktop.org>
diff --git a/configure.ac b/configure.ac
index a2e824f..4d112a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xauth,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
commit 1c701094169b6e33f7faf21a269e949bf134a326
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 22:58:52 2009 -0700
Bug 7051: xauth says creating new authority file even though it does not
https://bugs.freedesktop.org/show_bug.cgi?id=7051
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/process.c b/process.c
index 893b51d..48a0df0 100644
--- a/process.c
+++ b/process.c
@@ -769,7 +769,7 @@ auth_initialize(char *authfilename)
return -1;
} /* else ignore it */
fprintf (stderr,
- "%s: creating new authority file %s\n",
+ "%s: file %s does not exist\n",
ProgramName, authfilename);
} else {
xauth_existed = True;
Reply to: