baloo, kfilemetadata in kf-14.
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
Move startx auth files in /tmp so they are removed on reboot.
|
||||
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
|
||||
The trap patch didn't seem to work on reboot.
|
||||
---
|
||||
startx.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: xinit/startx.cpp
|
||||
===================================================================
|
||||
--- xinit.orig/startx.cpp
|
||||
+++ xinit/startx.cpp
|
||||
@@ -273,7 +273,7 @@
|
||||
dummy=0
|
||||
|
||||
XCOMM create a file with auth information for the server. ':0' is a dummy.
|
||||
- xserverauthfile=$HOME/.serverauth.$$
|
||||
+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
|
||||
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
|
||||
xauth -q -f "$xserverauthfile" << EOF
|
||||
add :$dummy . $mcookie
|
||||
@@ -0,0 +1,16 @@
|
||||
Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
|
||||
diff -u xinit.orig/startx.cpp xinit/startx.cpp
|
||||
--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
|
||||
+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
|
||||
@@ -290,9 +290,9 @@
|
||||
XCOMM now add the same credentials to the client authority file
|
||||
XCOMM if '$displayname' already exists do not overwrite it as another
|
||||
XCOMM server man need it. Add them to the '$xserverauthfile' instead.
|
||||
- for displayname in $authdisplay $hostname$authdisplay; do
|
||||
+ for displayname in $authdisplay $hostname/unix$authdisplay; do
|
||||
authcookie=`XAUTH list "$displayname" @@
|
||||
- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
||||
+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
||||
if [ "z${authcookie}" = "z" ] ; then
|
||||
XAUTH -q << EOF
|
||||
add $displayname . $mcookie
|
||||
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
exec /usr/bin/X -nolisten tcp "$@"
|
||||
@@ -20,7 +20,8 @@
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--Patch level="1">xinit-1.0.2-client-session.patch</Patch-->
|
||||
<Patch level="1">unset-session-cookie.patch</Patch>
|
||||
<Patch>06_move_serverauthfile_into_tmp.diff</Patch>
|
||||
<Patch>fs25361.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -29,11 +30,11 @@
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>xorg-app</Dependency>
|
||||
<Dependency>ConsoleKit</Dependency>
|
||||
<Dependency>ConsoleKit</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="config">/etc/X11/Xresources</Path>
|
||||
<Path fileType="config">/etc/X11/xinit/xinitrc</Path>
|
||||
<Path fileType="config">/etc/X11/xinit</Path>
|
||||
<Path fileType="data">/etc/X11/Xsession.d</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="executable">/usr/lib/X11/xinit</Path>
|
||||
@@ -43,6 +44,8 @@
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0755" target="/usr/lib/X11/xinit/Xsession">Xsession</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xinitrc">xinitrc</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/X11/xinit/xserverrc">xserverrc</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xserverrc">xserverrc</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xresources" >Xresources</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-localuser.sh">Xsession.d/localuser.sh</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-xdg-runtime-dir.sh">Xsession.d/xdg-runtime-dir.sh</AdditionalFile>
|
||||
@@ -57,6 +60,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2015-09-13</Date>
|
||||
<Version>1.3.4</Version>
|
||||
<Comment>add patchs.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2015-05-10</Date>
|
||||
<Version>1.3.4</Version>
|
||||
|
||||
Reference in New Issue
Block a user