From d22f9c0925ec816f131349a9b2fa3999ad14108c Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sun, 30 Jun 2002 03:57:57 +0000 Subject: Update to version 1.2.33. --- security/ssh/Makefile | 11 ++++++++--- security/ssh/distinfo | 2 +- security/ssh/files/patch-ac | 39 +++++++++++++-------------------------- security/ssh/files/patch-be | 2 +- security/ssh/files/patch-bi | 26 +++++++++++++++----------- 5 files changed, 38 insertions(+), 42 deletions(-) (limited to 'security') diff --git a/security/ssh/Makefile b/security/ssh/Makefile index d15ab006d30a..a29b7722c60a 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,3 +1,4 @@ +REALLY_WANT_SSH=1 # New ports collection makefile for: ssh # Date created: 30 Jul 1995 # Whom: torstenb@FreeBSD.org @@ -9,13 +10,16 @@ # PORTNAME= ssh -PORTVERSION= 1.2.32 +PORTVERSION= 1.2.33 PORTREVISION= 0 CATEGORIES= security ipv6 -MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/security/ssh/old/ \ +MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/security/ssh/ \ + ftp://ftp.tokyonet.ad.jp/pub/security/ssh/old/ \ + ftp://ftp.dei.uc.pt/pub/ssh/ \ + ftp://ftp.ssh.com/ \ ftp://ftp.nsysu.edu.tw/Unix/Security/ssh/old/ \ ftp://ftp.cronyx.ru/mirror/ssh/old/ - + MAINTAINER= ports@FreeBSD.org USE_AUTOCONF= YES @@ -63,6 +67,7 @@ CONFIGURE_ARGS+= --without-idea .if ${OSVERSION} > 500023 LIB_DEPENDS+= gmp.3:${PORTSDIR}/math/libgmp-freebsd +#LIB_DEPENDS+= gmp.4:${PORTSDIR}/math/libgmp3 MAKE_ENV+= GMPINCDIR="${LOCALBASE}/include" \ GMPLIBDIR="${LOCALBASE}/lib" .endif diff --git a/security/ssh/distinfo b/security/ssh/distinfo index 37a4bc1ddb41..e719bc57dde7 100644 --- a/security/ssh/distinfo +++ b/security/ssh/distinfo @@ -1 +1 @@ -MD5 (ssh-1.2.32.tar.gz) = dad51d7af41259d85623bcf33fd02137 +MD5 (ssh-1.2.33.tar.gz) = 1a0ec35dfa1d8d9c0b650fa99ab21d56 diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac index 02fc5eae34fd..8926e9f150d9 100644 --- a/security/ssh/files/patch-ac +++ b/security/ssh/files/patch-ac @@ -1,27 +1,21 @@ ---- Makefile.in.orig Mon Jul 3 10:07:39 2000 -+++ Makefile.in Fri Jun 21 17:50:07 2002 -@@ -307,13 +307,15 @@ +--- Makefile.in.orig Thu Jan 17 05:35:34 2002 ++++ Makefile.in Sat Jun 29 20:37:40 2002 +@@ -307,11 +307,11 @@ SHELL = /bin/sh -GMPDIR = gmp-2.0.2-ssh-2 --GMPLIBS = @ssh_gmp_ldadd_options@ ++GMPDIR = $(PREFIX) + GMPLIBS = @ssh_gmp_ldadd_options@ -GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a -+# We have the same libgmp in the base system, so use it instead -+GMPINCDIR ?= /usr/include -+GMPLIBDIR ?= /usr/lib -+GMPLIBS = -L$(GMPLIBDIR) -lgmp -+GMPDEP = $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a ++GMPDEP = -ZLIBDIR = zlib-1.0.4 +ZLIBDIR = /usr/lib ZLIBDEP = $(ZLIBDIR)/libz.a --ZLIBLIBS = @ssh_zlib_ldadd_options@ -+ZLIBLIBS = -lz + ZLIBLIBS = @ssh_zlib_ldadd_options@ - RSAREFDIR = rsaref2 - RSAREFSRCDIR = $(RSAREFDIR)/source -@@ -418,7 +420,7 @@ +@@ -418,7 +418,7 @@ $(CC) -o rfc-pg rfc-pg.o .c.o: @@ -30,15 +24,8 @@ sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd -@@ -461,12 +463,12 @@ - sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts - chmod +x make-ssh-known-hosts - --GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \ -+XXX_DONT_GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \ - mpz_mul.c mpz_cmp.c mpz_sqrtrem.c --$(GMPDIR)/libgmp.a: -+XXX_DONT_$(GMPDIR)/libgmp.a: +@@ -466,7 +466,7 @@ + $(GMPDIR)/libgmp.a: cd $(GMPDIR); $(MAKE) -$(ZLIBDEP): @@ -46,7 +33,7 @@ -if test '!' -d $(ZLIBDIR); then \ mkdir $(ZLIBDIR); \ cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ -@@ -530,7 +532,7 @@ +@@ -530,7 +530,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. @@ -55,12 +42,12 @@ -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 +756,7 @@ (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null depend: - $(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS) -+ $(MAKEDEP) -I$(srcdir) -I. -I$(GMPINCDIR) $(DEFS) $(SRCS) ++ $(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS) tags: -rm -f TAGS diff --git a/security/ssh/files/patch-be b/security/ssh/files/patch-be index 4a13d5dccb48..875f6bcfbd25 100644 --- a/security/ssh/files/patch-be +++ b/security/ssh/files/patch-be @@ -358,7 +358,7 @@ AC_MSG_RESULT($PIDDIR) -AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2) -+#AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2) ++AC_CONFIG_SUBDIRS(gmp-2.0.2-ssh-2) AC_ARG_PROGRAM diff --git a/security/ssh/files/patch-bi b/security/ssh/files/patch-bi index 158c7583691b..b4108fd81d49 100644 --- a/security/ssh/files/patch-bi +++ b/security/ssh/files/patch-bi @@ -1,6 +1,6 @@ ---- log-server.c.orig Wed Jul 5 08:26:48 2000 -+++ log-server.c Sat Jun 29 14:25:37 2002 -@@ -160,6 +160,25 @@ +--- log-server.c.orig Thu Jan 17 05:35:33 2002 ++++ log-server.c Sat Jun 29 14:50:00 2002 +@@ -163,6 +163,27 @@ closelog(); } @@ -21,22 +21,26 @@ + fprintf(stderr, "log: %s\n", buf); + syslog(LOG_INFO|LOG_AUTH, "%.500s", buf); +} ++ ++extern char *unauthenticated_user; +#endif /* ENABLE_LOG_AUTH */ + /* Converts portable syslog severity to machine-specific syslog severity. */ static int syslog_severity(int severity) -@@ -344,6 +363,9 @@ - { - char buf[1024]; - va_list args; +@@ -336,6 +357,11 @@ + fprintf(stderr, "fatal: %s\n", buf); + openlog(prg_name, LOG_PID, log_facility); + syslog(LOG_ERR, "fatal: %.500s", buf); +#ifdef ENABLE_LOG_AUTH -+ extern char *unauthenticated_user; ++ if (unauthenticated_user) ++ log_auth("LOGIN FAILED %.100s from %.200s", ++ unauthenticated_user, get_canonical_hostname()); +#endif /* ENABLE_LOG_AUTH */ + closelog(); - if (log_quiet) - exit(1); -@@ -354,6 +376,11 @@ + do_fatal_cleanups(); +@@ -357,6 +383,11 @@ fprintf(stderr, "fatal: %s\n", buf); openlog(prg_name, LOG_PID, log_facility); syslog(syslog_severity(severity), "fatal: %.500s", buf); -- cgit v1.2.3