Mailinglist Archive: opensuse-commit (875 mails)
| < Previous | Next > |
commit xorg-x11-xtrans-devel
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 05 Jul 2008 02:02:09 +0200
- Message-id: <20080705000210.0D3B4678176@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xorg-x11-xtrans-devel
checked in at Sat Jul 5 02:02:09 CEST 2008.
--------
--- xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.changes 2008-05-08
21:07:01.000000000 +0200
+++ xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.changes 2008-07-04
05:07:51.600685000 +0200
@@ -1,0 +2,12 @@
+Fri Jul 4 05:06:31 CEST 2008 - sndirsch@xxxxxxx
+
+- xtrans 1.2.1
+ * Connection failure for abstract socket is ECONNREFUSED, not
+ ENOENT.
+ * LocalClose() takes a ConnInfoPtr, not an fd
+ * Clear some pointer type mismatch warnings
+ * Ignore mkdir() errors when creating the abstract socket.
+ * Remove extraneous execute bit from .c file
+ * Launchd: This functionality has been moved into xorg-server
+
+-------------------------------------------------------------------
Old:
----
xtrans-1.2.tar.bz2
New:
----
xtrans-1.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-xtrans-devel.spec ++++++
--- /var/tmp/diff_new_pack.T15706/_old 2008-07-05 02:00:36.000000000 +0200
+++ /var/tmp/diff_new_pack.T15706/_new 2008-07-05 02:00:36.000000000 +0200
@@ -13,9 +13,9 @@
Name: xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
-%define tarball_version 1.2
+%define tarball_version 1.2.1
Version: 7.3
-Release: 36
+Release: 43
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -72,6 +72,15 @@
/usr/share/aclocal/*.m4
%changelog
+* Fri Jul 04 2008 sndirsch@xxxxxxx
+- xtrans 1.2.1
+ * Connection failure for abstract socket is ECONNREFUSED, not
+ ENOENT.
+ * LocalClose() takes a ConnInfoPtr, not an fd
+ * Clear some pointer type mismatch warnings
+ * Ignore mkdir() errors when creating the abstract socket.
+ * Remove extraneous execute bit from .c file
+ * Launchd: This functionality has been moved into xorg-server
* Thu May 08 2008 sndirsch@xxxxxxx
- xtrans 1.2
* Among other things, this release fixes the linux abstract
++++++ xtrans-1.2.tar.bz2 -> xtrans-1.2.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/xtrans-1.2/ChangeLog new/xtrans-1.2.1/ChangeLog
--- old/xtrans-1.2/ChangeLog 2008-05-08 16:27:52.000000000 +0200
+++ new/xtrans-1.2.1/ChangeLog 2008-07-02 21:24:34.000000000 +0200
@@ -1,3 +1,49 @@
+commit 81d8bdced6b45ab2ab3d3a0bc164ddbf1659fea1
+Author: Adam Jackson <ajax@xxxxxxxxxx>
+Date: Wed Jul 2 15:24:20 2008 -0400
+
+ xtrans 1.2.1
+
+commit 302af17c4d5f0293a9af4d6c1097ab57a57d3f0f
+Author: Alan Coopersmith <alan.coopersmith@xxxxxxx>
+Date: Tue Jun 24 15:45:38 2008 -0700
+
+ Clear some pointer type mismatch warnings
+
+commit 4d184e41d30a8fe27380e04beb24f775d4a40782
+Author: Alan Coopersmith <alan.coopersmith@xxxxxxx>
+Date: Tue Jun 24 15:45:18 2008 -0700
+
+ LocalClose() takes a ConnInfoPtr, not an fd
+
+commit 177c2fd41727bd0110b493933dcbdbf21878fe09
+Author: Jeremy Huddleston <jeremyhu@xxxxxxxxxxxxxxx>
+Date: Fri May 23 09:48:59 2008 -0700
+
+ Launchd: This functionality has been moved into xorg-server
+
+commit 02fcb08803dca5bb2df4f8be490a845659bd7ed3
+Author: Adam Jackson <ajax@xxxxxxxxxx>
+Date: Mon May 12 17:49:41 2008 -0400
+
+ Connection failure for abstract socket is ECONNREFUSED, not ENOENT.
+
+ Apropos of bug #15884.
+
+commit 906294025573d07c739894fa3b2eedc82813a379
+Author: Bill Nottingham <notting@xxxxxxxxxx>
+Date: Mon May 12 17:43:36 2008 -0400
+
+ Ignore mkdir() errors when creating the abstract socket.
+
+ Red Hat bug #445303.
+
+commit 08134c2ce72bc43c172b6ae134d8a94a40b45c9b
+Author: James Cloos <cloos@xxxxxxxxxxx>
+Date: Sat May 10 07:02:09 2008 -0400
+
+ Remove extraneous execute bit from .c file
+
commit e75b9dad0ae4bc0869af81652d8259675a3c5cac
Author: Julien Cristau <jcristau@xxxxxxxxxx>
Date: Thu May 8 16:27:29 2008 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/xtrans-1.2/configure new/xtrans-1.2.1/configure
--- old/xtrans-1.2/configure 2008-05-08 16:23:47.000000000 +0200
+++ new/xtrans-1.2.1/configure 2008-07-02 21:24:31.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xtrans 1.2.
+# Generated by GNU Autoconf 2.61 for xtrans 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='xtrans'
PACKAGE_TARNAME='xtrans'
-PACKAGE_VERSION='1.2'
-PACKAGE_STRING='xtrans 1.2'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xtrans 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1171,7 +1171,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xtrans 1.2 to adapt to many kinds of systems.
+\`configure' configures xtrans 1.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1237,7 +1237,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xtrans 1.2:";;
+ short | recursive ) echo "Configuration of xtrans 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1328,7 +1328,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xtrans configure 1.2
+xtrans configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1342,7 +1342,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xtrans $as_me 1.2, which was
+It was created by xtrans $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2032,7 +2032,7 @@
# Define the identity of the package.
PACKAGE='xtrans'
- VERSION='1.2'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -3884,7 +3884,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xtrans $as_me 1.2, which was
+This file was extended by xtrans $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3931,7 +3931,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xtrans config.status 1.2
+xtrans config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/xtrans-1.2/configure.ac new/xtrans-1.2.1/configure.ac
--- old/xtrans-1.2/configure.ac 2008-05-08 16:23:23.000000000 +0200
+++ new/xtrans-1.2.1/configure.ac 2008-07-02 21:24:19.000000000 +0200
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xtrans, 1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
+AC_INIT(xtrans, 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/xtrans-1.2/Xtrans.c new/xtrans-1.2.1/Xtrans.c
--- old/xtrans-1.2/Xtrans.c 2008-03-07 11:58:02.000000000 +0100
+++ new/xtrans-1.2.1/Xtrans.c 2008-07-02 21:23:58.000000000 +0200
@@ -48,9 +48,6 @@
*/
#include <ctype.h>
-#ifdef HAVE_LAUNCHD
-#include <launch.h>
-#endif
/*
* The transport table contains a definition for every transport (protocol)
@@ -866,7 +863,7 @@
}
#ifdef HAVE_LAUNCHD
- if (!host || !*host) host=strdup("");
+ if (!host) host=strdup("");
#endif
if (!port || !*port)
@@ -1064,11 +1061,6 @@
char buffer[256]; /* ??? What size ?? */
XtransConnInfo ciptr, temp_ciptrs[NUMTRANS];
int status, i, j;
-#ifdef HAVE_LAUNCHD
- int launchd_fd;
- launch_data_t sockets_dict, checkin_request, checkin_response;
- launch_data_t listening_fd_array, listening_fd;
-#endif
#if defined(IPv6) && defined(AF_INET6)
int ipv6_succ = 0;
@@ -1078,59 +1070,6 @@
*count_ret = 0;
-#ifdef HAVE_LAUNCHD
- /* Get launchd fd */
- if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) ==
NULL) {
- fprintf(stderr,"launch_data_new_string(\"" LAUNCH_KEY_CHECKIN "\")
Unable to create string.\n");
- goto not_launchd;
- }
-
- if ((checkin_response = launch_msg(checkin_request)) == NULL) {
- fprintf(stderr,"launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure:
%s\n",strerror(errno));
- goto not_launchd;
- }
-
- if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {
- // ignore EACCES, which is common if we weren't started by launchd
- if (launch_data_get_errno(checkin_response) != EACCES)
- fprintf(stderr,"launchd check-in failed:
%s\n",strerror(launch_data_get_errno(checkin_response)));
- goto not_launchd;
- }
-
- sockets_dict = launch_data_dict_lookup(checkin_response,
LAUNCH_JOBKEY_SOCKETS);
- if (NULL == sockets_dict) {
- fprintf(stderr,"launchd check-in: no sockets found to answer requests
on!\n");
- goto not_launchd;
- }
-
- if (launch_data_dict_get_count(sockets_dict) > 1) {
- fprintf(stderr,"launchd check-in: some sockets will be ignored!\n");
- goto not_launchd;
- }
-
- listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
- if (NULL == listening_fd_array) {
- fprintf(stderr,"launchd check-in: No known sockets found to answer
requests on!\n");
- goto not_launchd;
- }
-
- if (launch_data_array_get_count(listening_fd_array)!=1) {
- fprintf(stderr,"launchd check-in: Expected 1 socket from launchd, got
%d)\n",
- launch_data_array_get_count(listening_fd_array));
- goto not_launchd;
- }
-
- listening_fd=launch_data_array_get_index(listening_fd_array, 0);
- launchd_fd=launch_data_get_fd(listening_fd);
- fprintf(stderr,"Xquartz: run by launchd for fd %d\n",launchd_fd);
- if((ciptr = TRANS(ReopenCOTSServer(TRANS_SOCKET_LOCAL_INDEX,
- launchd_fd, getenv("DISPLAY"))))==NULL)
- fprintf(stderr,"Got NULL while trying to Reopen launchd port\n");
- else temp_ciptrs[(*count_ret)++] = ciptr;
-
-not_launchd:
-#endif
-
for (i = 0; i < NUMTRANS; i++)
{
Xtransport *trans = Xtransports[i].transport;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/xtrans-1.2/Xtranslcl.c new/xtrans-1.2.1/Xtranslcl.c
--- old/xtrans-1.2/Xtranslcl.c 2008-03-07 11:58:02.000000000 +0100
+++ new/xtrans-1.2.1/Xtranslcl.c 2008-07-02 21:23:58.000000000 +0200
@@ -858,7 +858,7 @@
if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
{
PRMSG(1,"NAMEDOpenServer: failed to fill in addr info\n", 0,0,0);
- TRANS(LocalClose)(fd);
+ TRANS(LocalClose)(ciptr);
return -1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/xtrans-1.2/Xtranssock.c new/xtrans-1.2.1/Xtranssock.c
--- old/xtrans-1.2/Xtranssock.c 2008-05-08 16:23:07.000000000 +0200
+++ new/xtrans-1.2.1/Xtranssock.c 2008-07-02 21:23:58.000000000 +0200
@@ -566,10 +566,10 @@
PRMSG (1, "SocketReopen: malloc(addr) failed\n", 0, 0, 0);
return NULL;
}
- ciptr->addr = addr;
+ ciptr->addr = (char *) addr;
ciptr->addrlen = portlen + 2;
- if ((ciptr->peeraddr = (struct sockaddr *) xcalloc (1, portlen + 2)) ==
NULL) {
+ if ((ciptr->peeraddr = (char *) xcalloc (1, portlen + 2)) == NULL) {
PRMSG (1, "SocketReopen: malloc(portaddr) failed\n", 0, 0, 0);
return NULL;
}
@@ -1148,7 +1148,7 @@
#else
mode = 0777;
#endif
- if (trans_mkdir(UNIX_DIR, mode) == -1) {
+ if (!abstract && trans_mkdir(UNIX_DIR, mode) == -1) {
PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
UNIX_DIR, errno, 0);
(void) umask (oldUmask);
@@ -2161,7 +2161,7 @@
return TRANS_IN_PROGRESS;
else if (olderrno == EINTR)
return TRANS_TRY_CONNECT_AGAIN;
- else if (olderrno == ENOENT) {
+ else if (olderrno == ENOENT || olderrno == ECONNREFUSED) {
/* If opening as abstract socket failed, try again normally */
if (abstract) {
ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |