Tue May 19 09:57:05 2020 UTC ()
libetpan: Update to 1.9.4

Changes:

- Bugfixes on QUOTA
- Various warning fixes & build fixes
- Added IMAP CLIENTID / SMTP CLIENTID support
- Use Cyrus SASL 2.1.27
- Support of TLS SNI
- LMDB for cache DB
- Fixed build with recent versions of curl


(nia)
diff -r1.62 -r1.63 pkgsrc/mail/libetpan/Makefile
diff -r1.11 -r1.12 pkgsrc/mail/libetpan/PLIST
diff -r1.22 -r1.23 pkgsrc/mail/libetpan/distinfo
diff -r1.2 -r0 pkgsrc/mail/libetpan/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/mail/libetpan/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/mail/libetpan/patches/patch-libetpan.pc.in
cvs diff -r1.62 -r1.63 pkgsrc/mail/libetpan/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/libetpan/Makefile 2020/05/06 14:04:11 1.62
+++ pkgsrc/mail/libetpan/Makefile 2020/05/19 09:57:05 1.63
@@ -1,45 +1,35 @@ @@ -1,45 +1,35 @@
1# $NetBSD: Makefile,v 1.62 2020/05/06 14:04:11 adam Exp $ 1# $NetBSD: Makefile,v 1.63 2020/05/19 09:57:05 nia Exp $
2 2
3DISTNAME= libetpan-1.9.1 3DISTNAME= libetpan-1.9.4
4PKGREVISION= 8 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_GITHUB:=dinhviethoa/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=dinhviethoa/}
7EXTRACT_USING= bsdtar 6EXTRACT_USING= bsdtar
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://etpan.org/libetpan.html 9HOMEPAGE= https://etpan.org/libetpan.html
11COMMENT= Really nice mail library 10COMMENT= Really nice mail library
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14BDB_ACCEPTED= db3 db4 db5 db6 13BDB_ACCEPTED= db3 db4 db5 db6
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
19USE_TOOLS+= autoconf automake 18USE_TOOLS+= autoconf automake
20TEST_TARGET= check 19TEST_TARGET= check
21 20
22pre-configure: 21pre-configure:
23 cd ${WRKSRC} && \ 22 cd ${WRKSRC} && NOCONFIGURE=1 ${SH} autogen.sh
24 libtoolize --force --copy && \ 
25 aclocal -I m4 && \ 
26 autoheader && \ 
27 autoconf && \ 
28 automake --add-missing --foreign --force --copy 
29 
30SUBST_CLASSES+= conf 
31SUBST_STAGE.conf= pre-configure 
32SUBST_FILES.conf= libetpan-config.in 
33SUBST_SED.conf= -e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g" 
34SUBST_MESSAGE.conf= Fixing libetpan-config. 
35 23
36LDFLAGS.SunOS+= -lsocket -lnsl 24LDFLAGS.SunOS+= -lsocket -lnsl
37 25
 26PKGCONFIG_OVERRIDE+= libetpan-config.in
 27
38.include "../../converters/libiconv/buildlink3.mk" 28.include "../../converters/libiconv/buildlink3.mk"
39.include "../../security/cyrus-sasl/buildlink3.mk" 29.include "../../security/cyrus-sasl/buildlink3.mk"
40.include "../../security/openssl/buildlink3.mk" 30.include "../../security/openssl/buildlink3.mk"
41.include "../../textproc/expat/buildlink3.mk" 31.include "../../textproc/expat/buildlink3.mk"
42.include "../../www/curl/buildlink3.mk" 32.include "../../www/curl/buildlink3.mk"
43.include "../../mk/bdb.buildlink3.mk" 33.include "../../mk/bdb.buildlink3.mk"
44.include "../../mk/pthread.buildlink3.mk" 34.include "../../mk/pthread.buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/mail/libetpan/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/libetpan/PLIST 2015/04/03 12:04:30 1.11
+++ pkgsrc/mail/libetpan/PLIST 2020/05/19 09:57:05 1.12
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1@comment $NetBSD: PLIST,v 1.11 2015/04/03 12:04:30 nros Exp $ 1@comment $NetBSD: PLIST,v 1.12 2020/05/19 09:57:05 nia Exp $
2bin/libetpan-config 
3include/libetpan.h 2include/libetpan.h
4include/libetpan/acl.h 3include/libetpan/acl.h
5include/libetpan/acl_types.h 4include/libetpan/acl_types.h
6include/libetpan/annotatemore.h 5include/libetpan/annotatemore.h
7include/libetpan/annotatemore_types.h 6include/libetpan/annotatemore_types.h
8include/libetpan/carray.h 7include/libetpan/carray.h
9include/libetpan/charconv.h 8include/libetpan/charconv.h
10include/libetpan/chash.h 9include/libetpan/chash.h
 10include/libetpan/clientid.h
11include/libetpan/clist.h 11include/libetpan/clist.h
12include/libetpan/condstore.h 12include/libetpan/condstore.h
13include/libetpan/condstore_types.h 13include/libetpan/condstore_types.h
14include/libetpan/data_message_driver.h 14include/libetpan/data_message_driver.h
15include/libetpan/dbdriver.h 15include/libetpan/dbdriver.h
16include/libetpan/dbdriver_message.h 16include/libetpan/dbdriver_message.h
17include/libetpan/dbdriver_types.h 17include/libetpan/dbdriver_types.h
18include/libetpan/dbstorage.h 18include/libetpan/dbstorage.h
19include/libetpan/enable.h 19include/libetpan/enable.h
20include/libetpan/feeddriver.h 20include/libetpan/feeddriver.h
21include/libetpan/feeddriver_message.h 21include/libetpan/feeddriver_message.h
22include/libetpan/feeddriver_types.h 22include/libetpan/feeddriver_types.h
23include/libetpan/feedstorage.h 23include/libetpan/feedstorage.h
@@ -155,13 +155,14 @@ include/libetpan/pop3storage.h @@ -155,13 +155,14 @@ include/libetpan/pop3storage.h
155include/libetpan/qresync.h 155include/libetpan/qresync.h
156include/libetpan/qresync_types.h 156include/libetpan/qresync_types.h
157include/libetpan/quota.h 157include/libetpan/quota.h
158include/libetpan/quota_parser.h 158include/libetpan/quota_parser.h
159include/libetpan/quota_sender.h 159include/libetpan/quota_sender.h
160include/libetpan/quota_types.h 160include/libetpan/quota_types.h
161include/libetpan/uidplus.h 161include/libetpan/uidplus.h
162include/libetpan/uidplus_types.h 162include/libetpan/uidplus_types.h
163include/libetpan/xgmlabels.h 163include/libetpan/xgmlabels.h
164include/libetpan/xgmmsgid.h 164include/libetpan/xgmmsgid.h
165include/libetpan/xgmthrid.h 165include/libetpan/xgmthrid.h
166include/libetpan/xlist.h 166include/libetpan/xlist.h
167lib/libetpan.la 167lib/libetpan.la
 168lib/pkgconfig/libetpan.pc
