Update security/gpgme to 1.9.0 and deal with fallout across the tree.

Fallout stems from the removal of the gpgme-pthread shared object.

Initial diff by me, refreshed diff from jca@.

Tested in a bulk by ajacoutot@.

OK jca@, ajacoutot@. Thanks.
This commit is contained in:
edd 2017-12-02 12:44:33 +00:00
parent 942c3170e9
commit 3bc18c7732
19 changed files with 64 additions and 71 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.164 2017/11/15 16:48:41 jasper Exp $
# $OpenBSD: Makefile,v 1.165 2017/12/02 12:44:33 edd Exp $
COMMENT= integrated music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 3.4.2
REVISION= 3
REVISION= 4
SHARED_LIBS += rhythmbox-core 0.0 # 7.0
@ -21,7 +21,7 @@ WANTLIB += Xrandr Xrender Xtst archive assuan atk-1.0 atk-bridge-2.0
WANTLIB += atspi bz2 c cairo cairo-gobject crypto dbus-1 epoxy
WANTLIB += expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmime-3.0 gmodule-2.0
WANTLIB += gobject-2.0 gpg-error gpgme-pthread gpod graphite2
WANTLIB += gobject-2.0 gpg-error gpgme gpod graphite2
WANTLIB += grilo-0.3 gstaudio-1.0 gstbase-1.0 gstcontroller-1.0
WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0
WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv idn intl json-glib-1.0

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2017/04/25 09:00:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.58 2017/12/02 12:44:33 edd Exp $
PORTROACH= limit:^2\.6
@ -6,7 +6,7 @@ COMMENT= MIME messages creation and parsing library
GNOME_PROJECT= gmime
GNOME_VERSION= 2.6.23
REVISION= 0
REVISION= 1
SHARED_LIBS += gmime-2.6 0.2 # 623.0
@ -20,7 +20,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += assuan ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gpg-error gpgme-pthread gthread-2.0 iconv intl pcre
WANTLIB += gpg-error gpgme gthread-2.0 iconv intl pcre
WANTLIB += pthread z
MODULES= x11/gnome

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2017/11/21 08:23:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2017/12/02 12:44:33 edd Exp $
COMMENT= MIME messages creation and parsing library
GNOME_PROJECT= gmime
GNOME_VERSION= 3.0.4
PKGNAME= gmime30-${GNOME_VERSION}
REVISION = 0
SHARED_LIBS += gmime-3.0 1.0 # 4.0
@ -18,7 +19,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += assuan ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gpg-error gpgme-pthread gthread-2.0 iconv idn intl
WANTLIB += gpg-error gpgme gthread-2.0 iconv idn intl
WANTLIB += pcre pthread z
MODULES= x11/gnome

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:26 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2017/12/02 12:44:33 edd Exp $
COMMENT= maildir indexer and searcher with emacs frontend
GH_TAGNAME= 0.9.18
GH_ACCOUNT= djcb
GH_PROJECT= mu
REVISION= 0
REVISION= 1
CATEGORIES= mail
HOMEPAGE= http://www.djcbsoftware.nl/code/mu/
@ -24,7 +24,7 @@ LIB_DEPENDS= databases/xapian-core \
security/gpgme
WANTLIB += assuan c ffi gio-2.0 glib-2.0 gmime-2.6 gmodule-2.0
WANTLIB += gobject-2.0 gpg-error gpgme-pthread gthread-2.0 iconv
WANTLIB += gobject-2.0 gpg-error gpgme gthread-2.0 iconv
WANTLIB += intl m pcre pthread ${COMPILER_LIBCXX} uuid xapian z
AUTOCONF_VERSION= 2.69

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2017/07/30 15:00:39 espie Exp $
# $OpenBSD: Makefile,v 1.25 2017/12/02 12:44:33 edd Exp $
COMMENT = fast Qt IMAP e-mail client
DISTNAME = trojita-0.7
REVISION = 3
REVISION = 4
SHARED_LIBS = trojita_plugins 2.0 # 2.0
@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c m pthread z KF5Gpgmepp-pthread KF5QGpgme
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Sql Qt5WebKit
WANTLIB += Qt5WebKitWidgets Qt5Widgets qt5keychain gpg-error
WANTLIB += gpgme-pthread mimetic assuan
WANTLIB += gpgme mimetic assuan
WANTLIB += ${COMPILER_LIBCXX}
MODULES = devel/cmake x11/qt5

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.29 2017/11/21 00:13:03 naddy Exp $
# $OpenBSD: Makefile,v 1.30 2017/12/02 12:44:33 edd Exp $
BROKEN-hppa = -Werror + sip-csta.c:707: warning: cast increases required alignment of target type
COMMENT = SIPE plugin for Pidgin
DISTNAME = pidgin-sipe-1.20.0
REVISION = 4
REVISION = 5
CATEGORIES = net
@ -17,7 +17,7 @@ MAINTAINER = Tom Doherty <tom@singlesecond.com>
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = assuan crypto dbus-1 dbus-glib-1 ffi gadu gio-2.0 glib-2.0
WANTLIB += gmime-2.6 gmodule-2.0 gobject-2.0 gpg-error gpgme-pthread
WANTLIB += gmime-2.6 gmodule-2.0 gobject-2.0 gpg-error gpgme
WANTLIB += gthread-2.0 iconv idn intl lzma m nspr4 nss3 nssutil3 pcre
WANTLIB += plc4 plds4 pthread purple smime3 sqlite3 ssl3 xml2 z

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2017/11/21 00:13:03 naddy Exp $
# $OpenBSD: Makefile,v 1.17 2017/12/02 12:44:33 edd Exp $
COMMENT = accounting for KDE 4
CATEGORIES = productivity x11
HOMEPAGE = https://kmymoney.org/
MAINTAINER = Vadim Zhukov <zhuk@openbsd.org>
VERSION = 4.8.0
DISTNAME = kmymoney-${VERSION}
REVISION = 3
REVISION = 4
SHARED_LIBS = kmm_kdchart 1.1
SHARED_LIBS += kmm_mymoney 1.1
@ -31,7 +31,7 @@ WANTLIB += ${KDE4LIB}/nepomukutils
WANTLIB += ${KDE4LIB}/akonadi-contact ${KDE4LIB}/akonadi-kde
WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kmime
WANTLIB += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kpimutils
WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme-pthread
WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme
WANTLIB += ical icalss iconv intl ofx osp qgpgme soprano
WANTLIB += aqbanking gwengui-cpp gwengui-qt4 gwenhywfar
WANTLIB += QtDeclarative QtScript krosscore

