From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- app-crypt/gnupg/Manifest | 6 +- app-crypt/gnupg/gnupg-2.2.10-r1.ebuild | 126 ------------------------------- app-crypt/gnupg/gnupg-2.2.10-r2.ebuild | 131 +++++++++++++++++++++++++++++++++ app-crypt/gnupg/gnupg-2.2.10.ebuild | 4 +- app-crypt/gnupg/metadata.xml | 3 + 5 files changed, 139 insertions(+), 131 deletions(-) delete mode 100644 app-crypt/gnupg/gnupg-2.2.10-r1.ebuild create mode 100644 app-crypt/gnupg/gnupg-2.2.10-r2.ebuild (limited to 'app-crypt/gnupg') diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 199c332ea2bb..ca28e1ed9eef 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -4,8 +4,8 @@ DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370be DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007 DIST gnupg-2.2.9.tar.bz2 6659547 BLAKE2B 3715fa0fcfbed24b0c985811c14e5a8c84caef0e66937ec7eb2ebefb4603a2c9a994d3c73224941254c685ca32cd83d7bb924fb7171ee569b346f2092ed7ae5d SHA512 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257 -EBUILD gnupg-2.2.10-r1.ebuild 3293 BLAKE2B 31c0b5f7e2b4f5feeb1cf5ffdbfe463075f86d56595ccb92b5a6a99a07b99613bb4e2915e456a435049a3674bba303a3ca782a9d98a8dcbc3432f98372385518 SHA512 6729c3c6885808059e8f5d3e4b19f8838a0908984d06abda0dc1340dd5944b7b3cc7f78648ba60352f7dec80b3d25bac51af849e631b25abe88b61801e26f5e1 -EBUILD gnupg-2.2.10.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a +EBUILD gnupg-2.2.10-r2.ebuild 3391 BLAKE2B 76baab11f3821af181f1747e131dd3ec86e748957a69009471147c509e5f795e681763deb8045db9c67ca05e5b57c244c03c82ae943e47c6e5a7d7cd0b6db0dc SHA512 205df2dd2b3fbb9f93f0a9fbbe24b922b8738a75921a1bc9147b799d9a383348fb7d8e836aae51e075865b9f0da5b7bc2f801c09fddd0048389b20435f9519ac +EBUILD gnupg-2.2.10.ebuild 3330 BLAKE2B 5463913efe11b4845e60846cf4600609a3d52583138c3e2e569f2601fb740ffdcdbe92ffcecbe1aa1572a971863a814b6c8beab66947f5af7d76a727d7c6b4a5 SHA512 d451d3b831d03960cab03907b2f607ab9b623681fc11fbc1adaeca317461f919c046c27173de6ddffe779f554e3f551292a7374fe5aec8b5eaf19fbdfd16b672 EBUILD gnupg-2.2.8.ebuild 3197 BLAKE2B 047ced194ad1467cdd5ade6f747b200aff373e5cbee4ae4ac17a113c4c1df5176abdb2658808c3bf00682dc08a42cca4c84c704016b682a8782521bf52783f4c SHA512 99bda452847ef64c1727b31d406034ad69da164355d18d36eefa7744f25cc2376abbf4dcc72b919884881b49cfdf27c8149c513c63c58467d4eb478d1db10fd7 EBUILD gnupg-2.2.9.ebuild 3334 BLAKE2B b59f061776948cacfcf4b0e7e348a66e2d8ae8fbb1ec3b906afc98944b9e3a92f35db13b8befb42194cdb71f2eebbf8a2e04ee9ec511aa73a5934d7996f1932e SHA512 7a8db6bfb393b88a60331ebdc3892f3b8175824adcf02338972084a6f272231bba783ff7394d02696471d962dc4298595d110c9f5b6127b6d8bedc00f1784c0a -MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069 +MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac diff --git a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild deleted file mode 100644 index 7d51332a5446..000000000000 --- a/app-crypt/gnupg/gnupg-2.2.10-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd toolchain-funcs - -MY_P="${P/_/-}" - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server" - -# Existence of executables is checked during configuration. -DEPEND="!app-crypt/dirmngr - >=dev-libs/libassuan-2.5.0 - >=dev-libs/libgcrypt-1.7.3 - >=dev-libs/libgpg-error-1.28 - >=dev-libs/libksba-1.3.4 - >=dev-libs/npth-1.2 - >=net-misc/curl-7.10 - bzip2? ( app-arch/bzip2 ) - ldap? ( net-nds/openldap ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:0 ) ) - ssl? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - tofu? ( >=dev-db/sqlite-3.7 ) - virtual/mta" - -RDEPEND="${DEPEND} - app-crypt/pinentry - nls? ( virtual/libintl ) - selinux? ( sec-policy/selinux-gpg )" - -BDEPEND="virtual/pkgconfig - doc? ( sys-apps/texinfo ) - nls? ( sys-devel/gettext )" - -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.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" -) - -src_configure() { - local myconf=() - - if use prefix && use usb; then - # bug #649598 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" - 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 nls) \ - $(use_enable smartcard scdaemon) \ - $(use_enable ssl gnutls) \ - $(use_enable tofu) \ - $(use_enable usb ccid-driver) \ - $(use_enable wks-server wks-tools) \ - $(use_with ldap) \ - $(use_with readline) \ - --disable-ntbtls \ - --enable-all-tests \ - --enable-gpg \ - --enable-gpgsm \ - --enable-large-secmem \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - $(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_test() { - #Bug: 638574 - use tofu && export TESTFLAGS=--parallel - default -} - -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 - - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die - - use doc && dodoc doc/gnupg.html/* doc/*.png - - systemd_douserunit doc/examples/systemd-user/*.{service,socket} -} diff --git a/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild new file mode 100644 index 000000000000..2bf51b3eec85 --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs + +MY_P="${P/_/-}" + +DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" + +# Existence of executables is checked during configuration. +DEPEND="!app-crypt/dirmngr + >=dev-libs/libassuan-2.5.0 + >=dev-libs/libgcrypt-1.7.3 + >=dev-libs/libgpg-error-1.28 + >=dev-libs/libksba-1.3.4 + >=dev-libs/npth-1.2 + >=net-misc/curl-7.10 + bzip2? ( app-arch/bzip2 ) + ldap? ( net-nds/openldap ) + readline? ( sys-libs/readline:0= ) + smartcard? ( usb? ( virtual/libusb:0 ) ) + ssl? ( >=net-libs/gnutls-3.0:0= ) + sys-libs/zlib + tofu? ( >=dev-db/sqlite-3.7 ) + virtual/mta" + +RDEPEND="${DEPEND} + app-crypt/pinentry + nls? ( virtual/libintl ) + selinux? ( sec-policy/selinux-gpg )" + +BDEPEND="virtual/pkgconfig + doc? ( sys-apps/texinfo ) + nls? ( sys-devel/gettext )" + +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.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" +) + +src_configure() { + local myconf=() + + if use prefix && use usb; then + # bug #649598 + append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" + fi + + if use elibc_SunOS || use elibc_AIX; then + myconf+=( --disable-symcryptrun ) + else + myconf+=( --enable-symcryptrun ) + fi + + #bug 663142 + if use user-socket; then + myconf+=( --enable-run-gnupg-user-socket ) + 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 nls) \ + $(use_enable smartcard scdaemon) \ + $(use_enable ssl gnutls) \ + $(use_enable tofu) \ + $(use_enable usb ccid-driver) \ + $(use_enable wks-server wks-tools) \ + $(use_with ldap) \ + $(use_with readline) \ + --disable-ntbtls \ + --enable-all-tests \ + --enable-gpg \ + --enable-gpgsm \ + --enable-large-secmem \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" \ + $(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_test() { + #Bug: 638574 + use tofu && export TESTFLAGS=--parallel + default +} + +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 + + dosym gpg /usr/bin/gpg2 + dosym gpgv /usr/bin/gpgv2 + echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die + echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die + + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die + + use doc && dodoc doc/gnupg.html/* doc/*.png + + systemd_douserunit doc/examples/systemd-user/*.{service,socket} +} diff --git a/app-crypt/gnupg/gnupg-2.2.10.ebuild b/app-crypt/gnupg/gnupg-2.2.10.ebuild index 0ca7e2fde80a..5824b9f624ac 100644 --- a/app-crypt/gnupg/gnupg-2.2.10.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server" COMMON_DEPEND_LIBS=" diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml index d9ae4079527c..710e79addfa5 100644 --- a/app-crypt/gnupg/metadata.xml +++ b/app-crypt/gnupg/metadata.xml @@ -22,6 +22,9 @@ Build direct CCID access for scdaemon; requires dev-libs/libusb. + + try a socket directory which is not removed by init manager at session end + Build mta support using virtual/mta. -- cgit v1.2.3