cvs diff -r1.22 -r1.23 pkgsrc/mail/libetpan/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/libetpan/distinfo 2018/12/10 15:18:21 1.22
+++ pkgsrc/mail/libetpan/distinfo 2020/05/19 09:57:05 1.23
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.22 2018/12/10 15:18:21 maya Exp $ 1$NetBSD: distinfo,v 1.23 2020/05/19 09:57:05 nia Exp $
2 2
3SHA1 (libetpan-1.9.1.tar.gz) = b7c0b645af9d5e5e250d2085782be4da1698d43b 3SHA1 (libetpan-1.9.4.tar.gz) = cfdfe4329382a30afc5b540e258aaa950fabd25f
4RMD160 (libetpan-1.9.1.tar.gz) = bb8adc310fb05e32dc22dd1c28373d2063c1d321 4RMD160 (libetpan-1.9.4.tar.gz) = cc1718182a677bc10aaab726ab0dc3d52de2e2f6
5SHA512 (libetpan-1.9.1.tar.gz) = 1dd72644672e15eecc9883ffb4b29ef34d4355c55aec950cac44e7b59f252d9355f37ef0ad37007c89728c09e057144b4c3b853496a011d693598b6027356286 5SHA512 (libetpan-1.9.4.tar.gz) = 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
6Size (libetpan-1.9.1.tar.gz) = 6189971 bytes 6Size (libetpan-1.9.4.tar.gz) = 5000025 bytes
7SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff 7SHA1 (patch-configure.ac) = 9d1562b4dd016fb26372bb437e3f4a0749ab2592
8SHA1 (patch-configure.ac) = 45ec1bd4384e3bdd31c1dd7ebef1d855b5c962c6 8SHA1 (patch-libetpan.pc.in) = b977b0982e3f6d32722eec7222eb3c40476d4fc9
9SHA1 (patch-src_low-level_feed_newsfeed.c) = 962f2059bb13a8f9c40cb6845276ee52e3bcd937 9SHA1 (patch-src_low-level_feed_newsfeed.c) = 962f2059bb13a8f9c40cb6845276ee52e3bcd937
File Deleted: pkgsrc/mail/libetpan/patches/Attic/patch-aa
cvs diff -r1.2 -r1.3 pkgsrc/mail/libetpan/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/mail/libetpan/patches/patch-configure.ac 2016/09/03 17:56:37 1.2
+++ pkgsrc/mail/libetpan/patches/patch-configure.ac 2020/05/19 09:57:05 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-configure.ac,v 1.2 2016/09/03 17:56:37 nros Exp $ 1$NetBSD: patch-configure.ac,v 1.3 2020/05/19 09:57:05 nia Exp $
2 Conversion of patch-ab to configure.ac 2
 3Correct db library names for pkgsrc.
 4
3--- configure.ac.orig 2016-05-26 05:27:47.000000000 +0000 5--- configure.ac.orig 2016-05-26 05:27:47.000000000 +0000
4+++ configure.ac 6+++ configure.ac
5@@ -395,7 +395,7 @@ dnl Look for db3 or superior with db_cre 7@@ -395,7 +395,7 @@ dnl Look for db3 or superior with db_cre
6 case "$DBVERS" in 8 case "$DBVERS" in
7 3) 9 3)
8 AC_MSG_RESULT([version 3.x or above]) 10 AC_MSG_RESULT([version 3.x or above])
9- for lib in db-6.0 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do 11- for lib in db-6.0 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
10+ for lib in db6 db5 db4 db3 db; do 12+ for lib in db6 db5 db4 db3 db; do
11 if test "x$DBLINKED" = "x0"; then 13 if test "x$DBLINKED" = "x0"; then
12 dnl AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], []) 14 dnl AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], [])
13 dnl installations of libdb4 function names are defined in db.h 15 dnl installations of libdb4 function names are defined in db.h
File Added: pkgsrc/mail/libetpan/patches/Attic/patch-libetpan.pc.in
$NetBSD: patch-libetpan.pc.in,v 1.1 2020/05/19 09:57:05 nia Exp $

Allow PKGCONFIG_OVERRIDE to work properly.

--- libetpan.pc.in.orig	2019-11-01 17:58:50.000000000 +0000
+++ libetpan.pc.in
@@ -6,5 +6,5 @@ libdir=@libdir@
 Name: libetpan
 Description: Libetpan C library.
 Version: @VERSION@
-Libs: -L${libdir} -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+Libs: -letpan@LIBSUFFIX@ @SSLLIBS@ @GNUTLSLIB@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
 Cflags: -I${includedir}