diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-05-31 07:28:46 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-05-31 07:28:46 +0000 |
| commit | f4eb252ac6f0d7338803b39c6a619b398d650910 (patch) | |
| tree | d197d8ac19cf29f589c3b2723fdec073a7325413 /security/openssh/files/patch-includes.h | |
| parent | Really fix the build on alpha. Seems alpha does not have fpresetsticky. (diff) | |
Update to OpenSSH 3.2.3
- patch openssh-3.1-adv.token.patch is now obsolete.
- remerged PAM changes form previous port
- declare CMSG_* macros.
- fixed bad type in function input_userauth_passwd_changereq
Update to OpenSSH-portable-3.2.3p1
- patch openssh-3.1p1-adv.token.patch is now obsolete
- keep previously declared CONFIGURE_ARGS
- remove openssh-mit-krb5-20020326.diff (should be in the distribution now)
- patch patch-readpassphrase.c is now in teh distribution
- merged previous patches.
- extend CONFIGURE_ARGS so it find OPENSSL again.
- new patches for GSSAPI, not fully tested.
If you have the patch applied:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/36080
Builds with openssl-0.9.6d under:
2.2.8-RELEASE
3.2-RELEASE
4.2-RELEASE
4.6-RC
Notes
Notes:
svn path=/head/; revision=60339
Diffstat (limited to 'security/openssh/files/patch-includes.h')
| -rw-r--r-- | security/openssh/files/patch-includes.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/security/openssh/files/patch-includes.h b/security/openssh/files/patch-includes.h index f110376005d8..dd24de4adc86 100644 --- a/security/openssh/files/patch-includes.h +++ b/security/openssh/files/patch-includes.h @@ -1,5 +1,5 @@ --- includes.h.orig Sat Jan 26 17:44:22 2002 -+++ includes.h Fri Mar 8 20:59:17 2002 ++++ includes.h Fri May 24 08:21:58 2002 @@ -24,12 +24,12 @@ #include <sys/select.h> #include <sys/param.h> @@ -22,7 +22,7 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> -@@ -62,5 +61,46 @@ +@@ -62,5 +61,64 @@ * client program. Socketpairs do not seem to work on all systems. */ #define USE_PIPES 1 @@ -66,6 +66,24 @@ +#define INET_ADDRSTRLEN 46 +#endif + ++#ifndef OSSH_ALIGNBYTES ++#define OSSH_ALIGNBYTES (sizeof(int) - 1) ++#endif ++ ++#ifndef __CMSG_ALIGN ++#define __CMSG_ALIGN(p) (((u_int)(p) + OSSH_ALIGNBYTES) &~ OSSH_ALIGNBYTES) ++#endif ++ ++/* Length of the contents of a control message of length len */ ++#ifndef CMSG_LEN ++#define CMSG_LEN(len) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (len)) ++#endif ++ ++/* Length of the space taken up by a padded control message of length len */ ++#ifndef CMSG_SPACE ++#define CMSG_SPACE(len) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(len)) ++#endif ++ +#endif #endif /* INCLUDES_H */ |