summaryrefslogtreecommitdiff
path: root/security/ssh
diff options
context:
space:
mode:
authoragc <agc>2002-08-07 13:27:51 +0000
committeragc <agc>2002-08-07 13:27:51 +0000
commitbfc8606f4b7c7c7d4bb2657a6cf7882619c1c977 (patch)
treecc4ca0d39a065f639c608c027f3f8e2471f5b571 /security/ssh
parent569055abd793e4bf4e09e8a7c841760ce25b6173 (diff)
downloadpkgsrc-bfc8606f4b7c7c7d4bb2657a6cf7882619c1c977.tar.gz
Fix a problem shown up in the last bulk build
Diffstat (limited to 'security/ssh')
-rw-r--r--security/ssh/distinfo4
-rw-r--r--security/ssh/patches/patch-au19
2 files changed, 17 insertions, 6 deletions
diff --git a/security/ssh/distinfo b/security/ssh/distinfo
index b6b4a8294a0..66c3f5c0d14 100644
--- a/security/ssh/distinfo
+++ b/security/ssh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/24 17:18:20 abs Exp $
+$NetBSD: distinfo,v 1.5 2002/08/07 13:27:51 agc Exp $
SHA1 (ssh-1.2.27.tar.gz) = 0e7d59c6a62b094bd51818599ae24f7de3462d14
Size (ssh-1.2.27.tar.gz) = 1022546 bytes
@@ -21,7 +21,7 @@ SHA1 (patch-aq) = 2314c993e8a0edb0dc5ff7076744a222a03f6a34
SHA1 (patch-ar) = 3c72885039fd3763f8e577ad7d9dc2f3558a44ad
SHA1 (patch-as) = 724fad32e30fb896c016e7c5175ecbf277b2a8e6
SHA1 (patch-at) = b2c65fdf1be1f94f2a1bb94e18ae2a70770b343d
-SHA1 (patch-au) = 1306064cf5f686cdabf0d73f6ad45c1ddafbe826
+SHA1 (patch-au) = ebbb3e5fe2bd6dabe583b557a057d9f80b061484
SHA1 (patch-av) = 149c9f538c0de05995246188cc5098ee6ee1f6b0
SHA1 (patch-ax) = 64b8460f961f7c874b8959480591abbc3e1ff3d2
SHA1 (patch-ay) = 6d4a63c65773d505b1cf94260f723a1378e748a2
diff --git a/security/ssh/patches/patch-au b/security/ssh/patches/patch-au
index 6f89614aa65..4c883c22ce0 100644
--- a/security/ssh/patches/patch-au
+++ b/security/ssh/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.6 2002/06/24 17:18:20 abs Exp $
+$NetBSD: patch-au,v 1.7 2002/08/07 13:27:52 agc Exp $
--- login.c.orig Wed May 12 07:19:26 1999
+++ login.c Fri Dec 24 22:01:25 1999
@@ -10,7 +10,7 @@ $NetBSD: patch-au,v 1.6 2002/06/24 17:18:20 abs Exp $
#include "ssh.h"
/* Returns the time when the user last logged in. Returns 0 if the
-@@ -271,7 +271,22 @@
+@@ -271,7 +272,22 @@
struct utmp u, u2;
off_t offset;
const char *utmp, *wtmp;
@@ -33,7 +33,7 @@ $NetBSD: patch-au,v 1.6 2002/06/24 17:18:20 abs Exp $
/* Construct an utmp/wtmp entry. */
memset(&u, 0, sizeof(u));
#ifdef DEAD_PROCESS
-@@ -301,17 +316,21 @@
+@@ -301,17 +317,21 @@
strncpy(u.ut_user, user, sizeof(u.ut_user));
#endif /* HAVE_NAME_IN_UTMP */
#ifdef HAVE_HOST_IN_UTMP
@@ -60,7 +60,18 @@ $NetBSD: patch-au,v 1.6 2002/06/24 17:18:20 abs Exp $
memset(&u.ut_addr, 0, sizeof(u.ut_addr));
#endif
-@@ -490,7 +509,12 @@
+@@ -462,8 +482,10 @@
+ makeutx(&ux);
+ #else
+ pututxline(&ux);
++#ifdef WTMPX_FILE
+ updwtmpx(WTMPX_FILE, &ux);
+ #endif
++#endif
+ endutxent();
+ }
+ #endif /* HAVE_UTMPX_H */
+@@ -490,7 +512,12 @@
/* Update lastlog. */
ll.ll_time = time(NULL);
strncpy(ll.ll_line, ttyname + 5, sizeof(ll.ll_line));