Version bump for bug 84536; added patch for both 2.0 and 2.1 to fix some compiler warnings. Also fixed deps.

(Portage version: 2.0.51.19)

6 files changed, 121 insertions, 17 deletions

diff --git a/net-analyzer/scanssh/ChangeLog b/net-analyzer/scanssh/ChangeLog
index 09fdec1b219c..4598e432a551 100644
--- a/net-analyzer/scanssh/ChangeLog
+++ b/net-analyzer/scanssh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/scanssh
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/ChangeLog,v 1.11 2005/03/07 18:37:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/ChangeLog,v 1.12 2005/03/09 12:12:15 ka0ttic Exp $
+
+*scanssh-2.1 (09 Mar 2005)
+
+  09 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/scanssh-2.0-fix-warnings.diff, scanssh-2.0.ebuild,
+  +scanssh-2.1.ebuild:
+  Version bump for bug 84536; added patch for both 2.0 and 2.1 to fix some
+  compiler warnings. Also fixed deps.
 
   07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> scanssh-2.0.ebuild:
   Stable on sparc
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index 8de455b6c0ab..3e0fe0ab6ef3 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b491b5b5ca3b643076d276a3cbd31e92 ChangeLog 1193
+MD5 1129c715e04982d825d683c7dffda52d scanssh-2.1.ebuild 695
+MD5 ee5c3fa83c560096342123b8ccab2593 scanssh-2.0.ebuild 688
+MD5 4c3d646d22d189b82fe6dc9971de0814 ChangeLog 1467
 MD5 5ef1334dd837ff015a4d3765d65d2f15 metadata.xml 319
 MD5 a163cabfb0a686754085c235298ae5d6 scanssh-1.6b.ebuild 618
-MD5 15fd4f7b0ec00abd8dbb54de4b38fc9e scanssh-2.0.ebuild 600
-MD5 41c4a3014bd820529d63f6b16a7b83d6 files/digest-scanssh-1.6b 63
 MD5 2541416a54e7fe091fb12c0e95754166 files/digest-scanssh-2.0 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLJ9+KRy60XGEcJIRAtHNAJ4ost+V/KPxqCAfMLfawjVflhx87wCbBmSl
