mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-05 11:35:01 +00:00
- Correctly order KERBEROS_LIBS so that the build doesn't try to
link against system krb5 libs. - Specify a runtime linker path option.
This commit is contained in:
Matthew N. Dodd
parent
44a4fb9b15
commit
4f0cbbf600
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=72777
@ -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:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- configure.in.orig Wed May 12 04:20:02 1999
|
||||
+++ configure.in Wed Apr 19 01:02:34 2000
|
||||
--- configure.in.orig Thu Jan 17 08:36:05 2002
|
||||
+++ configure.in Wed Jan 8 18:24:51 2003
|
||||
@@ -30,8 +30,140 @@
|
||||
fi
|
||||
|
||||
@ -176,7 +176,7 @@
|
||||
AC_CHECK_LIB(c, crypt, [true], AC_CHECK_LIB(crypt, crypt))
|
||||
AC_CHECK_LIB(sec, getspnam)
|
||||
AC_CHECK_LIB(seq, get_process_stats)
|
||||
@@ -436,6 +578,107 @@
|
||||
@@ -438,6 +580,107 @@
|
||||
|
||||
AC_REPLACE_FUNCS(strerror memmove remove random putenv crypt socketpair snprintf)
|
||||
|
||||
@ -284,20 +284,20 @@
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_INSTALL
|
||||
AC_CHECK_PROG(AR, ar, ar, echo)
|
||||
@@ -932,7 +1175,11 @@
|
||||
@@ -934,7 +1177,11 @@
|
||||
AC_DEFINE(KRB5)
|
||||
KERBEROS_ROOT="$with_kerberos5"
|
||||
KERBEROS_INCS="-I${KERBEROS_ROOT}/include"
|
||||
- KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
|
||||
+ if test -f ${KERBEROS_ROOT}/lib/libk5crypto.a ; then
|
||||
+ KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
|
||||
+ KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -R${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
|
||||
+ else
|
||||
+ KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
|
||||
+ KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -R${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
|
||||
+ fi
|
||||
AC_CHECK_LIB(ndbm, dbm_open, KERBEROS_LIBS="$KERBEROS_LIBS -lndbm")
|
||||
KERBEROS_OBJS="auth-kerberos.o"
|
||||
;;
|
||||
@@ -1123,6 +1370,7 @@
|
||||
@@ -1125,6 +1372,7 @@
|
||||
AC_DEFINE(Rdup2,SOCKSdup2)
|
||||
AC_DEFINE(Rfclose,SOCKSfclose)
|
||||
AC_DEFINE(Rgethostbyname,SOCKSgethostbyname)
|
||||
@ -305,7 +305,7 @@
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(whether to use rsaref)
|
||||
@@ -1252,6 +1500,38 @@
|
||||
@@ -1254,6 +1502,38 @@
|
||||
AC_DEFINE(ENABLE_TCP_NODELAY)
|
||||
)
|
||||
|
||||
@ -344,7 +344,7 @@
|
||||
AC_MSG_CHECKING(whether to enable SO_LINGER)
|
||||
AC_ARG_ENABLE(so-linger,
|
||||
[ --enable-so-linger Enable setting SO_LINGER socket option],
|
||||
@@ -1311,6 +1591,8 @@
|
||||
@@ -1313,6 +1593,8 @@
|
||||
AC_DEFINE(SCP_ALL_STATISTICS_ENABLED)
|
||||
)
|
||||
|
||||
@ -353,7 +353,7 @@
|
||||
# We include this here only to make it visible in --help; this is only used
|
||||
# in the gmp subdirectory.
|
||||
AC_ARG_ENABLE(asm,
|
||||
@@ -1324,7 +1606,7 @@
|
||||
@@ -1326,7 +1608,7 @@
|
||||
fi
|
||||
AC_MSG_RESULT($PIDDIR)
|
||||
|
||||
@ -362,7 +362,7 @@
|
||||
|
||||
AC_ARG_PROGRAM
|
||||
|
||||
@@ -1336,4 +1618,4 @@
|
||||
@@ -1357,4 +1639,4 @@
|
||||
AC_SUBST(SSHDCONFOBJS)
|
||||
AC_SUBST(SSHINSTALLMODE)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user