Fri Mar 20 22:41:19 2015 UTC ()
Fix build on FreeBSD. Approved by gdt@.


(rodent)
diff -r1.89 -r1.90 pkgsrc/security/openssh/distinfo
diff -r1.2 -r1.3 pkgsrc/security/openssh/patches/patch-loginrec.c
cvs diff -r1.89 -r1.90 pkgsrc/security/openssh/distinfo (expand / switch to unified diff)

--- pkgsrc/security/openssh/distinfo 2015/03/20 02:34:32 1.89
+++ pkgsrc/security/openssh/distinfo 2015/03/20 22:41:19 1.90
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: distinfo,v 1.89 2015/03/20 02:34:32 taca Exp $ 1$NetBSD: distinfo,v 1.90 2015/03/20 22:41:19 rodent Exp $
2 2
3SHA1 (openssh-6.6p1-hpnssh14v4.diff.gz) = 1cb86c7151ea4c805cfb1197eac13844cd8f2f2c 3SHA1 (openssh-6.6p1-hpnssh14v4.diff.gz) = 1cb86c7151ea4c805cfb1197eac13844cd8f2f2c
4RMD160 (openssh-6.6p1-hpnssh14v4.diff.gz) = 292cea7880ff66040d915f2d5957dd27d0835984 4RMD160 (openssh-6.6p1-hpnssh14v4.diff.gz) = 292cea7880ff66040d915f2d5957dd27d0835984
5Size (openssh-6.6p1-hpnssh14v4.diff.gz) = 23417 bytes 5Size (openssh-6.6p1-hpnssh14v4.diff.gz) = 23417 bytes
6SHA1 (openssh-6.6p1.tar.gz) = b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e 6SHA1 (openssh-6.6p1.tar.gz) = b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e
7RMD160 (openssh-6.6p1.tar.gz) = e19ed34e240001898b6665bb4356b868bba5513d 7RMD160 (openssh-6.6p1.tar.gz) = e19ed34e240001898b6665bb4356b868bba5513d
8Size (openssh-6.6p1.tar.gz) = 1282502 bytes 8Size (openssh-6.6p1.tar.gz) = 1282502 bytes
9SHA1 (patch-Makefile.in) = 3b136be23e0dab21894dcc881746cf5a186ff572 9SHA1 (patch-Makefile.in) = 3b136be23e0dab21894dcc881746cf5a186ff572
10SHA1 (patch-auth-passwd.c) = de9f5487fe1f5848cc702e549bce949fd75d70cd 10SHA1 (patch-auth-passwd.c) = de9f5487fe1f5848cc702e549bce949fd75d70cd
11SHA1 (patch-auth-rhosts.c) = ab8dd3e375accc5bed3e15b158a85a1b1f9a2e3e 11SHA1 (patch-auth-rhosts.c) = ab8dd3e375accc5bed3e15b158a85a1b1f9a2e3e
12SHA1 (patch-auth.c) = 950b0380bcbb0fa1681014cfbb41528d09a10a18 12SHA1 (patch-auth.c) = 950b0380bcbb0fa1681014cfbb41528d09a10a18
13SHA1 (patch-auth1.c) = 7b0481f445bc85cce9d7539b00bf581b9aa09fea 13SHA1 (patch-auth1.c) = 7b0481f445bc85cce9d7539b00bf581b9aa09fea
14SHA1 (patch-auth2.c) = 8f4f97516874fc4af5814cbd3a1f59b9ca77b43f 14SHA1 (patch-auth2.c) = 8f4f97516874fc4af5814cbd3a1f59b9ca77b43f
15SHA1 (patch-channels.c) = 88af4136f13f93d73c70caacea0a2ded0601d1cf 15SHA1 (patch-channels.c) = 88af4136f13f93d73c70caacea0a2ded0601d1cf
16SHA1 (patch-clientloop.c) = 499f34ce4e067f1da8aca257cfa7dd820efa3504 16SHA1 (patch-clientloop.c) = 499f34ce4e067f1da8aca257cfa7dd820efa3504
17SHA1 (patch-config.h.in) = 9799f48f204aa213318914f1d6c45e83a8af942f 17SHA1 (patch-config.h.in) = 9799f48f204aa213318914f1d6c45e83a8af942f
18SHA1 (patch-configure) = 3015dda57a5626667cf5c15c7c7be25f8844cfc6 18SHA1 (patch-configure) = 3015dda57a5626667cf5c15c7c7be25f8844cfc6
19SHA1 (patch-configure.ac) = 996a3bcf133a0832b9d7fa35cc0983562d9fa60a 19SHA1 (patch-configure.ac) = 996a3bcf133a0832b9d7fa35cc0983562d9fa60a
20SHA1 (patch-defines.h) = 4f4f4c8dc54aa86275192edf230b36737b1c0cf6 20SHA1 (patch-defines.h) = 4f4f4c8dc54aa86275192edf230b36737b1c0cf6
21SHA1 (patch-includes.h) = 0a899d3b38ef3de7f5b08fec022696b4e998b54e 21SHA1 (patch-includes.h) = 0a899d3b38ef3de7f5b08fec022696b4e998b54e
22SHA1 (patch-loginrec.c) = 3b42ea96935a69316233eb2c65d810e46a3e5d76 22SHA1 (patch-loginrec.c) = 111530a4895c8f88c464c7495cee0dba1952d9ce
23SHA1 (patch-openbsd-compat_bsd-openpty.c) = a1318cf691f0ad844a8761a77e3bb32a9e20c695 23SHA1 (patch-openbsd-compat_bsd-openpty.c) = a1318cf691f0ad844a8761a77e3bb32a9e20c695
24SHA1 (patch-openbsd-compat_openbsd-compat.h) = 1cafbe8f226c16443d2cfd003166923f33352eb0 24SHA1 (patch-openbsd-compat_openbsd-compat.h) = 1cafbe8f226c16443d2cfd003166923f33352eb0
25SHA1 (patch-openbsd-compat_port-tun.c) = 8288e2b9336ea1fcc1129d8a2ab5e55816b2ccbf 25SHA1 (patch-openbsd-compat_port-tun.c) = 8288e2b9336ea1fcc1129d8a2ab5e55816b2ccbf
26SHA1 (patch-platform.c) = c2f85f494f0a38ed9fea93c46c98b20d865610a0 26SHA1 (patch-platform.c) = c2f85f494f0a38ed9fea93c46c98b20d865610a0
27SHA1 (patch-scp.c) = 97e33843cc1b93babb6c45225c07ac74555e6d54 27SHA1 (patch-scp.c) = 97e33843cc1b93babb6c45225c07ac74555e6d54
28SHA1 (patch-session.c) = 55e84175c7294816107c970f002401d1766f7095 28SHA1 (patch-session.c) = 55e84175c7294816107c970f002401d1766f7095
29SHA1 (patch-sftp-common.c) = 5b36300c6a83ceef2340c2cee3be211eaf39ecdd 29SHA1 (patch-sftp-common.c) = 5b36300c6a83ceef2340c2cee3be211eaf39ecdd
30SHA1 (patch-ssh.c) = 8965e0458aabc137fa3b5e53c6573c0f0fba8280 30SHA1 (patch-ssh.c) = 8965e0458aabc137fa3b5e53c6573c0f0fba8280
31SHA1 (patch-sshconnect.c) = 7bee56ee50ec26913999296eefa93c0be63a9e75 31SHA1 (patch-sshconnect.c) = 7bee56ee50ec26913999296eefa93c0be63a9e75
32SHA1 (patch-sshd.c) = 43b3e4383142303a5d1158f08baee4a27f2f7b13 32SHA1 (patch-sshd.c) = 43b3e4383142303a5d1158f08baee4a27f2f7b13
33SHA1 (patch-sshpty.c) = 9f08f899919d05567998087a060b90800c2c7b11 33SHA1 (patch-sshpty.c) = 9f08f899919d05567998087a060b90800c2c7b11
34SHA1 (patch-uidswap.c) = 0b76322d47b9e14bb2828bc143645d38028bdafd 34SHA1 (patch-uidswap.c) = 0b76322d47b9e14bb2828bc143645d38028bdafd
cvs diff -r1.2 -r1.3 pkgsrc/security/openssh/patches/patch-loginrec.c (expand / switch to unified diff)

