rpm/xinit
SHA256
1
0
Fork 0
forked from pool/xinit
Code Pull Requests Activity

- Fixed some more spacing and minor issues in adapted patches

Browse Source 
- 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
This commit is contained in:
Stefan Dirsch 2015-01-21 09:42:12 +00:00 committed by Git OBS Bridge
parent f1cbba5d31
commit 3bb28eaf77
7 changed files with 87 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xinit-1.3.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af
size 163905

3
xinit-1.3.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3
size 165881

16
xinit-client-session.patch
View File

@ -1,6 +1,8 @@
--- xinit-1.3.0/xinit.c.orig 2010-06-12 03:14:10.000000000 +0200 Index: xinit-1.3.4/xinit.c
+++ xinit-1.3.0/xinit.c 2010-10-31 04:32:20.000000000 +0100 ===================================================================
@@ -91,6 +91,7 @@ char xserverrcbuf[256]; --- xinit-1.3.4.orig/xinit.c
+++ xinit-1.3.4/xinit.c
@@ -89,6 +89,7 @@ char xserverrcbuf[256];
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
@ -8,7 +10,7 @@
static char *default_server = "X"; static char *default_server = "X";
static char *default_display = ":0"; /* choose most efficient */ 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(); clientpid = fork();
if (clientpid == 0) { if (clientpid == 0) {
@ -17,7 +19,7 @@
set_environment(); set_environment();
setWindowPath(); setWindowPath();
@@ -569,7 +571,17 @@ startClient(char *client[]) @@ -567,7 +570,17 @@ startClient(char *client_argv[])
Error("cannot change uid"); Error("cannot change uid");
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
@ -33,6 +35,6 @@
+ close (fd); + close (fd);
+ setsid(); + setsid();
+ +
Execute(client); Execute(client_argv);
Error("Unable to run program \"%s\"", client[0]); Error("Unable to run program \"%s\"", client_argv[0]);

32
xinit-suse.diff → xinit-suse.patch
View File

@ -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.4.orig/startx.cpp
+++ xinit-1.3.0/startx.cpp +++ xinit-1.3.4/startx.cpp
@@ -70,10 +70,115 @@ userclientrc=$HOME/.xinitrc @@ -50,10 +50,115 @@ export PATH
userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc sysclientrc=XINITDIR/xinitrc
#endif
+XCOMM +XCOMM
+XCOMM check for installed servers +XCOMM check for installed servers
@ -38,7 +38,7 @@ Index: xinit-1.3.0/startx.cpp
+ +
+XCOMM +XCOMM
+XCOMM User could have set a list of window manager in WINDOWMANAGERLIST. +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 +XCOMM
+ +
+for WM in $WMLIST $WINDOWMANAGERLIST +for WM in $WMLIST $WINDOWMANAGERLIST
@ -50,7 +50,7 @@ Index: xinit-1.3.0/startx.cpp
+ type -p $WM &> /dev/null || { + type -p $WM &> /dev/null || {
+ +
+ echo "`basename $0`: error: the requested window manager '$1' could not be found!" + 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 + for i in $WMLIST; do echo $i; done
+ exit 1 + exit 1
+ } + }
@ -92,7 +92,7 @@ Index: xinit-1.3.0/startx.cpp
+fi +fi
+ +
+XCOMM +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 +XCOMM
+ +
+if [ ! -x /var/X11R6/bin/X ]; then +if [ ! -x /var/X11R6/bin/X ]; then
@ -118,17 +118,17 @@ Index: xinit-1.3.0/startx.cpp
defaultclientargs="" defaultclientargs=""
defaultserverargs="" defaultserverargs=""
defaultdisplay=":0" defaultdisplay=":0"
@@ -314,6 +419,9 @@ else @@ -300,6 +405,9 @@ EOF
XINIT "$client" $clientargs -- "$server" $display $serverargs fi
done
fi fi
#else
+XCOMM handle TCP port 6000 +XCOMM handle TCP port 6000
+test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ +test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
+ serverargs="$serverargs -nolisten tcp" + serverargs="$serverargs -nolisten tcp"
#if defined(__APPLE__) || defined(__CYGWIN__) #if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
@@ -324,6 +432,12 @@ XINIT "$client" $clientargs -- "$server" @@ -308,6 +416,12 @@ XINIT "$client" $clientargs -- "$server"
#endif #endif
retval=$? retval=$?
@ -141,11 +141,11 @@ Index: xinit-1.3.0/startx.cpp
if [ x"$enable_xauth" = x1 ] ; then if [ x"$enable_xauth" = x1 ] ; then
if [ x"$removelist" != x ]; then if [ x"$removelist" != x ]; then
XAUTH remove $removelist 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.4.orig/xinitrc.cpp
+++ xinit-1.3.0/xinitrc.cpp +++ xinit-1.3.4/xinitrc.cpp
@@ -91,8 +91,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then @@ -48,8 +48,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then
unset f unset f
fi fi

8
xinit-tolerant-hostname-changes.diff → xinit-tolerant-hostname-changes.patch
View File

@ -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.4.orig/startx.cpp
+++ xinit-1.3.0/startx.cpp +++ xinit-1.3.4/startx.cpp
@@ -422,6 +422,7 @@ fi @@ -408,6 +408,7 @@ fi
XCOMM handle TCP port 6000 XCOMM handle TCP port 6000
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \ test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
serverargs="$serverargs -nolisten tcp" serverargs="$serverargs -nolisten tcp"

50
xinit.changes
View File

@ -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 Wed Dec 17 20:36:15 UTC 2014 - dimstar@opensuse.org

8
xinit.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xinit # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: xinit Name: xinit
Version: 1.3.3 Version: 1.3.4
Release: 0 Release: 0
Summary: X Window System initializer Summary: X Window System initializer
License: MIT License: MIT
@ -29,8 +29,8 @@ Source2: keygen.c
Source3: keygen.1 Source3: keygen.1
Patch0: xinit.diff Patch0: xinit.diff
Patch1: xinit-client-session.patch Patch1: xinit-client-session.patch
Patch2: xinit-suse.diff Patch2: xinit-suse.patch
Patch3: xinit-tolerant-hostname-changes.diff Patch3: xinit-tolerant-hostname-changes.patch
# needed for patch0 # needed for patch0
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config