[gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/net-tools/files/, sys-apps/net-tools/

[Anthony G. Basile]

commit:     281dbc321e9f8fc7df4f01dca364ef6c7a3533fe
Author:     layman <layman <AT> localhost>
AuthorDate: Tue Jan 21 22:24:15 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 15:52:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=281dbc32

sys-apps/net-tools: fix assumption about headers

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 .../files/net-tools-fix-header-assumptions.patch   | 93 ++++++++++++++++++++
 sys-apps/net-tools/metadata.xml                    |  8 ++
 .../net-tools-1.60_p20120127084908-r99.ebuild      | 98 ++++++++++++++++++++++
 3 files changed, 199 insertions(+)

diff --git a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch b/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
new file mode 100644
index 0000000..f56dffc
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
@@ -0,0 +1,93 @@
+diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c net-tools-1.60_p20120127084908/lib/inet6_gr.c
+--- net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/lib/inet6_gr.c	2014-01-21 19:18:50.557199377 +0000
+@@ -23,9 +23,6 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#ifndef __GLIBC__
+-#include <netinet6/ipv6_route.h>	/* glibc doesn't have this */
+-#endif
+ #include "version.h"
+ #include "net-support.h"
+ #include "pathnames.h"
+diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c net-tools-1.60_p20120127084908/lib/inet6_sr.c
+--- net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/lib/inet6_sr.c	2014-01-21 19:19:23.307201208 +0000
+@@ -23,11 +23,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#ifdef __GLIBC__
+ #include <net/route.h>
+-#else
+-#include <netinet6/ipv6_route.h>	/* glibc does not have this */
+-#endif
+ #include "version.h"
+ #include "net-support.h"
+ #include "pathnames.h"
+diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet_sr.c net-tools-1.60_p20120127084908/lib/inet_sr.c
+--- net-tools-1.60_p20120127084908.orig/lib/inet_sr.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/lib/inet_sr.c	2014-01-21 20:41:59.223478324 +0000
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <asm-generic/param.h>
+ #include "version.h"
+ #include "net-support.h"
+ #include "pathnames.h"
+diff -Naur net-tools-1.60_p20120127084908.orig/lib/util-ank.c net-tools-1.60_p20120127084908/lib/util-ank.c
+--- net-tools-1.60_p20120127084908.orig/lib/util-ank.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/lib/util-ank.c	2014-01-21 20:42:56.876481548 +0000
+@@ -25,6 +25,7 @@
+ #include <netdb.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
++#include <limits.h>
+ 
+ #include "intl.h"
+ #include "util-ank.h"
+diff -Naur net-tools-1.60_p20120127084908.orig/mii-tool.c net-tools-1.60_p20120127084908/mii-tool.c
+--- net-tools-1.60_p20120127084908.orig/mii-tool.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/mii-tool.c	2014-01-21 20:54:31.563520392 +0000
+@@ -47,10 +47,6 @@
+ #include <net/if.h>
+ #include <linux/sockios.h>
+ 
+-#ifndef __GLIBC__
+-#include <linux/if_arp.h>
+-#include <linux/if_ether.h>
+-#endif
+ #include <linux/mii.h>
+ #include <linux/sockios.h>
+ #include "version.h"
+diff -Naur net-tools-1.60_p20120127084908.orig/netstat.c net-tools-1.60_p20120127084908/netstat.c
+--- net-tools-1.60_p20120127084908.orig/netstat.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/netstat.c	2014-01-21 20:43:34.023483625 +0000
+@@ -88,6 +88,7 @@
+ #include <sys/stat.h>
+ #include <net/if.h>
+ #include <dirent.h>
++#include <asm-generic/param.h>
+ 
+ #if HAVE_SELINUX
+ #include <selinux/selinux.h>
+diff -Naur net-tools-1.60_p20120127084908.orig/slattach.c net-tools-1.60_p20120127084908/slattach.c
+--- net-tools-1.60_p20120127084908.orig/slattach.c	2012-01-27 08:49:08.000000000 +0000
++++ net-tools-1.60_p20120127084908/slattach.c	2014-01-21 20:44:46.953487703 +0000
+@@ -45,14 +45,7 @@
+ #include <unistd.h>
+ #include <getopt.h>
+ #include <linux/if_slip.h>
+-
+-#if defined(__GLIBC__)
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
+-# include <termbits.h>
+-#else
+ # include <termios.h>
+-#endif
+-#endif
+ 
+ #include "pathnames.h"
+ #include "net-support.h"

diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
new file mode 100644
index 0000000..0c72e81
--- /dev/null
+++ b/sys-apps/net-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<use>
+ <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
+</use>
+</pkgmetadata>

diff --git a/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild
new file mode 100644
index 0000000..01c1324
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 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_p20120127084908.ebuild,v 1.16 2014/01/18 03:28:51 vapier 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
+	KEYWORDS=""
+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 ~arm-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls old-output static"
+
+RDEPEND="!<sys-apps/openrc-0.9.9.3"
+DEPEND="${RDEPEND}
+	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="nt/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	pushd nt >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
+	emake dist >/dev/null
+	popd >/dev/null
+	zcat ${p}.tar.gz | xz > ${p}.tar.xz
+	rm -f ${p}.tar.gz
+	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://git.overlays.gentoo.org/gitweb/?p=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() {
+	epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch
+	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'
+	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"
+}