Hello community,
here is the log from the commit of package xlogin
checked in at Tue Aug 22 00:39:32 CEST 2006.
--------
--- xlogin/xlogin.changes 2006-08-06 15:23:29.000000000 +0200
+++ xlogin/xlogin.changes 2006-08-21 19:43:15.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 21 19:42:51 CEST 2006 - werner@suse.de
+
+- Make it work with X.org 7.1
+
+-------------------------------------------------------------------
Old:
----
xlogin-0.1.dif
xlogin-0.1.tar.gz
New:
----
xlogin-0.2.dif
xlogin-0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xlogin.spec ++++++
--- /var/tmp/diff_new_pack.fQ7Rg6/_old 2006-08-22 00:39:18.000000000 +0200
+++ /var/tmp/diff_new_pack.fQ7Rg6/_new 2006-08-22 00:39:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xlogin (Version 0.1)
+# spec file for package xlogin (Version 0.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,11 +16,11 @@
Group: Productivity/Networking/Other
Requires: textutils
Autoreqprov: on
-Version: 0.1
-Release: 1029
+Version: 0.2
+Release: 1
Summary: xlogin, xtelnet
-Source: xlogin-0.1.tar.gz
-Patch: xlogin-0.1.dif
+Source: xlogin-0.2.tar.gz
+Patch: xlogin-0.2.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -61,6 +61,8 @@
%{_bindir}/*
%changelog -n xlogin
+* Mon Aug 21 2006 - werner@suse.de
+- Make it work with X.org 7.1
* Sun Aug 06 2006 - cthiel@suse.de
- fix build with X.org 7.1
* Wed Jan 25 2006 - mls@suse.de
++++++ xlogin-0.1.dif -> xlogin-0.2.dif ++++++
--- xlogin/xlogin-0.1.dif 2001-09-12 14:31:57.000000000 +0200
+++ xlogin/xlogin-0.2.dif 2006-08-21 19:41:07.000000000 +0200
@@ -1,5 +1,5 @@
--- Makefile.Linux
-+++ Makefile.Linux Wed Sep 12 13:56:53 2001
++++ Makefile.Linux 2006-08-21 19:30:02.000000000 +0200
@@ -0,0 +1,20 @@
+#
+#
@@ -21,68 +21,3 @@
+ make install.man
+
+
---- xlogin.script
-+++ xlogin.script Wed Sep 12 14:10:00 2001
-@@ -1,6 +1,6 @@
- #!/bin/bash
- #
--# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany.
-+# Copyright (c) 1997-2000 SuSE GmbH Nuernberg, Germany.
- #
- # Author: Werner Fink,
- #
-@@ -11,9 +11,14 @@
- term="/usr/bin/X11/xterm -ls"
- xauth="/usr/bin/X11/xauth"
- md5="/usr/bin/md5sum"
-- rsh="rsh"
-- [ -n "$XLOGINRSH" ] && rsh="$XLOGINRSH"
-+ opt=""
-+case "$XLOGINRSH" in
-+ "") rsh="rsh"; opt="-n" ;;
-+ ssh*) rsh="$XLOGINRSH"; opt="-x" ;;
-+ *) rsh="$XLOGINRSH"; opt="" ;;
-+esac
- redi="< /dev/null > /dev/null"
-+
- #
- # Usage
- #
-@@ -27,12 +32,13 @@
- #
- while [ -n "$1" ] ; do
- case $1 in
-- -i|-iconic) iconic="-iconic" ; shift ;;
-- -s|-secure) rsh="ssh" ; shift ;;
-+ -i|-iconic) iconic="-iconic" ; shift ;;
-+ -s|-secure) rsh="ssh"; opt="-x"; shift ;;
- -*) usage ;;
-- *) hosts="$hosts $1" ; shift ;;
-+ *) hosts="$hosts $1" ; shift ;;
- esac
- done
-+
- #
- # Hey ... without local DISPLAY we will not start
- #
-@@ -87,7 +93,7 @@
- for h in $hosts; do
- rchksum="no remote check"
- xterm="${term} -T ${h} -n ${h} ${iconic} ${redi}"
-- [ -x $md5 ] && rchksum=`${rsh} -n ${h} "$rmd5"`
-+ [ -x $md5 ] && rchksum=`${rsh} ${opt} ${h} "$rmd5"`
- if [ "$chksum" != "$rchksum" ]; then
- #
- # different local and remote ~/.Xauthority
-@@ -98,7 +104,10 @@
- #
- # Start the remote xterm
- #
-- ${rsh} -n ${h} "${xterm}" &
-+ case "$rsh" in
-+ ssh*) ${rsh} ${opt} -f ${h} "${xterm}" ;;
-+ *) ${rsh} ${opt} ${h} "${xterm}" & ;;
-+ esac
- done
-
- exit 0
++++++ xlogin-0.1.tar.gz -> xlogin-0.2.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xlogin-0.1/xlogin.script new/xlogin-0.2/xlogin.script
--- old/xlogin-0.1/xlogin.script 1997-01-22 14:56:02.000000000 +0100
+++ new/xlogin-0.2/xlogin.script 2006-08-21 19:39:22.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany.
+# Copyright (c) 1997-2000 SuSE GmbH Nuernberg, Germany.
#
# Author: Werner Fink,
#
@@ -8,12 +8,20 @@
#
# Common programs and variables
#
- term="/usr/bin/X11/xterm -ls"
+if test -x /usr/bin/X11/xauth ; then
xauth="/usr/bin/X11/xauth"
+else
+ xauth="/usr/bin/xauth"
+fi
md5="/usr/bin/md5sum"
- rsh="rsh"
- [ -n "$XLOGINRSH" ] && rsh="$XLOGINRSH"
+ opt=""
+case "$XLOGINRSH" in
+ "") rsh="rsh"; opt="-n" ;;
+ ssh*) rsh="$XLOGINRSH"; opt="-x" ;;
+ *) rsh="$XLOGINRSH"; opt="" ;;
+esac
redi="< /dev/null > /dev/null"
+
#
# Usage
#
@@ -25,18 +33,19 @@
#
# Parse options
#
-while [ -n "$1" ] ; do
+while test -n "$1" ; do
case $1 in
- -i|-iconic) iconic="-iconic" ; shift ;;
- -s|-secure) rsh="ssh" ; shift ;;
+ -i|-iconic) iconic="-iconic" ; shift ;;
+ -s|-secure) rsh="ssh"; opt="-x"; shift ;;
-*) usage ;;
- *) hosts="$hosts $1" ; shift ;;
+ *) hosts="$hosts $1" ; shift ;;
esac
done
+
#
# Hey ... without local DISPLAY we will not start
#
-if [ -z "${DISPLAY}" ]; then
+if test -z "${DISPLAY}" ; then
echo "No DISPLAY variable" 1>2&
exit 1
else
@@ -45,60 +54,82 @@
#
DISPLAY=${DISPLAY##*/unix}
fi
+
#
# Where we come from: the local system
#
-if [ -z "${HOSTNAME}" ]; then
- HOSTNAME=`hostname -f`
+if test -z "${HOSTNAME}" ; then
+ HOSTNAME=$(hostname -f)
fi
+
#
# Set an unique DISPLAY
#
case ${DISPLAY} in
:*) DISPLAY=${HOSTNAME}${DISPLAY}
esac
+
#
# We need ~/.Xauthority
#
-if [ -z "${XAUTHORITY}" ]; then
+if test -z "${XAUTHORITY}" ; then
XAUTHORITY="${HOME}/.Xauthority"
- [ -e ${XAUTHORITY} ] || touch ${XAUTHORITY}
+ test -e ${XAUTHORITY} || touch ${XAUTHORITY}
fi
#
# Do some checks on ~/.Xauthority
#
chksum="no local check"
-if [ -x $md5 ]; then
- chksum=`$md5 < ${XAUTHORITY}`
+if test -x $md5 ; then
+ chksum=$($md5 < ${XAUTHORITY})
rmd5="test -x $md5 -a -r ${XAUTHORITY} && \
$md5 < ${XAUTHORITY} || echo 'no remote check'"
fi
#
# Programs and variables
#
-remote_xauth="exec ${xauth} -i merge -"
- local_xauth="${xauth} -i -f ${XAUTHORITY} extract - ${DISPLAY}"
- term="exec ${term} -display ${DISPLAY}"
+local_xauth="${xauth} -i -f ${XAUTHORITY} extract - ${DISPLAY}"
+
+#
+# Test on remote system
+#
+checkpath ()
+{
+ echo "$(${rsh} ${opt} ${1+"$@"} "test -d /usr/bin/X11/ && echo /usr/bin/X11 || echo /usr/bin")"
+}
+
#
# First check if local and remote ~/.Xauthority are identical
# ... if not we should export our magic cookie.
# And start the xterm
#
for h in $hosts; do
+
+ rpath=$(checkpath $h)
+ remote_xauth="exec $rpath/xauth -i merge -"
+ term="exec $rpath/xterm -ls -display ${DISPLAY}"
+
rchksum="no remote check"
- xterm="${term} -T ${h} -n ${h} ${iconic} ${redi}"
- [ -x $md5 ] && rchksum=`${rsh} -n ${h} "$rmd5"`
- if [ "$chksum" != "$rchksum" ]; then
+ test -x $md5 && rchksum=$(${rsh} ${opt} ${h} "$rmd5")
+ if test "$chksum" != "$rchksum" ; then
#
# different local and remote ~/.Xauthority
# ... export our magic cookie
#
${local_xauth} | ${rsh} ${h} "${remote_xauth}"
+ else
+ case "$rsh" in
+ ssh*) opt="-q"
+ esac
fi
+ xterm="${term} -T ${h} -n ${h} ${iconic} ${redi}"
#
# Start the remote xterm
#
- ${rsh} -n ${h} "${xterm}" &
+ case "$rsh" in
+ ssh*) ${rsh} ${opt} -f ${h} "${xterm}" &> /dev/null ;;
+ *) ${rsh} ${opt} ${h} "${xterm}" & ;;
+ esac
done
exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xlogin-0.1/xtelnet.man new/xlogin-0.2/xtelnet.man
--- old/xlogin-0.1/xtelnet.man 1997-01-22 20:08:28.000000000 +0100
+++ new/xlogin-0.2/xtelnet.man 2006-08-21 19:36:29.000000000 +0200
@@ -7,7 +7,7 @@
Xtelnet
.SH SYNOPSIS
.B xtelnet
-.RB [\| -iconic\| ][\| -a\| ][\| -q\| ]
+.RB [\| -iconic\| ][\| -a\| ][\| -q\| ][\| -s\| ]
.IR "host " [\| host\| " ...]"
.SH DESCRIPTION
The script
@@ -44,6 +44,13 @@
This option causes
.I xtelnet
to skip the warn message about the backspace key.
+.TP
+.IR \-s
+This option causes
+.I xtelnet
+to use
+.BR slogin (8)
+instead of telnet.
.IP
.SH EXAMPLE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xlogin-0.1/xtelnet.script new/xlogin-0.2/xtelnet.script
--- old/xlogin-0.1/xtelnet.script 1997-01-22 20:21:34.000000000 +0100
+++ new/xlogin-0.2/xtelnet.script 2006-08-21 19:33:49.000000000 +0200
@@ -2,13 +2,17 @@
#
# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany.
#
-# Author: Werner Fink,
+# Author: Werner Fink
#
#
# Common programs and variables
#
+if test -x /usr/bin/X11/xterm ; then
term="/usr/bin/X11/xterm -ls"
+else
+ term="/usr/bin/xterm -ls"
+fi
telnet="telnet"
# local xterm kbs
kbs="`tput -Txterm kbs|sed -e 's@@^?@;s@@^H@'`"
@@ -26,10 +30,11 @@
#
# Parse options
#
-while [ -n "$1" ] ; do
+while test -n "$1" ; do
case $1 in
-i|-iconic) iconic="-iconic" ; shift ;;
-a) telnet="telnet -a" ; shift ;;
+ -s) telnet="slogin" ; shift ;;
-q) quiet=true ; shift ;;
-*) usage ;;
*) hosts="$hosts $1" ; shift ;;
@@ -38,7 +43,7 @@
#
# And start the xterm
#
-[ -z "$quiet" ] && echo -e "$0:
+test -z "$quiet" && echo -e "$0:
If you have problems with the backspace key you should execute
the command line:
\tstty erase '$kbs'
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org