--- pkgsrc/security/openssh/patches/patch-loginrec.c 2014/03/29 09:38:11 1.2
+++ pkgsrc/security/openssh/patches/patch-loginrec.c 2015/03/20 22:41:19 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-loginrec.c,v 1.2 2014/03/29 09:38:11 taca Exp $ 1$NetBSD: patch-loginrec.c,v 1.3 2015/03/20 22:41:19 rodent Exp $
2 2
3Interix support and related fixes 3Interix support and related fixes. Fix build on FreeBSD.
4 4
5--- loginrec.c.orig 2014-01-17 01:23:24.000000000 +0000 5--- loginrec.c.orig 2014-01-17 01:23:24.000000000 +0000
6+++ loginrec.c 6+++ loginrec.c
7@@ -432,8 +432,8 @@ login_set_addr(struct logininfo *li, con 7@@ -432,8 +432,8 @@ login_set_addr(struct logininfo *li, con
8 int 8 int
9 login_write(struct logininfo *li) 9 login_write(struct logininfo *li)
10 { 10 {
11-#ifndef HAVE_CYGWIN 11-#ifndef HAVE_CYGWIN
12- if (geteuid() != 0) { 12- if (geteuid() != 0) {
13+#if !defined(HAVE_CYGWIN) && !defined(HAVE_INTERIX) 13+#if !defined(HAVE_CYGWIN) && !defined(HAVE_INTERIX)
14+ if (geteuid() != ROOTUID) { 14+ if (geteuid() != ROOTUID) {
15 logit("Attempt to write login records by non-root user (aborting)"); 15 logit("Attempt to write login records by non-root user (aborting)");
16 return (1); 16 return (1);
@@ -34,31 +34,35 @@ Interix support and related fixes @@ -34,31 +34,35 @@ Interix support and related fixes
34 /* build the utmp structure */ 34 /* build the utmp structure */
35 void 35 void
36@@ -762,10 +762,6 @@ construct_utmpx(struct logininfo *li, st 36@@ -762,10 +762,6 @@ construct_utmpx(struct logininfo *li, st
37 set_utmpx_time(li, utx); 37 set_utmpx_time(li, utx);
38 utx->ut_pid = li->pid; 38 utx->ut_pid = li->pid;
39  39
40- /* strncpy(): Don't necessarily want null termination */ 40- /* strncpy(): Don't necessarily want null termination */
41- strncpy(utx->ut_user, li->username, 41- strncpy(utx->ut_user, li->username,
42- MIN_SIZEOF(utx->ut_user, li->username)); 42- MIN_SIZEOF(utx->ut_user, li->username));
43- 43-
44 if (li->type == LTYPE_LOGOUT) 44 if (li->type == LTYPE_LOGOUT)
45 return; 45 return;
46  46
47@@ -774,6 +770,8 @@ construct_utmpx(struct logininfo *li, st 47@@ -774,6 +770,12 @@ construct_utmpx(struct logininfo *li, st
48 * for logouts. 48 * for logouts.
49 */ 49 */
50  50
51+ /* strncpy(): Don't necessarily want null termination */ 51+ /* strncpy(): Don't necessarily want null termination */
 52+#if defined(__FreeBSD__)
 53+ strncpy(utx->ut_user, li->username, MIN_SIZEOF(utx->ut_user, li->username));
 54+#else
52+ strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username)); 55+ strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
 56+#endif
53 # ifdef HAVE_HOST_IN_UTMPX 57 # ifdef HAVE_HOST_IN_UTMPX
54 strncpy(utx->ut_host, li->hostname, 58 strncpy(utx->ut_host, li->hostname,
55 MIN_SIZEOF(utx->ut_host, li->hostname)); 59 MIN_SIZEOF(utx->ut_host, li->hostname));
56@@ -1409,7 +1407,7 @@ wtmpx_get_entry(struct logininfo *li) 60@@ -1409,7 +1411,7 @@ wtmpx_get_entry(struct logininfo *li)
57 ** Low-level libutil login() functions 61 ** Low-level libutil login() functions
58 **/ 62 **/
59  63
60-#ifdef USE_LOGIN 64-#ifdef USE_LOGIN
61+#if defined(USE_LOGIN) && defined(HAVE_UTMP_H) 65+#if defined(USE_LOGIN) && defined(HAVE_UTMP_H)
62 static int 66 static int
63 syslogin_perform_login(struct logininfo *li) 67 syslogin_perform_login(struct logininfo *li)
64 { 68 {