gentoo resync : 29.08.2018

5 files changed, 31 insertions, 172 deletions

diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index e2a7b922dc14..11a3a50b53b0 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -1,7 +1,5 @@
+AUX liboping-1.10.0-gcc8-fix.patch 887 BLAKE2B c40500b5183eabe352e4a8b15c06f051de0240f1aadc43848e4f2b82c6e4feec44eed993d579ff04a1295eddf39bc312280396cfe3e1517c359f81f1a25f5230 SHA512 073ba6c52cf2c9f414e79a1411b7d7d4250c06dc32975bb96fba5df35ecf863e50bc3f8dd2c8b965e77890740b5414511bef2007f831d778c8527f27da87e834
 AUX liboping-1.6.2-nouidmagic.patch 741 BLAKE2B c8ee54176ded65740d5b035a4f572b45b42f8c4f6f99b723eef7c73d459c4b38907570c3da3dc54c2b71a360164ed1d84dce44a2053050c7ef13f72a13b36ba7 SHA512 d991b2871091c3e92d6b194bfdaa77db34455aec3c32087fff0a02ccee0e1f6fa0e0453a61d28a0fc9549644359f91425efef0b94e37c033d4d43b12bbd7b07d
-AUX liboping-1.8.0-remove-ncurses-automagic.patch 3192 BLAKE2B 4acbd0cffa4f1c5219e715c1194f800615c53ca152e7b3ae1f43d8556478ef2c410ceff4ea8bbfd28064e1818f1f708895a8322fce46553da34b5f1bb0e44315 SHA512 6bed10c7963f0ae3442e4ff4523985c61b8b8acca8bb39b511fb30b25133d50d31c642d181157216d903c647e585989e08892c4f61ffd9ee9964050769a8a656
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
-DIST liboping-1.9.0.tar.bz2 313884 BLAKE2B faf22b008bc60d8000b44d9fd3082eb6beafc0b1622c144b8b8b2b9fc79e8dc93380973c6c0a85726c2d4de55d9b94ed15dce7394a0b74d724cbd2554aaf25e1 SHA512 dcbadeea5154d4f4c31f806cae4ee5b8d5a8dfe243a9de4dad4b81b5b227538e1bb0c20afef121bd8ad841346da39fd5fb4710db981b89c11acc573c4f401c85
-EBUILD liboping-1.10.0.ebuild 1324 BLAKE2B eb093c47417564dd78ca46860e3865c001609f7de532fcd09bdc140b1bc3ee023768981c7f81b23549204603386a03bc7113c12c6b12ee01508bc7901a71798d SHA512 f21074efebd8c5865a41ef9a0f955ff96579c13bc85e3694bcb18a607dfcc24cea0dcdcb76c8b8e9719251f5c833e2119c8bfe90177f34730a3214e63b0050c9
-EBUILD liboping-1.9.0.ebuild 1382 BLAKE2B 2fc0a30587d69a359f081d9fd70ea025c568ac06947eb027a87290cd6eaa38bf79f023132e29f7fea66ea83feed09258943666c43d49257a3fc9608c3acb8c12 SHA512 eea9f247a6177d28a0e2d732090412ba1fff276968e70e6307a7f7a7dc77469be2e821241bb0f7e5cbb85bedc96504eaac07eaa0a31192dd3faf09aec97a8ec0
+EBUILD liboping-1.10.0-r1.ebuild 1359 BLAKE2B b07c09f90235e14eaf13c68d2df9e6dddc79177d22f5d672867dea40c13608a71c032bb7e26b8f02c854eaeb4b91f3dbfd576ffe0134b66600050fa75f642627 SHA512 9180bae51161c65b53769a32af2212ecb92188f5509a666a520a0febdca44f1821ed2a88309e0aa12dd0c1fc44196fab1891b2e73a7cb12e39b154041c000733
 MISC metadata.xml 717 BLAKE2B dfa3179582723dc5deb92ec7a8c0bdb39151f99ef68cd5033dc867811574c3b46b1390813caaf65aa18d5e3fea13762b7f5d38069a775c703ee6e849275fe00e SHA512 ef68e308920311969fc83de9e82e6e97648b5376819a5a122e1aa4c68ef3f6ae0bad6dc95a28eb4629f8915c4658facbeabc7740df090cff2598b5ebbd049edd
