Hello community,
here is the log from the commit of package xinit for openSUSE:Factory checked
in at 2019-03-08 11:59:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xinit (Old)
and /work/SRC/openSUSE:Factory/.xinit.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit"
Fri Mar 8 11:59:39 2019 rev:24 rq:681296 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2018-09-20
11:37:44.136987909 +0200
+++ /work/SRC/openSUSE:Factory/.xinit.new.28833/xinit.changes 2019-03-08
11:59:41.419972281 +0100
@@ -1,0 +2,7 @@
+Mon Mar 4 10:47:26 UTC 2019 - Stefan Dirsch <sndir...@suse.com>
+
+- Update to version 1.4.1
+ * This release fixes a bug when too many arguments are supplied
+ to the program and improves the man pages.
+
+-------------------------------------------------------------------
Old:
----
xinit-1.4.0.tar.bz2
New:
----
xinit-1.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xinit.spec ++++++
--- /var/tmp/diff_new_pack.qwx4v7/_old 2019-03-08 11:59:42.551972090 +0100
+++ /var/tmp/diff_new_pack.qwx4v7/_new 2019-03-08 11:59:42.551972090 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xinit
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xinit
-Version: 1.4.0
+Version: 1.4.1
Release: 0
Summary: X Window System initializer
License: MIT
@@ -86,7 +86,7 @@
%files
%defattr(-,root,root)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README.md
%config %{_sysconfdir}/X11/xinit/
%config %{_sysconfdir}/X11/Xresources
%config %{_sysconfdir}/skel/.xinitrc.template
++++++ xinit-1.4.0.tar.bz2 -> xinit-1.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/ChangeLog new/xinit-1.4.1/ChangeLog
--- old/xinit-1.4.0/ChangeLog 2018-03-10 02:46:13.000000000 +0100
+++ new/xinit-1.4.1/ChangeLog 2019-03-03 20:58:21.000000000 +0100
@@ -1,3 +1,67 @@
+commit 9a8b937bcfd84575e13039f316cbcb14c9729df4
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Mar 3 11:56:43 2019 -0800
+
+ xinit 1.4.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b3dc751212e5f2f6b5d263e009cc2b85e56bfdbf
+Author: Tobias Stoeckmann <tob...@stoeckmann.org>
+Date: Thu Feb 7 20:54:37 2019 +0100
+
+ Buffer overflow with many arguments.
+
+ Command line arguments are copied into clientargv and serverargv without
+ verifying that enough space is available. A high amount of arguments can
+ therefore trigger a buffer overflow like this:
+
+ $ xinit $(seq 1 500)
+
+ Signed-off-by: Tobias Stoeckmann <tob...@stoeckmann.org>
+ Reviewed-by: Walter Harms wharms@bfs,de
+
+commit f727023c1a75dcc467dd99a3db69a5834a0718f0
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Wed Nov 21 17:06:34 2018 -0800
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit ce311771ca86a4134511aecda5601d7c76d763dd
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Nov 16 22:19:18 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 752ef176eb99f6315be27f00896b37ce217758b9
+Author: Laurent Bigonville <bi...@bigon.be>
+Date: Fri Sep 12 15:35:49 2014 +0200
+
+ Fix some miscellaneous stuffs in the manpages
+
+ See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726962
+ https://bugs.freedesktop.org/show_bug.cgi?id=83797
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit aac8e17d28665dd35a73ee188c007f0b0f9cd9fe
+Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
+Date: Mon Oct 26 13:55:35 2009 +0000
+
+ Make text about supplying X server arguments via startx more generic
+
+ Make text about supplying X server arguments via startx more generic,
+ rather than assuming the started server will be Xorg, and hence will
+ take Xorg's arguments.
+
+ Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
+ Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 2df7937c6d57a4f44288d13fc50218fe088c4185
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Mar 9 17:44:47 2018 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/Makefile.am new/xinit-1.4.1/Makefile.am
--- old/xinit-1.4.0/Makefile.am 2018-03-10 02:46:03.000000000 +0100
+++ new/xinit-1.4.1/Makefile.am 2019-03-03 20:58:11.000000000 +0100
@@ -61,7 +61,7 @@
CLEANFILES = xinitrc startx
EXTRA_DIST = xinitrc.cpp startx.cpp \
- autogen.sh
+ autogen.sh README.md
.PHONY: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/Makefile.in new/xinit-1.4.1/Makefile.in
--- old/xinit-1.4.0/Makefile.in 2018-03-10 02:46:07.000000000 +0100
+++ new/xinit-1.4.1/Makefile.in 2019-03-03 20:58:15.000000000 +0100
@@ -243,8 +243,8 @@
CSCOPE = cscope
DIST_SUBDIRS = man launchd
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/cpprules.in COPYING ChangeLog INSTALL README \
- compile config.guess config.sub depcomp install-sh missing
+ $(top_srcdir)/cpprules.in COPYING ChangeLog INSTALL compile \
+ config.guess config.sub depcomp install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -469,7 +469,7 @@
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = xinitrc startx
EXTRA_DIST = xinitrc.cpp startx.cpp \
- autogen.sh
+ autogen.sh README.md
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/README new/xinit-1.4.1/README
--- old/xinit-1.4.0/README 2018-03-10 02:46:03.000000000 +0100
+++ new/xinit-1.4.1/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-The xinit program is used to start the X Window System server and a first
-client program on systems that are not using a display manager such as xdm.
-
-The xinit is not intended for naive users. Instead, site administrators should
-design user-friendly scripts that present the desired interface when starting
-up X. The startx script is one such example.
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/app/xinit
-
- http://cgit.freedesktop.org/xorg/app/xinit
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/README.md new/xinit-1.4.1/README.md
--- old/xinit-1.4.0/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/xinit-1.4.1/README.md 2019-03-03 20:58:11.000000000 +0100
@@ -0,0 +1,22 @@
+The xinit program is used to start the X Window System server and a first
+client program on systems that are not using a display manager such as xdm.
+
+The xinit is not intended for naive users. Instead, site administrators should
+design user-friendly scripts that present the desired interface when starting
+up X. The startx script is one such example.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ https://gitlab.freedesktop.org/xorg/app/xinit
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/configure new/xinit-1.4.1/configure
--- old/xinit-1.4.0/configure 2018-03-10 02:46:06.000000000 +0100
+++ new/xinit-1.4.1/configure 2019-03-03 20:58:14.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xinit 1.4.0.
+# Generated by GNU Autoconf 2.69 for xinit 1.4.1.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xinit/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,7 @@
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoc...@gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: https://gitlab.freedesktop.org/xorg/app/xinit/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -581,9 +581,9 @@
# Identity of this package.
PACKAGE_NAME='xinit'
PACKAGE_TARNAME='xinit'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='xinit 1.4.0'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_VERSION='1.4.1'
+PACKAGE_STRING='xinit 1.4.1'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xinit/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@@ -1352,7 +1352,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 xinit 1.4.0 to adapt to many kinds of systems.
+\`configure' configures xinit 1.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1422,7 +1422,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xinit 1.4.0:";;
+ short | recursive ) echo "Configuration of xinit 1.4.1:";;
esac
cat <<\_ACEOF
@@ -1494,7 +1494,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xinit/issues>.
_ACEOF
ac_status=$?
fi
@@ -1557,7 +1557,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xinit configure 1.4.0
+xinit configure 1.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1881,7 +1881,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xinit $as_me 1.4.0, which was
+It was created by xinit $as_me 1.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2749,7 +2749,7 @@
# Define the identity of the package.
PACKAGE='xinit'
- VERSION='1.4.0'
+ VERSION='1.4.1'
cat >>confdefs.h <<_ACEOF
@@ -11873,7 +11873,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xinit $as_me 1.4.0, which was
+This file was extended by xinit $as_me 1.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11933,13 +11933,13 @@
Configuration commands:
$config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xinit/issues>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xinit config.status 1.4.0
+xinit config.status 1.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/configure.ac new/xinit-1.4.1/configure.ac
--- old/xinit-1.4.0/configure.ac 2018-03-10 02:46:03.000000000 +0100
+++ new/xinit-1.4.1/configure.ac 2019-03-03 20:58:11.000000000 +0100
@@ -22,8 +22,8 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xinit], [1.4.0],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit])
+AC_INIT([xinit], [1.4.1],
+ [https://gitlab.freedesktop.org/xorg/app/xinit/issues], [xinit])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/man/startx.man
new/xinit-1.4.1/man/startx.man
--- old/xinit-1.4.0/man/startx.man 2018-03-10 02:46:03.000000000 +0100
+++ new/xinit-1.4.1/man/startx.man 2019-03-03 20:58:11.000000000 +0100
@@ -54,25 +54,19 @@
command are used to start a client in the same manner as
.BR xinit (__appmansuffix__).
The special argument
-.RB '--'
+.RB '\-\^\-'
marks the end of client arguments and the beginning of server options.
-It may be convenient to specify server options with startx to change on a
-per-session basis the
-default color depth, the server's notion of the number of dots-per-inch the
-display device presents, or take advantage of a different server layout, as
-permitted by the
-.BR __XSERVERNAME__ (__appmansuffix__)
-server and specified in the
-.BR __XCONFIGFILEMAN__
-configuration. Some examples of specifying server arguments follow; consult
+It may be convenient to specify server options with startx to change them on a
+per-session basis.
+Some examples of specifying server arguments follow; consult
the manual page for your X server to determine which arguments are legal.
.RS
.PP
-startx -- -depth 16
+startx \-\^\- \-depth 16
.PP
-startx -- -dpi 100
+startx \-\^\- \-dpi 100
.PP
-startx -- -layout Multihead
+startx \-\^\- \-layout Multihead
.RE
.PP
To determine the client to run,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/man/xinit.man
new/xinit-1.4.1/man/xinit.man
--- old/xinit-1.4.0/man/xinit.man 2018-03-10 02:46:03.000000000 +0100
+++ new/xinit-1.4.1/man/xinit.man 2019-03-03 20:58:11.000000000 +0100
@@ -161,7 +161,7 @@
.in +8
.nf
\&#!/bin/sh
-xinit __configdir__/site.xinitrc \-\^\- __bindir__/X -br
+xinit __configdir__/site.xinitrc \-\^\- __bindir__/X \-br
.fi
.in -8
.sp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xinit-1.4.0/xinit.c new/xinit-1.4.1/xinit.c
--- old/xinit-1.4.0/xinit.c 2018-03-10 02:46:03.000000000 +0100
+++ new/xinit-1.4.1/xinit.c 2019-03-03 20:58:11.000000000 +0100
@@ -151,7 +151,6 @@
register char **ptr;
pid_t pid;
int client_given = 0, server_given = 0;
- int client_args_given = 0, server_args_given = 0;
int start_of_client_args, start_of_server_args;
struct sigaction sa, si;
#ifdef __APPLE__
@@ -174,7 +173,8 @@
}
start_of_client_args = (cptr - client);
while (argc && strcmp(*argv, "--")) {
- client_args_given++;
+ if (cptr > clientargv + sizeof(clientargv) / sizeof(*clientargv) - 2)
+ Fatalx("too many client arguments");
*cptr++ = *argv++;
argc--;
}
@@ -202,7 +202,8 @@
start_of_server_args = (sptr - server);
while (--argc >= 0) {
- server_args_given++;
+ if (sptr > serverargv + sizeof(serverargv) / sizeof(*serverargv) - 2)
+ Fatalx("too many server arguments");
*sptr++ = *argv++;
}
*sptr = NULL;
