diff options
| author | rodent <rodent@pkgsrc.org> | 2015-03-20 22:41:19 +0000 |
|---|---|---|
| committer | rodent <rodent@pkgsrc.org> | 2015-03-20 22:41:19 +0000 |
| commit | 0dc26f5ed83c5caea4d647a406ebb022c7734fb7 (patch) | |
| tree | c99cc37e8fdb54a339b996995b5c02b56d7144e1 /security | |
| parent | f19d8fbba96f6e4b7ebb040d0e4450ab1976d09b (diff) | |
| download | pkgsrc-0dc26f5ed83c5caea4d647a406ebb022c7734fb7.tar.gz | |
Fix build on FreeBSD. Approved by gdt@.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/distinfo | 4 | ||||
| -rw-r--r-- | security/openssh/patches/patch-loginrec.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 63be57ab116..b68f51fcee6 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.89 2015/03/20 02:34:32 taca Exp $ +$NetBSD: distinfo,v 1.90 2015/03/20 22:41:19 rodent Exp $ SHA1 (openssh-6.6p1-hpnssh14v4.diff.gz) = 1cb86c7151ea4c805cfb1197eac13844cd8f2f2c RMD160 (openssh-6.6p1-hpnssh14v4.diff.gz) = 292cea7880ff66040d915f2d5957dd27d0835984 @@ -19,7 +19,7 @@ SHA1 (patch-configure) = 3015dda57a5626667cf5c15c7c7be25f8844cfc6 SHA1 (patch-configure.ac) = 996a3bcf133a0832b9d7fa35cc0983562d9fa60a SHA1 (patch-defines.h) = 4f4f4c8dc54aa86275192edf230b36737b1c0cf6 SHA1 (patch-includes.h) = 0a899d3b38ef3de7f5b08fec022696b4e998b54e -SHA1 (patch-loginrec.c) = 3b42ea96935a69316233eb2c65d810e46a3e5d76 +SHA1 (patch-loginrec.c) = 111530a4895c8f88c464c7495cee0dba1952d9ce SHA1 (patch-openbsd-compat_bsd-openpty.c) = a1318cf691f0ad844a8761a77e3bb32a9e20c695 SHA1 (patch-openbsd-compat_openbsd-compat.h) = 1cafbe8f226c16443d2cfd003166923f33352eb0 SHA1 (patch-openbsd-compat_port-tun.c) = 8288e2b9336ea1fcc1129d8a2ab5e55816b2ccbf diff --git a/security/openssh/patches/patch-loginrec.c b/security/openssh/patches/patch-loginrec.c index 503e4e85bd4..11bf035bd68 100644 --- a/security/openssh/patches/patch-loginrec.c +++ b/security/openssh/patches/patch-loginrec.c @@ -1,6 +1,6 @@ -$NetBSD: patch-loginrec.c,v 1.2 2014/03/29 09:38:11 taca Exp $ +$NetBSD: patch-loginrec.c,v 1.3 2015/03/20 22:41:19 rodent Exp $ -Interix support and related fixes +Interix support and related fixes. Fix build on FreeBSD. --- loginrec.c.orig 2014-01-17 01:23:24.000000000 +0000 +++ loginrec.c @@ -44,16 +44,20 @@ Interix support and related fixes if (li->type == LTYPE_LOGOUT) return; -@@ -774,6 +770,8 @@ construct_utmpx(struct logininfo *li, st +@@ -774,6 +770,12 @@ construct_utmpx(struct logininfo *li, st * for logouts. */ + /* strncpy(): Don't necessarily want null termination */ ++#if defined(__FreeBSD__) ++ strncpy(utx->ut_user, li->username, MIN_SIZEOF(utx->ut_user, li->username)); ++#else + strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username)); ++#endif # ifdef HAVE_HOST_IN_UTMPX strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname)); -@@ -1409,7 +1407,7 @@ wtmpx_get_entry(struct logininfo *li) +@@ -1409,7 +1411,7 @@ wtmpx_get_entry(struct logininfo *li) ** Low-level libutil login() functions **/ |