rpms/xorg-x11-xinit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- xinit-1.0.7-unset.patch: Unset various session-related environment

Browse Source 
variables at the top of startx. (#431899)
This commit is contained in:
Adam Jackson 2008-02-11 19:15:59 +00:00
parent afece66c47
commit 484d78d126
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xinit-1.0.7-unset.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up xinit-1.0.7/startx.cpp.jx xinit-1.0.7/startx.cpp
--- xinit-1.0.7/startx.cpp.jx 2007-09-16 17:24:48.000000000 -0400
+++ xinit-1.0.7/startx.cpp 2008-02-11 14:05:03.000000000 -0500
@@ -13,6 +13,9 @@ XCOMM Site administrators are STRONGLY u
XCOMM
XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
+unset DBUS_SESSION_BUS_ADDRESS
+unset SESSION_MANAGER
+
#if defined(__SCO__) || defined(__UNIXWARE__)
XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them.

12
xorg-x11-xinit.spec
View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.7 Version: 1.0.7
Release: 3%{?dist} Release: 4%{?dist}
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -23,6 +23,7 @@ Source100: ck-xinit-session.c
Patch1: xinit-1.0.2-client-session.patch Patch1: xinit-1.0.2-client-session.patch
Patch2: xinit-1.0.7-poke-ck.patch Patch2: xinit-1.0.7-poke-ck.patch
Patch3: xinit-1.0.7-unset.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -40,10 +41,6 @@ Requires: xorg-x11-server-utils
Requires: ConsoleKit-x11 Requires: ConsoleKit-x11
Requires: ConsoleKit-libs Requires: ConsoleKit-libs
# NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
# modularization. These Obsoletes lines ensure upgrades work smoothly.
Obsoletes: XFree86, xorg-x11
# NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit, # NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit,
# so the xinitrc package became unnecessary. The xdm configs/scripts move # so the xinitrc package became unnecessary. The xdm configs/scripts move
# to the xdm package. # to the xdm package.
@ -61,6 +58,7 @@ X.Org X11 X Window System xinit startup scripts
%setup -q -n %{pkgname}-%{version} %setup -q -n %{pkgname}-%{version}
%patch1 -p1 -b .client-session %patch1 -p1 -b .client-session
#%patch2 -p1 -b .poke-ck #%patch2 -p1 -b .poke-ck
%patch3 -p1 -b .unset
%build %build
autoreconf autoreconf
@ -120,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1* %{_mandir}/man1/xinit.1*
%changelog %changelog
* Mon Feb 11 2008 Adam Jackson <ajax@redhat.com> 1.0.7-4
- xinit-1.0.7-unset.patch: Unset various session-related environment
variables at the top of startx. (#431899)
* Mon Feb 4 2008 Ray Strode <rstrode@redhat.com> 1.0.7-3 * Mon Feb 4 2008 Ray Strode <rstrode@redhat.com> 1.0.7-3
- don't special case dbus-launch. dbus-x11 now installs - don't special case dbus-launch. dbus-x11 now installs
a script into /etc/X11/xinit/xinitrc.d. a script into /etc/X11/xinit/xinitrc.d.