diff options
| -rw-r--r-- | app-crypt/gnupg/Manifest | 1 | ||||
| -rw-r--r-- | app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch | 46 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.1.17-r1.ebuild | 128 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.1.17-r2.ebuild | 124 |
4 files changed, 0 insertions, 299 deletions
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 98298c0afe99..7b6cc781ae71 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,4 +1,3 @@ DIST gnupg-1.4.21.tar.bz2 3689305 SHA256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 WHIRLPOOL eb596be347dd90be93d381fe405e50f5808160b546705493bc9d817d521ea236a2374648e6c2cab396f54bba74de4caf2b92e894df3a17aa339f014ef8cc8802 DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151 -DIST gnupg-2.1.17.tar.bz2 5970042 SHA256 c5dc54db432209fa8f9bdb071c8fb60a765ff28e363150e30bdd4543160243cb SHA512 f826100be4f0480b9a2c68a51dd668e0fd551fd250a37dbe906fe5a89c658b4861a0567038bf687473de9901e268809c1b8d8c200008e082a3ace189d9829b9c WHIRLPOOL d70fa5ae0a90d5c9fa594d79cdb9bc1528b7db1a35d23ee7d3f047b4fb275d02bd8f5e6ccb0a798fedf539c8c384d3713295785183266de43fe3cb978c47916b DIST gnupg-2.1.18.tar.bz2 6308666 SHA256 d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994 SHA512 b8357f0a883a33c2e4f6ab5a8f5ddb171c899b7a2899e8ce4cac232938fe1dffb789a54980dfc4b758c4cb47f11f1fc570fea905244735048dfc6f06b3353baf WHIRLPOOL c5f132beb3b454146747fe14cd12576fb4d9a9adb8cfd80fcae4482b111672fd38e412dba72caa75af717069d7182a99c7f30ea03dc9adf190f5aa1f01748247 diff --git a/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch b/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch deleted file mode 100644 index 4b715028f678..000000000000 --- a/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Mon, 2 Jan 2017 10:00:33 +0100 -Subject: [PATCH] dirmngr: Strip root zone suffix from libdns cname results. - -* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot. -(get_dns_cname_libdns): Ditto. --- - -Signed-off-by: Werner Koch <wk@gnupg.org> ---- - dirmngr/dns-stuff.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c -index a31b073..f2e1df9 100644 ---- a/dirmngr/dns-stuff.c -+++ b/dirmngr/dns-stuff.c -@@ -732,6 +732,10 @@ resolve_name_libdns (const char *name, unsigned short port, - err = gpg_error_from_syserror (); - goto leave; - } -+ /* Libdns appends the root zone part which is problematic -+ * for most other functions - strip it. */ -+ if (**r_canonname && (*r_canonname)[strlen (*r_canonname)-1] == '.') -+ (*r_canonname)[strlen (*r_canonname)-1] = 0; - } - - dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1); -@@ -1899,6 +1903,13 @@ get_dns_cname_libdns (const char *name, char **r_cname) - *r_cname = xtrystrdup (cname.host); - if (!*r_cname) - err = gpg_error_from_syserror (); -+ else -+ { -+ /* Libdns appends the root zone part which is problematic -+ * for most other functions - strip it. */ -+ if (**r_cname && (*r_cname)[strlen (*r_cname)-1] == '.') -+ (*r_cname)[strlen (*r_cname)-1] = 0; -+ } - - leave: - dns_free (ans); --- -2.8.1 - diff --git a/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild deleted file mode 100644 index 091ec57b80d5..000000000000 --- a/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="http://www.gnupg.org/" -LICENSE="GPL-3" - -MY_P="${P/_/-}" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -SLOT="0" -IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" - -COMMON_DEPEND_LIBS=" - >=dev-libs/npth-1.2 - >=dev-libs/libassuan-2.4.3 - >=dev-libs/libgcrypt-1.7.3 - >=dev-libs/libgpg-error-1.24 - >=dev-libs/libksba-1.3.4 - >=net-misc/curl-7.10 - gnutls? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - ldap? ( net-nds/openldap ) - bzip2? ( app-arch/bzip2 ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:0 ) ) - tofu? ( >=dev-db/sqlite-3.7 ) - " -COMMON_DEPEND_BINS="app-crypt/pinentry - !app-crypt/dirmngr" - -# Existence of executables is checked during configuration. -DEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - nls? ( sys-devel/gettext ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - selinux? ( sec-policy/selinux-gpg ) - nls? ( virtual/libintl )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" \ - "${FILESDIR}/${P}-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch" - epatch_user -} - -src_configure() { - local myconf=() - - if use smartcard; then - myconf+=( - --enable-scdaemon - $(use_enable usb ccid-driver) - ) - else - myconf+=( --disable-scdaemon ) - fi - - if use elibc_SunOS || use elibc_AIX; then - myconf+=( --disable-symcryptrun ) - else - myconf+=( --enable-symcryptrun ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h - - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --enable-gpg \ - --enable-gpgsm \ - --enable-large-secmem \ - "${myconf[@]}" \ - $(use_enable bzip2) \ - $(use_enable gnutls) \ - $(use_with ldap) \ - $(use_enable nls) \ - $(use_with readline) \ - $(use_enable tofu) \ - --enable-tools \ - $(use_enable wks-server wks-tools) \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -src_compile() { - default - - if use doc; then - cd doc - emake html - fi -} - -src_install() { - default - - use tools && dobin tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ - tools/make-dns-cert - emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA - - dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ - doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* - - dosym gpg2 /usr/bin/gpg - dosym gpgv2 /usr/bin/gpgv - echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 - echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg - - if use doc; then - dohtml doc/gnupg.html/* doc/*.png - fi -} diff --git a/app-crypt/gnupg/gnupg-2.1.17-r2.ebuild b/app-crypt/gnupg/gnupg-2.1.17-r2.ebuild deleted file mode 100644 index dbfe09bce25d..000000000000 --- a/app-crypt/gnupg/gnupg-2.1.17-r2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="http://www.gnupg.org/" -LICENSE="GPL-3" - -MY_P="${P/_/-}" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -SLOT="0" -IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" - -COMMON_DEPEND_LIBS=" - >=dev-libs/npth-1.2 - >=dev-libs/libassuan-2.4.3 - >=dev-libs/libgcrypt-1.7.3 - >=dev-libs/libgpg-error-1.24 - >=dev-libs/libksba-1.3.4 - >=net-misc/curl-7.10 - gnutls? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - ldap? ( net-nds/openldap ) - bzip2? ( app-arch/bzip2 ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:0 ) ) - tofu? ( >=dev-db/sqlite-3.7 ) - " -COMMON_DEPEND_BINS="app-crypt/pinentry - !app-crypt/dirmngr" - -# Existence of executables is checked during configuration. -DEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - nls? ( sys-devel/gettext ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - selinux? ( sec-policy/selinux-gpg ) - nls? ( virtual/libintl )" - -S="${WORKDIR}/${MY_P}" - -DOCS=( - ChangeLog NEWS README THANKS TODO VERSION - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER -) - -PATCHES=( - "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" - "${FILESDIR}/${P}-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch" -) - -src_configure() { - local myconf=() - - if use smartcard; then - myconf+=( - --enable-scdaemon - $(use_enable usb ccid-driver) - ) - else - myconf+=( --disable-scdaemon ) - fi - - if use elibc_SunOS || use elibc_AIX; then - myconf+=( --disable-symcryptrun ) - else - myconf+=( --enable-symcryptrun ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h - - econf \ - "${myconf[@]}" \ - $(use_enable bzip2) \ - $(use_enable gnutls) \ - $(use_enable nls) \ - $(use_enable tofu) \ - $(use_enable wks-server wks-tools) \ - $(use_with ldap) \ - $(use_with readline) \ - --enable-gpg \ - --enable-gpgsm \ - --enable-large-secmem \ - --enable-tools \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_install() { - default - - use tools && - dobin \ - tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ - tools/make-dns-cert - emake DESTDIR="${ED}" -f doc/Makefile uninstall-nobase_dist_docDATA - - dosym gpg2 /usr/bin/gpg - dosym gpgv2 /usr/bin/gpgv - echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 - echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg - - use doc && dodoc doc/gnupg.html/* doc/*.png -} |