mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-15 07:56:36 +00:00
d47f13ae97
ssh_encode_{array_alloc,buffer}() calls as appropriate in order to
fix argument size problems on 64-bit platforms and that manifest
themselves on amd64 and ia64. [1]
- Allow the tcsetattr(3) calls in ssh_rl_{restore,set}_tty_modes_for_fd()
to be interrupted by signal. This fixes occasional problems when
connecting to a host for the first time.
- Use the base zlib instead of the one shipping with SSH; although the
latter has an enhancement allowing a minor SSH-specific optimization,
using the base one has the benefit of not needing to track security
vulnerabilities of zlib in this port (SSH 3.2.9.1 ships with zlib
1.1.4 which is not know to be vulnerable though).
- Try to make the description of the WITHOUT_X11 option of the port
Makefile to be more sentence-like.
PR: 98016 [1]
Approved by: netchild
Obtained from: NetBSD [1]
21 lines
640 B
C
21 lines
640 B
C
--- lib/sshutil/sshincludes.h.orig Wed Dec 3 14:17:18 2003
|
|
+++ lib/sshutil/sshincludes.h Sun Jul 30 15:27:37 2006
|
|
@@ -331,7 +331,7 @@
|
|
#define UID_ROOT 0
|
|
#endif /* UID_ROOT */
|
|
|
|
-#ifdef SSHDIST_ZLIB
|
|
+#if defined(SSHDIST_ZLIB) && !defined(__FreeBSD__)
|
|
/* Define zlib to have ssh prefix, so we will not care if there is another zlib
|
|
in the kernel */
|
|
#define deflateInit_ ssh_z_deflateInit_
|
|
@@ -367,7 +367,7 @@
|
|
#define uLongf ssh_z_uLongf
|
|
#define voidpf ssh_z_voidpf
|
|
#define voidp ssh_z_voidp
|
|
-#endif /* SSHDIST_ZLIB */
|
|
+#endif /* SSHDIST_ZLIB && !__FreeBSD__ */
|
|
|
|
|
|
|