From b3e338b2f3a60fe9e85a5fe010e299307bb92843 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 17 Jun 2021 10:59:37 +0200
Subject: [PATCH] update gnupg

---
 pkg/de-p1st-gnupg/PKGBUILD             | 14 ++-------
 pkg/de-p1st-gnupg/generate-gpg-conf.sh |  5 ----
 pkg/de-p1st-gnupg/gpg-conf.sh          | 40 ++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 17 deletions(-)
 delete mode 100755 pkg/de-p1st-gnupg/generate-gpg-conf.sh
 create mode 100755 pkg/de-p1st-gnupg/gpg-conf.sh

diff --git a/pkg/de-p1st-gnupg/PKGBUILD b/pkg/de-p1st-gnupg/PKGBUILD
index 8c8c5f8..01ee6df 100644
--- a/pkg/de-p1st-gnupg/PKGBUILD
+++ b/pkg/de-p1st-gnupg/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=gnupg
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.7
+pkgver=0.0.8
 pkgrel=1
 pkgdesc="gnupg with configuration"
 arch=('any')
@@ -11,20 +11,10 @@ license=('MIT')
 depends=('gnupg' 'holo' 'git' 'base')
 makedepends=('git')
 install='.install'
-source=("git+${url}.git" 'git+https://github.com/ioerror/duraconf.git')
+source=("git+${url}.git")
 noextract=()
 sha256sums=('SKIP' 'SKIP')
 
-build() {
-  # copy gpg.conf from duraconf harded configs git repo as gpg.conf.template
-  cp duraconf/configs/gnupg/gpg.conf "${_reponame}/pkg/${pkgname}/gpg.conf.template"
-
-  cd "${_reponame}/pkg/${pkgname}"
-
-  # gpg.conf.template -> gpg.conf
-  ./generate-gpg-conf.sh
-}
-
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
diff --git a/pkg/de-p1st-gnupg/generate-gpg-conf.sh b/pkg/de-p1st-gnupg/generate-gpg-conf.sh
deleted file mode 100755
index 5953a1a..0000000
--- a/pkg/de-p1st-gnupg/generate-gpg-conf.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-DEFAULT_KEY='0x94F3D3DDAC22802258FC044B6C47C753F0823002'
-
-sed "s|^#default-key\\s*.*\$|default-key ${DEFAULT_KEY}|" < gpg.conf.template > gpg.conf
diff --git a/pkg/de-p1st-gnupg/gpg-conf.sh b/pkg/de-p1st-gnupg/gpg-conf.sh
new file mode 100755
index 0000000..bd12389
--- /dev/null
+++ b/pkg/de-p1st-gnupg/gpg-conf.sh
@@ -0,0 +1,40 @@
+# Configuration Examples:
+#   https://github.com/ioerror/duraconf
+#   https://gist.github.com/graffen/37eaa2332ee7e584bfda
+
+#-----------------------------
+# default key
+#-----------------------------
+
+# The default key to sign with. If this option is not used, the default key is
+# the first key found in the secret keyring
+default-key 0x94F3D3DDAC22802258FC044B6C47C753F0823002
+
+#-----------------------------
+# behavior
+#-----------------------------
+
+# Automatically retrieve missing keys from Ubuntu's keyserver
+# See [build-pkg/Dockerfile](https://codeberg.org/privacy1st/arch/src/commit/f127910308e027a42d4e8eabb8b1bd07c5ff8b36/build-pkg/Dockerfile#L32)
+keyserver-options auto-key-retrieve
+keyserver hkp://keyserver.ubuntu.com
+
+# Disable inclusion of the version string in ASCII armored output
+#no-emit-version
+
+# Disable comment string in clear text signatures and ASCII armored messages
+#no-comments
+
+# Display long key IDs
+keyid-format 0xlong
+
+# List all keys (or the specified ones) along with their fingerprints
+with-fingerprint
+
+# Display the calculated validity of user IDs during key listings
+list-options show-uid-validity
+verify-options show-uid-validity
+
+# Try to use the GnuPG-Agent. With this option, GnuPG first tries to connect to
+# the agent before it asks for a passphrase.
+#use-agent