aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2021-09-26 02:01:11 +0200
committerJakub Jirutka <jakub@jirutka.cz>2021-09-26 01:56:04 +0200
commit6c5546114a5ce946ecba258459270e8a6155fe33 (patch)
tree4ba63c202b86eb7bc43a84980de3d003435f0d0d /main
parentfa04c13bbffedc3671eeac798105c8e43d7a4e8a (diff)
downloadaports-6c5546114a5ce946ecba258459270e8a6155fe33.tar.gz
aports-6c5546114a5ce946ecba258459270e8a6155fe33.tar.bz2
aports-6c5546114a5ce946ecba258459270e8a6155fe33.tar.xz
main/gnupg: drop changes in docs to fix build
Fixes error introduced in 7dab305ca6e124503037ed23b325130ca3cfba57. WTF is this crap?! make[2]: Entering directory '/home/buildozer/aports/main/gnupg/src/gnupg-2.2.23/doc' : >defsincdate ; \ if test -e ../.git; then \ (cd . && git log -1 --format='%ct' \ -- gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi tools.texi debugging.texi glossary.texi contrib.texi gpl.texi sysnotes.texi dirmngr.texi wks.texi gnupg-module-overview.svg gnupg-card-architecture.fig howtos.texi howto-create-a-server-cert.texi 2>/dev/null) >>defsincdate; \ elif test x"OURCE_DATE_EPOCH" != x; then \ echo "OURCE_DATE_EPOCH" >>defsincdate ; \ fi gcc -I. -I.. -I. -DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -DGNUPG_LIBEXECDIR="\"/usr/libexec\"" -DGNUPG_LIBDIR="\"/usr/lib/gnupg\"" -DGNUPG_DATADIR="\"/usr/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\"" \ -o mkdefsinc ./mkdefsinc.c incd="`test -f defsincdate || echo './'`defsincdate"; \ ./mkdefsinc -C . --date "`cat $incd 2>/dev/null`" \ gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi tools.texi debugging.texi glossary.texi contrib.texi gpl.texi sysnotes.texi dirmngr.texi wks.texi gnupg-module-overview.svg gnupg-card-architecture.fig howtos.texi howto-create-a-server-cert.texi >defs.inc mkdefsinc: bad date 'OURCE_DATE_EPOCH' make[2]: *** [Makefile:1245: defs.inc] Error 1
Diffstat (limited to 'main')
-rw-r--r--main/gnupg/APKBUILD2
-rw-r--r--main/gnupg/change-default-keyserver.patch22
2 files changed, 1 insertions, 23 deletions
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index 28498daee8..58675c400f 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -78,5 +78,5 @@ scdaemon() {
sha512sums="736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90 gnupg-2.2.23.tar.bz2
c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch
b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch
-628923b6541bac7a0670d716a4527c3b7bc891ac7cac29625ed56921141c9fbe10f9fff3137f699d196ed60784a78a1411c564c72ee35db9a35eaea5316a1659 change-default-keyserver.patch
+770f9c9c32fa1a297bef34f00cc4e5837f6afe5f26a9739465d8096223b15705947dfe538b2039762a765525cf08fdf2b75b57497d905240ebf965090c3d032e change-default-keyserver.patch
4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules"
diff --git a/main/gnupg/change-default-keyserver.patch b/main/gnupg/change-default-keyserver.patch
index 8096fb9b8c..f2be04460d 100644
--- a/main/gnupg/change-default-keyserver.patch
+++ b/main/gnupg/change-default-keyserver.patch
@@ -23,25 +23,3 @@ the default keyserver from newer versions of gnupg to keyserver.ubuntu.com.
[The default keyserver for dirmngr to use, if none is explicitly given])
AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])
---- a/doc/dirmngr.texi
-+++ b/doc/dirmngr.texi
-@@ -328,7 +328,7 @@
- done for each new connection.
-
- If no keyserver is explicitly configured, dirmngr will use the
--built-in default of hkps://hkps.pool.sks-keyservers.net.
-+built-in default of @code{https://keyserver.ubuntu.com}.
-
- @item --nameserver @var{ipaddr}
- @opindex nameserver
---- a/doc/gnupg.info-1
-+++ b/doc/gnupg.info-1
-@@ -1733,7 +1733,7 @@
- a running Tor is done for each new connection.
-
- If no keyserver is explicitly configured, dirmngr will use the
-- built-in default of hkps://hkps.pool.sks-keyservers.net.
-+ built-in default of https://keyserver.ubuntu.com.
-
- '--nameserver IPADDR'
- In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS