On Thu, Sep 06, 2018 at 11:09:56AM -0400, Daniel Jakots wrote:
> On Thu, 6 Sep 2018 09:10:13 +0200, Antoine Jacoutot
> <ajacou...@bsdfrog.org> wrote:
>
> > On Wed, Sep 05, 2018 at 08:39:00PM -0400, Daniel Jakots wrote:
> > > On Wed, 5 Sep 2018 22:54:48 +0200, Remi Locherer
> > > <remi.loche...@relo.ch> wrote:
> > >
> > > > On Mon, Sep 03, 2018 at 09:29:20PM -0400, Daniel Jakots wrote:
>
> > > > port-lib-depends-check is complaining about missing WANTLIB
> > > > fribidi.
> > >
> > > Yeah, that's "normal", sometimes it complains and sometimes it
> > > doesn't. AFAIK there are several ports where it happens.
> >
> > Huh? That just means fribidi is missing in WANTLIB, that's all.
> > It's probably because this port has pango in the dependency chain
> > (which started to require fribidi a few months ago). So some WANTLIBs
> > need adjustment.
> >
>
> I stand corrected. Let's add it then!
ok remi@
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/Makefile,v
> retrieving revision 1.114
> diff -u -p -r1.114 Makefile
> --- Makefile 29 Jun 2018 22:16:17 -0000 1.114
> +++ Makefile 6 Sep 2018 14:58:36 -0000
> @@ -6,14 +6,13 @@ COMMENT-spamassassin= spamassassin plugi
> COMMENT-pdfviewer= pdfviewer plugin
> COMMENT-gdata= gdata plugin
>
> -V= 3.16.0
> +V= 3.17.1
> DISTNAME= claws-mail-${V}
> PKGNAME-main= ${DISTNAME}
> PKGNAME-bogofilter= claws-mail-bogofilter-${V}
> PKGNAME-spamassassin= claws-mail-spamassassin-${V}
> PKGNAME-pdfviewer= claws-mail-pdfviewer-${V}
> PKGNAME-gdata= claws-mail-gdata-${V}
> -REVISION-main= 2
>
> CATEGORIES= mail news
>
> @@ -41,7 +40,7 @@ RUN_DEPENDS-spamassassin=${BUILD_PKGPATH
>
> WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> WANTLIB += Xrandr Xrender atk-1.0 cairo crypto curl etpan execinfo
> -WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
> +WANTLIB += expat ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
> WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
> WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl m nghttp2 pango-1.0
> WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> @@ -81,6 +80,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
> devel/libnotify \
> security/gnutls>=2.2 \
> security/gpgme \
> + security/libnettle \
> textproc/libical \
> x11/dbus-glib
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/distinfo,v
> retrieving revision 1.34
> diff -u -p -r1.34 distinfo
> --- distinfo 21 Jan 2018 19:24:41 -0000 1.34
> +++ distinfo 6 Sep 2018 14:58:36 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (claws/claws-mail-3.16.0.tar.gz) =
> WjpshvjmgLhocmQ3M5852jwQY/8brA2OybTvxBK+3iI=
> -SIZE (claws/claws-mail-3.16.0.tar.gz) = 11507479
> +SHA256 (claws/claws-mail-3.17.1.tar.gz) =
> WNjMZ6v4+t7mFJP0vuVZmk14oj5Jd5CNMtJIjLx0En8=
> +SIZE (claws/claws-mail-3.17.1.tar.gz) = 10171803
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/patches/patch-configure_ac,v
> retrieving revision 1.18
> diff -u -p -r1.18 patch-configure_ac
> --- patches/patch-configure_ac 21 Jan 2018 19:24:41 -0000 1.18
> +++ patches/patch-configure_ac 6 Sep 2018 14:58:36 -0000
> @@ -11,16 +11,7 @@ Index: configure.ac
> #CFLAGS="-g -Wall -Wno-unused-function"
> fi
>
> -@@ -497,6 +497,8 @@ dnl password encryption
> - OLDLIBS=$LIBS
> - LIBS=
> - case $host_os in
> -+ *openbsd*)
> -+ ;;
> - *dragonfly*)
> - AC_SEARCH_LIBS(encrypt, cipher, [],
> AC_MSG_ERROR(['encrypt'-function not found.]))
> - ;;
> -@@ -784,6 +786,7 @@ if test x"$enable_alternate_addressbook" = xno; then
> +@@ -783,6 +783,7 @@ if test x"$enable_alternate_addressbook" = xno; then
> AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
> AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
> AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
> @@ -28,7 +19,7 @@ Index: configure.ac
> AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
> $LDAP_LIBS)
>
> -@@ -856,7 +859,7 @@ if test x"$enable_alternate_addressbook" = xno; then
> +@@ -855,7 +856,7 @@ if test x"$enable_alternate_addressbook" = xno; then
> AC_DEFINE(USE_JPILOT, 1, Define if
> you want JPilot support in addressbook.) ])
> fi
>
> Index: patches/patch-src_common_passcrypt_c
> ===================================================================
> RCS file: patches/patch-src_common_passcrypt_c
> diff -N patches/patch-src_common_passcrypt_c
> --- patches/patch-src_common_passcrypt_c 12 Jan 2015 21:47:13 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,134 +0,0 @@
> -$OpenBSD: patch-src_common_passcrypt_c,v 1.1 2015/01/12 21:47:13 landry Exp $
> -
> -Use libressl des code to read/write the pwd. backwards-compatible with 5.6
> -
> ---- src/common/passcrypt.c.orig Sat Dec 14 11:15:06 2013
> -+++ src/common/passcrypt.c Sun Jan 11 22:32:43 2015
> -@@ -35,6 +35,7 @@
> - #endif
> -
> - #include <glib.h>
> -+#include <openssl/des.h>
> -
> - #include "passcrypt.h"
> -
> -@@ -72,100 +73,30 @@ crypt_cfb_buf(const char key[8], unsigned char *buf, u
> - ecb_crypt(des_key, buf, len, DES_ENCRYPT);
> - }
> - #else
> --static void crypt_cfb_shift(unsigned char *to,
> -- const unsigned char *from, unsigned len);
> --static void crypt_cfb_xor(unsigned char *to, const unsigned char *from,
> -- unsigned len);
> --static void crypt_unpack(unsigned char *a);
> --
> - static void
> - crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
> - unsigned chunksize, int decrypt)
> - {
> -- unsigned char temp[64];
> -+ unsigned char *out;
> -+ char des_key[8];
> -+ DES_key_schedule keysched;
> -
> -- memcpy(temp, key, 8);
> -- crypt_unpack(temp);
> -- setkey((const char *) temp);
> -- memset(temp, 0, sizeof(temp));
> -+ out = malloc(len);
> -+ if(out == NULL)
> -+ return;
> -+ strncpy(des_key, PASSCRYPT_KEY, 8);
> -+ memset(&crypt_cfb_iv, 0, sizeof(crypt_cfb_iv));
> -+
> -+ DES_set_odd_parity(&des_key);
> -+ DES_set_key_unchecked(&des_key, &keysched);
> -+ if (decrypt)
> -+ DES_cfb_encrypt(buf, out, crypt_cfb_blocksize,\
> -+ len, &keysched, &crypt_cfb_iv, DES_DECRYPT);
> -+ else
> -+ DES_cfb_encrypt(buf, out, crypt_cfb_blocksize,\
> -+ len, &keysched, &crypt_cfb_iv, DES_ENCRYPT);
> -
> -- memset(crypt_cfb_iv, 0, sizeof(crypt_cfb_iv));
> --
> -- if (chunksize > crypt_cfb_blocksize)
> -- chunksize = crypt_cfb_blocksize;
> --
> -- while (len) {
> -- memcpy(temp, crypt_cfb_iv, sizeof(temp));
> -- encrypt((char *) temp, 0);
> -- if (chunksize > len)
> -- chunksize = len;
> -- if (decrypt)
> -- crypt_cfb_shift(crypt_cfb_iv, buf, chunksize);
> -- crypt_cfb_xor((unsigned char *) buf, temp, chunksize);
> -- if (!decrypt)
> -- crypt_cfb_shift(crypt_cfb_iv, buf, chunksize);
> -- len -= chunksize;
> -- buf += chunksize;
> -- }
> --}
> --
> --/*
> --* Shift len bytes from end of to buffer to beginning, then put len
> --* bytes from from at the end. Caution: the to buffer is unpacked,
> --* but the from buffer is not.
> --*/
> --static void
> --crypt_cfb_shift(unsigned char *to, const unsigned char *from, unsigned len)
> --{
> -- unsigned i;
> -- unsigned j;
> -- unsigned k;
> --
> -- if (len < crypt_cfb_blocksize) {
> -- i = len * 8;
> -- j = crypt_cfb_blocksize * 8;
> -- for (k = i; k < j; k++) {
> -- to[0] = to[i];
> -- ++to;
> -- }
> -- }
> --
> -- for (i = 0; i < len; i++) {
> -- j = *from++;
> -- for (k = 0x80; k; k >>= 1)
> -- *to++ = ((j & k) != 0);
> -- }
> --}
> --
> --/*
> --* XOR len bytes from from into the data at to. Caution: the from buffer
> --* is unpacked, but the to buffer is not.
> --*/
> --static void
> --crypt_cfb_xor(unsigned char *to, const unsigned char *from, unsigned len)
> --{
> -- unsigned i;
> -- unsigned j;
> -- unsigned char c;
> --
> -- for (i = 0; i < len; i++) {
> -- c = 0;
> -- for (j = 0; j < 8; j++)
> -- c = (c << 1) | *from++;
> -- *to++ ^= c;
> -- }
> --}
> --
> --/*
> --* Take the 8-byte array at *a (must be able to hold 64 bytes!) and unpack
> --* each bit into its own byte.
> --*/
> --static void crypt_unpack(unsigned char *a)
> --{
> -- int i, j;
> --
> -- for (i = 7; i >= 0; --i)
> -- for (j = 7; j >= 0; --j)
> -- a[(i << 3) + j] = (a[i] & (0x80 >> j)) != 0;
> -+ strncpy(buf, out, len);
> -+ free(out);
> - }
> - #endif
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-main,v
> retrieving revision 1.39
> diff -u -p -r1.39 PLIST-main
> --- pkg/PLIST-main 29 Jun 2018 22:16:17 -0000 1.39
> +++ pkg/PLIST-main 6 Sep 2018 14:58:36 -0000
> @@ -32,6 +32,7 @@ include/claws-mail/addrgather.h
> include/claws-mail/addrharvest.h
> include/claws-mail/addrindex.h
> include/claws-mail/addritem.h
> +include/claws-mail/addrmerge.h
> include/claws-mail/addrquery.h
> include/claws-mail/addrselect.h
> include/claws-mail/advsearch.h
> @@ -53,6 +54,7 @@ include/claws-mail/common/pkcs5_pbkdf2.h
> include/claws-mail/common/plugin.h
> include/claws-mail/common/prefs.h
> include/claws-mail/common/progressindicator.h
> +include/claws-mail/common/proxy.h
> include/claws-mail/common/quoted-printable.h
> include/claws-mail/common/session.h
> include/claws-mail/common/smtp.h
> @@ -181,37 +183,11 @@ include/claws-mail/password_gtk.h
> include/claws-mail/passwordstore.h
> include/claws-mail/pine.h
> include/claws-mail/plugins/
> -include/claws-mail/plugins/claws-mail/
> -include/claws-mail/plugins/claws-mail/archiver.h
> -include/claws-mail/plugins/claws-mail/archiver_prefs.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/
> -include/claws-mail/plugins/claws-mail/gtkhotkey/eggaccelerators.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-error.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-info.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-key-file-registry.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-listener.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-marshal.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-registry.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-utils.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-x11-listener.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/gtkhotkey.h
> -include/claws-mail/plugins/claws-mail/gtkhotkey/tomboykeybinder.h
> include/claws-mail/plugins/pgpcore/
> -include/claws-mail/plugins/pgpcore/autocompletion.h
> include/claws-mail/plugins/pgpcore/passphrase.h
> include/claws-mail/plugins/pgpcore/pgp_utils.h
> -include/claws-mail/plugins/pgpcore/pgp_viewer.h
> include/claws-mail/plugins/pgpcore/prefs_gpg.h
> -include/claws-mail/plugins/pgpcore/select-keys.h
> include/claws-mail/plugins/pgpcore/sgpgme.h
> -include/claws-mail/plugins/pgpinline/
> -include/claws-mail/plugins/pgpinline/pgpinline.h
> -include/claws-mail/plugins/pgpmime/
> -include/claws-mail/plugins/pgpmime/pgpmime.h
> -include/claws-mail/plugins/smime/
> -include/claws-mail/plugins/smime/smime.h
> -include/claws-mail/plugins/vcalendar/
> -include/claws-mail/plugins/vcalendar/vcal_interface.h
> include/claws-mail/pop.h
> include/claws-mail/prefs_account.h
> include/claws-mail/prefs_actions.h
> @@ -233,6 +209,7 @@ include/claws-mail/prefs_message.h
> include/claws-mail/prefs_migration.h
> include/claws-mail/prefs_msg_colors.h
> include/claws-mail/prefs_other.h
> +include/claws-mail/prefs_proxy.h
> include/claws-mail/prefs_quote.h
> include/claws-mail/prefs_receive.h
> include/claws-mail/prefs_send.h
> @@ -285,6 +262,8 @@ lib/claws-mail/plugins/bsfilter.la
> lib/claws-mail/plugins/bsfilter.so
> lib/claws-mail/plugins/clamd.la
> lib/claws-mail/plugins/clamd.so
> +lib/claws-mail/plugins/dillo.la
> +lib/claws-mail/plugins/dillo.so
> lib/claws-mail/plugins/fetchinfo.la
> lib/claws-mail/plugins/fetchinfo.so
> lib/claws-mail/plugins/libravatar.la
