Attachment 200241 Details for Bug 232134 – pop3proxy-fix-build-with-openssl111.patch

[patch] pop3proxy-fix-build-with-openssl111.patch

pop3proxy-fix-build-with-openssl111.patch (text/plain), 4.05 KB, created by Kai Knoblich on 2018-12-18 21:36:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2018-12-18 21:36:51 UTC

Size: 4.05 KB

patch

obsolete

>Index: pop3proxy/Makefile
>===================================================================
>--- pop3proxy/Makefile	(revision 487766)
>+++ pop3proxy/Makefile	(working copy)
>@@ -3,18 +3,21 @@
> 
> PORTNAME=	pop3proxy
> PORTVERSION=	1.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail
> MASTER_SITES=	http://people.freebsd.org/~mbr/distfiles/
>-EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	POP3 Proxy Server derived from UP IMAP Proxy
> 
>-GNU_CONFIGURE=	yes
>-USES=		autoreconf ssl
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+USES=		autoreconf ssl tar:tgz
> USE_RC_SUBR=	pop3proxyd
> 
>+GNU_CONFIGURE=	yes
>+
> post-patch:
> 	@${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4
> 	@${REINPLACE_CMD} 's/HAVE_LIBSSL/HAVE_LIBCRYPTO/' \
>@@ -21,11 +24,13 @@
> 		${WRKSRC}/include/pop3proxy.h ${WRKSRC}/src/icc.c \
> 		${WRKSRC}/src/imapcommon.c ${WRKSRC}/src/main.c \
> 		${WRKSRC}/src/request.c
>+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \
>+		${WRKSRC}/Makefile.in
> 
> do-install:
> 	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} pop3proxystat pop3proxyd \
> 		${STAGEDIR}${PREFIX}/sbin)
>-	${INSTALL} -c ${WRKSRC}/pop3proxyd.conf \
>+	${INSTALL_DATA} ${WRKSRC}/pop3proxyd.conf \
> 		${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample
> 
> .include <bsd.port.mk>
>Index: pop3proxy/files/patch-Makefile.in
>===================================================================
>--- pop3proxy/files/patch-Makefile.in	(nonexistent)
>+++ pop3proxy/files/patch-Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- Makefile.in.orig	2004-04-21 13:30:34 UTC
>++++ Makefile.in
>+@@ -24,7 +24,7 @@ mandir = $(prefix)/man/man3
>+ rpm_prefix = @rpm_prefix@
>+ 
>+ CC = @CC@
>+-CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONFIG_FILE=\"/docsis/etc/pop3proxyd.conf\"
>++CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONFIG_FILE=\"%%PREFIX%%/etc/pop3proxyd.conf\"
>+ LDFLAGS = @LDFLAGS@
>+ LIBS = @LIBS@
>+ DEFINES = @DEFINES@
>
>Property changes on: pop3proxy/files/patch-Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pop3proxy/files/patch-src_imapcommon.c
>===================================================================
>--- pop3proxy/files/patch-src_imapcommon.c	(revision 487766)
>+++ pop3proxy/files/patch-src_imapcommon.c	(working copy)
>@@ -1,10 +1,31 @@
>---- src/imapcommon.c.orig
>+--- src/imapcommon.c.orig	2005-02-01 15:21:28 UTC
> +++ src/imapcommon.c
>-@@ -121,6 +121,7 @@
>- #include <errno.h>
>+@@ -295,16 +295,24 @@ extern ICD_Struct *Get_Server_conn( char *Username, 
>+     int rc;
>+     unsigned int Expiration;
>  
>- #include <openssl/evp.h>
>-+#include <openssl/md5.h>
>+-    EVP_MD_CTX mdctx;
>++    EVP_MD_CTX *mdctx;
>+     int md_len;
>  
>- #include <pthread.h>
>- #include <sys/types.h>
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++    EVP_MD_CTX mdctx_;
>++#define EVP_MD_CTX_new(x) &mdctx_
>++#define EVP_MD_CTX_free(x)
>++#endif
>++
>+     Expiration = PC_Struct.cache_expiration_time;
>+     memset( &Server, 0, sizeof Server );
>+     
>+     /* need to md5 the passwd regardless, so do that now */
>+-    EVP_DigestInit(&mdctx, EVP_md5());
>+-    EVP_DigestUpdate(&mdctx, Password, strlen(Password));
>+-    EVP_DigestFinal(&mdctx, md5pw, &md_len);
>++    mdctx = EVP_MD_CTX_new();
>++    EVP_DigestInit(mdctx, EVP_md5());
>++    EVP_DigestUpdate(mdctx, Password, strlen(Password));
>++    EVP_DigestFinal(mdctx, md5pw, &md_len);
>++    EVP_MD_CTX_free(mdctx);
>+     
>+     /* see if we have a reusable connection available */
>+     ICC_Active = NULL;
>Index: pop3proxy/pkg-descr
>===================================================================
>--- pop3proxy/pkg-descr	(revision 487766)
>+++ pop3proxy/pkg-descr	(working copy)
>@@ -1,2 +1,4 @@
>-This is a POP3 proxycache server useful for use with webmail clients.
>-It keeps track of existing connections and caches them.
>+This is a POP3 proxycache server, derived from up-imapproxy and is useful for
>+use with webmail clients.
>+
>+It also keeps track of existing connections and caches them.

Flags:

kai: maintainer-approval+

Actions: View | Diff

Attachments on bug 232134: 197984 | 198028 | 200241