Disable broken suid/caps automagic, bug 380619

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 42 insertions, 7 deletions

diff --git a/net-libs/liboping/ChangeLog b/net-libs/liboping/ChangeLog
index b7422dac995d..eceeef12e8c2 100644
--- a/net-libs/liboping/ChangeLog
+++ b/net-libs/liboping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/liboping
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/ChangeLog,v 1.5 2011/08/25 21:07:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/ChangeLog,v 1.6 2011/08/25 21:30:00 dilfridge Exp $
+
+  25 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> liboping-1.6.0.ebuild,
+  liboping-1.6.1.ebuild, +files/liboping-1.6.1-nouidmagic.patch:
+  Disable broken suid/caps automagic, bug 380619
 
   25 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> liboping-1.6.0.ebuild,
   liboping-1.6.1.ebuild:
diff --git a/net-libs/liboping/files/liboping-1.6.1-nouidmagic.patch b/net-libs/liboping/files/liboping-1.6.1-nouidmagic.patch
new file mode 100644
index 000000000000..16586b25ab3d
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.6.1-nouidmagic.patch
@@ -0,0 +1,19 @@
+--- liboping-1.6.1/src/Makefile.am	2011-03-06 10:03:21.000000000 +0100
++++ liboping-1.6.0/src/Makefile.am	2011-01-26 14:18:42.000000000 +0100
+@@ -51,16 +51,3 @@
+ noping_LDADD += -lrt
+ endif
+ endif # BUILD_WITH_LIBNCURSES
+-
+-install-exec-hook:
+-	@if test "x0" = "x$$UID"; then \
+-		if test "xLinux" = "x`uname -s`"; then \
+-			echo "Setting CAP_NET_RAW capability on binaries."; \
+-			setcap cap_net_raw=ep $(DESTDIR)$(bindir)/oping; \
+-			setcap cap_net_raw=ep $(DESTDIR)$(bindir)/noping; \
+-		else \
+-			echo "Setting set-UID bit on binaries."; \
+-			chmod u+s $(DESTDIR)$(bindir)/oping; \
+-			chmod u+s $(DESTDIR)$(bindir)/noping; \
+-		fi; \
+-	fi
diff --git a/net-libs/liboping/liboping-1.6.0.ebuild b/net-libs/liboping/liboping-1.6.0.ebuild
index 3a6b37459dde..4acae65f5fe3 100644
--- a/net-libs/liboping/liboping-1.6.0.ebuild
+++ b/net-libs/liboping/liboping-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.6.0.ebuild,v 1.2 2011/08/25 21:07:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.6.0.ebuild,v 1.3 2011/08/25 21:30:00 dilfridge Exp $
 
 EAPI=4
 
@@ -20,8 +20,8 @@ RDEPEND=${DEPEND}
 
 src_configure() {
 	econf \
-                $(use_with perl perl-bindings INSTALLDIRS=vendor) \
-                --disable-static
+		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
+		--disable-static
 }
 
 src_install() {
diff --git a/net-libs/liboping/liboping-1.6.1.ebuild b/net-libs/liboping/liboping-1.6.1.ebuild
index 82577be02b8a..b3d4c9090457 100644
--- a/net-libs/liboping/liboping-1.6.1.ebuild
+++ b/net-libs/liboping/liboping-1.6.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.6.1.ebuild,v 1.2 2011/08/25 21:07:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.6.1.ebuild,v 1.3 2011/08/25 21:30:00 dilfridge Exp $
 
 EAPI=4
 
+inherit base autotools
+
 DESCRIPTION="C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once"
 HOMEPAGE="http://verplant.org/liboping"
 SRC_URI="http://verplant.org/${PN}/files/${P}.tar.bz2"
@@ -18,13 +20,23 @@ DEPEND="
 "
 RDEPEND=${DEPEND}
 
+PATCHES=( "${FILESDIR}/${P}-nouidmagic.patch" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	econf \
-                $(use_with perl perl-bindings INSTALLDIRS=vendor) \
-                --disable-static
+		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
+		--disable-static
 }
 
 src_install() {
 	default
 	find "${D}" -name '*.la'  -delete || die
+
+	fperms u+s,og-r /usr/bin/oping
+	fperms u+s,og-r /usr/bin/noping
 }