Attachment #200241 for bug #232134





PORTNAME=	pop3proxy
PORTVERSION=	1.2
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

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/' \

		${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_DATA} ${WRKSRC}/pop3proxyd.conf \
		${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample

.include <bsd.port.mk>

Line 0 Link Here

(-)pop3proxy/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig 2004-04-21 13:30:34 UTC
	2	+++ Makefile.in
	3	@@ -24,7 +24,7 @@ mandir = $(prefix)/man/man3
	4	rpm_prefix = @rpm_prefix@
	5
	6	CC = @CC@
	7	-CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONFIG_FILE=\"/docsis/etc/pop3proxyd.conf\"
	8	+CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONFIG_FILE=\"%%PREFIX%%/etc/pop3proxyd.conf\"
	9	LDFLAGS = @LDFLAGS@
	10	LIBS = @LIBS@
	11	DEFINES = @DEFINES@




--- src/imapcommon.c.orig	2005-02-01 15:21:28 UTC
+++ src/imapcommon.c
@@ -295,16 +295,24 @@ extern ICD_Struct *Get_Server_conn( char *Username, 
     int rc;
     unsigned int Expiration;
 
-    EVP_MD_CTX mdctx;
+    EVP_MD_CTX *mdctx;
     int md_len;
 
+#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;

Lines 1-2 Link Here

(-)pop3proxy/pkg-descr (-2 / +4 lines)
1	This is a POP3 proxycache server useful for use with webmail clients.	1	This is a POP3 proxycache server, derived from up-imapproxy and is useful for
2	It keeps track of existing connections and caches them.	2	use with webmail clients.
		3
		4	It also keeps track of existing connections and caches them.

Return to bug 232134

Lines 3-20 Link Here

(-)pop3proxy/Makefile (-5 / +10 lines)
3		3
4	PORTNAME= pop3proxy	4	PORTNAME= pop3proxy
5	PORTVERSION= 1.2	5	PORTVERSION= 1.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://people.freebsd.org/~mbr/distfiles/	8	MASTER_SITES= http://people.freebsd.org/~mbr/distfiles/
9	EXTRACT_SUFX= .tgz
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= POP3 Proxy Server derived from UP IMAP Proxy	11	COMMENT= POP3 Proxy Server derived from UP IMAP Proxy
13		12
14	GNU_CONFIGURE= yes	13	LICENSE= GPLv2+
15	USES= autoreconf ssl	14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
		16	USES= autoreconf ssl tar:tgz
16	USE_RC_SUBR= pop3proxyd	17	USE_RC_SUBR= pop3proxyd
17		18
		19	GNU_CONFIGURE= yes
		20
18	post-patch:	21	post-patch:
19	@${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4	22	@${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4
20	@${REINPLACE_CMD} 's/HAVE_LIBSSL/HAVE_LIBCRYPTO/' \	23	@${REINPLACE_CMD} 's/HAVE_LIBSSL/HAVE_LIBCRYPTO/' \
Lines 21-31 Link Here
21	${WRKSRC}/include/pop3proxy.h ${WRKSRC}/src/icc.c \	24	${WRKSRC}/include/pop3proxy.h ${WRKSRC}/src/icc.c \
22	${WRKSRC}/src/imapcommon.c ${WRKSRC}/src/main.c \	25	${WRKSRC}/src/imapcommon.c ${WRKSRC}/src/main.c \
23	${WRKSRC}/src/request.c	26	${WRKSRC}/src/request.c
		27	@${REINPLACE_CMD} 's\|%%PREFIX%%\|${PREFIX}\|' \
		28	${WRKSRC}/Makefile.in
24		29
25	do-install:	30	do-install:
26	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} pop3proxystat pop3proxyd \	31	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} pop3proxystat pop3proxyd \
27	${STAGEDIR}${PREFIX}/sbin)	32	${STAGEDIR}${PREFIX}/sbin)
28	${INSTALL} -c ${WRKSRC}/pop3proxyd.conf \	33	${INSTALL_DATA} ${WRKSRC}/pop3proxyd.conf \
29	${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample	34	${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample
30		35
31	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-10 Link Here

(-)pop3proxy/files/patch-src_imapcommon.c (-7 / +28 lines)
1	--- src/imapcommon.c.orig	1	--- src/imapcommon.c.orig 2005-02-01 15:21:28 UTC
2	+++ src/imapcommon.c	2	+++ src/imapcommon.c
3	@@ -121,6 +121,7 @@	3	@@ -295,16 +295,24 @@ extern ICD_Struct Get_Server_conn( char Username,
4	#include <errno.h>	4	int rc;
		5	unsigned int Expiration;
5		6
6	#include <openssl/evp.h>	7	- EVP_MD_CTX mdctx;
7	+#include <openssl/md5.h>	8	+ EVP_MD_CTX *mdctx;
		9	int md_len;
8		10
9	#include <pthread.h>	11	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
10	#include <sys/types.h>	12	+ EVP_MD_CTX mdctx_;
		13	+#define EVP_MD_CTX_new(x) &mdctx_
		14	+#define EVP_MD_CTX_free(x)
		15	+#endif
		16	+
		17	Expiration = PC_Struct.cache_expiration_time;
		18	memset( &Server, 0, sizeof Server );
		19
		20	/* need to md5 the passwd regardless, so do that now */
		21	- EVP_DigestInit(&mdctx, EVP_md5());
		22	- EVP_DigestUpdate(&mdctx, Password, strlen(Password));
		23	- EVP_DigestFinal(&mdctx, md5pw, &md_len);
		24	+ mdctx = EVP_MD_CTX_new();
		25	+ EVP_DigestInit(mdctx, EVP_md5());
		26	+ EVP_DigestUpdate(mdctx, Password, strlen(Password));
		27	+ EVP_DigestFinal(mdctx, md5pw, &md_len);
		28	+ EVP_MD_CTX_free(mdctx);
		29
		30	/* see if we have a reusable connection available */
		31	ICC_Active = NULL;