From patchwork Wed Sep 13 13:13:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 813427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xshtb69cWz9s4s for ; Wed, 13 Sep 2017 23:13:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CF0EC30C1C; Wed, 13 Sep 2017 13:13:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KTCT+--kEwV6; Wed, 13 Sep 2017 13:13:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2750330C1A; Wed, 13 Sep 2017 13:13:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EFE391C1054 for ; Wed, 13 Sep 2017 13:13:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E944630C1A for ; Wed, 13 Sep 2017 13:13:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h6aw-YazGlkf for ; Wed, 13 Sep 2017 13:13:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by silver.osuosl.org (Postfix) with ESMTPS id EADF730C0C for ; Wed, 13 Sep 2017 13:13:18 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout07.t-online.de (Postfix) with SMTP id 07A88427BCBF; Wed, 13 Sep 2017 15:13:16 +0200 (CEST) Received: from fli4l.lan.fli4l (SsV1eYZ6rhte5e+2R8BIEhqwtl1CQcVN0VTgzpoT32pHffob3r0E2VHNSJN7gDygyP@[79.228.1.99]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1ds7Tg-1XCUnQ0; Wed, 13 Sep 2017 15:13:16 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:38616 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1ds7Tf-00042l-4m; Wed, 13 Sep 2017 15:13:15 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 13 Sep 2017 15:13:15 +0200 Message-Id: <20170913131315.12129-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: SsV1eYZ6rhte5e+2R8BIEhqwtl1CQcVN0VTgzpoT32pHffob3r0E2VHNSJN7gDygyP X-TOI-MSGID: 7e0fdae7-7336-4b9e-9c04-b890dec50e8e Subject: [Buildroot] [PATCH 1/1] package/nmap: bump version to 7.60 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Version 7.60 added optional support for libssh2: http://seclists.org/nmap-announce/2017/4 Switched _SITE to https Signed-off-by: Bernd Kuhls --- package/nmap/nmap.hash | 4 ++-- package/nmap/nmap.mk | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 239ca13816..740ec7a001 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,2 +1,2 @@ -# From https://nmap.org/dist/sigs/nmap-7.40.tar.bz2.digest.txt -sha256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 nmap-7.40.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.60.tar.bz2.digest.txt +sha256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 nmap-7.60.tar.bz2 diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 37720e2cad..9db06d1455 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,8 +4,8 @@ # ################################################################################ -NMAP_VERSION = 7.40 -NMAP_SITE = http://nmap.org/dist +NMAP_VERSION = 7.60 +NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = libpcap pcre NMAP_CONF_OPTS = --without-liblua --without-zenmap \ @@ -27,6 +27,14 @@ define NMAP_WRAPPER_EXEC endef NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +NMAP_CONF_OPTS += --with-libssh2="$(STAGING_DIR)/usr" +NMAP_DEPENDENCIES += libssh2 +NMAP_LIBS_FOR_STATIC_LINK += `$(PKG_CONFIG_HOST_BINARY) --libs libssh2` +else +NMAP_CONF_OPTS += --without-libssh2 +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr" NMAP_DEPENDENCIES += host-pkgconf openssl