diff --git a/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch b/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch
new file mode 100644
index 000000000000..a7b3a3edd1c8
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch
@@ -0,0 +1,28 @@
+From 18ca43507b351f339ff23062541ee8d58e813a53 Mon Sep 17 00:00:00 2001
+From: Florian Forster <ff@octo.it>
+Date: Sun, 29 Jul 2018 14:34:19 +0200
+Subject: [PATCH] ping_host_add: Decrease buffer size to make GCC's truncation
+ check happy.
+
+Fixes: #38
+---
+ src/liboping.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/liboping.c b/src/liboping.c
+index 5253e8c..2470988 100644
+--- a/src/liboping.c
++++ b/src/liboping.c
+@@ -1636,10 +1636,8 @@ int ping_host_add (pingobj_t *obj, const char *host)
+ 		}
+ 		else
+ 		{
+-			char errmsg[PING_ERRMSG_LEN];
+-
+-			snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family);
+-			errmsg[PING_ERRMSG_LEN - 1] = '\0';
++			char errmsg[64];
++			snprintf (errmsg, sizeof(errmsg), "Unknown `ai_family': %d", ai_ptr->ai_family);
+ 
+ 			dprintf ("%s", errmsg);
+ 			ping_set_error (obj, "getaddrinfo", errmsg);
diff --git a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch b/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch
deleted file mode 100644
index 67e389ff139c..000000000000
--- a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-configure: Make use of ncurses configurable
-
-https://github.com/octo/liboping/pull/15
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -206,27 +206,30 @@ AC_CHECK_FUNCS(nanosleep, [],
- 		AC_MSG_ERROR(cannot find nanosleep)))
- AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
- 
--with_ncurses="no"
--AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], [])
--if test "x$with_ncurses" = "xyes"
--then
--	have_ncursesw="no"
--	have_ncurses="no"
--	NCURSES_LIB=""
-+AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses], [Build oping CLI tool with ncurses support]))
-+AS_IF([test "x$with_ncurses" != "xno"], [
-+	can_build_with_ncurses="no"
-+	PKG_CHECK_MODULES([NCURSES], [ncursesw], [can_build_with_ncurses=yes], [
-+		PKG_CHECK_MODULES([NCURSES], [ncurses], [can_build_with_ncurses=yes], [
-+			AC_CHECK_LIB(ncursesw, mvwprintw, [NCURSES_LIBS="-lncursesw"; can_build_with_ncurses=yes], [
-+				AC_CHECK_LIB(ncurses, mvwprintw, [NCURSES_LIBS="-lncurses"; can_build_with_ncurses=yes])
-+			])
-+		])
-+	])
- 
--	AC_CHECK_LIB(ncursesw, mvwprintw, [have_ncursesw="yes"], [have_ncursesw="no"])
--	AC_CHECK_LIB(ncurses, mvwprintw, [have_ncurses="yes"], [have_ncurses="no"])
-+	AS_IF([test "x$can_build_with_ncurses" = "xyes"], [
-+		AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h], [can_build_with_ncurses=yes; break;], [can_build_with_ncurses=no])
-+	])
- 
--	if test "x$have_ncursesw" = "xyes"; then
--		NCURSES_LIB="-lncursesw"
--	else if test "x$have_ncurses" = "xyes"; then
--		NCURSES_LIB="-lncurses"
--	else
--		with_ncurses="no"
--	fi; fi
--	AC_SUBST(NCURSES_LIB)
--fi
--AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" = "xyes")
-+	AS_IF([test "x$can_build_with_ncurses" = "xno" && test "x$with_ncurses" = "xyes"], [
-+		AC_MSG_ERROR([ncurses not found but explicit enabled])
-+	],
-+	[test "x$can_build_with_ncurses" = "xno"], [
-+		AC_MSG_WARN([Will not build oping with ncurses support -- no suiteable ncurses installation found])
-+	])
-+])
-+
-+AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" != "xno" && test "x$can_build_with_ncurses" = "xyes")
- 
- AC_FUNC_STRERROR_R
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -43,8 +43,8 @@ if BUILD_WITH_LIBNCURSES
- bin_PROGRAMS += noping
- 
- noping_SOURCES = oping.c
--noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1
--noping_LDADD = liboping.la -lm $(NCURSES_LIB)
-+noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1 $(NCURSES_CFLAGS)
-+noping_LDADD = liboping.la -lm $(NCURSES_LIBS)
- if BUILD_WITH_LIBRT
- noping_LDADD += -lrt
- endif
---- a/src/oping.c
-+++ b/src/oping.c
-@@ -82,11 +82,17 @@
- /* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
- # define _X_OPEN_SOURCE_EXTENDED
- 
--# if HAVE_NCURSESW_NCURSES_H
--#  include <ncursesw/ncurses.h>
--# elif HAVE_NCURSES_H
-+#if defined HAVE_NCURSESW_CURSES_H
-+#  include <ncursesw/curses.h>
-+#elif defined HAVE_NCURSESW_H
-+#  include <ncursesw.h>
-+#elif defined HAVE_NCURSES_CURSES_H
-+#  include <ncurses/curses.h>
-+#elif defined HAVE_NCURSES_H
- #  include <ncurses.h>
--# endif
-+#else
-+#  error "SysV or X/Open-compatible Curses header file required"
-+#endif
- 
- # define OPING_GREEN 1
- # define OPING_YELLOW 2
--- 
diff --git a/net-libs/liboping/liboping-1.10.0.ebuild b/net-libs/liboping/liboping-1.10.0-r1.ebuild
index 8f0bc99aa447..50dc00c8fb46 100644
--- a/net-libs/liboping/liboping-1.10.0.ebuild
+++ b/net-libs/liboping/liboping-1.10.0-r1.ebuild
@@ -19,6 +19,7 @@ RDEPEND=${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
+	"${FILESDIR}"/${P}-gcc8-fix.patch
 )
 
 src_prepare() {
diff --git a/net-libs/liboping/liboping-1.9.0.ebuild b/net-libs/liboping/liboping-1.9.0.ebuild
deleted file mode 100644
index 789d2a749265..000000000000
--- a/net-libs/liboping/liboping-1.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools fcaps perl-module
-
-DESCRIPTION="Protocol independent ANSI-C ping library and command line utility"
-HOMEPAGE="https://noping.cc/"
-SRC_URI="https://noping.cc/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/0.2"
-KEYWORDS="alpha amd64 arm x86"
-IUSE="+filecaps ncurses perl"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
-	"${FILESDIR}/${PN}-1.8.0-remove-ncurses-automagic.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
-		$(use_with ncurses)
-}
-
-src_test() {
-	if use perl; then
-		pushd bindings/perl >/dev/null || die
-		perl-module_src_test
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	if use filecaps; then
-		local _caps_str="CAP_NET_RAW"
-		_files=( "${EROOT%/}/usr/bin/oping")
-
-		if use ncurses; then
-			_files+=( "${EROOT%/}/usr/bin/noping")
-		fi
-
-		fcaps "${_caps_str}" "${_files[@]}"
-
-		elog "Capabilities for"
-		elog ""
-
-		local _file=
-		for _file in "${_files[@]}"; do
-			elog "  ${_file}"
-		done
-
-		elog ""
-		elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag."
-		elog
-	fi
-}