Fix bug #520700 - Properly enable SELinux support

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 216 insertions, 6 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 18ac1173b3ce..0c19ec0fa4d2 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.154 2015/04/25 16:36:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.155 2015/07/15 12:56:21 swift Exp $
+
+*net-tools-1.60_p20141019041918-r1 (15 Jul 2015)
+*net-tools-1.60_p20130513023548-r2 (15 Jul 2015)
+
+  15 Jul 2015; Sven Vermeulen <swift@gentoo.org>
+  +net-tools-1.60_p20130513023548-r2.ebuild,
+  +net-tools-1.60_p20141019041918-r1.ebuild:
+  Fix bug #520700 - Properly enable SELinux support
 
   25 Apr 2015; Mike Gilbert <floppym@gentoo.org>
   net-tools-1.60_p20110409135728.ebuild, net-tools-1.60_p20111120203157.ebuild,
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 037d090c92a0..0ea509aabfa3 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -16,15 +16,27 @@ EBUILD net-tools-1.60_p20110409135728.ebuild 2301 SHA256 d9274f0fe5ea00c0401f768
 EBUILD net-tools-1.60_p20111120203157.ebuild 2747 SHA256 4d0b9e08d0b129686f2324b1970bae393b25533a5791970361524f2c3b98d1d1 SHA512 013ab94cc32aa1f03006934f8416165ad5947080286d4912959750bc14bfe55f8a17dbec93db69fc8a938dfb679630a208e29d1a1622a9629f0e93fd07de1a06 WHIRLPOOL cbfa689810bef407c04d751e3521ce25c317f0ca207bad81626eb7705f14836c88d26a8a686abe187d61189c19260bfe1aae6c2f9d8f91142fe1a49be74b0341
 EBUILD net-tools-1.60_p20120127084908.ebuild 2749 SHA256 e9ae3144fbc33094c136c09596c7556e21456d883271ca7ef5eb1440eee71767 SHA512 5e1279e97766c95022e7dde621518ed47df1f619682d6420fb81ae63fd6c7f1db464c68eacf6fd08889faa4499df7f3ebad09ad75c732ac78bf390d242da1050 WHIRLPOOL 04911b022e06ab6fa665047aee6074aeb000f5764a78497bb9c757897072da436fda3a41131f8954a900d5be9d14ad31d0c3b1a5492c907712e772b7eaa546c7
 EBUILD net-tools-1.60_p20130513023548-r1.ebuild 2765 SHA256 efbf3369da461ed73df5d8ad25c4bb4b575e5d023b6471d4fa73c5b54a91470a SHA512 a5873e31368d569498ea72648a5cac2d20f47a8d77ecd07ae15387fdb43735a8b9c5e67d0058a08e80358c1e7b39b6900c1ef126b85e35c8c91865dbacad7119 WHIRLPOOL ea61fad29b5aa7235d0c99cfbb1d317d4f6df1dad92a14108e86a26ef02677a4d431747a836f51f9092ab4366690e6ab2ed62d3ec834a074219a2347de18af6b
+EBUILD net-tools-1.60_p20130513023548-r2.ebuild 2768 SHA256 b47d0d1fa80a42574cbfddbd9721c6a34595ce1c45720a29c3c02bc1b3f20368 SHA512 6e3401842c3bdc51bcc04337dac52344d06591cbff4cd7e9716d42466d95283f72dad859174bb7c2ad9a53325d8acbc1eedd1cf73b3fdf6cb9131b8f9ff6e4ae WHIRLPOOL d33c831b430555643c2d26e02d479ac9df3db53d5107faf061e93bd910244988cd148850a91eab74b00bd91112ac8e1a48c8d5be3d78e431d251680ff30ba6c1
 EBUILD net-tools-1.60_p20130513023548.ebuild 2750 SHA256 841667628d6f50efb72781ab8e7237d7e24467b94b1f1932e43309400161a150 SHA512 a3be11018a60ff9bc1ffdf5ed32b4e9b9a03fc60d1ee086d6fe7c62bb113df9f318fbd28d5d6517d894d8b45fc15321d99174e2eee5bf06b8e752e2eb1810923 WHIRLPOOL 99f6498ff5506e26784050b6e17a54e7dc4eaebfab737aaf43c876fc70d344ed78b1b200acf6ff45762967580e7063edbc7f46800b069ad0be2d5ce0f706ce2e
