On Thu, Sep 17, 2015 at 08:34:23PM +0200, Jérémie Courrèges-Anglas wrote:
> [email protected] (Jérémie Courrèges-Anglas) writes:
>
> > Major bump because I'm not sure whether a minor one is actually enough.
> > No more autotools goo, no more docs since it comes straight out of the
> > git repo. Making releases is hard. Extra time_t fixes because it
> > seemed easy in comparison to building the docs...
> >
> > sigh
>
> Updated diff that adds feedback from sthen@: use
> MODGNU_AUTO{CONF,MAKE}_DEPENDS and an additional cast/format string fix.
OK aja
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/libetpan/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 21 Apr 2015 18:24:22 -0000 1.16
> +++ Makefile 17 Sep 2015 18:31:22 -0000
> @@ -2,14 +2,15 @@
>
> COMMENT= mail purpose library
>
> -DISTNAME= libetpan-1.0
> -REVISION= 3
> +GH_ACCOUNT= dinhviethoa
> +GH_PROJECT= libetpan
> +GH_TAGNAME= 1.6
> +DISTNAME= libetpan-1.6
> CATEGORIES= mail devel
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libetpan/}
>
> -SHARED_LIBS= etpan 14.0
> +SHARED_LIBS= etpan 15.0
>
> -HOMEPAGE= http://libetpan.sourceforge.net/
> +HOMEPAGE= http://www.etpan.org/libetpan.html
>
> # BSD
> PERMIT_PACKAGE_CDROM= Yes
> @@ -18,26 +19,28 @@ WANTLIB += crypto curl expat idn m pthre
>
> MODULES= devel/gettext
>
> -
> +AUTOCONF_VERSION= 2.69
> +AUTOMAKE_VERSION= 1.15
> +BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
> + ${MODGNU_AUTOMAKE_DEPENDS} \
> + devel/libtool
> LIB_DEPENDS+= net/curl \
> devel/libidn \
> security/cyrus-sasl2
>
> CONFIGURE_STYLE= gnu
> CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
> -CONFIGURE_ARGS+= --without-gnutls --with-sasl=${LOCALBASE}
> +CONFIGURE_ARGS+= --with-curl=auto \
> + --with-sasl="${LOCALBASE}" \
> + --without-gnutls
> CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
>
> -NO_TEST= Yes
> -
> -post-install:
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libetpan/html/{API,README}
> - ${INSTALL_DATA}
> ${WRKSRC}/{COPYRIGHT,doc/{DOCUMENTATION,{API,README}.txt}}
> ${PREFIX}/share/doc/libetpan
> -. for d in API README
> - ${INSTALL_DATA} ${WRKSRC}/doc/${d}.html
> ${PREFIX}/share/doc/libetpan/html
> - cd ${WRKSRC}/doc/${d};\
> - find * -exec ${INSTALL_DATA} {}
> ${PREFIX}/share/doc/libetpan/html/${d}/{} \;
> -. endfor
> +post-patch:
> + cd ${WRKSRC} && ${SETENV} \
> + AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
> + AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
> + NOCONFIGURE=1 \
> + ./autogen.sh
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/libetpan/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 18 Jan 2015 03:14:22 -0000 1.6
> +++ distinfo 17 Sep 2015 18:31:22 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libetpan-1.0.tar.gz) = z+PvZ0Jbta1XyMI6Re6hrf/Try51R5MujThOOt381V4=
> -SIZE (libetpan-1.0.tar.gz) = 1669965
> +SHA256 (libetpan-1.6.tar.gz) = eWKx+URb4k0ety2t2rrrtCcHTBSlDp2tDOvewETHHhc=
> +SIZE (libetpan-1.6.tar.gz) = 6144117
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-configure_ac 17 Sep 2015 18:31:22 -0000
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +Fix wrong logic that turns off curl and expat support.
> +
> +--- configure.ac.orig Fri Oct 31 22:41:02 2014
> ++++ configure.ac Thu Sep 17 19:08:19 2015
> +@@ -581,7 +581,7 @@ dnl libcurl
> + libcurl=no
> + AC_ARG_WITH(curl, [ --with-curl[=DIR] curl install directory
> (default=auto)],
> + [], [with_curl=auto])
> +-if test "x$with_curl" != "xno"; then
> ++if test "x$with_curl" = "xno"; then
> + :
> + elif test "x$with_curl" != "xauto"; then
> + OCPPFLAGS="$CPPFLAGS"
> +@@ -639,7 +639,7 @@ dnl expat
> + libexpat=no
> + AC_ARG_WITH(expat, [ --with-expat[=DIR] expat install directory
> (default=auto)],
> + [], [with_expat=auto])
> +-if test "x$with_expat" != "xno"; then
> ++if test "x$with_expat" = "xno"; then
> + :
> + elif test "x$with_expat" != "xauto"; then
> + OCPPFLAGS="$CPPFLAGS"
> Index: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
> ===================================================================
> RCS file: patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
> diff -N patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_driver_implementation_mh_mhdriver_cached_message_c
> 17 Sep 2015 18:31:22 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- src/driver/implementation/mh/mhdriver_cached_message.c.orig Fri Oct
> 31 22:41:02 2014
> ++++ src/driver/implementation/mh/mhdriver_cached_message.c Thu Sep 17
> 20:27:20 2015
> +@@ -187,8 +187,8 @@ static int mh_initialize(mailmessage * msg_info)
> +
> + mh_msg_info = data.data;
> +
> +- snprintf(static_uid, PATH_MAX, "%u-%lu-%lu", msg_info->msg_index,
> +- mh_msg_info->msg_mtime, (unsigned long) mh_msg_info->msg_size);
> ++ snprintf(static_uid, PATH_MAX, "%u-%lld-%zu", msg_info->msg_index,
> ++ (long long)mh_msg_info->msg_mtime, mh_msg_info->msg_size);
> + uid = strdup(static_uid);
> + if (uid == NULL)
> + return MAIL_ERROR_MEMORY;
> Index: patches/patch-src_low-level_mime_mailmime_types_helper_c
> ===================================================================
> RCS file: patches/patch-src_low-level_mime_mailmime_types_helper_c
> diff -N patches/patch-src_low-level_mime_mailmime_types_helper_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_low-level_mime_mailmime_types_helper_c 17 Sep 2015
> 18:31:22 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/low-level/mime/mailmime_types_helper.c.orig Thu Sep 17 19:02:07 2015
> ++++ src/low-level/mime/mailmime_types_helper.c Thu Sep 17 19:02:32 2015
> +@@ -518,7 +518,7 @@ char * mailmime_generate_boundary(void)
> + value = random();
> +
> + gethostname(name, MAX_MESSAGE_ID);
> +- snprintf(id, MAX_MESSAGE_ID, "%lx_%lx_%x", now, value, getpid());
> ++ snprintf(id, MAX_MESSAGE_ID, "%llx_%lx_%x", (long long)now, value,
> getpid());
> +
> + return strdup(id);
> + }
> Index: patches/patch-tests_mime-create_c
> ===================================================================
> RCS file: patches/patch-tests_mime-create_c
> diff -N patches/patch-tests_mime-create_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-tests_mime-create_c 17 Sep 2015 18:31:22 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- tests/mime-create.c.orig Thu Sep 17 19:03:11 2015
> ++++ tests/mime-create.c Thu Sep 17 19:03:31 2015
> +@@ -272,7 +272,7 @@ static char * generate_boundary(const char * boundary_
> + if (boundary_prefix == NULL)
> + boundary_prefix = "";
> +
> +- snprintf(id, MAX_MESSAGE_ID, "%s%lx_%lx_%x", boundary_prefix, now,
> value, getpid());
> ++ snprintf(id, MAX_MESSAGE_ID, "%s%llx_%lx_%x", boundary_prefix, (long
> long)now, value, getpid());
> +
> + return strdup(id);
> + }
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/libetpan/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 16 Mar 2015 18:07:49 -0000 1.4
> +++ pkg/PLIST 17 Sep 2015 18:31:22 -0000
> @@ -10,11 +10,14 @@ include/libetpan/carray.h
> include/libetpan/charconv.h
> include/libetpan/chash.h
> include/libetpan/clist.h
> +include/libetpan/condstore.h
> +include/libetpan/condstore_types.h
> include/libetpan/data_message_driver.h
> include/libetpan/dbdriver.h
> include/libetpan/dbdriver_message.h
> include/libetpan/dbdriver_types.h
> include/libetpan/dbstorage.h
> +include/libetpan/enable.h
> include/libetpan/feeddriver.h
> include/libetpan/feeddriver_message.h
> include/libetpan/feeddriver_types.h
> @@ -49,10 +52,16 @@ include/libetpan/maildriver_types_helper
> include/libetpan/mailengine.h
> include/libetpan/mailfolder.h
> include/libetpan/mailimap.h
> +include/libetpan/mailimap_compress.h
> include/libetpan/mailimap_extension.h
> include/libetpan/mailimap_extension_types.h
> include/libetpan/mailimap_helper.h
> +include/libetpan/mailimap_id.h
> +include/libetpan/mailimap_id_types.h
> +include/libetpan/mailimap_oauth2.h
> include/libetpan/mailimap_socket.h
> +include/libetpan/mailimap_sort.h
> +include/libetpan/mailimap_sort_types.h
> include/libetpan/mailimap_ssl.h
> include/libetpan/mailimap_types.h
> include/libetpan/mailimap_types_helper.h
> @@ -90,12 +99,15 @@ include/libetpan/mailprivacy_types.h
> include/libetpan/mailsem.h
> include/libetpan/mailsmtp.h
> include/libetpan/mailsmtp_helper.h
> +include/libetpan/mailsmtp_oauth2.h
> include/libetpan/mailsmtp_socket.h
> include/libetpan/mailsmtp_ssl.h
> include/libetpan/mailsmtp_types.h
> include/libetpan/mailstorage.h
> include/libetpan/mailstorage_types.h
> include/libetpan/mailstream.h
> +include/libetpan/mailstream_cfstream.h
> +include/libetpan/mailstream_compress.h
> include/libetpan/mailstream_helper.h
> include/libetpan/mailstream_low.h
> include/libetpan/mailstream_socket.h
> @@ -117,6 +129,10 @@ include/libetpan/mhdriver_types.h
> include/libetpan/mhstorage.h
> include/libetpan/mime_message_driver.h
> include/libetpan/mmapstring.h
> +include/libetpan/namespace.h
> +include/libetpan/namespace_parser.h
> +include/libetpan/namespace_sender.h
> +include/libetpan/namespace_types.h
> include/libetpan/newsfeed.h
> include/libetpan/newsfeed_item.h
> include/libetpan/newsfeed_item_enclosure.h
> @@ -137,54 +153,18 @@ include/libetpan/pop3driver_cached_messa
> include/libetpan/pop3driver_message.h
> include/libetpan/pop3driver_types.h
> include/libetpan/pop3storage.h
> +include/libetpan/qresync.h
> +include/libetpan/qresync_types.h
> include/libetpan/quota.h
> include/libetpan/quota_parser.h
> include/libetpan/quota_sender.h
> include/libetpan/quota_types.h
> include/libetpan/uidplus.h
> include/libetpan/uidplus_types.h
> +include/libetpan/xgmlabels.h
> +include/libetpan/xgmmsgid.h
> +include/libetpan/xgmthrid.h
> +include/libetpan/xlist.h
> lib/libetpan.a
> lib/libetpan.la
> @lib lib/libetpan.so.${LIBetpan_VERSION}
> -share/doc/libetpan/
> -share/doc/libetpan/API.txt
> -share/doc/libetpan/COPYRIGHT
> -share/doc/libetpan/DOCUMENTATION
> -share/doc/libetpan/README.txt
> -share/doc/libetpan/html/
> -share/doc/libetpan/html/API/
> -share/doc/libetpan/html/API.html
> -share/doc/libetpan/html/API/book1.htm
> -share/doc/libetpan/html/API/c13.htm
> -share/doc/libetpan/html/API/c1586.htm
> -share/doc/libetpan/html/API/c16.htm
> -share/doc/libetpan/html/API/c2988.htm
> -share/doc/libetpan/html/API/c385.htm
> -share/doc/libetpan/html/API/x1094.htm
> -share/doc/libetpan/html/API/x1381.htm
> -share/doc/libetpan/html/API/x1556.htm
> -share/doc/libetpan/html/API/x161.htm
> -share/doc/libetpan/html/API/x1614.htm
> -share/doc/libetpan/html/API/x2180.htm
> -share/doc/libetpan/html/API/x229.htm
> -share/doc/libetpan/html/API/x2583.htm
> -share/doc/libetpan/html/API/x2669.htm
> -share/doc/libetpan/html/API/x289.htm
> -share/doc/libetpan/html/API/x2946.htm
> -share/doc/libetpan/html/API/x3011.htm
> -share/doc/libetpan/html/API/x3015.htm
> -share/doc/libetpan/html/API/x3082.htm
> -share/doc/libetpan/html/API/x312.htm
> -share/doc/libetpan/html/API/x3198.htm
> -share/doc/libetpan/html/API/x3472.htm
> -share/doc/libetpan/html/API/x425.htm
> -share/doc/libetpan/html/API/x88.htm
> -share/doc/libetpan/html/README/
> -share/doc/libetpan/html/README.html
> -share/doc/libetpan/html/README/book1.htm
> -share/doc/libetpan/html/README/c13.htm
> -share/doc/libetpan/html/README/c157.htm
> -share/doc/libetpan/html/README/c53.htm
> -share/doc/libetpan/html/README/x19.htm
> -share/doc/libetpan/html/README/x82.htm
> -share/doc/libetpan/html/README/x94.htm
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
--
Antoine
