ftp/bsdftpd-ssl: convert to modern OpenSSL and unbreak the build on -CURRENT.

1 files changed, 0 insertions, 69 deletions

diff --git a/ftp/bsdftpd-ssl/files/patch-gcc4 b/ftp/bsdftpd-ssl/files/patch-gcc4
index 5076f96e973e..d8cc291e4621 100644
--- a/ftp/bsdftpd-ssl/files/patch-gcc4
+++ b/ftp/bsdftpd-ssl/files/patch-gcc4
@@ -126,72 +126,3 @@
  
  .if !target(${PROG})
  SRCS=	${PROG}.c
---- ssl/sslapp.c.orig	2005-01-10 23:34:59 UTC
-+++ ssl/sslapp.c
-@@ -108,8 +108,8 @@ do_ssleay_init(int server)
-      * export things work... If so we generate one now!
-      */
-     if (server) {
--	    const char ctx_sid[] = "BSDftpd-ssl";
--	    SSL_CTX_set_session_id_context(ssl_ctx, ctx_sid, strlen(ctx_sid));
-+	    const unsigned char ctx_sid[] = "BSDftpd-ssl";
-+	    SSL_CTX_set_session_id_context(ssl_ctx, ctx_sid, strlen((const char*)ctx_sid));
- 
- 	    if (SSL_CTX_need_tmp_RSA(ssl_ctx)) {
- 		    RSA *rsa;
-@@ -474,12 +474,12 @@ ssl_log_msg(BIO *bio, const char *fmt, .
-     va_end(ap);
-     if (outputbuf == NULL) {
- 	    BIO_printf(bio, "\r\nRan out of memory.\r\n");
--	    BIO_flush(bio);
-+	    (void)BIO_flush(bio);
- 	    return;
-     }
- 
-     BIO_printf(bio, "%s", outputbuf);
--    BIO_flush(bio);
-+    (void)BIO_flush(bio);
- 
-     free(outputbuf);
- }
-@@ -498,12 +498,12 @@ ssl_log_msgn(BIO *bio, const char *fmt, 
-     va_end(ap);
-     if (outputbuf == NULL) {
- 	    BIO_printf(bio, "\r\nRan out of memory.\r\n");
--	    BIO_flush(bio);
-+	    (void)BIO_flush(bio);
- 	    return;
-     }
- 
-     BIO_printf(bio, "\r\n%s\r\n", outputbuf);
--    BIO_flush(bio);
-+    (void)BIO_flush(bio);
- 
-     free(outputbuf);
- }
-@@ -519,7 +519,7 @@ ssl_log_vwarn_common(BIO *bio, int debug
-     vasprintf(&tmp, fmt, ap);
-     if (tmp == NULL) {
- 	    BIO_printf(bio, "\r\nRan out of memory.\r\n");
--	    BIO_flush(bio);
-+	    (void)BIO_flush(bio);
- 	    if (ssl_logerr_syslog)
- 		    syslog(LOG_ERR, "Ran out of memory.");
- 	    return;
-@@ -531,14 +531,14 @@ ssl_log_vwarn_common(BIO *bio, int debug
-     free(tmp);
-     if (outputbuf == NULL) {
- 	    BIO_printf(bio, "\r\nRan out of memory.\r\n");
--	    BIO_flush(bio);
-+	    (void)BIO_flush(bio);
- 	    if (ssl_logerr_syslog)
- 		    syslog(LOG_ERR, "Ran out of memory.");
- 	    return;
-     }
- 
-     BIO_printf(bio, "%s\r\n", outputbuf);
--    BIO_flush(bio);
-+    (void)BIO_flush(bio);
-     if (ssl_logerr_syslog)
- 	    syslog(LOG_WARNING, "%s", outputbuf);
-     free(outputbuf);