From: Alon Bar-Lev Date: Sun, 11 Feb 2007 12:58:47 +0000 (+0000) Subject: Finish cleanup as requested by bug#164197 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=964b6717e738215e11c36bc5c087d9af0fb6a5d6;p=gentoo.git Finish cleanup as requested by bug#164197 Package-Manager: portage-2.1.2-r9 --- diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 79cba7881a7c..d5c7d3c9c46b 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # 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.277 2007/02/10 21:16:17 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.278 2007/02/11 12:58:47 alonbl Exp $ + + 11 Feb 2007; Alon Bar-Lev + -files/gnupg-1.4.5_rc1-ecc-helper.patch, -gnupg-1.4.5-r2.ebuild: + Finish cleanup as requested by bug#164197 10 Feb 2007; Alon Bar-Lev gnupg-1.4.6.ebuild, gnupg-1.4.6-r1.ebuild: diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 6cfde3a4019f..2db87666837d 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gnupg-1.4-emptytrustpackets.patch 611 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 SHA1 5de97cdd26d155132c828db89b28cd37e9f03aad SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689 MD5 c0b3223dbc599c2da7707cdae2b3683a files/gnupg-1.4-emptytrustpackets.patch 611 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 files/gnupg-1.4-emptytrustpackets.patch 611 @@ -49,10 +46,6 @@ AUX gnupg-1.4.5-ecc-helper.patch 349 RMD160 d0b3f8e7a42ca3f0e55a95e4d786d2b27b47 MD5 d3dfce5c3329cbbf981328e0e1b8d175 files/gnupg-1.4.5-ecc-helper.patch 349 RMD160 d0b3f8e7a42ca3f0e55a95e4d786d2b27b47b714 files/gnupg-1.4.5-ecc-helper.patch 349 SHA256 507bac4b69e14fed3a647a4ad38c445c868fa30146e16ba5c1ef95eb2ecbe1dc files/gnupg-1.4.5-ecc-helper.patch 349 -AUX gnupg-1.4.5_rc1-ecc-helper.patch 355 RMD160 1cfadc15bde3922a7047614ce0583ca9738f49e1 SHA1 f1ed9f40eab8613e126b4a2585a40367dad47208 SHA256 e5be26caf4b51f49529342791bc8886721d4e4ae5967cdd88555f3520db917bb -MD5 4882cbe55ee9eb446d103b469c13242e files/gnupg-1.4.5_rc1-ecc-helper.patch 355 -RMD160 1cfadc15bde3922a7047614ce0583ca9738f49e1 files/gnupg-1.4.5_rc1-ecc-helper.patch 355 -SHA256 e5be26caf4b51f49529342791bc8886721d4e4ae5967cdd88555f3520db917bb files/gnupg-1.4.5_rc1-ecc-helper.patch 355 AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 SHA1 8423f2fb9e41fdfbcb4b1eae2c5a99b0c9e045bb SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5 MD5 0e2449e22416d4ef22158a2baa72a494 files/gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 files/gnupg-1.4.6-badruman.patch 534 @@ -85,9 +78,7 @@ AUX gnupg-2.0.1-bsd-make.patch 6960 RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce37 MD5 30c96069403e772fc6bd777d0622dd9f files/gnupg-2.0.1-bsd-make.patch 6960 RMD160 694eaf6b2b12eb6aa5e425ca48fd37064ce371f2 files/gnupg-2.0.1-bsd-make.patch 6960 SHA256 cfac92c65ed1b8efa1927b8194eea62f7e45fadded559028a7072cc0685d29a3 files/gnupg-2.0.1-bsd-make.patch 6960 -DIST gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a SHA1 15831b5d4cbccdca3c005199d510700ee862fbc5 SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be DIST gnupg-1.4.5-ecc0.1.6.diff.bz2 16926 RMD160 1f80d5137f47e48bda96dd59506c452a3833e4e4 SHA1 be330df0b9907a151cd2b97659b93e4fa21fe491 SHA256 3263d8bd2bea6807445f9592b705ae4fca6bb89e8483613a53d553947424c51a -DIST gnupg-1.4.5.tar.bz2 3089617 RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5 SHA1 553fefe0da5a91108dd9468e381faf9487754f9a SHA256 f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805 DIST gnupg-1.4.6-ecc0.1.6.diff.bz2 17005 RMD160 6a30606386ad9848362f696e5f42c0614d2e5731 SHA1 cc18a613adc3ab382bda93e9a9b474606fd171ad SHA256 cbe2e1a987f7ef2339eb1cd0380708718027fc81da242c7a7c83d32287a83d35 DIST gnupg-1.4.6.tar.bz2 3149454 RMD160 c7e7409358aaaaf7f3bb202aa86f6121749b97e3 SHA1 9cbbef5c94f793867ff3ae4941816962311a0563 SHA256 fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c @@ -97,10 +88,6 @@ DIST gnupg-2.0.0.tar.bz2 3904270 RMD160 739e303f1380ec9cb5c3a248179001700efe6f2e DIST gnupg-2.0.1.tar.bz2 3923924 RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 SHA1 ec84ffb1d2ac013dc0afb5bdf8b9df2c838673e9 SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d DIST gnupg-2.0.2.tar.bz2 3969476 RMD160 6cc52da761927e17842842c00598c4974208affa SHA1 1a3165c5b601f3244b8885143d02bea4210495e3 SHA256 10da9a7adadedaa4a9bba8ed936e0421526eea3ea7b63081273d7aa740b3bef9 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 -EBUILD gnupg-1.4.5-r2.ebuild 5989 RMD160 bd31e4304b6b8746dabc17a5c721f991da6c4ebc SHA1 c6c71f8966b9fa6a5e2f4be6bbf17e5f32777c21 SHA256 a67740ddceb8070e22228c60a781fb48329ab3eb20dc4acb179124929013f9fe -MD5 935b15b17f1c232e742d0f5bd3c8f5cf gnupg-1.4.5-r2.ebuild 5989 -RMD160 bd31e4304b6b8746dabc17a5c721f991da6c4ebc gnupg-1.4.5-r2.ebuild 5989 -SHA256 a67740ddceb8070e22228c60a781fb48329ab3eb20dc4acb179124929013f9fe gnupg-1.4.5-r2.ebuild 5989 EBUILD gnupg-1.4.6-r1.ebuild 5801 RMD160 2f0a9db69a6aed5de72df5289ca0f97ea9066d1c SHA1 b238ebea8a37da5150c6da2d883923a4be331bea SHA256 784ee01eb551a87642c5f98009f7e2acb9b6c1d1028109757d1ecb549b23f101 MD5 715b8379b9aabffd08c6902aadd6733a gnupg-1.4.6-r1.ebuild 5801 RMD160 2f0a9db69a6aed5de72df5289ca0f97ea9066d1c gnupg-1.4.6-r1.ebuild 5801 @@ -149,17 +136,14 @@ 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 -MISC ChangeLog 42977 RMD160 a1c74b6805a91d5a808358b11012ff9b8c094cd8 SHA1 73696e349814bea2678bcd0646ffed19dc1a4b7a SHA256 89e605eb80817e1c0a1b1324edbf2cf0006c75ff91f52cdd6bc9a2583b5879ec -MD5 8f4bed8620ca914361a893d9bf83266f ChangeLog 42977 -RMD160 a1c74b6805a91d5a808358b11012ff9b8c094cd8 ChangeLog 42977 -SHA256 89e605eb80817e1c0a1b1324edbf2cf0006c75ff91f52cdd6bc9a2583b5879ec ChangeLog 42977 +MISC ChangeLog 43137 RMD160 a3037bdd2ca52c9b501743d1ad97a65866b24f5b SHA1 88a66affb1b7ee6766c909ae63d2f8630a941cf3 SHA256 a648f57734508e2be2e14ffbec864c14e7d45bb39467ee2cb4dd97c64bc6b6ae +MD5 4c8fef5a4a695f71603808d442ef1db7 ChangeLog 43137 +RMD160 a3037bdd2ca52c9b501743d1ad97a65866b24f5b ChangeLog 43137 +SHA256 a648f57734508e2be2e14ffbec864c14e7d45bb39467ee2cb4dd97c64bc6b6ae ChangeLog 43137 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata.xml 481 -MD5 8f18ae380f06f5dd90d7992982200d25 files/digest-gnupg-1.4.5-r2 708 -RMD160 bd8c14fcd3786d851d9a77b0a9aec639de6a5c23 files/digest-gnupg-1.4.5-r2 708 -SHA256 d8f3903fe059e480b38d1602fd9efa409019129dfc9362acfe3e363375b9f90d files/digest-gnupg-1.4.5-r2 708 MD5 5c3fa7ed67452d1f8d07729de1dbf3d3 files/digest-gnupg-1.4.6 708 RMD160 851f04c7257989afb7d059f3a8eed38ec7b89487 files/digest-gnupg-1.4.6 708 SHA256 923e5f60f1905c9a960016e5cfcc8e6979710c867e40c5b0fb2f22adf3931fad files/digest-gnupg-1.4.6 708 @@ -196,10 +180,3 @@ SHA256 bd68ceadd1c0dcb85124b859d63408bcf8f9676d4b95ba345e5f41550614ec53 files/di MD5 8dd7795cd36c3bff26a4d635297c5f45 files/digest-gnupg-2.0.2 241 RMD160 b938fa8c34590900d0b7e1efe151e2a7d18eac88 files/digest-gnupg-2.0.2 241 SHA256 d8968e441b1b712ddafaa0a1c0cb0f6d91eeae76a6a5f2d7adb6ada1a128c23a files/digest-gnupg-2.0.2 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFzu3/8bi6rjpTunYRAr7GAKDA86ovys1MezGZ8HBMTiv62Uo5SwCcDm8P -6/+HhSBR5ljHlOKbuj2ehEg= -=zIyl ------END PGP SIGNATURE----- diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.5-r2 b/app-crypt/gnupg/files/digest-gnupg-1.4.5-r2 deleted file mode 100644 index 78a17a5c85fc..000000000000 --- a/app-crypt/gnupg/files/digest-gnupg-1.4.5-r2 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 0be9a69c1ff363e4ad671860a2b9c14f gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 -RMD160 30af14d212c50c56d7f170b6697a9148d086bb5a gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 -SHA256 023e1da2837a06e9c92785184f31c6ecb31c0a328446100ab2c6dcf819c1f5be gnupg-1.4.4-ecc0.1.6.diff.bz2 16931 -MD5 811525965b4c0987e6418a7729a6444d gnupg-1.4.5.tar.bz2 3089617 -RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5 gnupg-1.4.5.tar.bz2 3089617 -SHA256 f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805 gnupg-1.4.5.tar.bz2 3089617 -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/gnupg-1.4.5_rc1-ecc-helper.patch b/app-crypt/gnupg/files/gnupg-1.4.5_rc1-ecc-helper.patch deleted file mode 100644 index cf26d3147856..000000000000 --- a/app-crypt/gnupg/files/gnupg-1.4.5_rc1-ecc-helper.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gnupg-1.4.4-ecc0.1.6.diff.orig 2006-08-01 10:22:39.000000000 +1000 -+++ gnupg-1.4.4-ecc0.1.6.diff 2006-08-01 10:24:34.000000000 +1000 -@@ -1961,8 +1961,8 @@ - - # Define the identity of the package. - PACKAGE='gnupg' --- VERSION='1.4.4' --+ VERSION='1.4.4-ecc0.1.6' -+- VERSION='1.4.5rc1' -++ VERSION='1.4.5rc1-ecc0.1.6' - - - cat >>confdefs.h <<_ACEOF diff --git a/app-crypt/gnupg/gnupg-1.4.5-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.5-r2.ebuild deleted file mode 100644 index 6d3735b885f2..000000000000 --- a/app-crypt/gnupg/gnupg-1.4.5-r2.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# 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.5-r2.ebuild,v 1.11 2007/01/24 17:05:34 genone Exp $ - -inherit eutils flag-o-matic - -ECCVER=0.1.6 -ECCVER_GNUPG=1.4.4 -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://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.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 X 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} - X? ( || ( media-gfx/xloadimage media-gfx/xli ) ) - ) - 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} - - - # Jari's patch to boost iterated key setup by factor of 128 - EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-jari.patch - - 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 - epatch "${FILESDIR}"/${P}-ecc-helper.patch - EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff - 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.3-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) \ - $(use_enable X photo-viewers) \ - --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,ChangeLog,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 -}