summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in57
-rw-r--r--acconfig.h3
-rw-r--r--configure.in22
4 files changed, 57 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index d4f7f8e7a..9d3da982e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120000122 120000122
2 - Fix compilation of bsd-snprintf.c on Solaris, fix from Ben Taylor 2 - Fix compilation of bsd-snprintf.c on Solaris, fix from Ben Taylor
3 <bent@clark.net> 3 <bent@clark.net>
4 - Merge preformatted manpage patch from Andre Lucas
5 <andre.lucas@dial.pipex.com>
4 6
520000120 720000120
6 - Don't use getaddrinfo on AIX 8 - Don't use getaddrinfo on AIX
diff --git a/Makefile.in b/Makefile.in
index 020b63264..0c9ea0d44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ bindir=@bindir@
4sbindir=@sbindir@ 4sbindir=@sbindir@
5libexecdir=@libexecdir@ 5libexecdir=@libexecdir@
6mandir=@mandir@ 6mandir=@mandir@
7mansubdir=@mansubdir@
7sysconfdir=@sysconfdir@ 8sysconfdir=@sysconfdir@
8piddir=@piddir@ 9piddir=@piddir@
9srcdir=@srcdir@ 10srcdir=@srcdir@
@@ -37,7 +38,9 @@ SSHOBJS= ssh.o sshconnect.o log-client.o readconf.o clientloop.o
37 38
38SSHDOBJS= sshd.o auth-rhosts.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o md5crypt.o 39SSHDOBJS= sshd.o auth-rhosts.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o md5crypt.o
39 40
40MANPAGES = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8 41TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8
42CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh.0 sshd.0
43MANPAGES = @MANTYPE@
41 44
42CONFIGFILES=sshd_config ssh_config 45CONFIGFILES=sshd_config ssh_config
43 46
@@ -87,30 +90,37 @@ distclean: clean
87mrproper: distclean 90mrproper: distclean
88 91
89veryclean: distclean 92veryclean: distclean
90 rm -f configure config.h.in 93 rm -f configure config.h.in *.0
94
95catman-do:
96 @for f in $(TROFFMAN) ; do \
97 echo "$$f -> $${f%%.[18]}.0" ; \
98 nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
99 >$${f%%.[18]}.0 ; \
100 done
91 101
92install: $(TARGETS) 102install: $(TARGETS)
93 $(INSTALL) -d $(bindir) 103 $(INSTALL) -d $(bindir)
94 $(INSTALL) -d $(sbindir) 104 $(INSTALL) -d $(sbindir)
95 $(INSTALL) -d $(mandir) 105 $(INSTALL) -d $(mandir)
96 $(INSTALL) -d $(mandir)/man1 106 $(INSTALL) -d $(mandir)/$(mansubdir)1
97 $(INSTALL) -d $(mandir)/man8 107 $(INSTALL) -d $(mandir)/$(mansubdir)8
98 $(INSTALL) -s ssh $(bindir)/ssh 108 $(INSTALL) -s ssh $(bindir)/ssh
99 $(INSTALL) -s scp $(bindir)/scp 109 $(INSTALL) -s scp $(bindir)/scp
100 $(INSTALL) -s ssh-add $(bindir)/ssh-add 110 $(INSTALL) -s ssh-add $(bindir)/ssh-add
101 $(INSTALL) -s ssh-agent $(bindir)/ssh-agent 111 $(INSTALL) -s ssh-agent $(bindir)/ssh-agent
102 $(INSTALL) -s ssh-keygen $(bindir)/ssh-keygen 112 $(INSTALL) -s ssh-keygen $(bindir)/ssh-keygen
103 $(INSTALL) -s sshd $(sbindir)/sshd 113 $(INSTALL) -s sshd $(sbindir)/sshd
104 $(INSTALL) -m 644 ssh.1.out $(mandir)/man1/ssh.1 114 $(INSTALL) -m 644 ssh.[01].out $(mandir)/$(mansubdir)1/ssh.1
105 $(INSTALL) -m 644 scp.1.out $(mandir)/man1/scp.1 115 $(INSTALL) -m 644 scp.[01].out $(mandir)/$(mansubdir)1/scp.1
106 $(INSTALL) -m 644 ssh-add.1.out $(mandir)/man1/ssh-add.1 116 $(INSTALL) -m 644 ssh-add.[01].out $(mandir)/$(mansubdir)1/ssh-add.1
107 $(INSTALL) -m 644 ssh-agent.1.out $(mandir)/man1/ssh-agent.1 117 $(INSTALL) -m 644 ssh-agent.[01].out $(mandir)/$(mansubdir)1/ssh-agent.1
108 $(INSTALL) -m 644 ssh-keygen.1.out $(mandir)/man1/ssh-keygen.1 118 $(INSTALL) -m 644 ssh-keygen.[01].out $(mandir)/$(mansubdir)1/ssh-keygen.1
109 $(INSTALL) -m 644 sshd.8.out $(mandir)/man8/sshd.8 119 $(INSTALL) -m 644 sshd.[08].out $(mandir)/$(mansubdir)8/sshd.8
110 -rm -f $(bindir)/slogin 120 -rm -f $(bindir)/slogin
111 ln -s ssh $(bindir)/slogin 121 ln -s ssh $(bindir)/slogin
112 -rm -f $(mandir)/man1/slogin.1 122 -rm -f $(mandir)/$(mansubdir)1/slogin.1
113 ln -s ssh.1 $(mandir)/man1/slogin.1 123 ln -s ssh.1 $(mandir)/$(mansubdir)1/slogin.1
114 124
115 if [ ! -z "@GNOME_ASKPASS@" ] ; then \ 125 if [ ! -z "@GNOME_ASKPASS@" ] ; then \
116 $(INSTALL) -d $(libexecdir) ; \ 126 $(INSTALL) -d $(libexecdir) ; \
@@ -130,8 +140,8 @@ uninstallall: uninstall
130 -rmdir $(sysconfdir) 140 -rmdir $(sysconfdir)
131 -rmdir $(bindir) 141 -rmdir $(bindir)
132 -rmdir $(sbindir) 142 -rmdir $(sbindir)
133 -rmdir $(mandir)/man1 143 -rmdir $(mandir)/$(mansubdir)1
134 -rmdir $(mandir)/man8 144 -rmdir $(mandir)/$(mansubdir)8
135 -rmdir $(mandir) 145 -rmdir $(mandir)
136 -rmdir $(libexecdir) 146 -rmdir $(libexecdir)
137 147
@@ -142,18 +152,13 @@ uninstall:
142 -rm -f $(bindir)/ssh-agent 152 -rm -f $(bindir)/ssh-agent
143 -rm -f $(bindir)/ssh-keygen 153 -rm -f $(bindir)/ssh-keygen
144 -rm -f $(sbindir)/sshd 154 -rm -f $(sbindir)/sshd
145 -rm -f $(mandir)/man1/ssh.1 155 -rm -f $(mandir)/$(mansubdir)1/ssh.1
146 -rm -f $(mandir)/man1/scp.1 156 -rm -f $(mandir)/$(mansubdir)1/scp.1
147 -rm -f $(mandir)/man1/ssh-add.1 157 -rm -f $(mandir)/$(mansubdir)1/ssh-add.1
148 -rm -f $(mandir)/man1/ssh-agent.1 158 -rm -f $(mandir)/$(mansubdir)1/ssh-agent.1
149 -rm -f $(mandir)/man1/ssh-keygen.1 159 -rm -f $(mandir)/$(mansubdir)1/ssh-keygen.1
150 -rm -f $(mandir)/man8/sshd.8 160 -rm -f $(mandir)/$(mansubdir)8/sshd.8
151 -rm -f $(bindir)/slogin 161 -rm -f $(bindir)/slogin
152 -rm -f $(mandir)/man1/slogin.1 162 -rm -f $(mandir)/$(mansubdir)1/slogin.1
153 -rm -f ${ASKPASS_PROGRAM} 163 -rm -f ${ASKPASS_PROGRAM}
154 -rmdir $(libexecdir)/ssh ; 164 -rmdir $(libexecdir)/ssh ;
155
156preformat:
157 -rm -f catman
158 -mkdir catman
159 for x in $(MANPAGES) ; do man ./$${x}.in > catman/$${x}.in ; done
diff --git a/acconfig.h b/acconfig.h
index 0854cbc5c..c5e6d3ee7 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,6 +30,9 @@
30/* Define if using the Dante SOCKS library. */ 30/* Define if using the Dante SOCKS library. */
31#undef HAVE_DANTE 31#undef HAVE_DANTE
32 32
33/* Define if you want to install preformatted manpages.*/
34#undef MANTYPE
35
33/* Define if your ssl headers are included with #include <ssl/header.h> */ 36/* Define if your ssl headers are included with #include <ssl/header.h> */
34#undef HAVE_SSL 37#undef HAVE_SSL
35 38
diff --git a/configure.in b/configure.in
index 4158b99b2..577332500 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,8 @@ case "$host" in
99 AC_MSG_RESULT(no) 99 AC_MSG_RESULT(no)
100 AC_DEFINE(DISABLE_SHADOW) 100 AC_DEFINE(DISABLE_SHADOW)
101 fi 101 fi
102 MANTYPE='$(CATMAN)'
103 mansubdir=cat
102 ;; 104 ;;
103*-*-irix5*) 105*-*-irix5*)
104 no_libsocket=1 106 no_libsocket=1
@@ -147,7 +149,7 @@ if test -z "$no_libnsl" ; then
147fi 149fi
148 150
149dnl Checks for header files. 151dnl Checks for header files.
150AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) 152AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
151 153
152dnl Checks for library functions. 154dnl Checks for library functions.
153AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty) 155AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty)
@@ -523,6 +525,24 @@ AC_ARG_WITH(dante,
523 fi 525 fi
524 ] 526 ]
525) 527)
528AC_ARG_WITH(catman,
529 [ --with-catman=man|cat Install preformatted manpages[no]],
530 [
531 MANTYPE='$(CATMAN)'
532 if test x"$withval" != x"yes" ; then
533 mansubdir=$withval
534 else
535 mansubdir=cat
536 fi
537 ], [
538 if test -z "$MANTYPE" ; then
539 MANTYPE='$(TROFFMAN)'
540 mansubdir=man
541 fi
542 ]
543)
544AC_SUBST(MANTYPE)
545AC_SUBST(mansubdir)
526 546
527if test -z "$no_dev_ptmx" ; then 547if test -z "$no_dev_ptmx" ; then
528 AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)) 548 AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX))