diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-01-28 07:23:21 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-01-28 07:23:21 +0000 |
| commit | 42b61e1a019db1dea442e0272ce5b475708e297d (patch) | |
| tree | c7522d585fa95f09ada9497eb25ec2f74b165744 | |
| parent | Update to 0.4.3 (diff) | |
Add patch for: readpassphrase.h
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
| -rw-r--r-- | security/hpn-ssh/Makefile | 2 | ||||
| -rw-r--r-- | security/hpn-ssh/files/patch-readpassphrase.h | 23 | ||||
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-readpassphrase.h | 23 |
4 files changed, 48 insertions, 2 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile index e0084d453e2c..ead7b3a3db01 100644 --- a/security/hpn-ssh/Makefile +++ b/security/hpn-ssh/Makefile @@ -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 \ diff --git a/security/hpn-ssh/files/patch-readpassphrase.h b/security/hpn-ssh/files/patch-readpassphrase.h new file mode 100644 index 000000000000..d2820ec0549d --- /dev/null +++ b/security/hpn-ssh/files/patch-readpassphrase.h @@ -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_ */ + + diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index e0084d453e2c..ead7b3a3db01 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -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 \ diff --git a/security/openssh-portable/files/patch-readpassphrase.h b/security/openssh-portable/files/patch-readpassphrase.h new file mode 100644 index 000000000000..d2820ec0549d --- /dev/null +++ b/security/openssh-portable/files/patch-readpassphrase.h @@ -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_ */ + + |