-yRunYSANtAdPfw+Mx6QZ02k=
-=ILWV
------END PGP SIGNATURE-----
+MD5 82a68194d8671c58066260fd56901294 files/digest-scanssh-2.1 63
+MD5 41c4a3014bd820529d63f6b16a7b83d6 files/digest-scanssh-1.6b 63
+MD5 b1cc68d1f6c015808670555fff3da70f files/scanssh-2.0-fix-warnings.diff 1928
diff --git a/net-analyzer/scanssh/files/digest-scanssh-2.1 b/net-analyzer/scanssh/files/digest-scanssh-2.1
new file mode 100644
index 000000000000..5761a2091aac
--- /dev/null
+++ b/net-analyzer/scanssh/files/digest-scanssh-2.1
@@ -0,0 +1 @@
+MD5 9fab4253b56b2d15367d4872b370cdcb scanssh-2.1.tar.gz 111481
diff --git a/net-analyzer/scanssh/files/scanssh-2.0-fix-warnings.diff b/net-analyzer/scanssh/files/scanssh-2.0-fix-warnings.diff
new file mode 100644
index 000000000000..bda9bccbf189
--- /dev/null
+++ b/net-analyzer/scanssh/files/scanssh-2.0-fix-warnings.diff
@@ -0,0 +1,66 @@
+diff --exclude='*~' -urN scanssh-2.1.orig/arc4random.c scanssh-2.1/arc4random.c
+--- scanssh-2.1.orig/arc4random.c	2005-03-08 21:20:11.117873024 -0500
++++ scanssh-2.1/arc4random.c	2005-03-08 21:26:22.265450016 -0500
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <time.h>
+ 
+ #include "config.h"
+ 
+diff --exclude='*~' -urN scanssh-2.1.orig/interface.c scanssh-2.1/interface.c
+--- scanssh-2.1.orig/interface.c	2005-03-08 21:20:11.116873176 -0500
++++ scanssh-2.1/interface.c	2005-03-08 21:33:50.532303096 -0500
+@@ -56,6 +56,13 @@
+ 
+ #include "interface.h"
+ 
++#ifndef HAVE_STRLCPY
++    size_t strlcpy(char *, const char *, size_t);
++#endif
++#ifndef HAVE_STRLCAT
++    size_t strlcat(char *, const char *, size_t);
++#endif
++
+ /* Prototypes */
+ static int pcap_dloff(pcap_t *);
+ 
+diff --exclude='*~' -urN scanssh-2.1.orig/md5.c scanssh-2.1/md5.c
+--- scanssh-2.1.orig/md5.c	2005-03-08 21:20:11.117873024 -0500
++++ scanssh-2.1/md5.c	2005-03-08 21:26:53.747663992 -0500
+@@ -23,6 +23,7 @@
+    copyright in any changes I have made; this code remains in the
+    public domain.  */
+ 
++#include <string.h>
+ #include <sys/types.h>
+ 
+ #ifdef HAVE_CONFIG_H
+diff --exclude='*~' -urN scanssh-2.1.orig/scanssh.c scanssh-2.1/scanssh.c
+--- scanssh-2.1.orig/scanssh.c	2005-03-08 21:20:11.124871960 -0500
++++ scanssh-2.1/scanssh.c	2005-03-08 21:34:08.508570288 -0500
+@@ -78,6 +78,10 @@
+ #define DNFPRINTF(y, x)
+ #endif
+ 
++#ifndef HAVE_STRLCPY
++    size_t strlcpy(char *, const char *, size_t);
++#endif
++
+ struct address_node {
+ 	TAILQ_ENTRY (address_node) an_next;
+ 
+diff --exclude='*~' -urN scanssh-2.1.orig/xmalloc.c scanssh-2.1/xmalloc.c
+--- scanssh-2.1.orig/xmalloc.c	2005-03-08 21:20:11.120872568 -0500
++++ scanssh-2.1/xmalloc.c	2005-03-08 21:34:26.479838240 -0500
+@@ -20,6 +20,10 @@
+ 
+ #include "config.h"
+ 
++#ifndef HAVE_STRLCPY
++    size_t strlcpy(char *, const char *, size_t);
++#endif
++
+ void *
+ xmalloc(size_t size)
+ {
diff --git a/net-analyzer/scanssh/scanssh-2.0.ebuild b/net-analyzer/scanssh/scanssh-2.0.ebuild
index c343549d457a..b9b706e2db01 100644
--- a/net-analyzer/scanssh/scanssh-2.0.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/scanssh-2.0.ebuild,v 1.5 2005/03/07 18:37:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/scanssh-2.0.ebuild,v 1.6 2005/03/09 12:12:15 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
 HOMEPAGE="http://monkey.org/~provos/scanssh/"
@@ -11,12 +13,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
-RDEPEND=""
 DEPEND="virtual/libpcap
 	dev-libs/libdnet
 	>=dev-libs/libevent-0.8a"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-warnings.diff
+}
+
 src_install() {
-	doman scanssh.1
 	dobin scanssh || die
+	doman scanssh.1
 }
diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild
new file mode 100644
index 000000000000..ea80b260e929
--- /dev/null
+++ b/net-analyzer/scanssh/scanssh-2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/scanssh-2.1.ebuild,v 1.1 2005/03/09 12:12:15 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
+HOMEPAGE="http://monkey.org/~provos/scanssh/"
+SRC_URI="http://monkey.org/~provos/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libpcap
+	dev-libs/libdnet
+	>=dev-libs/libevent-0.8a"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.0-fix-warnings.diff
+}
+
+src_install() {
+	dobin scanssh || die
+	doman scanssh.1
+}