[patch] 3.7.1p2: slogin symlink fixes
Maciej W. Rozycki
macro at ds2.pg.gda.pl
Sun Nov 16 05:27:00 EST 2003
Hello,
There are three small problems with the "slogin" and "slogin.1" symlinks
created upon installation:
1. "./" is included in the target path unnecessarily.
2. Symlinks are assumed to be available, while only hardlinks could.
3. EXEEXT is not respected for slogin.
Here is a fix for both problems -- the "./" is simply removed, EXEEXT is
added, the availability of symlinks is tested and the installation command
is rewritten to work even with hardlinks. It works for me. Please apply.
Maciej
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro at ds2.pg.gda.pl, PGP key available +
openssh-3.6.1p2-symlink.patch
diff -up --recursive --new-file openssh-3.6.1p2.macro/Makefile.in openssh-3.6.1p2/Makefile.in
--- openssh-3.6.1p2.macro/Makefile.in 2003-04-29 09:12:08.000000000 +0000
+++ openssh-3.6.1p2/Makefile.in 2003-05-06 20:55:54.000000000 +0000
@@ -48,6 +48,7 @@ LIBWRAP=@LIBWRAP@
AR=@AR@
RANLIB=@RANLIB@
INSTALL=@INSTALL@
+LN_S=@LN_S@
PERL=@PERL@
SED=@SED@
ENT=@ENT@
@@ -263,9 +264,9 @@ install-files: scard-install
$(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
$(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
-rm -f $(DESTDIR)$(bindir)/slogin
- ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
+ cd $(DESTDIR)$(bindir) && $(LN_S) ssh$(EXEEXT) slogin$(EXEEXT)
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
+ cd $(DESTDIR)$(mandir)/$(mansubdir)1 && $(LN_S) ssh.1 slogin.1
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
fi
diff -up --recursive --new-file openssh-3.6.1p2.macro/configure.ac openssh-3.6.1p2/configure.ac
--- openssh-3.6.1p2.macro/configure.ac 2003-04-29 09:12:08.000000000 +0000
+++ openssh-3.6.1p2/configure.ac 2003-05-06 20:53:51.000000000 +0000
@@ -12,6 +12,7 @@ AC_C_BIGENDIAN
AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_INSTALL
+AC_PROG_LN_S
AC_PATH_PROG(AR, ar)
AC_PATH_PROGS(PERL, perl5 perl)
AC_PATH_PROG(SED, sed)
More information about the openssh-unix-dev
mailing list