From: Daniel Black Date: Sat, 3 Sep 2005 11:15:26 +0000 (+0000) Subject: post 2.6.9 kernels don't get suid root on gpg (bug #102501) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87984387f417b91e8963f738c6ea309b3e1fed8c;p=gentoo.git post 2.6.9 kernels don't get suid root on gpg (bug #102501) Package-Manager: portage-2.0.51.22-r2 --- diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 6db4660a04fe..406e1719644f 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gnupg # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.129 2005/08/31 21:02:15 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.130 2005/09/03 11:15:26 dragonheart Exp $ + + 03 Sep 2005; Daniel Black gnupg-1.4.2-r2.ebuild: + Check kernel version so that users with post 2.6.9 kernels don't get suid + root on gpg (bug #102501). Thanks to Tobias Sager 31 Aug 2005; Daniel Black +files/gnupg-1.4.2-jari.patch, gnupg-1.4.2-r2.ebuild: diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 1bdecf3047a1..510fcd500bde 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -2,9 +2,9 @@ Hash: SHA1 MD5 83679e04da772721130866b531ea0da2 gnupg-1.9.18.ebuild 3211 -MD5 0bedf7570556909f0d5fc50d04de91b3 ChangeLog 21434 +MD5 87fdacc9d65d942c90aa4ee5ad8064e1 ChangeLog 21639 MD5 1acf1bfff7899ec20b139fbba785e69c gnupg-1.4.2-r1.ebuild 6250 -MD5 896521bec32a5589de756e83ecf4481d gnupg-1.4.2-r2.ebuild 6295 +MD5 1b511c3c1694cd55e2f9687ecef65493 gnupg-1.4.2-r2.ebuild 6422 MD5 921f00a83ce6b1d77190396b4456f05f gnupg-1.2.6.ebuild 3800 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481 MD5 fb2459cc632ade0377625d0768292e92 gnupg-1.4.1.ebuild 6195 @@ -23,7 +23,7 @@ MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDFhr1mdTrptrqvGERAmqXAJ4n3Hii9k+bNs0SjoGbl8P7QHgYNQCbBj54 -BXN/lIRqIDntJuMKnYuICgc= -=6axk +iD8DBQFDGYXlmdTrptrqvGERAqmjAJ4ugeWfKZrIgNRbCJSA1RqruI/7yQCdHgMw +4hZePB7PTm349HwVNOHbXe0= +=YxX7 -----END PGP SIGNATURE----- diff --git a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild index f3d0e1c99325..0253f2791bf0 100644 --- a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild +++ b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.2 2005/08/31 21:02:15 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.3 2005/09/03 11:15:26 dragonheart Exp $ -inherit eutils flag-o-matic +inherit eutils flag-o-matic linux-info ECCVER=0.1.6 ECCVER_GNUPG=1.4.0 @@ -127,7 +127,11 @@ src_install() { make DESTDIR=${D} install || die # caps support makes life easier - use caps || fperms u+s,go-r /usr/bin/gpg + if ! use caps && kernel_is lt 2 6 9 + then + ewarn "installing gpg suid for memory space protection" + fperms u+s,go-r /usr/bin/gpg + fi # keep the documentation in /usr/share/doc/... rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html" @@ -169,7 +173,8 @@ src_test() { } pkg_postinst() { - if ! use caps; then + if ! use caps && kernel_is lt 2 6 9 + then einfo "gpg is installed suid root to make use of protected memory space" einfo "This is needed in order to have a secure place to store your" einfo "passphrases, etc. at runtime but may make some sysadmins nervous."