<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/494ceebdd7d1c08b6cde2e071512fc39dade3df1">https://github.com/macports/macports-ports/commit/494ceebdd7d1c08b6cde2e071512fc39dade3df1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 494ceeb qpopper: apply FreeBSD patches
</span>494ceeb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 494ceebdd7d1c08b6cde2e071512fc39dade3df1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 21 18:54:12 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> qpopper: apply FreeBSD patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add variant descriptions, switch to archived homepage, and use
</span><span style='display:block; white-space:pre;color:#404040;'> preferred depspec for openssl.
</span>---
mail/qpopper/Portfile | 16 ++++++----
mail/qpopper/files/patch-pop_pass.c | 12 ++++----
mail/qpopper/files/popper__pop_pass.c.patch | 21 +++++++++++++
mail/qpopper/files/popper__pop_tls_openssl.c.patch | 34 ++++++++++++++++++++++
4 files changed, 71 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/qpopper/Portfile b/mail/qpopper/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e71b0b6..787cacd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/qpopper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/qpopper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name qpopper
version 4.1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories mail
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +16,7 @@ long_description popper is Eudora's POP3 mail server. It does not include a m
</span> transfer agent or an SMTP server, it just let you get your mail stored \
on the machine via POP3.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.eudora.com/products/unsupported/qpopper/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://web.archive.org/web/20140923185107/http://www.eudora.com/products/unsupported/qpopper/
</span> master_sites http://www.ring.gr.jp/archives/net/mail/qpopper/ \
ftp://ftp.nctu.edu.tw/network/mail/qpopper/ \
ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +26,10 @@ distname ${name}${version}
</span> checksums rmd160 5254dd252739b2465795a0161bc2fed82adffbcc \
sha256 1bc21f83cda47e9b2d5d8ceecc49f169e10fdb9b99ddddcd543218fad269b0de
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in patch-popper-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-popper-Makefile.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ popper__pop_pass.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ popper__pop_tls_openssl.c.patch
</span>
post-patch {
reinplace "s|@@INSTALL.USER@@|${install.user}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,18 +84,18 @@ platform darwin {
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ssl {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append lib:libssl.0:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ssl description "Enable TLS/SSL support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libssl.dylib:openssl
</span>
configure.args-append --with-openssl=${prefix}
notes-append "
To get TLS/SSL working, you need to set up certificates.\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Cf: http://www.eudora.com/qpopper/faq.html#tls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cf: https://web.archive.org/web/20120627080748/http://www.eudora.com/products/unsupported/qpopper/faq.html#tls
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant pam {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant pam description "Enable PAM authentication" {
</span> post-extract {
system "mkdir -p ${workpath}/paminclude"
system "ln -s /usr/include/pam ${workpath}/paminclude/security"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/qpopper/files/patch-pop_pass.c b/mail/qpopper/files/patch-pop_pass.c
</span><span style='display:block; white-space:pre;color:#808080;'>index db7f8b9..6c8eb83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/qpopper/files/patch-pop_pass.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/qpopper/files/patch-pop_pass.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- popper/pop_pass.c.orig 2006-03-10 07:32:38.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ popper/pop_pass.c 2006-09-17 17:46:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- popper/pop_pass.c.orig 2011-05-31 05:13:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ popper/pop_pass.c 2018-04-21 18:47:08.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +53,10 @@
</span> * <security/pam_appl.h> (otherwise build fails)
* (thanks to Kyle McKay for the patch)
*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +10,9 @@
</span> + *
* 01/16/03 [rcg]
* - Renamed PASSWD macro to QPASSWD to avoid redefining
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * PASSWD in shadow.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1054,6 +1058,143 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif /* AIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * QPASSWD in shadow.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1132,6 +1136,143 @@ auth_user ( POP *p, struct passwd *pw )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* CYGWIN */
</span>
+/*----------------------------------------------- DARWIN/MacOS X */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/qpopper/files/popper__pop_pass.c.patch b/mail/qpopper/files/popper__pop_pass.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..42a379f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/qpopper/files/popper__pop_pass.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- popper/pop_pass.c.orig Sat Jun 2 02:24:13 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ popper/pop_pass.c Sat Sep 8 00:26:27 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1226,6 +1226,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ( pop_msg ( p, POP_FAILURE, HERE, ERRMSG_PW, p->user ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__APPLE__) || defined(FREEBSD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Nor from expired accounts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pw->pw_expire != 0 && pw->pw_expire <= time(NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sleep ( SLEEP_SECONDS );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ( pop_msg ( p, POP_FAILURE, HERE, ERRMSG_ACEXP, p->user ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif /* __APPLE__ || FreeBSD */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ( POP_SUCCESS );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/qpopper/files/popper__pop_tls_openssl.c.patch b/mail/qpopper/files/popper__pop_tls_openssl.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9c134eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/qpopper/files/popper__pop_tls_openssl.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- popper/pop_tls_openssl.c.orig 2011-05-30 19:13:40 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ popper/pop_tls_openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,21 +312,31 @@ openssl_init ( pop_tls *pTLS, POP *pPOP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * concern.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ( pPOP->tls_version ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case QPOP_SSLv2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef OPENSSL_NO_SSL3_METHOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case QPOP_SSLv3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QPOP_TLSvDEFAULT: /* unspecified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QPOP_SSLv23:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_LOG0 ( pPOP, "...setting method to SSLv23_server_method" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pTLS->m_OpenSSLmeth = SSLv23_server_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QPOP_SSLv2: /* SSL version 2 only */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_LOG0 ( pPOP, "...setting method to SSLv2_server_method" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pTLS->m_OpenSSLmeth = SSLv2_server_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef OPENSSL_NO_SSL3_METHOD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QPOP_SSLv3: /* SSL version 3 only */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_LOG0 ( pPOP, "...setting method to SSLv3_server_method" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pTLS->m_OpenSSLmeth = SSLv3_server_method();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QPOP_TLSv1: /* TLS version 1 only */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_LOG0 ( pPOP, "...setting method to TLSv1_server_method" );
</span></pre><pre style='margin:0'>
</pre>