3 files changed, 52 insertions, 58 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 83becc403dee..d2009a992fc1 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -9,7 +9,7 @@
 #
 
 PORTNAME=	ssh
-PORTVERSION=	1.2.29 # Note, 1.2.30 is under a more restrictive license
+PORTVERSION=	1.2.30
 PORTREVISION=	0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.tokyonet.ad.jp/pub/security/ssh/old/ \
diff --git a/security/ssh/distinfo b/security/ssh/distinfo
index 4b406864f3b6..e7c0ed6c2442 100644
--- a/security/ssh/distinfo
+++ b/security/ssh/distinfo
@@ -1 +1 @@
-MD5 (ssh-1.2.29.tar.gz) = b2a1281696dccbdc4246f3cc00ab7821
+MD5 (ssh-1.2.30.tar.gz) = 328475a59043770f95bdc691f3604da9
diff --git a/security/ssh/files/patch-bi b/security/ssh/files/patch-bi
index 77ff392db911..158c7583691b 100644
--- a/security/ssh/files/patch-bi
+++ b/security/ssh/files/patch-bi
@@ -1,56 +1,50 @@
-*** log-server.c.orig	Wed May 12 13:19:26 1999
---- log-server.c	Mon Jan 10 22:56:13 2000
-***************
-*** 146,151 ****
---- 146,170 ----
-    syslog(LOG_INFO, "log: %.500s", buf);
-  }
-  
-+ #ifdef ENABLE_LOG_AUTH
-+ void log_auth(const char *fmt, ...)
-+ {
-+   char buf[1024];
-+   va_list args;
-+   extern int log_auth_flag;
-+   if (!log_auth_flag)
-+     return;
-+   if (log_quiet)
-+     return;
-+   va_start(args, fmt);
-+   vsprintf(buf, fmt, args);
-+   va_end(args);
-+   if (log_on_stderr)
-+     fprintf(stderr, "log: %s\n", buf);
-+   syslog(LOG_INFO|LOG_AUTH, "%.500s", buf);
-+ }
-+ #endif /* ENABLE_LOG_AUTH */
-+ 
-  /* Converts portable syslog severity to machine-specific syslog severity. */
-  
-  static int syslog_severity(int severity)
-***************
-*** 322,327 ****
---- 341,349 ----
-  {
-    char buf[1024];
-    va_list args;
-+ #ifdef ENABLE_LOG_AUTH
-+   extern char *unauthenticated_user;
-+ #endif /* ENABLE_LOG_AUTH */
-  
-    if (log_quiet)
-      exit(1);
-***************
-*** 331,336 ****
---- 353,363 ----
-    if (log_on_stderr)
-      fprintf(stderr, "fatal: %s\n", buf);
-    syslog(syslog_severity(severity), "fatal: %.500s", buf);
-+ #ifdef ENABLE_LOG_AUTH
-+   if (unauthenticated_user)
-+     log_auth("LOGIN FAILED %.100s from %.200s",
-+ 	     unauthenticated_user, get_canonical_hostname());
-+ #endif /* ENABLE_LOG_AUTH */
-  
-    do_fatal_cleanups();
-  
+--- 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 @@
+   closelog();
+ }
+ 
++#ifdef ENABLE_LOG_AUTH
++void log_auth(const char *fmt, ...)
++{
++  char buf[1024];
++  va_list args;
++  extern int log_auth_flag;
++  if (!log_auth_flag)
++    return;
++  if (log_quiet)
++    return;
++  va_start(args, fmt);
++  vsprintf(buf, fmt, args);
++  va_end(args);
++  if (log_on_stderr)
++    fprintf(stderr, "log: %s\n", buf);
++  syslog(LOG_INFO|LOG_AUTH, "%.500s", buf);
++}
++#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;
++#ifdef ENABLE_LOG_AUTH
++  extern char *unauthenticated_user;
++#endif /* ENABLE_LOG_AUTH */
+ 
+   if (log_quiet)
+     exit(1);
+@@ -354,6 +376,11 @@
+     fprintf(stderr, "fatal: %s\n", buf);
+   openlog(prg_name, LOG_PID, log_facility);
+   syslog(syslog_severity(severity), "fatal: %.500s", buf);
++#ifdef ENABLE_LOG_AUTH
++  if (unauthenticated_user)
++    log_auth("LOGIN FAILED %.100s from %.200s",
++	     unauthenticated_user, get_canonical_hostname());
++#endif /* ENABLE_LOG_AUTH */
+   closelog();
+ 
+   do_fatal_cleanups();