gentoo resync : 25.08.2020

3 files changed, 193 insertions, 3 deletions

diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index 6e76ae8eee61..a8ebcee02b6a 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,5 +1,6 @@
 AUX scanssh-2.0-fix-warnings.diff 1071 BLAKE2B c92997cd26cd03ec451ebf83a54f19ba86d6b33f90dd666c8637fceb222849b3d2703ca9c8c1645a95186059ccf049ae462d7a4c58486ee8c0d086cb8f73e625 SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06
+AUX scanssh-2.0-libdir.diff 4916 BLAKE2B 23fb00f8880e9a2407e919c626328430fc7c09d21bcdb535cf2411b41fc4c623ab04e2411dbdd239e62cc4f6545b9d67d29bab879f6ac268c241d1cd884b2592 SHA512 be01518f156b724439837150f9f02148d6f92c0bac2557419f2f9def9244d29006a6c84ceecf193b6f57830c697d9b650102625cf78787fc59709a2ef2b7847f
 DIST scanssh-2.1.tar.gz 111481 BLAKE2B 08ba8439cd02d597647f865fed68ef9eb32d63726f8d14bebe3b58a067b56eee70e01a1a7911ce69cf4466c0863d92d5d22e0202bb1cc60426ac283855438079 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c
-EBUILD scanssh-2.1-r1.ebuild 647 BLAKE2B 11b7cbd3020698756b9ddced2827fc4e249ad7defafc71059efa4f7079473e824c29a5b88de1aa8f75470b4bb7a4812e880992962dfe0b11e1c3cf402448c237 SHA512 89f9bae762d242c013b99a971c55b4e0bd4d1ada3253760e5de0c89a08de5ec9fcd59241a14ac5f9ed25ba8bb90a96a9bf0f8634569cf4cf722338955f93a84a
+EBUILD scanssh-2.1-r2.ebuild 831 BLAKE2B 141448c971983f22bbace5a1888e20eef9ee99597ae44092f271689950be50e3c7f527d782e2740eac24d7c36992684f95aec8c559d93cb262b60de197bc3419 SHA512 50d6179496f1896edb14278af86ae7c9452932579073802017394442c4b8d656fd4bb41952b2bb9ceb6b4f0bd755522f94bab50b04f918468bcf48be9d7839ca
 EBUILD scanssh-2.1.ebuild 641 BLAKE2B 8023919e0452fdaa5420cf90b59466b04070b9c4b1ff733657d5a0b22ab6c870113a9234b1442d88a02b34d91d8504a41eb101e38fd77e8c58c41bb8d61bd59e SHA512 56e016f7ff11ea334c276f011b73870079e1b40bc2baeab621a141722b1f52c9da7f1d16beedc0952b6722907fe5445d3b40b7252141abd99de10e68e3329baa
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/files/scanssh-2.0-libdir.diff b/net-analyzer/scanssh/files/scanssh-2.0-libdir.diff
new file mode 100644
index 000000000000..23cb3c722717
--- /dev/null
+++ b/net-analyzer/scanssh/files/scanssh-2.0-libdir.diff
@@ -0,0 +1,177 @@
+--- a/configure.in
++++ b/configure.in
+@@ -20,8 +20,8 @@
+ AC_PROG_INSTALL
+ 
+ dnl XXX - Solaris sux.
+-AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(nsl, gethostbyname)
++AC_SEARCH_LIBS(socket, socket)
++AC_SEARCH_LIBS(gethostbyname, nsl)
+ 
+ dnl XXX - we need WinPcap developer's pack under Cygwin for win32
+ AC_CYGWIN
+@@ -77,92 +77,9 @@
+    AC_LIBOBJ(err)
+ fi
+ 
+-dnl Checks for libpcap
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap,
+-[  --with-libpcap=DIR      use libpcap build directory],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAPINC="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
+-     else
+-        AC_ERROR(pcap.h or libpcap.a not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/pcap.h; then
+-     PCAPINC="-I${prefix}/include"
+-     PCAPLIB="-L${prefix}/lib -lpcap"
+-  elif test -f /usr/include/pcap/pcap.h; then
+-     PCAPINC="-I/usr/include/pcap"
+-     PCAPLIB="-lpcap"
+-  elif test -f /usr/include/pcap.h; then
+-     PCAPLIB="-lpcap"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libpcap not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+ AC_SUBST(PCAPINC)
+ AC_SUBST(PCAPLIB)
+ 
+-dnl Checks for (installed) libdnet
+-AC_ARG_WITH(libdnet,
+-[  --with-libdnet=DIR      use libdnet in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_ERROR([Please specify directory containing dnet-config when using --with-libdnet])
+-     ;;
+-  *)
+-     AC_MSG_CHECKING(for libdnet)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/src/libdnet.a; then
+-	DNETINC="-I$withval/include"
+-	DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`"
+-     elif test -x $withval/bin/dnet-config; then
+-	DNETINC="`$withval/bin/dnet-config --cflags`"
+-	DNETLIB="`$withval/bin/dnet-config --libs`"
+-     else
+-        AC_MSG_RESULT(no)
+-        AC_ERROR(dnet-config not found in $withval/bin)
+-     fi
+-     ;;
+-  esac
+-  AC_MSG_RESULT(yes) ],
+-[ dnl This is the default case so let's just use AC_PATH_PROG! --CPK.
+-  AC_PATH_PROG(dnetconfig, dnet-config, "no")
+-  if test "$dnetconfig" = "no"; then
+-     AC_ERROR(dnet-config not found)
+-  else
+-     DNETINC="`$dnetconfig --cflags`"
+-     DNETLIB="`$dnetconfig --libs`"
+-  fi]
+-)
+-
+-dnl We still need to check whether it's dnet or dumbnet as
+-dnl for example on Debian. We test by looking at the content
+-dnl of DNETLIB and derive from the library name what version
+-dnl we're dealing with. If we find a libdumbnet, we prefix
+-dnl compat/libdnet to our inclusion path. It provides a dnet.h
+-dnl that transparently includes dumbnet.h for those systems. --CPK.
+-AC_MSG_CHECKING([whether libdnet is a libdumbnet])
+-if test `echo $DNETLIB | sed -e '/dumb/=;d'`; then
+-     AC_MSG_RESULT(yes)
+-     AC_DEFINE(HAVE_DUMBNET, 1,
+-		[Define if our libdnet is a libdumbnet])
+-     DNETCOMPAT="compat/libdnet"
+-else
+-     AC_MSG_RESULT(no)
+-fi
+-
+ AC_SUBST(DNETCOMPAT)
+ AC_SUBST(DNETINC)
+ AC_SUBST(DNETLIB)
+@@ -173,6 +90,7 @@
+ else
+ 	CFLAGS="-I$DNETCOMPAT $DNETINC"
+ fi
++save_LIBS=$LIBS
+ LIBS=$DNETLIB
+ 
+         AC_MSG_CHECKING(for working addr_pton in libdnet)
+@@ -190,61 +108,10 @@
+         exit(a1.addr_bits != 0);
+ }, AC_MSG_RESULT(yes), AC_WARNING(your version of libdnet is buggy - working around it), AC_MSG_RESULT(yes))
+ 
+-dnl Checks for libevent
+-AC_MSG_CHECKING(for libevent)
+-AC_ARG_WITH(libevent,
+-[  --with-libevent=DIR     use libevent build directory],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/event.h -a -f $withval/libevent.a; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        EVENTINC="-I$withval"
+-        EVENTLIB="-L$withval -levent"
+-     else
+-        AC_ERROR(event.h or libevent.a not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/event.h; then
+-     EVENTINC="-I${prefix}/include"
+-     EVENTLIB="-L${prefix}/lib -levent"
+-  elif test -f /usr/include/event/event.h; then
+-     EVENTINC="-I/usr/include/event"
+-     EVENTLIB="-levent"
+-  elif test -f /usr/include/event.h; then
+-     EVENTLIB="-levent"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libevent not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+ AC_SUBST(EVENTINC)
+ AC_SUBST(EVENTLIB)
+ 
+-CFLAGS=$EVENTINC
+-LIBS=$EVENTLIB
+-
+-	AC_MSG_CHECKING(for bufferevent in libevent)
+-	AC_TRY_LINK([
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <stdlib.h>
+-#include <event.h>],[
+-	struct bufferevent bev;
+-	bufferevent_settimeout(&bev, 1, 1);
+-], AC_MSG_RESULT(yes), [
+-        AC_ERROR([you need to install a more recent version of libevent,
+-	check http://www.monkey.org/~provos/libevent/])
+-], AC_MSG_RESULT(yes))
+-
+-CFLAGS=""
+-LIBS=""
++LIBS=$save_LIBS
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/net-analyzer/scanssh/scanssh-2.1-r1.ebuild b/net-analyzer/scanssh/scanssh-2.1-r2.ebuild
index 0aa7c1f944ad..954e6059dec1 100644
--- a/net-analyzer/scanssh/scanssh-2.1-r1.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools
 
 DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
 HOMEPAGE="https://monkey.org/~provos/scanssh/"
@@ -21,11 +22,22 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-fix-warnings.diff
+	"${FILESDIR}"/${PN}-2.0-libdir.diff
 )
 
 src_prepare() {
 	default
-	touch configure
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		DNETINC='' \
+		DNETLIB=-ldnet \
+		EVENTINC='' \
+		EVENTLIB=-levent \
+		PCAPINC='' \
+		PCAPLIB=-lpcap
 }
 
 src_compile() {