Date: Wednesday, March 22, 2023 @ 21:37:19
Author: freswa
Revision: 1426971
archrelease: copy trunk to community-x86_64
Added:
neomutt/repos/community-x86_64/PKGBUILD
(from rev 1426970, neomutt/trunk/PKGBUILD)
neomutt/repos/community-x86_64/default-ca-certificates.patch
(from rev 1426970, neomutt/trunk/default-ca-certificates.patch)
neomutt/repos/community-x86_64/find_gpg-error_with_pkgconf.patch
(from rev 1426970, neomutt/trunk/find_gpg-error_with_pkgconf.patch)
neomutt/repos/community-x86_64/keys/
Deleted:
neomutt/repos/community-x86_64/PKGBUILD
neomutt/repos/community-x86_64/default-ca-certificates.patch
neomutt/repos/community-x86_64/find_gpg-error_with_pkgconf.patch
neomutt/repos/community-x86_64/keys/
-----------------------------------+
PKGBUILD | 135 ++++++++++------------
default-ca-certificates.patch | 24 +--
find_gpg-error_with_pkgconf.patch | 220 ++++++++++++++++++------------------
3 files changed, 187 insertions(+), 192 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-22 21:37:14 UTC (rev 1426970)
+++ PKGBUILD 2023-03-22 21:37:19 UTC (rev 1426971)
@@ -1,70 +0,0 @@
-# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
-# Maintainer: Frederik Schwan <freswa at archlinux dot org>
-# Contributor: Alad Wenter <a...@archlinux.org>
-# Contributor: Jelle van der Waa <je...@vdwaa.nl>
-# Contributor: Chris Salzberg <ch...@dejimata.com>
-# Contributor: Leonidas Spyropoulos <artafi...@gmail.com>
-pkgname=neomutt
-pkgver=20220429
-pkgrel=3
-pkgdesc='A version of mutt with added features'
-url='https://neomutt.org/'
-license=('GPL')
-arch=('x86_64')
-depends=('glibc' 'gpgme' 'lua53' 'notmuch-runtime' 'krb5' 'gnutls' 'sqlite'
- 'libsasl' 'ncurses' 'libidn2' 'lmdb' 'gdbm' 'kyotocabinet'
- 'lz4' 'zlib' 'zstd')
-optdepends=('python: keybase.py'
- 'perl: smime_keys'
- 'ca-certificates: default CA certificates')
-makedepends=('git' 'gnupg' 'libxslt' 'docbook-xsl' 'w3m')
-_github='https://github.com/neomutt/neomutt'
-source=("$pkgname-$pkgver.tar.gz::$_github/archive/$pkgver.tar.gz"
-
"$pkgname-$pkgver.tar.gz.sig::$_github/releases/download/$pkgver/$pkgver.tar.gz.sig"
- "default-ca-certificates.patch"
- "find_gpg-error_with_pkgconf.patch")
-sha256sums=('45496542897ba8de6bc7cce3f5951d9033ed1c49e5d6f1353adaeefe795d9043'
- 'SKIP'
- '571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776'
- '4de55bd0ab92d6499dfa49d06a2148f6cbff5cd2e5dabdcc73c8667c5f9c2dfe')
-validpgpkeys=('86C2397270DD7A561263CA4E5FAF0A6EE7371805') # Richard Russon
(flatcap) <r...@flatcap.org>
-options=('debug')
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i "$srcdir/default-ca-certificates.patch"
- # 23620d6fdf4a59cc0720c5d4d92bc5e7d241aed7
- patch -Np1 -i "$srcdir/find_gpg-error_with_pkgconf.patch"
-}
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --gpgme \
- --sqlite \
- --autocrypt \
- --lua \
- --notmuch \
- --gss \
- --gnutls \
- --sasl \
- --with-ui=ncurses \
- --with-idn2=/usr \
- --disable-idn \
- --idn2 \
- --lmdb \
- --kyotocabinet \
- --gdbm \
- --lz4 \
- --zlib \
- --zstd
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: neomutt/repos/community-x86_64/PKGBUILD (from rev 1426970,
neomutt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-22 21:37:19 UTC (rev 1426971)
@@ -0,0 +1,65 @@
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Maintainer: Frederik Schwan <freswa at archlinux dot org>
+# Contributor: Alad Wenter <a...@archlinux.org>
+# Contributor: Jelle van der Waa <je...@vdwaa.nl>
+# Contributor: Chris Salzberg <ch...@dejimata.com>
+# Contributor: Leonidas Spyropoulos <artafi...@gmail.com>
+pkgname=neomutt
+pkgver=20230322
+pkgrel=1
+pkgdesc='A version of mutt with added features'
+url='https://neomutt.org/'
+license=('GPL')
+arch=('x86_64')
+depends=('glibc' 'gpgme' 'lua53' 'notmuch-runtime' 'krb5' 'gnutls' 'sqlite'
+ 'libsasl' 'ncurses' 'libidn2' 'lmdb' 'gdbm' 'kyotocabinet'
+ 'lz4' 'zlib' 'zstd')
+optdepends=('python: keybase.py'
+ 'perl: smime_keys'
+ 'ca-certificates: default CA certificates')
+makedepends=('git' 'gnupg' 'libxslt' 'docbook-xsl' 'w3m')
+_github='https://github.com/neomutt/neomutt'
+source=("$pkgname-$pkgver.tar.gz::$_github/archive/$pkgver.tar.gz"
+
"$pkgname-$pkgver.tar.gz.sig::$_github/releases/download/$pkgver/$pkgver.tar.gz.sig"
+ "default-ca-certificates.patch")
+sha256sums=('47f024d4ae2d976f95b626c5fe6cad6ef22ed187426efbd7cf61435ba1790a48'
+ 'SKIP'
+ '571716b8979e9b43328416c3c56eff228b6c58355d7c080b8987ea89c6360776')
+validpgpkeys=('86C2397270DD7A561263CA4E5FAF0A6EE7371805') # Richard Russon
(flatcap) <r...@flatcap.org>
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/default-ca-certificates.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --gpgme \
+ --sqlite \
+ --autocrypt \
+ --lua \
+ --notmuch \
+ --gss \
+ --gnutls \
+ --sasl \
+ --with-ui=ncurses \
+ --with-idn2=/usr \
+ --disable-idn \
+ --idn2 \
+ --lmdb \
+ --kyotocabinet \
+ --gdbm \
+ --lz4 \
+ --zlib \
+ --zstd
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: default-ca-certificates.patch
===================================================================
--- default-ca-certificates.patch 2023-03-22 21:37:14 UTC (rev 1426970)
+++ default-ca-certificates.patch 2023-03-22 21:37:19 UTC (rev 1426971)
@@ -1,12 +0,0 @@
---- a/docs/neomuttrc.head
-+++ b/docs/neomuttrc.head.new
-@@ -48,6 +48,9 @@ bind browser y exit
- # be undone with unmime_lookup.
- mime_lookup application/octet-stream
-
-+# System-wide CA file managed by the ca-certificates package
-+set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
-+
- ##
- ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
- ##
Copied: neomutt/repos/community-x86_64/default-ca-certificates.patch (from rev
1426970, neomutt/trunk/default-ca-certificates.patch)
===================================================================
--- default-ca-certificates.patch (rev 0)
+++ default-ca-certificates.patch 2023-03-22 21:37:19 UTC (rev 1426971)
@@ -0,0 +1,12 @@
+--- a/docs/neomuttrc.head
++++ b/docs/neomuttrc.head.new
+@@ -48,6 +48,9 @@ bind browser y exit
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream
+
++# System-wide CA file managed by the ca-certificates package
++set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
++
+ ##
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
+ ##
Deleted: find_gpg-error_with_pkgconf.patch
===================================================================
--- find_gpg-error_with_pkgconf.patch 2023-03-22 21:37:14 UTC (rev 1426970)
+++ find_gpg-error_with_pkgconf.patch 2023-03-22 21:37:19 UTC (rev 1426971)
@@ -1,110 +0,0 @@
-diff --git a/Makefile.autosetup b/Makefile.autosetup
-index 339c536eba..2ae61bc107 100644
---- a/Makefile.autosetup
-+++ b/Makefile.autosetup
-@@ -601,7 +601,7 @@ $(PWD)/mutt:
- LIBNCRYPT= libncrypt.a
- LIBNCRYPTOBJS= ncrypt/config.o ncrypt/crypt.o ncrypt/cryptglue.o \
- ncrypt/crypt_mod.o
--@if HAVE_GPGME
-+@if HAVE_PKG_GPGME
- LIBNCRYPTOBJS+= ncrypt/crypt_gpgme.o ncrypt/dlg_gpgme.o \
- ncrypt/gpgme_functions.o ncrypt/crypt_mod_pgp_gpgme.o \
- ncrypt/crypt_mod_smime_gpgme.o
-diff --git a/auto.def b/auto.def
-index 34572c4e72..24fe5eb95f 100644
---- a/auto.def
-+++ b/auto.def
-@@ -478,88 +478,13 @@
- define-append CFLAGS -D_FILE_OFFSET_BITS=[get-define _FILE_OFFSET_BITS]
- }
-
-- msg-checking "Checking for GPGME..."
-- if {1} {
-- # Locate gpgme-config
-- set gpgme_prefix [opt-val with-gpgme $prefix]
-- set gpgme_config_guess [file join $gpgme_prefix bin gpgme-config]
-- if {[file-isexec $gpgme_config_guess]} {
-- define GPGME-CONFIG $gpgme_config_guess
-- } else {
-- if {![cc-check-progs gpgme-config]} {
-- user-error "Unable to find gpgme-config"
-- }
-- }
-- set gpgme_config [get-define GPGME-CONFIG]
-+ pkgconf true gpgme
-+ pkgconf true gpg-error
-+ # Version might look like this: 1.13.1-unknown, so split on both '.'
and '-'
-+ lassign [split [get-define PKG_GPGME_VERSION] .-] gpgme_maj gpgme_min
gpgme_patch
-
-- # Version
-- if {[catch {exec-with-stderr $gpgme_config --version} gpgme_version err]}
{
-- user-error "Could not derive --version from $gpgme_config"
-- }
-- if {[scan $gpgme_version "%d.%d.%d" gpgme_maj gpgme_min gpgme_patch] !=
3} {
-- user-error "Could not parse GPGME version $gpgme_version"
-- }
-- msg-result $gpgme_version
-- if {[get-define want-autocrypt]} {
-- if {$gpgme_maj < 1 || $gpgme_min < 8} {
-- user-error "Found GPGME version $gpgme_version, need 1.8.0 for
AutoCrypt"
-- }
-- } else {
-- if {$gpgme_maj < 1 || $gpgme_min < 4} {
-- user-error "Found GPGME version $gpgme_version, need 1.4.0"
-- }
-- }
-- define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj
$gpgme_min $gpgme_patch]
--
-- # RHEL6 doesn't have this function yet
-- cc-check-function-in-lib gpgme_op_export_keys gpgme
--
-- # CFLAGS
-- if {[catch {exec-with-stderr $gpgme_config --cflags} res err]} {
-- user-error "Could not derive --cflags from $gpgme_config"
-- }
-- define-append CFLAGS $res
--
-- # LIBS
-- if {[catch {exec-with-stderr $gpgme_config --libs} res err]} {
-- user-error "Could not derive --libs from $gpgme_config"
-- }
-- define-append LIBS $res
-- }
-- define-feature gpgme
--
-- msg-checking "Checking for gpg-error..."
-- if {1} {
-- # Locate gpg-error-config
-- set gpg_error_config_guess [file join $gpgme_prefix bin gpg-error-config]
-- if {[file-isexec $gpg_error_config_guess]} {
-- define GPG-ERROR-CONFIG $gpg_error_config_guess
-- } else {
-- if {![cc-check-progs gpg-error-config]} {
-- user-error "Unable to find gpg-error-config"
-- }
-- }
-- set gpg_error_config [get-define GPG-ERROR-CONFIG]
--
-- # Version
-- if {[catch {exec-with-stderr $gpg_error_config --version}
gpg_error_version err]} {
-- user-error "Could not derive --version from $gpg_error_config"
-- }
--
-- # CFLAGS
-- if {[catch {exec-with-stderr $gpg_error_config --cflags} res err]} {
-- user-error "Could not derive --cflags from $gpg_error_config"
-- }
-- define-append CFLAGS $res
--
-- # LIBS
-- if {[catch {exec-with-stderr $gpg_error_config --libs} res err]} {
-- user-error "Could not derive --libs from $gpg_error_config"
-- }
-- define-append LIBS $res
-- }
-- msg-result $gpg_error_version
-
-+ define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj
$gpgme_min $gpgme_patch]
- define CRYPT_BACKEND_GPGME
- }
Copied: neomutt/repos/community-x86_64/find_gpg-error_with_pkgconf.patch (from
rev 1426970, neomutt/trunk/find_gpg-error_with_pkgconf.patch)
===================================================================
--- find_gpg-error_with_pkgconf.patch (rev 0)
+++ find_gpg-error_with_pkgconf.patch 2023-03-22 21:37:19 UTC (rev 1426971)
@@ -0,0 +1,110 @@
+diff --git a/Makefile.autosetup b/Makefile.autosetup
+index 339c536eba..2ae61bc107 100644
+--- a/Makefile.autosetup
++++ b/Makefile.autosetup
+@@ -601,7 +601,7 @@ $(PWD)/mutt:
+ LIBNCRYPT= libncrypt.a
+ LIBNCRYPTOBJS= ncrypt/config.o ncrypt/crypt.o ncrypt/cryptglue.o \
+ ncrypt/crypt_mod.o
+-@if HAVE_GPGME
++@if HAVE_PKG_GPGME
+ LIBNCRYPTOBJS+= ncrypt/crypt_gpgme.o ncrypt/dlg_gpgme.o \
+ ncrypt/gpgme_functions.o ncrypt/crypt_mod_pgp_gpgme.o \
+ ncrypt/crypt_mod_smime_gpgme.o
+diff --git a/auto.def b/auto.def
+index 34572c4e72..24fe5eb95f 100644
+--- a/auto.def
++++ b/auto.def
+@@ -478,88 +478,13 @@
+ define-append CFLAGS -D_FILE_OFFSET_BITS=[get-define _FILE_OFFSET_BITS]
+ }
+
+- msg-checking "Checking for GPGME..."
+- if {1} {
+- # Locate gpgme-config
+- set gpgme_prefix [opt-val with-gpgme $prefix]
+- set gpgme_config_guess [file join $gpgme_prefix bin gpgme-config]
+- if {[file-isexec $gpgme_config_guess]} {
+- define GPGME-CONFIG $gpgme_config_guess
+- } else {
+- if {![cc-check-progs gpgme-config]} {
+- user-error "Unable to find gpgme-config"
+- }
+- }
+- set gpgme_config [get-define GPGME-CONFIG]
++ pkgconf true gpgme
++ pkgconf true gpg-error
++ # Version might look like this: 1.13.1-unknown, so split on both '.'
and '-'
++ lassign [split [get-define PKG_GPGME_VERSION] .-] gpgme_maj gpgme_min
gpgme_patch
+
+- # Version
+- if {[catch {exec-with-stderr $gpgme_config --version} gpgme_version err]}
{
+- user-error "Could not derive --version from $gpgme_config"
+- }
+- if {[scan $gpgme_version "%d.%d.%d" gpgme_maj gpgme_min gpgme_patch] !=
3} {
+- user-error "Could not parse GPGME version $gpgme_version"
+- }
+- msg-result $gpgme_version
+- if {[get-define want-autocrypt]} {
+- if {$gpgme_maj < 1 || $gpgme_min < 8} {
+- user-error "Found GPGME version $gpgme_version, need 1.8.0 for
AutoCrypt"
+- }
+- } else {
+- if {$gpgme_maj < 1 || $gpgme_min < 4} {
+- user-error "Found GPGME version $gpgme_version, need 1.4.0"
+- }
+- }
+- define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj
$gpgme_min $gpgme_patch]
+-
+- # RHEL6 doesn't have this function yet
+- cc-check-function-in-lib gpgme_op_export_keys gpgme
+-
+- # CFLAGS
+- if {[catch {exec-with-stderr $gpgme_config --cflags} res err]} {
+- user-error "Could not derive --cflags from $gpgme_config"
+- }
+- define-append CFLAGS $res
+-
+- # LIBS
+- if {[catch {exec-with-stderr $gpgme_config --libs} res err]} {
+- user-error "Could not derive --libs from $gpgme_config"
+- }
+- define-append LIBS $res
+- }
+- define-feature gpgme
+-
+- msg-checking "Checking for gpg-error..."
+- if {1} {
+- # Locate gpg-error-config
+- set gpg_error_config_guess [file join $gpgme_prefix bin gpg-error-config]
+- if {[file-isexec $gpg_error_config_guess]} {
+- define GPG-ERROR-CONFIG $gpg_error_config_guess
+- } else {
+- if {![cc-check-progs gpg-error-config]} {
+- user-error "Unable to find gpg-error-config"
+- }
+- }
+- set gpg_error_config [get-define GPG-ERROR-CONFIG]
+-
+- # Version
+- if {[catch {exec-with-stderr $gpg_error_config --version}
gpg_error_version err]} {
+- user-error "Could not derive --version from $gpg_error_config"
+- }
+-
+- # CFLAGS
+- if {[catch {exec-with-stderr $gpg_error_config --cflags} res err]} {
+- user-error "Could not derive --cflags from $gpg_error_config"
+- }
+- define-append CFLAGS $res
+-
+- # LIBS
+- if {[catch {exec-with-stderr $gpg_error_config --libs} res err]} {
+- user-error "Could not derive --libs from $gpg_error_config"
+- }
+- define-append LIBS $res
+- }
+- msg-result $gpg_error_version
+
++ define GPGME_VERSION_NUMBER [format "0x%02x%02x%02x" $gpgme_maj
$gpgme_min $gpgme_patch]
+ define CRYPT_BACKEND_GPGME
+ }