+EBUILD net-tools-1.60_p20141019041918-r1.ebuild 2768 SHA256 0e9aea08031f2ece2cfd5ff32dcedd97ca559eb9c5a66d0b55c3b831bd039ef9 SHA512 b40d19bd148653e131f38d73d4f480878ee91c6dad3ec3b835f82528d20f44d15e60488da4f125cad59c196e6b817a5cb27af483d675b18bfc480cb542e37b4f WHIRLPOOL 5a8ac3bdcba17029e2cb6c6eb98427f48a45494d4e3c4b2d7139ec7e5daff21238ebf3584be33eaab54c9ca75fe70f9f8ae8b81248438ec14d0eebd69cd6609f
 EBUILD net-tools-1.60_p20141019041918.ebuild 2762 SHA256 ce6a04c70d73b8f87e5d2a351f2b5b62dda342f8752bae6c43df67d7755315a7 SHA512 14db3ec825bd3b33d3872e127b490e04a3d37dfbda14637e2946f4740c76b3487e9033cec88c7d0b75bc07b04e3914e9eab34bd12970816199fcc42ec3a4cbc6 WHIRLPOOL c7158dee8644c113414607d579c96acb1b2a24749c22d1f4dcb5f7e27f4fc7efda4e1f1eb76f461e8a9a957982188e05e7cb7286fd20af383a0780edd7b11465
 EBUILD net-tools-9999.ebuild 2639 SHA256 94e2f44d3e21f6f93a55cc23f53d616fe7eb0b3315ea674af4410a9c1af574ac SHA512 e27238fc8811f2ca62e9a9807ce3a8ce6212b506fd0482b74e692dc3c6fba818602cfa37fe2b93c107f83800655255a5780e46e64de6478f51bdaea61bb90308 WHIRLPOOL c0fad392c57d3e9495fef7bb6f71518deaca153c1b1b408b9e0d24ce676f9ac302b3fee4e7f6f5a53286d5f26cc995ce1ac03ab32e792398d7938578eee847f6
-MISC ChangeLog 24366 SHA256 fc03886579794bdb89a750073443a7360d48a6bcf07da9a57f3995c542cebef3 SHA512 6d5ed9f2911b6cb54d26a301607771a69f0a609c750ed8ee035130aad59fa389e3505b11775173aecebcb0d57ec45b5e983fa61fb387a16f2653a9648961f93e WHIRLPOOL a2584d91f6961b015283cf9a29059344450d2065cd98fe6f4e461102f9da79577297c7d5bb29766ce2714db647459246f677bfa5baa3ec3652b99ae1aeda9be2
+MISC ChangeLog 24655 SHA256 a0d7447edfad831a58c37d390a3ef60c4227211b2164908531db3ab2975d2eb7 SHA512 e0c8fd376012aa8fdf4fbf2c47879effa776b2c65ea3b10b623ed99b17aea039ac59091d7e142837722f8419a139bef622514fa256492cf2b5c3de0fc39541b0 WHIRLPOOL 0407e6c32f7d521955e10d13b572940c03921ffd594de6a9e83ff2780c965028c61354031a2efad40734bd6297f5bdc11cea7a66067450079a08866f4bf46f61
 MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlU7wp4ACgkQC77qH+pIQ6QHtAEAiptp/+G0/6nVOgKhTT1IBofN
