diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2009-11-05 22:58:20 +0100 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-11-05 22:58:20 +0100 |
| commit | 89d8de912453f4a89a00c7cfdfc867a38f654f31 (patch) | |
| tree | 0a55fd7545d12467b1045df9777aaa0db390bf3c /x11-apps/xinit | |
| parent | x11-apps/xinit: correctly source xinitrc.d files, fixes bug #201625 (diff) | |
| download | x11-89d8de912453f4a89a00c7cfdfc867a38f654f31.tar.gz x11-89d8de912453f4a89a00c7cfdfc867a38f654f31.tar.bz2 x11-89d8de912453f4a89a00c7cfdfc867a38f654f31.zip | |
x11-apps/xinit: allow local connections from the current user (see bug #287498)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/Manifest | 3 | ||||
| -rw-r--r-- | x11-apps/xinit/files/00-xhost | 7 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-9999.ebuild | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index aafdf1d3..4690a79f 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,3 +1,4 @@ +AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02629cd14f5f5fa8a56ec9421e0dc46b SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97 AUX 0001-Gentoo-specific-customizations.patch 1508 RMD160 1322bb133689aa68b101f13fe341df83f4378eb9 SHA1 1db44e5fc0f870f58791ec654cf6abe4ae23cf0e SHA256 6c7811e0ea33fd32e9e8d1157f34c28e8b687f31a9d1264868abaff207387df6 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212 @@ -7,4 +8,4 @@ AUX xdm.confd-2 854 RMD160 dd5b1786b03c8ae79b34d61cd0bd591dd83193c4 SHA1 e32357c AUX xdm.initd-4 5388 RMD160 ce0eae80a29b2a4d282b2d8d8f00c7ca9ff73f02 SHA1 30c8511145a0be1e0e389b3f69e002d7234244af SHA256 2949d2b4d2220cc9f3c632826959204970886712929319b5b1d227dac96bc8cc AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe -EBUILD xinit-9999.ebuild 1768 RMD160 7e6fd3bbfdfe615b186d37b8fec3106f90df74b0 SHA1 575a219ff66c8ac6fe55d4da2ac1a56dcfaa064d SHA256 7db76f7b1f8739eaffef9a281a58b0630e83402703af9ef6f0e0718aabdfe0b9 +EBUILD xinit-9999.ebuild 1865 RMD160 e8659510c5139eda25ab68eb4c0bfb5c46a171c4 SHA1 49f84ef0628dad5a6519882aab6a199f3ca6849a SHA256 419efb238e93ec671bcd95fef69429486c088901ee9b719be87002aaaf502d05 diff --git a/x11-apps/xinit/files/00-xhost b/x11-apps/xinit/files/00-xhost new file mode 100644 index 00000000..82cf1038 --- /dev/null +++ b/x11-apps/xinit/files/00-xhost @@ -0,0 +1,7 @@ +#!/bin/sh +# Allow all local connections from the current UID +# This fixes issues with hostname changes (usually by dhcp clients) +# see bug 287498 for more info + +[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] && + xhost +si:localuser:`id -un` > /dev/null 2>&1 diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild index 53b3ce39..6f9f16c3 100644 --- a/x11-apps/xinit/xinit-9999.ebuild +++ b/x11-apps/xinit/xinit-9999.ebuild @@ -49,6 +49,9 @@ src_install() { newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die newconfd "${FILESDIR}"/xdm.confd-2 xdm || die newpamd "${FILESDIR}"/xserver.pamd xserver + dodir /etc/X11/xinit/xinitrc.d + exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}/00-xhost" } pkg_postinst() { |