summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Rousse <guillomovitch@mandriva.org>2007-12-12 21:26:11 +0000
committerGuillaume Rousse <guillomovitch@mandriva.org>2007-12-12 21:26:11 +0000
commit6846fa47b435e3cde05024e5d621b308baf71841 (patch)
treecbd39b203169de8e394f4ee93e6be99c686a7763
parent443e6d1e48118067fa6ae535272839ef183863a0 (diff)
downloadsetup-6846fa47b435e3cde05024e5d621b308baf71841.tar
setup-6846fa47b435e3cde05024e5d621b308baf71841.tar.gz
setup-6846fa47b435e3cde05024e5d621b308baf71841.tar.bz2
setup-6846fa47b435e3cde05024e5d621b308baf71841.tar.xz
setup-6846fa47b435e3cde05024e5d621b308baf71841.zip
drop xhost profile scriptlets, they belong to xhost2.7.10
-rw-r--r--Makefile4
-rw-r--r--NEWS4
-rwxr-xr-xprofile.d/xhost.csh11
-rwxr-xr-xprofile.d/xhost.sh9
4 files changed, 6 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 4c10bd6..c32c0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
PACKAGE = setup
-VERSION = 2.7.9
+VERSION = 2.7.10
SVNPATH = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE)
LIST = csh.cshrc csh.login host.conf hosts.allow hosts.deny inputrc \
- motd printcap profile.d protocols securetty services shells profile \
+ motd printcap protocols securetty services shells profile \
filesystems fstab resolv.conf hosts
subdir = passgrp utils man
diff --git a/NEWS b/NEWS
index 924c32c..c23b9da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2007-12-12 Guillaume Rousse <guillomovitch@mandriva.org> 2.7.10
+
+ * drop xhost profile scriptlets, they belong to xhost
+
2007-08-11 Guillaume Rousse <guillomovitch@mandriva.org> 2.7.9
* add iprop service
diff --git a/profile.d/xhost.csh b/profile.d/xhost.csh
deleted file mode 100755
index 948e617..0000000
--- a/profile.d/xhost.csh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Export Xauthority for users not for root.
-
-if ($?DISPLAY) then
- if (! $?SSH_TTY) then
- if ( `id -u` >= 14 ) then
- if (! $?XAUTHORITY) then
- setenv XAUTHORITY $HOME/.Xauthority
- endif
- endif
- endif
-endif
diff --git a/profile.d/xhost.sh b/profile.d/xhost.sh
deleted file mode 100755
index 04bb7ee..0000000
--- a/profile.d/xhost.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Export Xauthority for users not for root.
-
-if [ ! -z "$DISPLAY" -a -z "$SSH_TTY" ];then
- if [ "`id -u`" -gt 14 ];then
- if [ -z $XAUTHORITY ];then
- export XAUTHORITY=$HOME/.Xauthority
- fi
- fi
-fi