-bwHZXItZe1GGE3wbbY4A/iY5Q55Dm+/YxUxUvM/FsoTfqr/sc2RA7pRwp6kloShL
-=4Buz
+iQIcBAEBCAAGBQJVplh6AAoJEC7dUkA7aK9HGFkP/2T5INyJF/s8MzA5W8AcHzk/
+pfNT1pWtOxN/00ErkU5fynQELT/E4GWHALvrycUXIJUTdccT8aNoZAE68xcogk+p
+hnizDISLqSbgX03QH8KeicQlLkj5GzyU/hPP/Q7oLjvxsRnUZzDxlPILyjNl/Qu1
+/l4UXXJR1CYAS0gmx8gbdfxEnIMVN0ikc3AxRAmBrJE14RN8GQ6CACf8zwpLMjVC
+QFPsBAkqtBFTyg3ZFcjTGGo5CaDBxBqtzPwaczmgN+PL3M8AMCcSNgZRPpYAz5/T
+GIXisjkdNFQz8q/PuF400HNsETtRwDRAZu+lKUMzms4C/fMap+aSTM4ATA97CIvD
+A+rPt6ERCT05EOJeLMyj8qm3PStsGKDF/HyGDFVoW3GbsGmJQ1SFTSBwpk8/tZhS
+PPCmDVIpN16PikyW0ffNNyDWfeQzqwo7zXk5wA79dv5/mcnRGrwZppLzNNdNnaSr
+O6HWwTCL9/siV61cYHlCfCYYx8MeKK2rNqH7ADiloSxGH9/pAj5wEJezUc3kjZik
+Zfkaw7oVKWAFBXIzLrdBkf6yANB1SZvzkXWmM5tDNiLidpo04/vdpXV4Iltsx0kP
+2PtMudCTg+IAWkXkEvANdONeqA3xurSYrWNiu4j4B3Hvc2UOdmG+djAJp5ZTAfN9
+HGOzn4X6arkxhV+8+SXd
+=gMpI
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild
new file mode 100644
index 000000000000..01ccbfe90802
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548-r2.ebuild,v 1.1 2015/07/15 12:56:21 swift Exp $
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
+	inherit git-2
+else
+	PATCH_VER="2"
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls old-output selinux static"
+
+RDEPEND="!<sys-apps/openrc-0.9.9.3
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	selinux? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools
+	#git-update
+	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
+	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
+	local p="${PN}-${pv}"
+	git archive --prefix="${p}/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
+	tar cf - ${p}/ | xz > ${p}.tar.xz
+	popd >/dev/null
+
+	local patches="${p}-patches-${PATCH_VER:-1}"
+	local d="${T}/${patches}"
+	mkdir "${d}"
+	git format-patch -o "${d}" master..gentoo > /dev/null
+	echo "From http://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
+	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
+	rm -rf "${d}"
+
+	du -b "${T}"/*.tar.xz
+}
+
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
+
+set_opt() {
+	local opt=$1 ans
+	shift
+	ans=$("$@" && echo y || echo n)
+	einfo "Setting option ${opt} to ${ans}"
+	sed -i \
+		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
+		config.in || die
+}
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
+		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+	fi
+}
+
+src_configure() {
+	set_opt I18N use nls
+	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
+	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
+	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
+	set_opt HAVE_SELINUX use selinux
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+	einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
new file mode 100644
index 000000000000..8f248fa4abcf
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild,v 1.1 2015/07/15 12:56:21 swift Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
+	inherit git-2
+else
+	PATCH_VER="1"
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls old-output selinux static"
+
+RDEPEND="!<sys-apps/openrc-0.9.9.3
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	selinux? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools
+	#git-update
+	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
+	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
+	local p="${PN}-${pv}"
+	git archive --prefix="${p}/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
+	tar cf - ${p}/ | xz > ${p}.tar.xz
+	popd >/dev/null
+
+	local patches="${p}-patches-${PATCH_VER:-1}"
+	local d="${T}/${patches}"
+	mkdir "${d}"
+	git format-patch -o "${d}" master..gentoo > /dev/null
+	echo "From http://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
+	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
+	rm -rf "${d}"
+
+	du -b "${T}"/*.tar.xz
+}
+
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
+
+set_opt() {
+	local opt=$1 ans
+	shift
+	ans=$("$@" && echo y || echo n)
+	einfo "Setting option ${opt} to ${ans}"
+	sed -i \
+		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
+		config.in || die
+}
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
+		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+	fi
+}
+
+src_configure() {
+	set_opt I18N use nls
+	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
+	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
+	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
+	set_opt HAVE_SELINUX use selinux
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+	einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}