From: Jeremy Olexa <darkside@gentoo.org>
Date: Fri, 2 Jul 2010 18:27:02 +0000 (+0000)
Subject: Fix suid/permission handling. Bug 296413, approved by pva
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1f8484a4319656b00020758f8ef74a0e03b50cc5;p=gentoo.git

Fix suid/permission handling. Bug 296413, approved by pva
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index cd343b820db7..b0754ed823f6 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.91 2010/06/15 16:09:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.92 2010/07/02 18:27:02 darkside Exp $
+
+  02 Jul 2010; Jeremy Olexa <darkside@gentoo.org> mtr-0.79.ebuild:
+  Fix suid/permission handling. Bug 296413, approved by pva
 
 *mtr-0.79 (15 Jun 2010)
 
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index bc7f0b045b2a..6fbeec55c3ee 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -3,6 +3,6 @@ DIST gtk-2.0-for-mtr.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6
 DIST mtr-0.75.tar.gz 179376 RMD160 d7df41c0c9b457eeff4034c9bc2f01456b8f6c68 SHA1 d9d3f849e32dda8aa5a7a297c25053e5d8504b27 SHA256 1d1a5de6b233289bf17a21e3bf83c82db47d22bb269af986229b788689e1f0f3
 DIST mtr-0.79.tar.gz 272643 RMD160 dba8d5e6766e3961481efc2c0274659c3c1507c4 SHA1 eccd53d8b42b673b7e9fe68821900703f867e675 SHA256 92595db3aae89fea76a856d988eeb3935b6550ff43cfc7afd17dec910e1b0511
 EBUILD mtr-0.75.ebuild 1240 RMD160 0c4be5bf46d4385a042ef7330d3f2eb43380e89f SHA1 82c5aaf1ed335139737f243db91ddb56c845d6e5 SHA256 2cfd81e2a4ca7a07a7e518edaffa64e39ec692dbae9468ae22f31b9aeb04e0a5
-EBUILD mtr-0.79.ebuild 1198 RMD160 70a43dfac6ce1d8939004d27879e12e26881130f SHA1 0884a5177558c3c2375e08f6d383d54f96911536 SHA256 59227fffa7650108f4cbb9bff4f04336e2b99c97998f9a2eef627ab971cd5297
-MISC ChangeLog 10815 RMD160 c27b273d9735a5c20017a9d302d61da7534526e1 SHA1 c01a34e4829b54ac04b1e90e5e785f9d8a5e7462 SHA256 861b271cba86de41fb4781118b48972d72b8d21d45ecc711e01323280610cb0b
+EBUILD mtr-0.79.ebuild 1265 RMD160 0633c5abcdbe24479217e752e6d9f077b26bff90 SHA1 8d850f1285d8b342dc36d92d386b0f7440cbfcf8 SHA256 11e0aa7d6b505951763a77a4b4151ee0e36a5bac931f2190ff96ee1978db11d1
+MISC ChangeLog 10948 RMD160 5717ed076957a0fddc317a4b16562a1fa3a39f04 SHA1 8b70943d5408f4322a086f4dc2a537744f0ed79e SHA256 be37856212a6f11ce2acb8ddec6cc10abcaebc008b93f85eec68b94f8a5c7cc7
 MISC metadata.xml 244 RMD160 e017aaa0a93030fffb56cd11f8894d932ca77173 SHA1 6c242450f36154bb9453827b44e6c2dc99ddc634 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9
diff --git a/net-analyzer/mtr/mtr-0.79.ebuild b/net-analyzer/mtr/mtr-0.79.ebuild
index b63b5d05f765..ae4c30ab2ed0 100644
--- a/net-analyzer/mtr/mtr-0.79.ebuild
+++ b/net-analyzer/mtr/mtr-0.79.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.79.ebuild,v 1.1 2010/06/15 16:09:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.79.ebuild,v 1.2 2010/07/02 18:27:02 darkside Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gtk ipv6"
+IUSE="gtk ipv6 suid"
 
 RDEPEND="sys-libs/ncurses
 	gtk? ( >=x11-libs/gtk+-2.4.0 )"
@@ -37,7 +37,10 @@ src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	fowners root:0 /usr/sbin/mtr
-	fperms 4710 /usr/sbin/mtr
-
+	if use suid; then
+		fperms 4711 /usr/sbin/mtr
+	else
+		fperms 0710 /usr/sbin/mtr
+	fi
 	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO || die
 }