On Tue, Nov 07 2017, Edd Barrett <e...@theunixzoo.co.uk> wrote:
> Hi,
>
> A much needed update to gpgme-1.9.0.

Already being discussed on ports@:

  https://marc.info/?l=openbsd-ports&m=150955525131345&w=2

> I noticed we were out of date when a Rust crate I was looking at using
> failed to build due to the old gpgme version.
>
> The newer version has the possibility to make several language bindings.
> I have disabled them all for now. People can enable them as they become
> needed.

Rafael already needs the qt bindings, but the solution is not ripe yet
(and maybe this will take the form of another port anyway).  I'm fine
with not enabling the python bindings for now.

> Also the pthread variant of the shared library has gone, presumably
> because the main shared object is now, since 1.8.0, thread safe
> (according to https://gnupg.org/documentation/manuals/gpgme.pdf).
>
> I bumped the shared library version because diffing the headers shows
> some deprecated functions being removed.

Diffing the headers is good, but checking the symbols exported by the
libs should te the first step.  /usr/src/lib/check_sym is very nice for
this.

> I've tested the build of all ports which LIB_DEPEND this (using
> gnupg-2.2.1) and have tested mutt using the new gpgme. Nothing caught
> fire.

So the ports below still package?

$ sqlite3 /usr/local/share/sqlports "select * from wantlib where value = 
'gpgme-pthread';"
audio/rhythmbox|gpgme-pthread|
mail/gmime|gpgme-pthread|
mail/gmime30|gpgme-pthread|
mail/mu|gpgme-pthread|
mail/trojita|gpgme-pthread|
net/pidgin-sipe|gpgme-pthread|
productivity/kmymoney|gpgme-pthread|
x11/gnome/grilo|gpgme-pthread|
x11/gnome/grilo-plugins|gpgme-pthread|
x11/gnome/totem|gpgme-pthread|
x11/gnome/tracker|gpgme-pthread|
x11/kde-applications/gpgmepp|gpgme-pthread|
x11/kde4/pimlibs|gpgme-pthread|
x11/kde4/runtime,-main|gpgme-pthread|
x11/kde4/pim|gpgme-pthread|
x11/kde4/kget|gpgme-pthread|
x11/pinot|gpgme-pthread|

Also port-lib-depends-check says this here (but I still have old-ish
packages on my laptop).

gpgme-1.9.0(security/gpgme):
Extra:  pthread.25

> Thoughts? OK?

As is, not ok on my side.  More questions below,

> Index: Makefile
> ===================================================================
> RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gpgme/Makefile,v
> retrieving revision 1.38
> diff -u -p -r1.38 Makefile
> --- Makefile  11 May 2017 00:29:50 -0000      1.38
> +++ Makefile  7 Nov 2017 09:05:50 -0000
> @@ -2,12 +2,10 @@
>  
>  COMMENT=             GnuPG Made Easy
>  
> -DISTNAME=            gpgme-1.6.0
> -REVISION=            0
> +DISTNAME=            gpgme-1.9.0
>  CATEGORIES=          security devel
>  
> -SHARED_LIBS +=  gpgme                20.0     # 25.0
> -SHARED_LIBS +=  gpgme-pthread        20.0     # 25.0
> +SHARED_LIBS +=  gpgme                21.0     # 29.0
>  
>  HOMEPAGE=            http://www.gnupg.org/gpgme.html
>  
> @@ -20,9 +18,7 @@ MASTER_SITES=               ${MASTER_SITE_GNUPG:=gpgm
>  EXTRACT_SUFX=                .tar.bz2
>  
>  CONFIGURE_STYLE=     gnu
> -
> -# not without -pthread
> -CONFIGURE_ENV +=             gpgme_cv_tls_works=no

So now TLS is detected/works properly because gpgme links against
libpthread?

> +CONFIGURE_ARGS +=    --enable-languages=''
>  
>  # Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg.
>  BUILD_DEPENDS=               gnupg->=2:security/gnupg2
> @@ -33,10 +29,9 @@ LIB_DEPENDS=               devel/gettext \
>                       security/libgpg-error>=1.4 \
>                       security/libassuan
>  
> -TEST_DEPENDS +=              security/gnupg
> +TEST_DEPENDS +=              security/gnupg2

I guess that means that the tests now require gpg2?

>  # needed for the regression tests
>  USE_GMAKE=           Yes
> -
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gpgme/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo  19 Sep 2016 17:13:55 -0000      1.12
> +++ distinfo  7 Nov 2017 09:05:50 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gpgme-1.6.0.tar.bz2) = sJ3kGXrCgLECCA4J6uxiEdCB7/8ZY794Ic+PT5kWCZ0=
> -SIZE (gpgme-1.6.0.tar.bz2) = 983573
> +SHA256 (gpgme-1.9.0.tar.bz2) = Gyn+24v613XnDq+sWwWQYhaDstmGnbmUVo5kAfQDTOs=
> +SIZE (gpgme-1.9.0.tar.bz2) = 1344222
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gpgme/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 19 Sep 2016 17:13:55 -0000      1.8
> +++ pkg/PLIST 7 Nov 2017 09:05:50 -0000
> @@ -3,16 +3,7 @@ bin/gpgme-config
>  @bin bin/gpgme-tool
>  include/gpgme.h
>  @info info/gpgme.info
> -lib/libgpgme-pthread.a
> -lib/libgpgme-pthread.la
> -@lib lib/libgpgme-pthread.so.${LIBgpgme-pthread_VERSION}
>  lib/libgpgme.a
>  lib/libgpgme.la
>  @lib lib/libgpgme.so.${LIBgpgme_VERSION}
>  share/aclocal/gpgme.m4
> -@comment share/common-lisp/
> -@comment share/common-lisp/source/
> -@comment share/common-lisp/source/gpgme/
> -@comment share/common-lisp/source/gpgme/gpgme-package.lisp
> -@comment share/common-lisp/source/gpgme/gpgme.asd
> -@comment share/common-lisp/source/gpgme/gpgme.lisp

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to