mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-25 21:07:40 +00:00
Code Issues Releases Activity

Add patch for: readpassphrase.h

Browse Source 
Someone in the OpenSSH world doesn't understand the difference
between application and implementation namespaces.  This causes
conflicts with <readpassphrase.h>.

PR:		34362
Submitted by:	wollman@hergotha.lcs.mit.edu
This commit is contained in:
Dirk Meyer 2002-01-28 07:23:21 +00:00
parent bc79226112
commit 42b61e1a01
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=53892
4 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/hpn-ssh/Makefile
View File

@ -20,7 +20,7 @@ MLINKS= ssh.1 slogin.1
MAN8= sftp-server.8 sshd.8
CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto
USE_OPENSSL= YES
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --prefix=${PREFIX} --with-md5-passwords
CLEAN= etc/ssh_config etc/sshd_config etc/moduli \

23
security/hpn-ssh/files/patch-readpassphrase.h Normal file
View File

@ -0,0 +1,23 @@
--- openbsd-compat/readpassphrase.h.orig Sun Jan 27 19:18:10 2002
+++ openbsd-compat/readpassphrase.h Sun Jan 27 19:18:54 2002
@@ -28,6 +28,6 @@
*/
-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
+#ifndef READPASSPHRASE_H_
+#define READPASSPHRASE_H_
#include "includes.h"
@@ -43,6 +43,7 @@
char *readpassphrase(const char *, char *, size_t, int);
-
+#else /* HAVE_READPASSPHRASE */
+#include <readpassphrase.h>
#endif /* HAVE_READPASSPHRASE */
-#endif /* !_READPASSPHRASE_H_ */
+#endif /* !READPASSPHRASE_H_ */

2
security/openssh-portable/Makefile
View File

@ -20,7 +20,7 @@ MLINKS= ssh.1 slogin.1
MAN8= sftp-server.8 sshd.8
CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto
USE_OPENSSL= YES
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --prefix=${PREFIX} --with-md5-passwords
CLEAN= etc/ssh_config etc/sshd_config etc/moduli \

23
security/openssh-portable/files/patch-readpassphrase.h Normal file
View File

@ -0,0 +1,23 @@
--- openbsd-compat/readpassphrase.h.orig Sun Jan 27 19:18:10 2002
+++ openbsd-compat/readpassphrase.h Sun Jan 27 19:18:54 2002
@@ -28,6 +28,6 @@
*/
-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
+#ifndef READPASSPHRASE_H_
+#define READPASSPHRASE_H_
#include "includes.h"
@@ -43,6 +43,7 @@
char *readpassphrase(const char *, char *, size_t, int);
-
+#else /* HAVE_READPASSPHRASE */
+#include <readpassphrase.h>
#endif /* HAVE_READPASSPHRASE */
-#endif /* !_READPASSPHRASE_H_ */
+#endif /* !READPASSPHRASE_H_ */