Disable broken suid/caps automagic, bug 380619

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 59 insertions, 23 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/Manifest b/net-libs/liboping/Manifest
index 67c806e713b0..ee7d7a3a175b 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX liboping-1.6.1-nouidmagic.patch 649 RMD160 2108e93735af1d6f79ad4a8b685fc68a40040154 SHA1 fff5a627260bbcc41fddbbd84d9fb33ee8bb3abc SHA256 aa37ac611fdb57fa08e66e2fd688a1221c8152677ed833636d90ef094090350f
 DIST liboping-1.6.0.tar.bz2 255311 RMD160 3b813131d6e634b46d7a80a98423e31bcad7c3aa SHA1 67f213e9fcd372e0ba0c342f793b52eab431691f SHA256 be042bbed28800b4c374399629961902e7b9f15f5f3adf37bbf763c397c20ad9
 DIST liboping-1.6.1.tar.bz2 282388 RMD160 76f07bc507bb5f351df1db0b9abc2fbea63c8698 SHA1 f8fa64134e5adff49b203f3ba0edf11ac0227532 SHA256 cf5c9ac217ddc653543785de50fae6b2595393efa9d73e2e1acb63dc48fb3983
-EBUILD liboping-1.6.0.ebuild 786 RMD160 abc75efe3775af2a2308ddb8981c1aabe3dab5ef SHA1 854a7165e438ff91caebff47f006165e1828fce3 SHA256 edf994fefbf3d0fb68fe9d4ba242873f35118b67c774058127ca4f9b37a27994
-EBUILD liboping-1.6.1.ebuild 786 RMD160 69b537af1189914acb24578b4ca79daf2cb736f2 SHA1 7753bae5ae7a540ea08cb87783ac8f615c415cc1 SHA256 f591cfc84d93fe67c303537001aff8006beb9b4b80ca42a2d5ad793f1458f34e
-MISC ChangeLog 1059 RMD160 d919a063643dbb53d5daffd4b5a5fb3008f95728 SHA1 a2531c9d14c133ff63c731d99f251ecb65c582f0 SHA256 a9488bebc30a3ef2d6d4dc15cf67b5f7745b7d34b4fe358829ce34009f3f82b6
+EBUILD liboping-1.6.0.ebuild 758 RMD160 a75b1320575995fba41b9aaf3826dd73abde7663 SHA1 95f3d5d681ad361efb43d61ce89dafb7a512841f SHA256 7bedfe5b826bfbcfca8798c25e7997c4073bd972cf154d134f6c581dfabb6a54
+EBUILD liboping-1.6.1.ebuild 947 RMD160 a08f1b71adeb2576a4dd1682f4cfb3e82abe242b SHA1 bebab21fd9c9c8c8f6c192c97247f3d061691c57 SHA256 e2d1cea0e142d88b4655b9817bb6318987c04661723d23df851ee30584fdb68e
+MISC ChangeLog 1254 RMD160 cdd678e6f2e6cea664ba1dea711712fd7b90e22d SHA1 419d86e5102e807d5b0dabd5481c2d82f239716e SHA256 f1b7e8928997a8c9a8f4d86969895a76504eb4f4b555b0d8de0ca5f4c71544f3
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOVrmLAAoJENwGBM22xffe4vwQAJJVY63TQwlAEgs37Bp4DUlF
-02BixC13aHCbLtcoqNnZ1pKoEkf1DtlaZC3xHoFZ6PkMQ2Ba4eQAKKpEwJandyKc
-rI4ARxU3WG5ABaHaxDBSVYYM0lfbU5fV4Eq8/nHPng5AlViqwEOgN5iUR43TdWiT
-1XyCzM8cY2RB6z0yJnlwo/DDOs7kOMUTNQ631CMQm7lFsSksfSorBP4LY2YZibE0
-ygezPGK3786KJ1/GH3rLYkZ7MScVuRKD3qePp7q3NHbaaEnYwTh/h4FzWT/l3/li
-BkWxL8aR30Z7bEJvo/tqCxjIYz2uAvJVWHiGRYS0uYcnrwZAy6tVd+cNr/doAUe3
-6cypVxZnPWWZpCmWTA3kItCHuf+p4hVj3PeMeIXqw074GzE3BVhKy7fdEhNh8a3R
-PLQUyK6+YBgTVhBF6lrM2G95NOpRnjH5Q2hJZ3I2QMJ/xkqNtWZS0p9YbH9+/jbz
-zBG11GbUEpuc3QR0TxECjL1ukRv34uo27yo3C9/G5CifqPSPmB1WsTGeQ0ZaXSAq
-rDIbIiHbMxjjAtvZ9GkHyl/LpvGYEWxQr/rXcAlntaPs/EPcsrPJGh4+QponOnox
-70nJ03mlKoiRcmKub8ouemMdrJ2yYT0Ilawy0mIB4ov5IUuTuIqhx+ot94jadlqD
-ufCqHfXVKcwhZZUeNkZC
-=T2Y+
+iQIcBAEBCgAGBQJOVr7rAAoJENwGBM22xffeXi4P/ioqC/zDab8xeiwYO+QbbWw2
+sanvgyBlT07WNi0RPIvBZknQ0rMhJ32HtXK3PKVdwY67IuoV5QotJRpp5eKGdvyD
+O+NzVnEuawkvk/HNxnMx6LYHw3DhVafI2EQDH/ErH+SKvEO7ijdeoSkNWeQ/Ystd
+MnBEOH0XkzVYRz2EnDgtwUkDfUZRMYGpA5Fbvko8SkAZiHs47kXUnuPytw0scKPi
+G2kO4kGRym1LFl0qRYSS+g7ruASjNk8/kHle4rZmhuzJ7oyLcKaPxNUE8dadowlk
+Ax9swEkaFjYNw5WA0Zyu4rJ0Xf+hC1Uivh20BBJtqqholfEH/2AfuebF49NSxw0J
+u0ctjZFkCZ9WmYPd1B03NojfbRATWi6mhoIi3ZvCEM/VH9Et1oS1jgZS7AS8E/Fj
+78guzJrETcYs23WAnkZp/J+3ooeHV6l45mSvgNzUK2X9bc4ntwqY1IIqgeVaEyeI
+nX31sDY8k1+TVZ9630++f1aLuReFZYqTzHVqR6OrY0pSLlN4COLUWKNuJdwVXjvb
+6VVhe+DxGZ6rB55/rmmA+8NovYB2Uisf9Vgtr+PJ0SVjFw0B5h5g5RoInvW/geE6
+2pFjRWrVOylIXMyWxrPQ4z9QiR1uUxaNdSQDj5r3+xKuOWNum1WwiKgJE1d6j5DO
+As8YmbhUeAWYaZDk6oHL
+=x/6J
 -----END PGP SIGNATURE-----
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
 }