xfs: Changes to 'debian-unstable'
ChangeLog | 31 ++++++++++
aclocal.m4 | 18 ++++--
configure | 110 ++++++++++++++++++++++++++++++++-------
configure.ac | 4 -
debian/changelog | 7 +-
debian/patches/01_xfs_fixes.diff | 2
os/config.c | 4 +
os/utils.c | 2
xfs-config.h.in | 3 +
9 files changed, 152 insertions(+), 29 deletions(-)
New commits:
commit 95295dcb222c824c2def937227a51fe67e5cb99a
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu May 22 21:47:07 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1f0f994..0df83fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfs (1:1.0.7-1) UNRELEASED; urgency=low
+xfs (1:1.0.7-1) unstable; urgency=low
* New upstream release.
+ Return an error to the log instead of segfaulting if
@@ -13,7 +13,7 @@ xfs (1:1.0.7-1) UNRELEASED; urgency=low
* Remove obsolete stuff from maintainer scripts.
* Add descriptive comment to top of init script, closes: #446275.
- -- Brice Goglin <bgoglin@debian.org> Thu, 22 May 2008 21:41:41 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 22 May 2008 21:47:03 +0200
xfs (1:1.0.6-1) unstable; urgency=low
commit c40b156451810e1897b8a803a5ecdc9034ce4613
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu May 22 21:46:06 2008 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 8902469..80f4d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+commit 9666b767a1f565bae06e84aacb53a1d9b7747f90
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:18:01 2008 -0400
+
+ xfs 1.0.7
+
+commit 4a163a076e90808fa47ade1504fd0f2893bdc306
+Author: Petter Reinholdtsen <pere@hungry.com>
+Date: Fri May 16 20:27:48 2008 +0200
+
+ Return an error to the log instead of segfaulting
+
+ Return an error to the log instead of segfaulting
+ if catalogue line is omitted from config file.
+
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=148650
+
+commit 6188cb8538b713296266238b7b780718fcec881b
+Author: Stephan A. Maciej <stephanm@datenfriedhof.net>
+Date: Mon Mar 17 18:00:49 2008 -0700
+
+ Allow font server to start with pid longer than 5 digits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 24d4172a71850299c797f887d3027c32068763d0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 14 19:32:09 2008 -0800
+
+ Fix --with-default-config to work with more than two config files
+
commit 8337bcb5650581874510514cce7d9df89db54d5c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 17:06:25 2008 -0500
diff --git a/aclocal.m4 b/aclocal.m4
index 4d4221f..4b4d75c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -719,6 +719,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
#include <sys/socket.h>
#include <netinet/in.h>
])
+
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ AC_CHECK_TYPES([socklen_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
]) # XTRANS_TCP_FLAGS
# XTRANS_CONNECTION_FLAGS()
@@ -728,17 +734,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_TYPE_SIGNAL])
+ [case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac]
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
- [UNIXCONN=$enableval], [UNIXCONN=yes])
- AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
- [TCPCONN=$enableval], [TCPCONN=yes])
+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
fi
AC_MSG_RESULT($UNIXCONN)
+ AC_ARG_ENABLE(tcp-transport,
+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ [TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
if test "$TCPCONN" = "yes"; then
diff --git a/configure b/configure
index 531b12c..e78c3f2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xfs 1.0.6.
+# Generated by GNU Autoconf 2.61 for xfs 1.0.7.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xfs'
PACKAGE_TARNAME='xfs'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='xfs 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='xfs 1.0.7'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then
# 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 xfs 1.0.6 to adapt to many kinds of systems.
+\`configure' configures xfs 1.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1312,7 +1312,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfs 1.0.6:";;
+ short | recursive ) echo "Configuration of xfs 1.0.7:";;
esac
cat <<\_ACEOF
@@ -1418,7 +1418,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfs configure 1.0.6
+xfs configure 1.0.7
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1432,7 +1432,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfs $as_me 1.0.6, which was
+It was created by xfs $as_me 1.0.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2122,7 +2122,7 @@ fi
# Define the identity of the package.
PACKAGE='xfs'
- VERSION='1.0.6'
+ VERSION='1.0.7'
cat >>confdefs.h <<_ACEOF
@@ -4373,7 +4373,7 @@ else
fi
-DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
+DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'g`
prefix_NONE=
exec_prefix_NONE=
@@ -4703,18 +4703,15 @@ _ACEOF
+ case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac
# Check whether --enable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval=$enable_unix_transport; UNIXCONN=$enableval
else
- UNIXCONN=yes
-fi
-
- # Check whether --enable-tcp-transport was given.
-if test "${enable_tcp_transport+set}" = set; then
- enableval=$enable_tcp_transport; TCPCONN=$enableval
-else
- TCPCONN=yes
+ UNIXCONN=$unixdef
fi
{ echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5
@@ -4728,6 +4725,13 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: result: $UNIXCONN" >&5
echo "${ECHO_T}$UNIXCONN" >&6; }
+ # Check whether --enable-tcp-transport was given.
+if test "${enable_tcp_transport+set}" = set; then
+ enableval=$enable_tcp_transport; TCPCONN=$enableval
+else
+ TCPCONN=yes
+fi
+
{ echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5
echo $ECHO_N "checking if Xtrans should support TCP socket connections... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $TCPCONN" >&5
@@ -5126,6 +5130,74 @@ _ACEOF
fi
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ { echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+$ac_includes_default
+#include <sys/socket.h>
+
+typedef socklen_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_socklen_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_socklen_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
+if test $ac_cv_type_socklen_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+
+fi
+
+
+
fi
case $host_os in
solaris*|sco*|sysv4*) localdef="yes" ;;
@@ -5730,7 +5802,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfs $as_me 1.0.6, which was
+This file was extended by xfs $as_me 1.0.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5783,7 +5855,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xfs config.status 1.0.6
+xfs config.status 1.0.7
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index abedf43..321143e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xfs,[1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
+AC_INIT(xfs,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -51,7 +51,7 @@ AC_ARG_WITH(default-config-file,
[comma-separated list of paths to look for config file when not specified (default: ${sysconfdir}/X11/fs/config)]),
[CONFIG_FILE="$withval"], [CONFIG_FILE="${sysconfdir}/X11/fs/config"])
-DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
+DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'g`
AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], DEFAULT_CONFIG_FILE,
[comma-separated list of strings for config file paths when not specified])
diff --git a/debian/changelog b/debian/changelog
index c982cdd..1f0f994 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-xfs (1:1.0.6-2) UNRELEASED; urgency=low
+xfs (1:1.0.7-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + Return an error to the log instead of segfaulting if
+ catalogue line is omitted from config file, closes: #148650
* Remove the obsolete /etc/X11/fs/xfs.options, closes: #382776.
* Make sure maintainer scripts are generated during build, so that
xfs-specific scripts are actually used instead of dh_installinit
@@ -10,7 +13,7 @@ xfs (1:1.0.6-2) UNRELEASED; urgency=low
* Remove obsolete stuff from maintainer scripts.
* Add descriptive comment to top of init script, closes: #446275.
- -- Brice Goglin <bgoglin@debian.org> Mon, 21 Apr 2008 02:08:10 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 22 May 2008 21:41:41 +0200
xfs (1:1.0.6-1) unstable; urgency=low
diff --git a/debian/patches/01_xfs_fixes.diff b/debian/patches/01_xfs_fixes.diff
index a9d9114..66d6024 100644
--- a/debian/patches/01_xfs_fixes.diff
+++ b/debian/patches/01_xfs_fixes.diff
@@ -241,7 +241,7 @@ Index: os/utils.c
+ pidFile, strerror (errno));
+ return -1;
}
-- if (fprintf (pidFilePtr, "%5ld\n", (long) getpid ()) != 6)
+- if (fprintf (pidFilePtr, "%11ld\n", (long) getpid ()) != 12)
+ (void) snprintf (pidstr, 11, "%ld", (long) getpid());
+ pidstrlen = strlen (pidstr);
+ if (fprintf (pidFilePtr, "%s\n", pidstr) != ( pidstrlen + 1))
diff --git a/os/config.c b/os/config.c
index 4623390..1efa2f2 100644
--- a/os/config.c
+++ b/os/config.c
@@ -296,6 +296,10 @@ SetConfigValues(void)
int err,
num;
+ if (font_catalogue = NULL) {
+ FatalError("font catalogue is missing/empty\n");
+ }
+
err = SetFontCatalogue(font_catalogue, &num);
if (err != FSSuccess) {
FatalError("element #%d (starting at 0) of font path is bad or has a bad font:\n\"%s\"\n",
diff --git a/os/utils.c b/os/utils.c
index fcc1c2a..5ee8b6e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -562,7 +562,7 @@ StorePid (void)
strerror (errno));
return -1;
}
- if (fprintf (pidFilePtr, "%5ld\n", (long) getpid ()) != 6)
+ if (fprintf (pidFilePtr, "%11ld\n", (long) getpid ()) != 12)
{
ErrorF ("cannot write to process-id file %s: %s\n", pidFile,
strerror (errno));
diff --git a/xfs-config.h.in b/xfs-config.h.in
index db60372..b44d4b4 100644
--- a/xfs-config.h.in
+++ b/xfs-config.h.in
@@ -12,6 +12,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
Reply to: