Date: Tue, 29 Jan 2019 17:49:13 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r491589 - in branches/2019Q1/mail/pop3proxy: . files Message-ID: <201901291749.x0THnDjb017695@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Jan 29 17:49:12 2019 New Revision: 491589 URL: https://svnweb.freebsd.org/changeset/ports/491589 Log: MFH: r491513 mail/pop3proxy: Fix build with OpenSSL 1.1.1 - Add license - Fix config file location - Reorder some things to pet portlint - Mark it deprecated too as it appears to have no upstream anymore and only works properly with unencrypted traffic PR: 232134 Submitted by: freebsd_ports@k-worx.org Approved by: ports-secteam (miwi) Added: branches/2019Q1/mail/pop3proxy/files/patch-Makefile.in - copied unchanged from r491513, head/mail/pop3proxy/files/patch-Makefile.in Modified: branches/2019Q1/mail/pop3proxy/Makefile branches/2019Q1/mail/pop3proxy/files/patch-src_imapcommon.c branches/2019Q1/mail/pop3proxy/pkg-descr Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/mail/pop3proxy/Makefile ============================================================================== --- branches/2019Q1/mail/pop3proxy/Makefile Tue Jan 29 17:44:08 2019 (r491588) +++ branches/2019Q1/mail/pop3proxy/Makefile Tue Jan 29 17:49:12 2019 (r491589) @@ -3,29 +3,37 @@ 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 + +DEPRECATED= no upstream and does not properly initiate SSL/TLS connections +EXPIRATION_DATE= 2019-04-15 + +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} -c ${WRKSRC}/pop3proxyd.conf \ + ${INSTALL_DATA} ${WRKSRC}/pop3proxyd.conf \ ${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample .include <bsd.port.mk> Copied: branches/2019Q1/mail/pop3proxy/files/patch-Makefile.in (from r491513, head/mail/pop3proxy/files/patch-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/mail/pop3proxy/files/patch-Makefile.in Tue Jan 29 17:49:12 2019 (r491589, copy of r491513, head/mail/pop3proxy/files/patch-Makefile.in) @@ -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@ Modified: branches/2019Q1/mail/pop3proxy/files/patch-src_imapcommon.c ============================================================================== --- branches/2019Q1/mail/pop3proxy/files/patch-src_imapcommon.c Tue Jan 29 17:44:08 2019 (r491588) +++ branches/2019Q1/mail/pop3proxy/files/patch-src_imapcommon.c Tue Jan 29 17:49:12 2019 (r491589) @@ -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; Modified: branches/2019Q1/mail/pop3proxy/pkg-descr ============================================================================== --- branches/2019Q1/mail/pop3proxy/pkg-descr Tue Jan 29 17:44:08 2019 (r491588) +++ branches/2019Q1/mail/pop3proxy/pkg-descr Tue Jan 29 17:49:12 2019 (r491589) @@ -1,2 +1,4 @@ -This is a POP3 proxycache server useful for use with webmail clients. +This is a POP3 proxycache server, derived from up-imapproxy and is +useful for use with webmail clients. + It keeps track of existing connections and caches them.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901291749.x0THnDjb017695>