From 3bb28eaf77806db5c6dd3710d67f6d89e97cb08181ec3410710dff9192b44e5e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 21 Jan 2015 09:42:12 +0000 Subject: [PATCH] - Fixed some more spacing and minor issues in adapted patches - Fixed some spacing and single quote vs backtick issues in patches - Corrections to variable names in xinit-suse.patch and xinit-tolerant-hostname-changes.patch - 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 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xinit?expand=0&rev=19 --- xinit-1.3.3.tar.bz2 | 3 -- xinit-1.3.4.tar.bz2 | 3 ++ xinit-client-session.patch | 16 +++--- xinit-suse.diff => xinit-suse.patch | 34 ++++++------- ...f => xinit-tolerant-hostname-changes.patch | 8 +-- xinit.changes | 50 +++++++++++++++++++ xinit.spec | 8 +-- 7 files changed, 87 insertions(+), 35 deletions(-) delete mode 100644 xinit-1.3.3.tar.bz2 create mode 100644 xinit-1.3.4.tar.bz2 rename xinit-suse.diff => xinit-suse.patch (86%) rename xinit-tolerant-hostname-changes.diff => xinit-tolerant-hostname-changes.patch (76%) diff --git a/xinit-1.3.3.tar.bz2 b/xinit-1.3.3.tar.bz2 deleted file mode 100644 index fcbfba9..0000000 --- a/xinit-1.3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af -size 163905 diff --git a/xinit-1.3.4.tar.bz2 b/xinit-1.3.4.tar.bz2 new file mode 100644 index 0000000..ab2c8db --- /dev/null +++ b/xinit-1.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 +size 165881 diff --git a/xinit-client-session.patch b/xinit-client-session.patch index f226db3..0c709a4 100644 --- a/xinit-client-session.patch +++ b/xinit-client-session.patch @@ -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]); diff --git a/xinit-suse.diff b/xinit-suse.patch similarity index 86% rename from xinit-suse.diff rename to xinit-suse.patch index ef856d8..e74b2f5 100644 --- a/xinit-suse.diff +++ b/xinit-suse.patch @@ -1,10 +1,10 @@ -Index: xinit-1.3.0/startx.cpp +Index: xinit-1.3.4/startx.cpp =================================================================== ---- xinit-1.3.0.orig/startx.cpp -+++ xinit-1.3.0/startx.cpp -@@ -70,10 +70,115 @@ userclientrc=$HOME/.xinitrc +--- 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 - #endif +XCOMM +XCOMM check for installed servers @@ -38,7 +38,7 @@ Index: xinit-1.3.0/startx.cpp + +XCOMM +XCOMM User could have set a list of window manager in WINDOWMANAGERLIST. -+XCOMM go throu wms and check if user specified a reachable one. ++XCOMM go through wms and check if user specified a reachable one. +XCOMM + +for WM in $WMLIST $WINDOWMANAGERLIST @@ -50,7 +50,7 @@ Index: xinit-1.3.0/startx.cpp + 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 managers):" ++ echo "Window manager must be one of (currently installed window amangers):" + for i in $WMLIST; do echo $i; done + exit 1 + } @@ -80,7 +80,7 @@ Index: xinit-1.3.0/startx.cpp + +XCOMM +XCOMM check for the second link -+XCOMM ++XCOMM + +if [ ! -L /var/X11R6/bin/X ]; then + @@ -92,7 +92,7 @@ Index: xinit-1.3.0/startx.cpp +fi + +XCOMM -+XCOMM check if the Xorg file is an executable or an accidentially copied script or similar things ++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 @@ -118,17 +118,17 @@ Index: xinit-1.3.0/startx.cpp defaultclientargs="" defaultserverargs="" defaultdisplay=":0" -@@ -314,6 +419,9 @@ else - XINIT "$client" $clientargs -- "$server" $display $serverargs +@@ -300,6 +405,9 @@ EOF + fi + done fi - #else +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 -@@ -324,6 +432,12 @@ XINIT "$client" $clientargs -- "$server" +@@ -308,6 +416,12 @@ XINIT "$client" $clientargs -- "$server" #endif retval=$? @@ -141,11 +141,11 @@ Index: xinit-1.3.0/startx.cpp if [ x"$enable_xauth" = x1 ] ; then if [ x"$removelist" != x ]; then XAUTH remove $removelist -Index: xinit-1.3.0/xinitrc.cpp +Index: xinit-1.3.4/xinitrc.cpp =================================================================== ---- xinit-1.3.0.orig/xinitrc.cpp -+++ xinit-1.3.0/xinitrc.cpp -@@ -91,8 +91,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then +--- 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 diff --git a/xinit-tolerant-hostname-changes.diff b/xinit-tolerant-hostname-changes.patch similarity index 76% rename from xinit-tolerant-hostname-changes.diff rename to xinit-tolerant-hostname-changes.patch index 2f1ff71..ce674e4 100644 --- a/xinit-tolerant-hostname-changes.diff +++ b/xinit-tolerant-hostname-changes.patch @@ -1,8 +1,8 @@ -Index: xinit-1.3.0/startx.cpp +Index: xinit-1.3.4/startx.cpp =================================================================== ---- xinit-1.3.0.orig/startx.cpp -+++ xinit-1.3.0/startx.cpp -@@ -422,6 +422,7 @@ fi +--- 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" diff --git a/xinit.changes b/xinit.changes index 3b1488b..b453984 100644 --- a/xinit.changes +++ b/xinit.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Wed Dec 17 20:36:15 UTC 2014 - dimstar@opensuse.org diff --git a/xinit.spec b/xinit.spec index d51939e..9a029c9 100644 --- a/xinit.spec +++ b/xinit.spec @@ -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 @@ Source2: keygen.c 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