diff options
| author | Matthew N. Dodd <mdodd@FreeBSD.org> | 2003-01-08 23:34:34 +0000 |
|---|---|---|
| committer | Matthew N. Dodd <mdodd@FreeBSD.org> | 2003-01-08 23:34:34 +0000 |
| commit | 4f0cbbf60081e11925ac702f65c914a009103812 (patch) | |
| tree | 123403a9a9b91944f317f00a779d9159d77f9412 /security/ssh/files/patch-ac | |
| parent | Update to a recent snapshot. Quite a number of documentation enhancements (diff) | |
- Correctly order KERBEROS_LIBS so that the build doesn't try to
link against system krb5 libs.
- Specify a runtime linker path option.
Notes
Notes:
svn path=/head/; revision=72777
Diffstat (limited to 'security/ssh/files/patch-ac')
| -rw-r--r-- | security/ssh/files/patch-ac | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac index fc7e5359b572..2e1d77d2aefb 100644 --- a/security/ssh/files/patch-ac +++ b/security/ssh/files/patch-ac @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Jan 17 14:35:34 2002 -+++ Makefile.in Mon Oct 21 23:43:07 2002 +--- Makefile.in.orig Thu Jan 17 08:35:34 2002 ++++ Makefile.in Wed Jan 8 18:13:41 2003 @@ -307,11 +307,13 @@ SHELL = /bin/sh @@ -18,7 +18,7 @@ ZLIBDEP = $(ZLIBDIR)/libz.a ZLIBLIBS = @ssh_zlib_ldadd_options@ -@@ -418,7 +420,7 @@ +@@ -418,17 +420,19 @@ $(CC) -o rfc-pg rfc-pg.o .c.o: @@ -27,7 +27,32 @@ sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd -@@ -461,12 +463,12 @@ + $(CC) $(LDFLAGS) -o sshd $(SSHD_OBJS) \ +- $(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) $(KERBEROS_LIBS) ++ $(KERBEROS_LIBS) \ ++ $(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) + + ssh: $(SSH_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) + -rm -f ssh + $(CC) $(LDFLAGS) -o ssh $(SSH_OBJS) \ +- $(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) $(KERBEROS_LIBS) ++ $(KERBEROS_LIBS) \ ++ $(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) + + ssh-keygen: $(KEYGEN_OBJS) $(GMPDEP) $(RSAREFDEP) + -rm -f ssh-keygen +@@ -436,7 +440,9 @@ + + ssh-agent: $(AGENT_OBJS) $(GMPDEP) $(RSAREFDEP) + -rm -f ssh-agent +- $(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) $(GMPLIBS) $(LIBS) $(KERBEROS_LIBS) ++ $(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) \ ++ $(KERBEROS_LIBS) \ ++ $(GMPLIBS) $(LIBS) + + ssh-add: $(ADD_OBJS) $(GMPDEP) $(RSAREFDEP) + -rm -f ssh-add +@@ -461,12 +467,12 @@ sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts chmod +x make-ssh-known-hosts @@ -43,7 +68,7 @@ -if test '!' -d $(ZLIBDIR); then \ mkdir $(ZLIBDIR); \ cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ -@@ -530,7 +532,7 @@ +@@ -530,7 +536,7 @@ # (otherwise it can only log in as the user it runs as, and must be # bound to a non-privileged port). Also, password authentication may # not be available if non-root and using shadow passwords. @@ -52,7 +77,7 @@ -rm -f $(install_prefix)$(bindir)/ssh1.old -chmod 755 $(install_prefix)$(bindir)/ssh1 -chmod 755 $(install_prefix)$(bindir)/ssh -@@ -756,7 +758,7 @@ +@@ -756,7 +762,7 @@ (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null depend: |