Thanks to those who replied! The include (ssl versus openssl) transform

is now done in post-patch.

Submitted by:	Anton Berezin <tobez@plab.ku.dk>, Christian Weisgerber <naddy@unix-ag.uni-kl.de>

12 files changed, 4 insertions, 153 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 74b22cfc58ab..dc9d50088ff2 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -63,10 +63,13 @@ do-extract:
 	@${CP} ${FILESDIR}/strlcpy.c ${WRKSRC}/lib/
 
 post-patch:
-	@${PERL} -pi.orig -e 's:_PATH_STDPATH:_PATH_STDPATH "${PREFIX}/bin":' \
+	@${PERL} -pi.orig -e 's:(_PATH_STDPATH):$$1 "${PREFIX}/bin":g' \
 		${WRKSRC}/sshd.c
 	@${PERL} -pi.orig -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/ssh.h
 	@${PERL} -pi.orig -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/sshd_config
+	@${PERL} -pi.openssl -e \
+		's:^(\s*#\s*include\s+<)ssl(/\w+\.h>\s*)$$:$$1openssl$$2:g' \
+		${WRKSRC}/*.[ch]
 
 pre-install:
 	@cd ${WRKSRC} && ${MAKE} DESTDIR=${PREFIX} distribution
diff --git a/security/openssh/files/patch-ac b/security/openssh/files/patch-ac
deleted file mode 100644
index e0c919165f9a..000000000000
--- a/security/openssh/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru /home/green/ssh/auth-rsa.c ./auth-rsa.c
---- /home/green/ssh/auth-rsa.c	Wed Nov  3 03:36:00 1999
-+++ ./auth-rsa.c	Mon Nov  8 00:06:40 1999
-@@ -25,8 +25,8 @@
- #include "mpaux.h"
- #include "uidswap.h"
- 
--#include <ssl/rsa.h>
--#include <ssl/md5.h>
-+#include <openssl/rsa.h>
-+#include <openssl/md5.h>
- 
- /* Flags that may be set in authorized_keys options. */
- extern int no_port_forwarding_flag;
diff --git a/security/openssh/files/patch-ad b/security/openssh/files/patch-ad
deleted file mode 100644
index bb39edf77f42..000000000000
--- a/security/openssh/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru /home/green/ssh/authfd.c ./authfd.c
---- /home/green/ssh/authfd.c	Fri Oct 15 03:34:00 1999
-+++ ./authfd.c	Mon Nov  8 00:06:40 1999
-@@ -24,7 +24,7 @@
- #include "xmalloc.h"
- #include "getput.h"
- 
--#include <ssl/rsa.h>
-+#include <openssl/rsa.h>
- 
- /* Returns the number of the authentication fd, or -1 if there is none. */
- 
diff --git a/security/openssh/files/patch-ae b/security/openssh/files/patch-ae
deleted file mode 100644
index 4d6ddf3967b8..000000000000
--- a/security/openssh/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru /home/green/ssh/authfile.c ./authfile.c
---- /home/green/ssh/authfile.c	Tue Oct 12 03:47:00 1999
-+++ ./authfile.c	Mon Nov  8 00:06:40 1999
-@@ -17,7 +17,7 @@
- #include "includes.h"
- RCSID("$Id: authfile.c,v 1.7 1999/10/11 20:00:35 markus Exp $");
- 
--#include <ssl/bn.h>
-+#include <openssl/bn.h>
- #include "xmalloc.h"
- #include "buffer.h"
- #include "bufaux.h"
diff --git a/security/openssh/files/patch-af b/security/openssh/files/patch-af
deleted file mode 100644
index 15308eb40dba..000000000000
--- a/security/openssh/files/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru /home/green/ssh/bufaux.c ./bufaux.c
---- /home/green/ssh/bufaux.c	Wed Nov  3 03:36:00 1999
-+++ ./bufaux.c	Mon Nov  8 00:06:40 1999
-@@ -18,7 +18,7 @@
- RCSID("$Id: bufaux.c,v 1.3 1999/11/02 19:42:35 markus Exp $");
- 
- #include "ssh.h"
--#include <ssl/bn.h>
-+#include <openssl/bn.h>
- #include "bufaux.h"
- #include "xmalloc.h"
- #include "getput.h"
diff --git a/security/openssh/files/patch-ag b/security/openssh/files/patch-ag
deleted file mode 100644
index 8effd22ebf74..000000000000
--- a/security/openssh/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru /home/green/ssh/cipher.c ./cipher.c
---- /home/green/ssh/cipher.c	Wed Nov  3 03:36:00 1999
-+++ ./cipher.c	Mon Nov  8 00:06:40 1999
-@@ -17,7 +17,7 @@
- #include "ssh.h"
- #include "cipher.h"
- 
--#include <ssl/md5.h>
-+#include <openssl/md5.h>
- 
- /*
-  * What kind of tripple DES are these 2 routines?
diff --git a/security/openssh/files/patch-ah b/security/openssh/files/patch-ah
deleted file mode 100644
index 0ebde6715cb9..000000000000
--- a/security/openssh/files/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru /home/green/ssh/cipher.h ./cipher.h
---- /home/green/ssh/cipher.h	Sun Oct  3 03:39:00 1999
-+++ ./cipher.h	Mon Nov  8 00:06:40 1999
-@@ -16,8 +16,8 @@
- #ifndef CIPHER_H
- #define CIPHER_H
- 
--#include <ssl/des.h>
--#include <ssl/blowfish.h>
-+#include <openssl/des.h>
-+#include <openssl/blowfish.h>
- 
- /* Cipher types.  New types can be added, but old types should not be removed
-    for compatibility.  The maximum allowed value is 31. */
diff --git a/security/openssh/files/patch-al b/security/openssh/files/patch-al
deleted file mode 100644
index dfed584cb6a8..000000000000
--- a/security/openssh/files/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru /home/green/ssh/mpaux.c ./mpaux.c
---- /home/green/ssh/mpaux.c	Thu Oct 28 03:32:00 1999
-+++ ./mpaux.c	Mon Nov  8 00:06:40 1999
-@@ -17,11 +17,11 @@
- #include "includes.h"
- RCSID("$Id: mpaux.c,v 1.4 1999/10/27 16:37:45 deraadt Exp $");
- 
--#include <ssl/bn.h>
-+#include <openssl/bn.h>
- #include "getput.h"
- #include "xmalloc.h"
- 
--#include <ssl/md5.h>
-+#include <openssl/md5.h>
- 
- void
- compute_session_id(unsigned char session_id[16],
diff --git a/security/openssh/files/patch-am b/security/openssh/files/patch-am
deleted file mode 100644
index d76eb91aebb9..000000000000
--- a/security/openssh/files/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru /home/green/ssh/packet.h ./packet.h
---- /home/green/ssh/packet.h	Tue Sep 28 03:45:00 1999
-+++ ./packet.h	Mon Nov  8 00:06:40 1999
-@@ -18,7 +18,7 @@
- #ifndef PACKET_H
- #define PACKET_H
- 
--#include <ssl/bn.h>
-+#include <openssl/bn.h>
- 
- /* Sets the socket used for communication.  Disables encryption until
-    packet_set_encryption_key is called.  It is permissible that fd_in
diff --git a/security/openssh/files/patch-an b/security/openssh/files/patch-an
deleted file mode 100644
index bf989a6f1773..000000000000
--- a/security/openssh/files/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru /home/green/ssh/rsa.h ./rsa.h
---- /home/green/ssh/rsa.h	Wed Sep 29 03:42:00 1999
-+++ ./rsa.h	Mon Nov  8 00:06:40 1999
-@@ -18,8 +18,8 @@
- #ifndef RSA_H
- #define RSA_H
- 
--#include <ssl/bn.h>
--#include <ssl/rsa.h>
-+#include <openssl/bn.h>
-+#include <openssl/rsa.h>
- 
- /* Calls SSL RSA_generate_key, only copies to prv and pub */
- void rsa_generate_key(RSA *prv, RSA *pub, unsigned int bits);
diff --git a/security/openssh/files/patch-as b/security/openssh/files/patch-as
deleted file mode 100644
index 0d7722403806..000000000000
--- a/security/openssh/files/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru /home/green/ssh/ssh-agent.c ./ssh-agent.c
---- /home/green/ssh/ssh-agent.c	Wed Nov  3 03:36:00 1999
-+++ ./ssh-agent.c	Mon Nov  8 00:06:40 1999
-@@ -28,7 +28,7 @@
- #include "getput.h"
- #include "mpaux.h"
- 
--#include <ssl/md5.h>
-+#include <openssl/md5.h>
- 
- typedef struct
- {
diff --git a/security/openssh/files/patch-av b/security/openssh/files/patch-av
deleted file mode 100644
index d91a35d12005..000000000000
--- a/security/openssh/files/patch-av
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru /home/green/ssh/sshconnect.c ./sshconnect.c
---- /home/green/ssh/sshconnect.c	Wed Nov  3 03:36:00 1999
-+++ ./sshconnect.c	Mon Nov  8 00:06:40 1999
-@@ -17,7 +17,7 @@
- #include "includes.h"
- RCSID("$Id: sshconnect.c,v 1.25 1999/11/02 19:42:36 markus Exp $");
- 
--#include <ssl/bn.h>
-+#include <openssl/bn.h>
- #include "xmalloc.h"
- #include "rsa.h"
- #include "ssh.h"
-@@ -28,7 +28,7 @@
- #include "uidswap.h"
- #include "compat.h"
- 
--#include <ssl/md5.h>
-+#include <openssl/md5.h>
- 
- /* Session id for the current session. */
- unsigned char session_id[16];