On Sun Aug 28, 2022 at 11:13:15AM +0100, Stuart Henderson wrote:
> On 2022/08/28 10:50, Rafael Sadowski wrote:
> > Update gpgme to 1.18.0, OK?
>
> I have this in my tree but haven't got round to testing dependent ports yet
>
> > diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
> > index c7934381aa8..aeea514a306 100644
> > --- a/security/gpgme/Makefile
> > +++ b/security/gpgme/Makefile
> > @@ -1,14 +1,14 @@
> > COMMENT-main = GnuPG Made Easy
> > COMMENT-qt = Qt bindings for GPGme
> >
> > -VERSION = 1.17.1
> > +VERSION = 1.18.0
> > DISTNAME = gpgme-${VERSION}
> > PKGNAME-main = gpgme-${VERSION}
> > PKGNAME-qt = gpgme-qt-${VERSION}
> >
> > CATEGORIES = security devel
> >
> > -SHARED_LIBS += gpgme 23.0 # 37.0
> > +SHARED_LIBS += gpgme 23.1 # 37.0
> > SHARED_LIBS += gpgmepp 2.0 # 20.0
> > SHARED_LIBS += qgpgme 1.0 # 14.0
>
> Should be
>
> SHARED_LIBS += gpgme 24.0 # 38.0
> SHARED_LIBS += gpgmepp 3.0 # 21.0
> SHARED_LIBS += qgpgme 2.0 # 16.0
Oh yeah I missed gpgmepp and qgpgme but I just saw new symbols gpgme.
Anyway
>
> With that, OK as long as it doesn't break deps
>
> $ sqlite3 /usr/local/share/sqlports "select distinct fullpkgpath from wantlib
> where value like '%gpgme%'"
> mail/claws-mail
> mail/claws-mail,
> mail/claws-mail,-main
> mail/claws-mail,ldap
> mail/claws-mail,ldap,-main
> mail/gmime30
> mail/mu
> mail/mutt,gpgme
> mail/mutt,gpgme,sasl
> mail/neomutt,gpgme
> mail/neomutt,gpgme,notmuch
> mail/neomutt,gpgme,notmuch,sasl
> mail/neomutt,gpgme,sasl
> mail/sylpheed
> mail/trojita
> misc/reprepro
> net/dino
> net/mcabber
> net/pidgin-sipe
> net/profanity
> productivity/kmymoney
> productivity/mcds
> security/fwknop
> security/gpa
> security/gpgme,,-qt
> security/gpgme,-qt
> security/pinentry-dmenu
> security/ruby-gpgme,ruby27
> security/ruby-gpgme,ruby30
> security/ruby-gpgme,ruby31
I caught a victim. ruby-gpgme ruby30 and ruby31 packaged fine but not
ruby27:
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/gpgme-1.12.0.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/gpgme-1.13.1.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/gpgme-1.9.0.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/libassuan-2.4.3.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/libassuan-2.5.1.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/libassuan-2.5.3.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/libgpg-error-1.27.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/libgpg-error-1.32.tar.bz2
does not exist
Error:
/usr/ports/pobj/gpgme-2.0.20-ruby27/fake-amd64-ruby27/usr/local/lib/ruby/gems/2.7/gems/gpgme-2.0.20/ports/archives/libgpg-error-1.37.tar.bz2
does not exist
Should we drop the tarballs?
Rafael
diff --git a/security/ruby-gpgme/Makefile b/security/ruby-gpgme/Makefile
index b35bc98e290..c616cf1e416 100644
--- a/security/ruby-gpgme/Makefile
+++ b/security/ruby-gpgme/Makefile
@@ -2,6 +2,7 @@ COMMENT = Ruby language binding for gpgme
DISTNAME = gpgme-2.0.20
CATEGORIES = security
+REVISION = 0
HOMEPAGE = http://github.com/ueno/ruby-gpgme
MAINTAINER = Sebastian Reitenbach <sebas...@openbsd.org>
@@ -11,7 +12,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby
-WANTLIB += c m assuan gpg-error gpgme
+WANTLIB += assuan gpg-error gpgme
LIB_DEPENDS += security/gpgme
diff --git a/security/ruby-gpgme/pkg/PLIST b/security/ruby-gpgme/pkg/PLIST
index 322a48e920e..01cf4df3904 100644
--- a/security/ruby-gpgme/pkg/PLIST
+++ b/security/ruby-gpgme/pkg/PLIST
@@ -1,5 +1,8 @@
${GEM_LIB}/build_info/${DISTNAME}.info
${GEM_LIB}/cache/${DISTNAME}.gem
+${GEM_EXTENSIONS_DIR}/gem_make.out
+@so ${GEM_EXTENSIONS_DIR}/gpgme_n.so
+${GEM_EXTENSIONS_DIR}/mkmf.log
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/examples/
${GEM_LIB}/gems/${DISTNAME}/examples/edit.rb
@@ -8,6 +11,14 @@ ${GEM_LIB}/gems/${DISTNAME}/examples/keylist.rb
${GEM_LIB}/gems/${DISTNAME}/examples/roundtrip.rb
${GEM_LIB}/gems/${DISTNAME}/examples/sign.rb
${GEM_LIB}/gems/${DISTNAME}/examples/verify.rb
+${GEM_LIB}/gems/${DISTNAME}/ext/
+${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/
+${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/.sitearchdir.time
+${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/Makefile
+${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/extconf.rb
+${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/gpgme_n.c
+${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/gpgme_n.o
+@so ${GEM_LIB}/gems/${DISTNAME}/ext/gpgme/gpgme_n.so
${GEM_LIB}/gems/${DISTNAME}/lib/
${GEM_LIB}/gems/${DISTNAME}/lib/gpgme/
${GEM_LIB}/gems/${DISTNAME}/lib/gpgme.rb
@@ -28,6 +39,17 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/gpgme/sub_key.rb
${GEM_LIB}/gems/${DISTNAME}/lib/gpgme/user_id.rb
${GEM_LIB}/gems/${DISTNAME}/lib/gpgme/version.rb
@so ${GEM_LIB}/gems/${DISTNAME}/lib/gpgme_n.so
+${GEM_LIB}/gems/${DISTNAME}/ports/
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/gpgme-1.12.0.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/gpgme-1.13.1.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/gpgme-1.9.0.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/libassuan-2.4.3.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/libassuan-2.5.1.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/libassuan-2.5.3.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/libgpg-error-1.27.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/libgpg-error-1.32.tar.bz2
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/libgpg-error-1.37.tar.bz2
${GEM_LIB}/gems/${DISTNAME}/test/
${GEM_LIB}/gems/${DISTNAME}/test/crypto_test.rb
${GEM_LIB}/gems/${DISTNAME}/test/ctx_test.rb
> x11/gnome/libcryptui
> x11/gnome/seahorse
> x11/gnome/seahorse-nautilus
> x11/gnome/seahorse-sharing
> x11/kde-applications/akonadi-import-wizard
> x11/kde-applications/akonadiconsole
> x11/kde-applications/akregator
> x11/kde-applications/grantlee-editor
> x11/kde-applications/kdepim-addons
> x11/kde-applications/kget
> x11/kde-applications/kleopatra
> x11/kde-applications/kmail
> x11/kde-applications/kmail-account-wizard
> x11/kde-applications/libkleo
> x11/kde-applications/mailcommon
> x11/kde-applications/mbox-importer
> x11/kde-applications/messagelib
> x11/kde-applications/pim-data-exporter
>
