Hello community,
here is the log from the commit of package xinit for openSUSE:Factory checked in at 2015-01-21 21:54:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xinit (Old)
and /work/SRC/openSUSE:Factory/.xinit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2014-12-22 12:52:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2015-01-21 21:54:33.000000000 +0100
@@ -1,0 +2,50 @@
+Wed Jan 21 09:40:03 UTC 2015 - sndirsch@suse.com
+
+- Fixed some more spacing and minor issues in adapted patches
+
+-------------------------------------------------------------------
+Tue Jan 20 17:44:43 UTC 2015 - sfalken@opensuse.org
+
+- Fixed some spacing and single quote vs backtick issues
+ in patches
+
+-------------------------------------------------------------------
+Mon Jan 19 17:12:31 UTC 2015 - sfalken@opensuse.org
+
+- Corrections to variable names in xinit-suse.patch and
+ xinit-tolerant-hostname-changes.patch
+
+-------------------------------------------------------------------
+Sun Jan 18 17:38:28 UTC 2015 - sfalken@opensuse.org
+
+- Update to version 1.3.4:
+ + Changes from 1.3.3
+ - Fix warnings about parameters to startServer & startClient
+ shadowing globals
+ - Pass files to cpp via CLI arg instead of stdin to workaround
+ gcc 4.8 change (fdo#69439)
+ - Remove unixware / sco support
+ - Bump required util-macros version to 1.19
+ - Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing
+ cpp files
+ - Under Linux start X on the current VT (rh#806491)
+ - startx; Pass vtX as long as the user did not specify one
+ - configure: Drop AM_MAINTAINER_MODE
+ - autogen.sh: Honor NOCONFIGURE=1
+ - startx: Make the bugzilla reference in a comment survive cpp
+ processing (fdo#83019)
+ - Remove hardcoded path to OpenSSL for OpenBSD
+ + Patches refactored/renamed for version change
+ + Added:
+ - xinit-client-session.patch
+ - xinit-tolerant-hostname-changes.patch
+ - xinit-suse.patch
+ - xinit-1.3.4.tar.bz2
+ + Modified:
+ - xinit-client-session.patch
+ + Dropped:
+ - xinit-tolerant-hostname-changes.diff
+ - xinit-suse.diff
+ - xinit-1.3.3.tar.bz2
+
+-------------------------------------------------------------------
Old:
----
xinit-1.3.3.tar.bz2
xinit-suse.diff
xinit-tolerant-hostname-changes.diff
New:
----
xinit-1.3.4.tar.bz2
xinit-suse.patch
xinit-tolerant-hostname-changes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xinit.spec ++++++
--- /var/tmp/diff_new_pack.TTX3TY/_old 2015-01-21 21:54:34.000000000 +0100
+++ /var/tmp/diff_new_pack.TTX3TY/_new 2015-01-21 21:54:34.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xinit
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products 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.3.3
+Version: 1.3.4
Release: 0
Summary: X Window System initializer
License: MIT
@@ -29,8 +29,8 @@
Source3: keygen.1
Patch0: xinit.diff
Patch1: xinit-client-session.patch
-Patch2: xinit-suse.diff
-Patch3: xinit-tolerant-hostname-changes.diff
+Patch2: xinit-suse.patch
+Patch3: xinit-tolerant-hostname-changes.patch
# needed for patch0
BuildRequires: libtool
BuildRequires: pkg-config
++++++ xinit-1.3.3.tar.bz2 -> xinit-1.3.4.tar.bz2 ++++++
++++ 8378 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/ChangeLog new/xinit-1.3.4/ChangeLog
--- old/xinit-1.3.3/ChangeLog 2013-09-08 18:37:56.000000000 +0200
+++ new/xinit-1.3.4/ChangeLog 2014-09-11 19:32:14.000000000 +0200
@@ -1,3 +1,156 @@
+commit 6f6747d500439782476cf5c029a7fc45fc954c86
+Author: Hans de Goede
+Date: Thu Sep 11 16:29:06 2014 +0200
+
+ xinit 1.3.4
+
+ Signed-off-by: Hans de Goede
+
+commit e91faac94e36937c96c04277eae7960bf5132b5b
+Author: Brad Smith
+Date: Fri Aug 29 01:34:16 2014 -0400
+
+ Remove hardcoded path to OpenSSL for OpenBSD
+
+ Since xinit's autoconf script was changed to use AC_PATH_PROGS() to find
+ openssl this hardcoded path to openssl can be removed. This was noticed
+ recently when openssl was moved from /usr/sbin to /usr/bin and developers
+ were looking for anything having hardcoded paths.
+
+ Reviewed-by: Matthieu Herrb
+
+commit 94b002262d27975dabf56c77fd308ebabc894090
+Author: Hans de Goede
+Date: Tue Aug 26 11:52:20 2014 +0200
+
+ startx: Make the bugzilla reference in a comment survive cpp processing
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=83019
+
+ Signed-off-by: Hans de Goede
+
+commit 5502aaf99f4e723e96791e8f4cf01e0c200ec269
+Author: Alan Coopersmith
+Date: Sat May 31 21:39:32 2014 -0700
+
+ autogen.sh: Honor NOCONFIGURE=1
+
+ See http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Alan Coopersmith
+
+commit a6a720b5181d4d0529e4eb203ece234ba45f69dd
+Author: Alan Coopersmith
+Date: Sat May 31 21:38:41 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1b23094a8606bf383ec6c7803a9cd300b1bb96a7
+Author: Hans de Goede
+Date: Mon Apr 7 11:23:48 2014 +0200
+
+ startx: Pass vtX as long as the user did not specify one
+
+ Adding vtX to $defaultserverargs means that it will only be added when
+ the user specifies no server arguments.
+
+ This means that doing ie: "startx -- -depth 16" will cause the server to start
+ on a different vt then just "startx", which does not meat the principle of
+ least surprise.
+
+ Instead always pass the vtX argument, except when the user has specified its
+ own vtX argument. Note that vtX still only gets added for the default server,
+ since for ie Xnest or Xephyr it makes no sense.
+
+ Signed-off-by: Hans de Goede
+ Reviewed-by: James Cloos
+
+commit 44915d6953076849b69a017f6fc8234b0f254362
+Author: Hans de Goede
+Date: Tue Mar 25 11:54:31 2014 +0100
+
+ startx: Under Linux start X on the current VT
+
+ When we let X allocate a new VT, systemd-logind will not recognize any
+ processes running on this VT as belonging to a valid session (since there
+ was no pam session opened on that tty).
+
+ This causes problems like PolicyKit denials for these processes.
+
+ ConsoleKit under Linux has been deprecated for a few years now and is no
+ longer being maintained, so simply make this the default under Linux.
+
+ Note we do not pass in the vt if the user has specified an alternative server
+ to start, as the vtX argument is only valid for the Xorg server, likewise we
+ omit it if the user has specified any other server arguments.
+
+ Fixes:
+ https://bugzilla.redhat.com/show_bug.cgi?id=806491
+
+ Signed-off-by: Hans de Goede
+ Reviewed-by: Peter Hutterer
+
+commit 79479a0c45f3177ddf0bb2666d39535b6c767c07
+Author: Hans de Goede
+Date: Tue Mar 25 11:48:58 2014 +0100
+
+ Replace $RAWCPPFLAGS with $TRADITIONALCPPFLAGS when processing cpp files
+
+ Various .cpp files containt things like #ifdef __APPLE__ and #ifdef __linux__
+ these have been broken (all #ifdef-s always seen as false) since:
+ http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d14...
+
+ This commit makes these work again by removing -undef from the cpp flags.
+
+ Signed-off-by: Hans de Goede
+ Reviewed-by: Gaetan Nadon
+
+commit 7f54370baca4203bb344f5f8a4c2683f5b78d50b
+Author: Hans de Goede
+Date: Thu Mar 27 14:37:19 2014 +0100
+
+ Bump required util-macros version to 1.19
+
+ Signed-off-by: Hans de Goede
+ Reviewed-by: Gaetan Nadon
+
+commit fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a
+Author: Hans de Goede
+Date: Thu Mar 27 12:29:19 2014 +0100
+
+ Remove unixware / sco support
+
+ We don't support SCO / Unixware anymore, so lets remove the SCO / Unixware
+ specific bits from startx and xinitrc
+
+ SCO support was removed from the server in 2010:
+ http://lists.x.org/archives/xorg-devel/2010-December/017209.html
+
+ Signed-off-by: Hans de Goede
+ Reviewed-by: Mark Kettenis
+ Reviewed-by: Gaetan Nadon
+
+commit 463b85fcf51d8ff5886ebe1f3481e5cb4d603436
+Author: Alan Coopersmith
+Date: Fri Nov 22 23:03:39 2013 -0800
+
+ Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change
+
+ Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
+ https://bugs.freedesktop.org/show_bug.cgi?id=69439
+
+ Signed-off-by: Alan Coopersmith
+
+commit 182920f156c87715d91b2f64b8781a0072af996e
+Author: Alan Coopersmith
+Date: Sun Sep 8 09:48:50 2013 -0700
+
+ Fix warnings about parameters to startServer & startClient shadowing globals
+
+ Signed-off-by: Alan Coopersmith
+
commit cdc39fd28649ea906dea8f58981d15d4b04a0a47
Author: Alan Coopersmith
Date: Sun Sep 8 09:35:35 2013 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/INSTALL new/xinit-1.3.4/INSTALL
--- old/xinit-1.3.3/INSTALL 2013-09-08 18:37:56.000000000 +0200
+++ new/xinit-1.3.4/INSTALL 2014-09-11 19:32:14.000000000 +0200
@@ -1,11 +1,13 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
@@ -13,7 +15,11 @@
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
- 5. You can remove the program binaries and object files from the
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,8 +83,15 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
@@ -93,7 +116,8 @@
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
@@ -120,7 +144,8 @@
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -131,15 +156,46 @@
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
Particular systems
==================
@@ -159,10 +222,15 @@
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
- ./configure CC="cc -Ae"
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@
./configure CC="cc -nodtk"
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
@@ -189,7 +267,8 @@
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +356,7 @@
`configure' can determine that directory automatically.
`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
+ Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/autogen.sh new/xinit-1.3.4/autogen.sh
--- old/xinit-1.3.3/autogen.sh 2013-09-08 18:37:33.000000000 +0200
+++ new/xinit-1.3.4/autogen.sh 2014-08-26 11:51:35.000000000 +0200
@@ -9,5 +9,6 @@
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
-
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/configure.ac new/xinit-1.3.4/configure.ac
--- old/xinit-1.3.3/configure.ac 2013-09-08 18:37:33.000000000 +0200
+++ new/xinit-1.3.4/configure.ac 2014-09-11 16:23:25.000000000 +0200
@@ -22,19 +22,18 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xinit], [1.3.3],
+AC_INIT([xinit], [1.3.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
+ [m4_fatal([must install xorg-macros 1.19 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.19)
XORG_DEFAULT_OPTIONS
XORG_PROG_RAWCPP
@@ -161,9 +160,6 @@
MCOOKIE="$OPENSSL rand -hex 16"
else
case $host_os in
- *openbsd*)
- MCOOKIE='/usr/sbin/openssl rand -hex 16'
- ;;
*solaris*)
MCOOKIE="/usr/bin/od -X -A n -N 16 /dev/urandom | /usr/bin/tr -d ' '"
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/cpprules.in new/xinit-1.3.4/cpprules.in
--- old/xinit-1.3.3/cpprules.in 2013-09-08 18:37:33.000000000 +0200
+++ new/xinit-1.3.4/cpprules.in 2014-04-02 09:01:51.000000000 +0200
@@ -15,4 +15,4 @@
SUFFIXES = .cpp
.cpp:
- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(RAWCPP) $(TRADITIONALCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/missing new/xinit-1.3.4/missing
--- old/xinit-1.3.3/missing 2013-09-08 18:37:40.000000000 +0200
+++ new/xinit-1.3.4/missing 2014-09-11 19:32:07.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/startx.cpp new/xinit-1.3.4/startx.cpp
--- old/xinit-1.3.3/startx.cpp 2013-09-08 18:37:33.000000000 +0200
+++ new/xinit-1.3.4/startx.cpp 2014-09-11 19:31:42.000000000 +0200
@@ -14,7 +14,7 @@
unset DBUS_SESSION_BUS_ADDRESS
unset SESSION_MANAGER
-#if defined(__SCO__) || defined(__UNIXWARE__) || defined(__APPLE__)
+#ifdef __APPLE__
XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them.
XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin
@@ -33,11 +33,7 @@
esac
XCOMM Now the "old" compiled path
-#ifdef __APPLE__
oldbindir=/usr/X11R6/bin
-#else
-oldbindir=/usr/bin/X11
-#endif
if [ -d "$oldbindir" ] ; then
case $PATH in
@@ -51,24 +47,8 @@
export PATH
#endif
-#if defined(__SCO__) || defined(__UNIXWARE__)
-XCOMM Set up the XMERGE env var so that dos merge is happy under X
-
-if [ -f /usr/lib/merge/xmergeset.sh ]; then
- . /usr/lib/merge/xmergeset.sh
-elif [ -f /usr/lib/merge/console.disp ]; then
- XMERGE=`cat /usr/lib/merge/console.disp`
- export XMERGE
-fi
-
-userclientrc=$HOME/.startxrc
-sysclientrc=LIBDIR/sys.startxrc
-scouserclientrc=$HOME/.xinitrc
-scosysclientrc=XINITDIR/xinitrc
-#else
userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
-#endif
userserverrc=$HOME/.xserverrc
sysserverrc=XINITDIR/xserverrc
@@ -79,6 +59,7 @@
defaultdisplay=":0"
clientargs=""
serverargs=""
+vtarg=""
#ifdef __APPLE__
@@ -145,21 +126,6 @@
defaultdisplay=":$d"
unset d
-#if defined(__SCO__) || defined(__UNIXWARE__)
-
-XCOMM SCO -t option: do not start an X server
-case $1 in
- -t) if [ -n "$DISPLAY" ]; then
- REMOTE_SERVER=TRUE
- shift
- else
- echo "DISPLAY environment variable not set"
- exit 1
- fi
- ;;
-esac
-#endif
-
whoseargs="client"
while [ x"$1" != x ]; do
case "$1" in
@@ -209,12 +175,6 @@
client=$userclientrc
elif [ -f "$sysclientrc" ]; then
client=$sysclientrc
-#if defined(__SCO__) || defined(__UNIXWARE__)
- elif [ -f "$scouserclientrc" ]; then
- client=$scouserclientrc
- elif [ -f "$scosysclientrc" ]; then
- client=$scosysclientrc
-#endif
fi
fi
fi
@@ -228,6 +188,17 @@
if [ x"$server" = x ]; then
server=$defaultserver
+#ifdef __linux__
+ XCOMM When starting the defaultserver start X on the current tty to avoid
+ XCOMM the startx session being seen as inactive:
+ XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+ tty=$(tty)
+ if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+ tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+ vtarg="vt$tty_num"
+ fi
+#endif
+
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ x"$serverargs" = x -a x"$display" = x ]; then
if [ -f "$userserverrc" ]; then
@@ -243,6 +214,17 @@
serverargs=$defaultserverargs
fi
+XCOMM if no vt is specified add vtarg (which may be empty)
+have_vtarg="no"
+for i in $serverargs; do
+ if expr match "$i" '^vt[0-9]\+$' > /dev/null; then
+ have_vtarg="yes"
+ fi
+done
+if [ "$have_vtarg" = "no" ]; then
+ serverargs="$serverargs $vtarg"
+fi
+
XCOMM if no display, use default
if [ x"$display" = x ]; then
display=$defaultdisplay
@@ -319,21 +301,11 @@
done
fi
-#if defined(__SCO__) || defined(__UNIXWARE__)
-if [ "$REMOTE_SERVER" = "TRUE" ]; then
- exec SHELL_CMD ${client}
-else
- XINIT "$client" $clientargs -- "$server" $display $serverargs
-fi
-#else
-
#if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
#else
XINIT "$client" $clientargs -- "$server" $display $serverargs
#endif
-
-#endif
retval=$?
if [ x"$enable_xauth" = x1 ] ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/xinit.c new/xinit-1.3.4/xinit.c
--- old/xinit-1.3.3/xinit.c 2013-09-08 18:37:33.000000000 +0200
+++ new/xinit-1.3.4/xinit.c 2014-03-25 10:20:26.000000000 +0100
@@ -390,7 +390,7 @@
}
static pid_t
-startServer(char *server[])
+startServer(char *server_argv[])
{
sigset_t mask, old;
const char * const *cpp;
@@ -422,12 +422,12 @@
* if client is xterm -L
*/
setpgid(0,getpid());
- Execute(server);
+ Execute(server_argv);
- Error("unable to run server \"%s\"", server[0]);
+ Error("unable to run server \"%s\"", server_argv[0]);
fprintf(stderr, "Use the -- option, or make sure that %s is in your path and\n", bindir);
- fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server[0]);
+ fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server_argv[0]);
fprintf(stderr, "for your display. Possible server names include:\n\n");
for (cpp = server_names; *cpp; cpp++)
fprintf(stderr, " %s\n", *cpp);
@@ -556,7 +556,7 @@
}
static pid_t
-startClient(char *client[])
+startClient(char *client_argv[])
{
clientpid = fork();
if (clientpid == 0) {
@@ -568,8 +568,8 @@
_exit(EXIT_FAILURE);
}
setpgid(0, getpid());
- Execute(client);
- Error("Unable to run program \"%s\"", client[0]);
+ Execute(client_argv);
+ Error("Unable to run program \"%s\"", client_argv[0]);
fprintf(stderr, "Specify a program on the command line or make sure that %s\n", bindir);
fprintf(stderr, "is in your path.\n\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinit-1.3.3/xinitrc.cpp new/xinit-1.3.4/xinitrc.cpp
--- old/xinit-1.3.3/xinitrc.cpp 2013-09-08 18:37:33.000000000 +0200
+++ new/xinit-1.3.4/xinitrc.cpp 2014-03-27 14:37:38.000000000 +0100
@@ -41,49 +41,6 @@
XCOMM start some nice programs
-#if defined(__SCO__) || defined(__UNIXWARE__)
-if [ -r /etc/default/xdesktops ]; then
- . /etc/default/xdesktops
-fi
-
-if [ -r $HOME/.x11rc ]; then
- . $HOME/.x11rc
-else
- if [ -r /etc/default/X11 ]; then
- . /etc/default/X11
- fi
-fi
-
-#if defined(__SCO__)
-if [ -n "$XSESSION" ]; then
- case "$XSESSION" in
- [Yy][Ee][Ss])
- [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession
- ;;
- esac
-fi
-
-if [ -n "$XDESKTOP" ]; then
- exec `eval echo $"$XDESKTOP"`
-else
- if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then
- /usr/bin/X11/scoterm 2> /dev/null &
- exec /usr/bin/X11/pmwm 2> /dev/null
- fi
-fi
-#elif defined(__UNIXWARE__)
-if [ -n "$XDESKTOP" ]; then
- exec `eval echo $"$XDESKTOP"`
-else
- if [ -x /usr/X/bin/pmwm ]; then
- exec /usr/X/bin/pmwm 2> /dev/null
- fi
-fi
-#endif
-
-XCOMM This is the fallback case if nothing else is executed above
-#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
-
if [ -d XINITDIR/xinitrc.d ] ; then
for f in XINITDIR/xinitrc.d/?*.sh ; do
[ -x "$f" ] && . "$f"
++++++ xinit-client-session.patch ++++++
--- /var/tmp/diff_new_pack.TTX3TY/_old 2015-01-21 21:54:35.000000000 +0100
+++ /var/tmp/diff_new_pack.TTX3TY/_new 2015-01-21 21:54:35.000000000 +0100
@@ -1,6 +1,8 @@
---- xinit-1.3.0/xinit.c.orig 2010-06-12 03:14:10.000000000 +0200
-+++ xinit-1.3.0/xinit.c 2010-10-31 04:32:20.000000000 +0100
-@@ -91,6 +91,7 @@ char xserverrcbuf[256];
+Index: xinit-1.3.4/xinit.c
+===================================================================
+--- xinit-1.3.4.orig/xinit.c
++++ xinit-1.3.4/xinit.c
+@@ -89,6 +89,7 @@ char xserverrcbuf[256];
#define TRUE 1
#define FALSE 0
@@ -8,7 +10,7 @@
static char *default_server = "X";
static char *default_display = ":0"; /* choose most efficient */
-@@ -562,6 +562,8 @@ startClient(char *client[])
+@@ -560,6 +561,8 @@ startClient(char *client_argv[])
{
clientpid = fork();
if (clientpid == 0) {
@@ -17,7 +19,7 @@
set_environment();
setWindowPath();
-@@ -569,7 +571,17 @@ startClient(char *client[])
+@@ -567,7 +570,17 @@ startClient(char *client_argv[])
Error("cannot change uid");
_exit(EXIT_FAILURE);
}
@@ -33,6 +35,6 @@
+ close (fd);
+ setsid();
+
- Execute(client);
- Error("Unable to run program \"%s\"", client[0]);
+ Execute(client_argv);
+ Error("Unable to run program \"%s\"", client_argv[0]);
++++++ xinit-suse.patch ++++++
Index: xinit-1.3.4/startx.cpp
===================================================================
--- xinit-1.3.4.orig/startx.cpp
+++ xinit-1.3.4/startx.cpp
@@ -50,10 +50,115 @@ export PATH
userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
+XCOMM
+XCOMM check for installed servers
+XCOMM
+
+#ifdef linux
+
+INSTALLED_SERVERS=`ls -1 /usr/bin/Xorg /usr/X11R6/bin/XFree86 /usr/X11R6/bin/Xorg* 2>/dev/null`
+
+
+if [ -z "$INSTALLED_SERVERS" ]; then
+
+ echo ""
+ echo "You did not install any X-Server \(e.g. Xorg\)!"
+ echo "Please install at least one server to start X."
+ echo "I'm aborting now."
+ exit 1
+fi
+
+
+XCOMM
+XCOMM perhaps a windowmanager is specified?
+XCOMM
+XCOMM
+XCOMM find wmlist utility, else take twm as default (always there :-))
+XCOMM
+type -p wmlist &> /dev/null && WMLIST="`for i in $(wmlist); do echo $i; done | sort`"
+test -z "$WMLIST" && WMLIST="twm"
+
+test "$1" = "--" || { test -n "$1" && WANTEDWM=`basename "$1"` ; }
+
+XCOMM
+XCOMM User could have set a list of window manager in WINDOWMANAGERLIST.
+XCOMM go through wms and check if user specified a reachable one.
+XCOMM
+
+for WM in $WMLIST $WINDOWMANAGERLIST
+do
+ test "$WM" = "$WANTEDWM" && {
+XCOMM
+XCOMM is it reachable via $PATH?
+XCOMM
+ type -p $WM &> /dev/null || {
+
+ echo "`basename $0`: error: the requested window manager '$1' could not be found!"
+ echo "Window manager must be one of (currently installed window amangers):"
+ for i in $WMLIST; do echo $i; done
+ exit 1
+ }
+XCOMM
+XCOMM OK, we got it, this will be the override for WINDOWMANAGER
+XCOMM
+ export WINDOWMANAGER=$WM
+ shift 1
+ break
+ }
+done
+
+unset WINDOWMANAGERLIST WMLIST WANTEDWM WM
+
+XCOMM
+XCOMM check for the first link
+XCOMM
+
+if [ ! -L /usr/X11R6/bin/X -a ! -L /usr/bin/X ]; then
+
+ echo ""
+ echo "There is no link /usr/X11R6/bin/X (/usr/bin/Xorg) to /var/X11R6/bin/X!"
+ echo "Please link the files as mentioned above or install the X-Server again."
+ echo "I'm aborting now."
+ exit 1
+fi
+
+XCOMM
+XCOMM check for the second link
+XCOMM
+
+if [ ! -L /var/X11R6/bin/X ]; then
+
+ echo ""
+ echo "There is no link /var/X11R6/bin/X to the correct X Server binary."
+ echo "Please configure the correct X Server with SaX/SaX2, which will create"
+ echo "the missing link. I'm aborting now."
+ exit 1
+fi
+
+XCOMM
+XCOMM check if the Xorg file is an executable or an accidentally copied script or similar things
+XCOMM
+
+if [ ! -x /var/X11R6/bin/X ]; then
+
+ echo ""
+ echo "The file Xorg (binary of X-Server) doesn't seem to be a binary file."
+ echo "Please check it or / and install a new X-Server-binary."
+ echo "I'm aborting now."
+ exit 1
+fi
+
+#endif /* linux */
+
+XCOMM set $DISPLAYMANAGER_XSERVER $DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN
+. /etc/sysconfig/displaymanager
+
userserverrc=$HOME/.xserverrc
sysserverrc=XINITDIR/xserverrc
defaultclient=XTERM
+XCOMM set X Server accordingly (Xorg/Xgl)
defaultserver=XSERVER
+test -n "$DISPLAYMANAGER_XSERVER" && defaultserver=/usr/bin/$DISPLAYMANAGER_XSERVER
defaultclientargs=""
defaultserverargs=""
defaultdisplay=":0"
@@ -300,6 +405,9 @@ EOF
fi
done
fi
+XCOMM handle TCP port 6000
+test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
+ serverargs="$serverargs -nolisten tcp"
#if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
@@ -308,6 +416,12 @@ XINIT "$client" $clientargs -- "$server"
#endif
retval=$?
+if [ "$retval" != 0 -a ! -u "/usr/bin/Xorg" ]; then
+ echo "-------------------------------------------------------------------------------------------"
+ echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?"
+ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local and run \"chkstat --system --set\" afterwards"
+fi
+
if [ x"$enable_xauth" = x1 ] ; then
if [ x"$removelist" != x ]; then
XAUTH remove $removelist
Index: xinit-1.3.4/xinitrc.cpp
===================================================================
--- xinit-1.3.4.orig/xinitrc.cpp
+++ xinit-1.3.4/xinitrc.cpp
@@ -48,8 +48,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then
unset f
fi
-TWM &
+if [ -x /usr/X11R6/bin/fvwm -o -x /usr/bin/fvwm]; then
+ exec fvwm
+fi
XCLOCK -geometry 50x50-1+1 &
XTERM -geometry 80x50+494+51 &
XTERM -geometry 80x20+494-0 &
-exec XTERM -geometry 80x66+0+0 -name login
+exec TWM
++++++ xinit-tolerant-hostname-changes.patch ++++++
Index: xinit-1.3.4/startx.cpp
===================================================================
--- xinit-1.3.4.orig/startx.cpp
+++ xinit-1.3.4/startx.cpp
@@ -408,6 +408,7 @@ fi
XCOMM handle TCP port 6000
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
serverargs="$serverargs -nolisten tcp"
+export XAUTHLOCALHOSTNAME=`hostname`
#if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org