From 1e512c5866fb30d73e573455b16339b6df18186c Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Mon, 2 Apr 2007 09:00:32 +0000 Subject: [PATCH] Removed photo-viewer enforcement, bug#172331, thanks to Daniel Kenzelmann Package-Manager: portage-2.1.2.3 --- app-crypt/gnupg/ChangeLog | 9 +- app-crypt/gnupg/Manifest | 22 +- app-crypt/gnupg/files/digest-gnupg-1.4.7-r1 | 9 + app-crypt/gnupg/files/digest-gnupg-2.0.3-r1 | 3 + app-crypt/gnupg/gnupg-1.4.7-r1.ebuild | 210 ++++++++++++++++++++ app-crypt/gnupg/gnupg-2.0.3-r1.ebuild | 78 ++++++++ 6 files changed, 326 insertions(+), 5 deletions(-) create mode 100644 app-crypt/gnupg/files/digest-gnupg-1.4.7-r1 create mode 100644 app-crypt/gnupg/files/digest-gnupg-2.0.3-r1 create mode 100644 app-crypt/gnupg/gnupg-1.4.7-r1.ebuild create mode 100644 app-crypt/gnupg/gnupg-2.0.3-r1.ebuild diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 113b5dcc5313..8a15bef81795 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-crypt/gnupg # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.282 2007/03/14 15:21:17 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.283 2007/04/02 09:00:32 alonbl Exp $ + +*gnupg-2.0.3-r1 (02 Apr 2007) +*gnupg-1.4.7-r1 (02 Apr 2007) + + 02 Apr 2007; Alon Bar-Lev +gnupg-1.4.7-r1.ebuild, + +gnupg-2.0.3-r1.ebuild: + Removed photo-viewer enforcement, bug#172331, thanks to Daniel Kenzelmann *gnupg-1.4.7 (14 Mar 2007) diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 35ea65befd13..8495fa9cc96c 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -49,6 +49,10 @@ EBUILD gnupg-1.4.6.ebuild 5834 RMD160 1d6accc691815d02028b3f9e9460336da145f1f5 S MD5 87338bf29981a8e0fd297bbfa5f9a6a5 gnupg-1.4.6.ebuild 5834 RMD160 1d6accc691815d02028b3f9e9460336da145f1f5 gnupg-1.4.6.ebuild 5834 SHA256 32acc4a9c6c755df57d5dc8098b9765d523828664e249dbf99ed9188ce3753f6 gnupg-1.4.6.ebuild 5834 +EBUILD gnupg-1.4.7-r1.ebuild 6123 RMD160 694834fc6e934d8448c0ed139dab9d7245107d2d SHA1 f02c1a5fdd2c4153d2dae2d30ef95d1f0efddd04 SHA256 4808bb7813d4cfea166347143c1b3c2b0d497607e3d436b347dd5fceaa6a31d3 +MD5 86b48ad299607b2a064795369dc538de gnupg-1.4.7-r1.ebuild 6123 +RMD160 694834fc6e934d8448c0ed139dab9d7245107d2d gnupg-1.4.7-r1.ebuild 6123 +SHA256 4808bb7813d4cfea166347143c1b3c2b0d497607e3d436b347dd5fceaa6a31d3 gnupg-1.4.7-r1.ebuild 6123 EBUILD gnupg-1.4.7.ebuild 6008 RMD160 01aafc1f26c7d48d910ca80ec7dcd8f958b6ec3d SHA1 81be44367b0ad3e138c7937376c8e2f61920e466 SHA256 52d19abf478e580813d7a707662fadb0ca24c5ebc56eb1bdc9c52f21a0560080 MD5 66f0f2ede4e1199b08c8b1f4fa5285c2 gnupg-1.4.7.ebuild 6008 RMD160 01aafc1f26c7d48d910ca80ec7dcd8f958b6ec3d gnupg-1.4.7.ebuild 6008 @@ -73,14 +77,18 @@ EBUILD gnupg-2.0.2.ebuild 2163 RMD160 66c9a377942a247ff2fb5b4c46e09c62c3de6fd7 S MD5 920aabb2fa6a43449bf3593e5b4fc2ca gnupg-2.0.2.ebuild 2163 RMD160 66c9a377942a247ff2fb5b4c46e09c62c3de6fd7 gnupg-2.0.2.ebuild 2163 SHA256 1b7f1cc606275e0569d7fd61dd167109cb6a42b587b078cc109ff3e488484dd1 gnupg-2.0.2.ebuild 2163 +EBUILD gnupg-2.0.3-r1.ebuild 2037 RMD160 829a9d2ccb851c1e6a1f4c00191faa36309e3a52 SHA1 2ee9c906c18903ebdf141d19d80c492c65d2b399 SHA256 7dc2b087b1feedf36c088760d5a6104aee9d366165e99fad3cd52050115fb6d4 +MD5 14cb0c0d23ab602227503264758147e7 gnupg-2.0.3-r1.ebuild 2037 +RMD160 829a9d2ccb851c1e6a1f4c00191faa36309e3a52 gnupg-2.0.3-r1.ebuild 2037 +SHA256 7dc2b087b1feedf36c088760d5a6104aee9d366165e99fad3cd52050115fb6d4 gnupg-2.0.3-r1.ebuild 2037 EBUILD gnupg-2.0.3.ebuild 2146 RMD160 30b7575d24cd4a2ea9a9e32500916aae3016ba4b SHA1 ed87b7b6c06b66741509d4d0a698dffbe6bf82ba SHA256 5409ea7562b9d21fa85b0f6326521e34ea5c434ee5ce4479cb3de29ee9671866 MD5 2f09aafaeb973a7446d3444f2bf47bbe gnupg-2.0.3.ebuild 2146 RMD160 30b7575d24cd4a2ea9a9e32500916aae3016ba4b gnupg-2.0.3.ebuild 2146 SHA256 5409ea7562b9d21fa85b0f6326521e34ea5c434ee5ce4479cb3de29ee9671866 gnupg-2.0.3.ebuild 2146 -MISC ChangeLog 43873 RMD160 c743ecca378455951ebc8da39ab5512717e86737 SHA1 6684342bc216828230afb1cedd24eb5ab12c49c1 SHA256 c926244fd5adf7a049b6c78b4dc4e762e2df968aa9dd5a757521ec9c5c994891 -MD5 35d262ff60db3a49d2fb907d28f3daf0 ChangeLog 43873 -RMD160 c743ecca378455951ebc8da39ab5512717e86737 ChangeLog 43873 -SHA256 c926244fd5adf7a049b6c78b4dc4e762e2df968aa9dd5a757521ec9c5c994891 ChangeLog 43873 +MISC ChangeLog 44109 RMD160 5deaf18e35f7347975db85fcf463c9a4f9ddd6af SHA1 3d9c4cc983c7f154fbc233349e40c2cdedc9d2a3 SHA256 04e45626408b70ef5919dda647ae91c4f045c87507ee488f6b24db88d25357d4 +MD5 67631a447e05093f83a2f55be862bedf ChangeLog 44109 +RMD160 5deaf18e35f7347975db85fcf463c9a4f9ddd6af ChangeLog 44109 +SHA256 04e45626408b70ef5919dda647ae91c4f045c87507ee488f6b24db88d25357d4 ChangeLog 44109 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481 @@ -94,6 +102,9 @@ SHA256 39042a8cc3e1302c8fe61fd479aef940a9b014797305450f5119f3780b68df22 files/di MD5 86dd165d088b67a019b76b7da0cf4a48 files/digest-gnupg-1.4.7 708 RMD160 dada10775841b227a433d3c2c0f7a9556bca5772 files/digest-gnupg-1.4.7 708 SHA256 59ec1edd1c0bac754b898f777d4b32a2ff7272aea738413ac7b356335a199b63 files/digest-gnupg-1.4.7 708 +MD5 86dd165d088b67a019b76b7da0cf4a48 files/digest-gnupg-1.4.7-r1 708 +RMD160 dada10775841b227a433d3c2c0f7a9556bca5772 files/digest-gnupg-1.4.7-r1 708 +SHA256 59ec1edd1c0bac754b898f777d4b32a2ff7272aea738413ac7b356335a199b63 files/digest-gnupg-1.4.7-r1 708 MD5 3a094d262f7870e0d3148bf61e353a31 files/digest-gnupg-1.9.21 244 RMD160 85a121d64713e41d718ffaafc308776d580c0b9f files/digest-gnupg-1.9.21 244 SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/digest-gnupg-1.9.21 244 @@ -112,3 +123,6 @@ SHA256 d8968e441b1b712ddafaa0a1c0cb0f6d91eeae76a6a5f2d7adb6ada1a128c23a files/di MD5 e4d530bc313564aa381b4917b54bff85 files/digest-gnupg-2.0.3 241 RMD160 993635401768a1de1ce0acc33509efc8a21d71b6 files/digest-gnupg-2.0.3 241 SHA256 f9a567761dd5dcce7091323289399cb11025cd836be9f103aa248c2b8577997a files/digest-gnupg-2.0.3 241 +MD5 e4d530bc313564aa381b4917b54bff85 files/digest-gnupg-2.0.3-r1 241 +RMD160 993635401768a1de1ce0acc33509efc8a21d71b6 files/digest-gnupg-2.0.3-r1 241 +SHA256 f9a567761dd5dcce7091323289399cb11025cd836be9f103aa248c2b8577997a files/digest-gnupg-2.0.3-r1 241 diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.7-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.7-r1 new file mode 100644 index 000000000000..a5be7d35d764 --- /dev/null +++ b/app-crypt/gnupg/files/digest-gnupg-1.4.7-r1 @@ -0,0 +1,9 @@ +MD5 9bd5efa5bd51f9c3bc7f9da5efe96169 gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 +RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 +SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 +MD5 b06a141cca5cd1a55bbdd25ab833303c gnupg-1.4.7.tar.bz2 3200642 +RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b gnupg-1.4.7.tar.bz2 3200642 +SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d gnupg-1.4.7.tar.bz2 3200642 +MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216 +RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216 +SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216 diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.3-r1 b/app-crypt/gnupg/files/digest-gnupg-2.0.3-r1 new file mode 100644 index 000000000000..68c838a92ee5 --- /dev/null +++ b/app-crypt/gnupg/files/digest-gnupg-2.0.3-r1 @@ -0,0 +1,3 @@ +MD5 4e33a5d35583da439f1bd26aa7e7042a gnupg-2.0.3.tar.bz2 3965529 +RMD160 bedd74d6c3a93cf6fbe719a2749ba658fa102cca gnupg-2.0.3.tar.bz2 3965529 +SHA256 d6c45386458d04cd56ceedad998f5aaf67e46e18d408a8e3658160aaf7751a86 gnupg-2.0.3.tar.bz2 3965529 diff --git a/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild new file mode 100644 index 000000000000..edb192adf948 --- /dev/null +++ b/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.7-r1.ebuild,v 1.1 2007/04/02 09:00:32 alonbl Exp $ + +inherit eutils flag-o-matic + +ECCVER="0.1.6" +ECCVER_GNUPG="1.4.7" +ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff" +MY_P=${P/_/} + +DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2 + !bindist? ( + idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz ) + ecc? ( http://www.calcurco.cat/eccGnuPG/src/${ECC_PATCH}.bz2 ) + )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib linguas_ru" + +COMMON_DEPEND=" + ldap? ( net-nds/openldap ) + bzip2? ( app-arch/bzip2 ) + zlib? ( sys-libs/zlib ) + curl? ( net-misc/curl ) + virtual/mta + readline? ( sys-libs/readline ) + smartcard? ( dev-libs/libusb ) + usb? ( dev-libs/libusb )" + +RDEPEND="!static? ( ${COMMON_DEPEND} ) + selinux? ( sec-policy/selinux-gnupg ) + nls? ( virtual/libintl )" + +DEPEND="${COMMON_DEPEND} + dev-lang/perl + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + + if use idea; then + if use bindist; then + einfo "Skipping IDEA support to comply with binary distribution (bug #148907)." + else + ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html" + mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \ + ewarn "failed to insert IDEA module" + fi + fi + + if use ecc; then + if use bindist; then + einfo "Skipping ECC patch to comply with binary distribution (bug #148907)." + else + sed -i \ + "s/- VERSION='${ECCVER_GNUPG}'/- VERSION='${PV}'/" \ + "${ECC_PATCH}" + sed -i \ + "s/+ VERSION='${ECCVER_GNUPG}-ecc${ECCVER}'/+ VERSION='${PV}-ecc${ECCVER}'/" \ + "${ECC_PATCH}" + + EPATCH_OPTS="-p1 -d ${S}" epatch "${ECC_PATCH}" + fi + fi + + # maketest fix + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch + + # install RU man page in right location + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.6-badruman.patch + + # keyserver fix + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch + + cd "${S}" + # Fix PIC definitions + sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c + sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S +} + +src_compile() { + # Certain sparc32 machines seem to have trouble building correctly with + # -mcpu enabled. While this is not a gnupg problem, it is a temporary + # fix until the gcc problem can be tracked down. + if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then + filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7 + fi + + # 'USE=static' support was requested in #29299 + use static &&append-ldflags -static + + append-ldflags $(bindnow-flags) + + # fix compile problem on ppc64 + use ppc64 && myconf="${myconf} --disable-asm" + + econf \ + $(use_enable ldap) \ + --enable-mailto \ + --enable-hkp \ + --enable-finger \ + $(use_with !zlib included-zlib) \ + $(use_with curl libcurl /usr) \ + $(use_enable nls) \ + $(use_enable bzip2) \ + $(use_enable smartcard card-support) \ + $(use_enable selinux selinux-support) \ + --disable-capabilities \ + $(use_with readline) \ + $(use_with usb libusb /usr) \ + $(use_enable static) \ + --enable-static-rnd=linux \ + --libexecdir=/usr/libexec \ + --enable-noexecstack \ + ${myconf} || die + # this is because it will run some tests directly + gnupg_fixcheckperms + emake || die +} + +src_install() { + gnupg_fixcheckperms + make DESTDIR="${D}" install || die + + # keep the documentation in /usr/share/doc/... + rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html" + + dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \ + TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP,faq.raw} + + docinto sgml + dodoc doc/*.sgml + + dohtml doc/faq.html + + exeinto /usr/libexec/gnupg + doexe tools/make-dns-cert + + # install RU documentation in right location + if use linguas_ru + then + cp doc/gpg.ru.1 ${T}/gpg.1 + doman -i18n=ru ${T}/gpg.1 + fi +} + +gnupg_fixcheckperms() { + # GnuPG does weird things for testing that it build correctly + # as we as for the additional tests. It WILL fail with perms 770 :-(. + # See bug #80044 + if has userpriv ${FEATURES}; then + einfo "Fixing permissions in check directory" + chown -R portage:portage ${S}/checks + chmod -R ugo+rw ${S}/checks + chmod ugo+rw ${S}/checks + fi +} + +src_test() { + gnupg_fixcheckperms + einfo "Running tests" + emake check + ret=$? + if [ $ret -ne 0 ]; then + die "Some tests failed! Please report to the Gentoo Bugzilla" + fi +} + +pkg_postinst() { + ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9," + ewarn "you MUST make the gpg binary setuid." + echo + if use !bindist && use idea; then + elog + elog "IDEA" + elog "you have compiled ${PN} with support for the IDEA algorithm, this code" + elog "is distributed under the GPL in countries where it is permitted to do so" + elog "by law." + elog + elog "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information." + elog + ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted" + ewarn "to use it at no cost for 'non revenue generating data transfer between private" + ewarn "individuals'." + ewarn + ewarn "Countries where the patent applies are listed here" + ewarn "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp" + ewarn + ewarn "Further information and other licenses are availble from http://www.mediacrypt.com/" + ewarn + fi + if use !bindist && use ecc; then + ewarn + ewarn "The elliptical curves patch is experimental" + ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html" + fi + elog + elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg" + elog + elog "If you wish to view images emerge:" + elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" + elog "Remember to use photo-viewer option in configuration file to activate the right viewer" +} diff --git a/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild new file mode 100644 index 000000000000..abab798c1bc3 --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild,v 1.1 2007/04/02 09:00:32 alonbl Exp $ + +inherit flag-o-matic + +DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="bzip2 doc ldap nls openct pcsc-lite smartcard selinux" + +COMMON_DEPEND=" + virtual/libc + >=dev-libs/pth-1.3.7 + >=dev-libs/libgcrypt-1.2.0 + >=dev-libs/libksba-1.0.0 + >=dev-libs/libgpg-error-1.4 + >=dev-libs/libassuan-1.0.1 + >=net-misc/curl-7.7.2 + bzip2? ( app-arch/bzip2 ) + pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) + openct? ( >=dev-libs/openct-0.5.0 ) + ldap? ( net-nds/openldap ) + app-crypt/pinentry" + +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext ) + doc? ( sys-apps/texinfo )" + +RDEPEND="${COMMON_DEPEND} + !app-crypt/gpg-agent + !<=app-crypt/gnupg-2.0.1 + virtual/mta + selinux? ( sec-policy/selinux-gnupg ) + nls? ( virtual/libintl )" + +src_compile() { + append-ldflags $(bindnow-flags) + + econf \ + --enable-symcryptrun \ + --enable-gpg \ + --enable-gpgsm \ + --enable-agent \ + $(use_enable bzip2) \ + $(use_enable smartcard scdaemon) \ + $(use_enable nls) \ + $(use_enable ldap) \ + --disable-capabilities \ + || die + emake || die + if use doc; then + cd doc + emake html || die + fi +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc ChangeLog NEWS README THANKS TODO VERSION + + dosym gpg2 /usr/bin/gpg + dosym gpgv2 /usr/bin/gpgv + echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1" + echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1" + + use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png +} + +pkg_postinst() { + elog "If you wish to view images emerge:" + elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" + elog "Remember to use photo-viewer option in configuration file to activate the right viewer" +} -- 2.26.2