commit ea7000e90ee0837ec64a7ef33b7d15a8694d2f21 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Sep 2 00:47:14 2019 +1000 gpgme: 1.8.0 -> 1.13.1 diff --git a/gpgme/.footprint b/gpgme/.footprint index 87b35949..a3a00458 100644 --- a/gpgme/.footprint +++ b/gpgme/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/gpgme-config +-rwxr-xr-x root/root usr/bin/gpgme-json -rwxr-xr-x root/root usr/bin/gpgme-tool drwxr-xr-x root/root usr/etc/ drwxr-xr-x root/root usr/etc/gpgme/ @@ -21,6 +22,7 @@ drwxr-xr-x root/root usr/include/gpgme++/ -rw-r--r-- root/root usr/include/gpgme++/global.h -rw-r--r-- root/root usr/include/gpgme++/gpgadduserideditinteractor.h -rw-r--r-- root/root usr/include/gpgme++/gpgagentgetinfoassuantransaction.h +-rw-r--r-- root/root usr/include/gpgme++/gpggencardkeyinteractor.h -rw-r--r-- root/root usr/include/gpgme++/gpgmefw.h -rw-r--r-- root/root usr/include/gpgme++/gpgmepp_export.h -rw-r--r-- root/root usr/include/gpgme++/gpgmepp_version.h @@ -52,19 +54,23 @@ drwxr-xr-x root/root usr/lib/cmake/Gpgmepp/ -rw-r--r-- root/root usr/lib/cmake/Gpgmepp/GpgmeppConfig.cmake -rw-r--r-- root/root usr/lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake -rwxr-xr-x root/root usr/lib/libgpgme.la -lrwxrwxrwx root/root usr/lib/libgpgme.so -> libgpgme.so.11.17.0 -lrwxrwxrwx root/root usr/lib/libgpgme.so.11 -> libgpgme.so.11.17.0 --rwxr-xr-x root/root usr/lib/libgpgme.so.11.17.0 +lrwxrwxrwx root/root usr/lib/libgpgme.so -> libgpgme.so.11.22.1 +lrwxrwxrwx root/root usr/lib/libgpgme.so.11 -> libgpgme.so.11.22.1 +-rwxr-xr-x root/root usr/lib/libgpgme.so.11.22.1 -rwxr-xr-x root/root usr/lib/libgpgmepp.la -lrwxrwxrwx root/root usr/lib/libgpgmepp.so -> libgpgmepp.so.6.3.0 -lrwxrwxrwx root/root usr/lib/libgpgmepp.so.6 -> libgpgmepp.so.6.3.0 --rwxr-xr-x root/root usr/lib/libgpgmepp.so.6.3.0 +lrwxrwxrwx root/root usr/lib/libgpgmepp.so -> libgpgmepp.so.6.10.0 +lrwxrwxrwx root/root usr/lib/libgpgmepp.so.6 -> libgpgmepp.so.6.10.0 +-rwxr-xr-x root/root usr/lib/libgpgmepp.so.6.10.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/gpgme-glib.pc +-rw-r--r-- root/root usr/lib/pkgconfig/gpgme.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/gpgme.m4 drwxr-xr-x root/root usr/share/common-lisp/ drwxr-xr-x root/root usr/share/common-lisp/source/ drwxr-xr-x root/root usr/share/common-lisp/source/gpgme/ +-rw-r--r-- root/root usr/share/common-lisp/source/gpgme/gpgme-grovel.lisp -rw-r--r-- root/root usr/share/common-lisp/source/gpgme/gpgme-package.lisp -rw-r--r-- root/root usr/share/common-lisp/source/gpgme/gpgme.asd -rw-r--r-- root/root usr/share/common-lisp/source/gpgme/gpgme.lisp diff --git a/gpgme/.signature b/gpgme/.signature index 385d7c33..995a547c 100644 --- a/gpgme/.signature +++ b/gpgme/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31BTgFXvHH8VWHCraF1FA0nAchCCcCnepa8tvaaN9Y0xssIg+MW73IyPNP+Z4agIbtV78EeoWwsLHM7eQuQcJgY= -SHA256 (Pkgfile) = 23285aba27cb7a48129b62709d374754d87ccf7abddbdbaacb70b348ca5754cb -SHA256 (.footprint) = 94bd721ddb5c74b70453e52f5a951dca57677be5c6b5c86aa9ed0a24b6251a39 -SHA256 (gpgme-1.8.0.tar.bz2) = 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 -SHA256 (gpgme-1.1.8-et_EE.patch) = 1c315576b34f1b68b264b3fc5762d0107c444bc76cd58af04c6304551ed8fb64 -SHA256 (gpgme-1.8.0-cmake.patch) = fb743604a031b9f8be816ccb643a78ed12a660d7cbeb8519387d7f44c7d33c8a +RWSagIOpLGJF32d8gxMDr+po2MgeOD0vYZY7bXMP/Z1ldTPs2pHTdjqmcbH3Rbkeu54ZEFdbLR1dnnGTGT5pbfyU/FxpBALaFwc= +SHA256 (Pkgfile) = c59164c98a2f82bc3f85c002eaab8e475a8f91c9c279f52af2a6fd58dab7cc63 +SHA256 (.footprint) = 3dad1fea72f522424500fbb5d86935534f3b1a7301d14c0776bac9515b3a3489 +SHA256 (gpgme-1.13.1.tar.bz2) = c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 diff --git a/gpgme/Pkgfile b/gpgme/Pkgfile index fce6afda..9ece3600 100644 --- a/gpgme/Pkgfile +++ b/gpgme/Pkgfile @@ -1,22 +1,16 @@ # Description: A C, CXX, and lisp API for GnuPG. -# URL: http://www.gnupg.org/gpgme.html +# URL: https://www.gnupg.org/related_software/gpgme/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Brett Goulder, predatorfreak at dcaf-security dot org # Depends on: gnupg name=gpgme -version=1.8.0 -release=3 -source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2 - gpgme-1.1.8-et_EE.patch - gpgme-1.8.0-cmake.patch) +version=1.13.1 +release=1 +source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/gpgme-1.1.8-et_EE.patch - patch -p1 -i $SRC/gpgme-1.8.0-cmake.patch - ./configure \ --prefix=/usr \ --enable-languages='cl cpp' @@ -24,9 +18,6 @@ build() { make make DESTDIR=$PKG install - sed -i -e 's:^avail_lang=.*:avail_lang="$(cat /usr/etc/gpgme/* | xargs)":' \ - $PKG/usr/bin/gpgme-config - install -d $PKG/usr/etc/gpgme echo 'c cl cpp' > $PKG/usr/etc/gpgme/base diff --git a/gpgme/gpgme-1.1.8-et_EE.patch b/gpgme/gpgme-1.1.8-et_EE.patch deleted file mode 100644 index 293debb5..00000000 --- a/gpgme/gpgme-1.1.8-et_EE.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:25:48.000000000 +1100 -+++ gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100 -@@ -64,7 +64,7 @@ - while test $# -gt 0; do - case "$1" in - -*=*) -- optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` -+ optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'` - ;; - *) - optarg= diff --git a/gpgme/gpgme-1.8.0-cmake.patch b/gpgme/gpgme-1.8.0-cmake.patch deleted file mode 100644 index 09775b86..00000000 --- a/gpgme/gpgme-1.8.0-cmake.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Wed, 16 Nov 2016 23:09:45 +0100 -Subject: [PATCH] Remove a forgotten instance of @libsuffix@ - -* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten -instance of @libsuffix@. --- - -b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from -cmake config files, but missed one instance. - -Signed-off-by: Heiko Becker <heirecka@exherbo.org> ---- - lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 928d19f..cbe9713 100644 ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" - ) - --- -2.8.0.rc3 -