View File

@ -1,28 +1,24 @@
# $OpenBSD: Makefile,v 1.38 2017/05/11 00:29:50 espie Exp $
# $OpenBSD: Makefile,v 1.39 2017/12/02 12:44:33 edd Exp $
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
# GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += assuan c gpg-error iconv intl pthread
WANTLIB += assuan c gpg-error iconv intl
MASTER_SITES= ${MASTER_SITE_GNUPG:=gpgme/}
EXTRACT_SUFX= .tar.bz2
CONFIGURE_STYLE= gnu
# not without -pthread
CONFIGURE_ENV += gpgme_cv_tls_works=no
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,14 @@ LIB_DEPENDS= devel/gettext \
security/libgpg-error>=1.4 \
security/libassuan
TEST_DEPENDS += security/gnupg
# The tests target gpg2. Running with gpg version 1 will give:
# `./t-support.h:160: GPGME: Invalid crypto engine'
# https://dev.gnupg.org/T3512
TEST_DEPENDS += security/gnupg2
pre-test:
ln -sf ${LOCALBASE}/bin/gpg2 ${WRKDIR}/bin/gpg
# needed for the regression tests
USE_GMAKE= Yes
.include <bsd.port.mk>

View File

@ -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

View File

@ -1,18 +1,9 @@
@comment $OpenBSD: PLIST,v 1.8 2016/09/19 17:13:55 edd Exp $
@comment $OpenBSD: PLIST,v 1.9 2017/12/02 12:44:33 edd Exp $
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

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2017/11/09 19:44:12 landry Exp $
# $OpenBSD: Makefile,v 1.71 2017/12/02 12:44:33 edd Exp $
# XXX: PORTROACH overriden at end of this file.
@ -8,7 +8,7 @@ COMMENT= plugins for Grilo
GNOME_PROJECT= grilo-plugins
GNOME_VERSION= 0.3.5
REVISION= 2
REVISION= 3
API= 0.3
SUBST_VARS= API
@ -22,7 +22,7 @@ WANTLIB += archive assuan avahi-client avahi-common avahi-glib
WANTLIB += avahi-gobject bz2 crypto curl dbus-1 expat ffi gck-1
WANTLIB += gcr-base-3 gcrypt gdata gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmime-3.0 gmodule-2.0 goa-1.0 gobject-2.0 gpg-error
WANTLIB += gpgme-pthread grilo-0.3 grlnet-0.3 grlpls-0.3 gthread-2.0
WANTLIB += gpgme grilo-0.3 grlnet-0.3 grlpls-0.3 gthread-2.0
WANTLIB += iconv icudata icui18n icuuc idn intl json-glib-1.0
WANTLIB += kvm lz4 lzma m mediaart-2.0 nghttp2 nspr4 nss3 oauth
WANTLIB += p11-kit pcre plc4 plds4 png pthread smime3 nssutil3

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.53 2017/11/09 19:44:12 landry Exp $
# $OpenBSD: Makefile,v 1.54 2017/12/02 12:44:33 edd Exp $
# XXX: PORTROACH overriden at end of this file.
@ -7,7 +7,7 @@ COMMENT= framework for making media discovery and browsing easy
GNOME_PROJECT= grilo
GNOME_VERSION= 0.3.4
API= 0.3
REVISION= 4
REVISION= 5
SUBST_VARS= API
@ -25,7 +25,7 @@ WANTLIB += Xrandr Xrender Xtst archive assuan atk-1.0 atk-bridge-2.0
WANTLIB += atspi bz2 c cairo cairo-gobject crypto curl dbus-1
WANTLIB += epoxy expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0 gobject-2.0
WANTLIB += gpg-error gpgme-pthread graphite2 gthread-2.0 gtk-3
WANTLIB += gpg-error gpgme graphite2 gthread-2.0 gtk-3
WANTLIB += harfbuzz iconv idn intl lz4 lzma m nghttp2 nspr4 nss3
WANTLIB += oauth pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += plc4 plds4 png pthread smime3 nssutil3 soup-2.4 sqlite3

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2017/11/15 20:35:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2017/12/02 12:44:33 edd Exp $
TRACKER_API= 2.0
SUBST_VARS= TRACKER_API
REVISION = 0
COMMENT= tracker miners and metadata extractors
@ -16,7 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${COMPILER_LIBCXX} X11 Xext Xrender archive assuan
WANTLIB += bz2 c cairo crypto cue enca exempi exif expat ffi fontconfig
WANTLIB += freetype gcrypt gif gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0
WANTLIB += gobject-2.0 gpg-error gpgme-pthread gsf-1 gstaudio-1.0
WANTLIB += gobject-2.0 gpg-error gpgme gsf-1 gstaudio-1.0
WANTLIB += gstbase-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
WANTLIB += gstvideo-1.0 gthread-2.0 gxps iconv icudata icui18n
WANTLIB += icuuc idn intl iptcdata jpeg json-glib-1.0 kvm lcms2

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.5 2017/07/27 10:15:29 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2017/12/02 12:44:33 edd Exp $
COMMENT = C++ bindings/wrapper for gpgme
VERSION= 16.04.0
DISTNAME = gpgmepp-${VERSION}
REVISION = 2
REVISION = 3
CATEGORIES = security
SHARED_LIBS = KF5QGpgme 0.0 # 4.80
SHARED_LIBS += KF5Gpgmepp-pthread 0.0 # 4.80
SHARED_LIBS += KF5Gpgmepp 0.0 # 4.80
WANTLIB = Qt5Core assuan gpg-error gpgme gpgme-pthread m pthread
WANTLIB = Qt5Core assuan gpg-error gpgme m pthread
WANTLIB += ${COMPILER_LIBCXX}
KDE5 = Yes

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2017/11/21 00:13:05 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2017/12/02 12:44:33 edd Exp $
COMMENT = download manager for KDE
DISTNAME = kget-${MODKDE4_VERSION}
REVISION = 5
REVISION = 6
CATEGORIES = net
HOMEPAGE = http://projects.kde.org/projects/kde/kdenetwork/kget
@ -19,7 +19,7 @@ WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/ktorrent
WANTLIB += ${KDE4LIB}/kworkspace ${KDE4LIB}/nepomuk
WANTLIB += ${KDE4LIB}/nepomukcore ${KDE4LIB}/nepomukutils
WANTLIB += ${KDE4LIB}/nepomukwidgets ${KDE4LIB}/plasma ${KDE4LIB}/solid
WANTLIB += assuan gpg-error gpgme++-pthread gpgme-pthread iconv intl mms
WANTLIB += assuan gpg-error gpgme++-pthread gpgme iconv intl mms
WANTLIB += qca qgpgme soprano
MODULES = multimedia/phonon

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2017/11/21 00:13:05 naddy Exp $
# $OpenBSD: Makefile,v 1.34 2017/12/02 12:44:33 edd Exp $
COMMENT = KDE personal information management
DISTNAME = kdepim-4.14.10
PKGSPEC = kdepim-${MODKDE4_SPEC}
REVISION = 4
REVISION = 5
DPB_PROPERTIES += parallel
MASTER_SITES = ${MASTER_SITE_KDE:=Attic/applications/15.04.3/src/}
@ -97,7 +97,7 @@ WANTLIB += ${KDE4LIB}/baloopim ${KDE4LIB}/kemoticons ${KDE4LIB}/kgapi2
WANTLIB += ${KDE4LIB}/kidletime ${KDE4LIB}/kutils
WANTLIB += ${KDE4LIB}/balooqueryparser ${KDE4LIB}/kfile
WANTLIB += akonadiprotocolinternals prison soprano
WANTLIB += assuan gpg-error gpgme++ gpgme++-pthread gpgme-pthread
WANTLIB += assuan gpg-error gpgme++ gpgme++-pthread gpgme
WANTLIB += grantlee_core grantlee_gui iconv intl qjson qgpgme sasl2
MODULES = multimedia/phonon

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.43 2017/11/21 00:13:05 naddy Exp $
# $OpenBSD: Makefile,v 1.44 2017/12/02 12:44:33 edd Exp $
COMMENT = libraries for KDE PIM services
DISTNAME = kdepimlibs-4.14.10
REVISION = 2
REVISION = 3
DPB_PROPERTIES = parallel
@ -54,7 +54,7 @@ WANTLIB += ${KDE4LIB}/kcmutils ${KDE4LIB}/kdeui ${KDE4LIB}/kemoticons
WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk
WANTLIB += ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
WANTLIB += akonadiprotocolinternals assuan uuid gpg-error gpgme
WANTLIB += gpgme-pthread ical icalss iconv intl lber ldap prison qjson sasl2
WANTLIB += ical icalss iconv intl lber ldap prison qjson sasl2
WANTLIB += soprano xml2
MODULES = multimedia/phonon

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2017/07/27 11:57:50 sthen Exp $
# $OpenBSD: Makefile,v 1.36 2017/12/02 12:44:33 edd Exp $
COMMENT-main = KDE core run-time components
COMMENT-locale = KDE locale data files
@ -6,7 +6,7 @@ DISTNAME = kde-runtime-${MODKDE4_VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-locale = kde4-locale-${MODKDE4_VERSION}
PKG_ARCH-locale = *
REVISION-main = 11
REVISION-main = 12
REVISION-locale = 2
DPB_PROPERTIES = parallel
@ -38,7 +38,7 @@ WANTLIB-main += ${KDE4LIB}/nepomukutils
WANTLIB-main += ${KDE4LIB}/plasma ${KDE4LIB}/qgpgme ${KDE4LIB}/solid
WANTLIB-main += attica canberra exiv2 glib-2.0 jpeg pulse
WANTLIB-main += pulse-mainloop-glib smbclient ssh soprano webp
WANTLIB-main += assuan gcrypt gpg-error gpgme++-pthread gpgme-pthread
WANTLIB-main += assuan gcrypt gpg-error gpgme++-pthread gpgme
WANTLIB-locale =

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.70 2017/11/16 23:20:41 naddy Exp $
# $OpenBSD: Makefile,v 1.71 2017/12/02 12:44:33 edd Exp $
COMMENT= personal search and metasearch
DISTNAME= pinot-1.06
REVISION= 13
REVISION= 14
SHARED_LIBS += xapianbackend 0.0 # 1.0
@ -14,8 +14,8 @@ HOMEPAGE= https://code.google.com/p/pinot-search/
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atkmm-1.6 atspi c cairo
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0 atkmm-1.6 atspi c cairo
WANTLIB += cairo-gobject cairomm-1.0 crypto curl dbus-1 dbus-glib-1
WANTLIB += epoxy exiv2 expat ffi fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0
@ -24,7 +24,7 @@ WANTLIB += gthread-2.0 gtk-3 gtkmm-3.0 harfbuzz iconv intl lzma m
WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4
WANTLIB += pcre pixman-1 png pthread sigc-2.0 sqlite3 ssl
WANTLIB += ${LIBCXX} tag textcat uuid xapian xcb xcb-render xcb-shm
WANTLIB += xml++-2.6 xml2 z assuan gpg-error gpgme-pthread
WANTLIB += xml++-2.6 xml2 z assuan gpg-error gpgme
MASTER_SITES= ${MASTER_SITE_GOOGLECODE:=pinot-search/}