Update libssh to (upstream) 0.5.4 == (our) 0.54.

(We need to keep the old numbering syntax to make versions compare
correctly.)

There are only two consumers in pkgsrc; one of them (remmina and
remmina-plugins) actually needed library version 0.4 or later, and
didn't build the ssh/sftp/nx plugins without. Hydra is also supposed
to build with 0.4.x and later.)

Upstream changelogs:

0.5.4:
        CVE-2013-0176 - NULL dereference leads to denial of service
        Fixed several NULL pointer dereferences in SSHv1.
        Fixed a free crash bug in options parsing.

and for completeness 0.5.3:

        This is an important SECURITY and maintenance release in
        order to address CVE-2012-4559, CVE-2012-4560, CVE-2012-4561
        and CVE-2012-4562.

        CVE-2012-4559 - Fix multiple double free() flaws
        CVE-2012-4560 - Fix multiple buffer overflow flaws
        CVE-2012-4561 - Fix multiple invalid free() flaws
        CVE-2012-4562 - Fix multiple improper overflow checks

        (...)

Suggested by Noud de Brouwer in wip/libssh and PR pkg/47518, but needed
some changes to PLIST as well as to make "pkg_admin audit" and updates
compare correctly.

2 files changed, 37 insertions, 28 deletions

diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index d26a322563b..51201624101 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 18:16:35 asau Exp $
-#
-# This package currently exists as a dependency for the hydra package but
-# the later versions of it are not supported by hydra.
-# This package should not be updated to the latest version available.
+# $NetBSD: Makefile,v 1.12 2013/02/01 13:33:49 is Exp $
 #
 
-DISTNAME=	libssh-0.11
-PKGREVISION=	3
-CATEGORIES=	security
-MASTER_SITES=	http://www.0xbadc0de.be/libssh/
-EXTRACT_SUFX=	.tgz
+# history: upstream renamed 0.11 to 0.1;
+# we have to use the old-style convention so that version compares work.
+# 
+DISTNAME=		libssh-0.5.4
+PKGNAME=		libssh-0.54
+CATEGORIES=		security
+MASTER_SITES=		https://red.libssh.org/attachments/download/41/
+
+MAINTAINER=		is@NetBSD.org
+HOMEPAGE=		http://www.libssh.org/
+COMMENT=		SSHv2 and SSHv1 protocol
+LICENSE=		2-clause-bsd
+
+DIST_SUBDIR=		security
+
+.include "../../mk/bsd.prefs.mk"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://0xbadc0de.be/
-COMMENT=	Library providing working SSH implementation
+# ftp: Unsupported URL scheme `https'
+FETCH_USING=		curl
 
-GNU_CONFIGURE=	YES
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
 
-INSTALLATION_DIRS=	share/doc/libssh
-INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \
-			prefix=${DESTDIR}${PREFIX}
+PKGCONFIG_OVERRIDE+=	libssh.pc.in
+TEST_TARGET=		check
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/API.html ${DESTDIR}${PREFIX}/share/doc/libssh
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/libssh
+.include "options.mk"
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libssh/PLIST b/security/libssh/PLIST
index 8a46ecfebcf..b3ff31b69e3 100644
--- a/security/libssh/PLIST
+++ b/security/libssh/PLIST
@@ -1,9 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:32 joerg Exp $
-include/libssh/config.h
-include/libssh/crypto.h
+@comment $NetBSD: PLIST,v 1.4 2013/02/01 13:33:49 is Exp $
+lib/pkgconfig/libssh.pc
+lib/pkgconfig/libssh_threads.pc
+include/libssh/callbacks.h
 include/libssh/libssh.h
-include/libssh/server.h
+include/libssh/ssh2.h
+include/libssh/legacy.h
 include/libssh/sftp.h
+include/libssh/server.h
+@comment, XXX PLIST lib handling seems to be broke
+lib/libssh.so.4.2.4
+lib/libssh.so.4
 lib/libssh.so
-share/doc/libssh/API.html
-share/doc/libssh/README
+lib/libssh_threads.so.4.2.4
+lib/libssh_threads.so.4
+lib/libssh_threads.so