From nobody Sun Feb 11 08:55:12 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TXhHj077sz59mQL; Sun, 11 Feb 2024 08:55:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TXhHh6jjYz4pDL; Sun, 11 Feb 2024 08:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707641712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ss2RFetBGggauIJK6TTYeUHHfoO9wqHTCXIvvhlXYNU=; b=ZoV9045s+Ly6VlG98h+vUkGbCSNA0gF5Jt7gIU6tKhpl+VNroTB3zajxPAb/q5lxPZy6TV qAEM5JPw5/CuO0bHocxxck8rdcyKxasAgPYJySCb5xcMiV4f9Ogy1XB2MLmdnLlII7EVcg MjeuIqqc1CDb101Y9B/IjS6AbpbHNKt/vYaUzbDqGSU/XrNToeFCC9+UbDmzkrYjIfNajV orZ2pYxdG6h6v8XnQeVlD/bfESysk7AclaYCwGGwA8cv6FmSaDeerheGGGInwoXrGCAEgD qGUcq29dwW68IGkrzZ5uiAa5fx8xdR5QKD0Tuv4+WrZnUXG9NRcr8xfOX/nF3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707641712; a=rsa-sha256; cv=none; b=SDrI1H3vChvmQfHYnqT+V9YEqEErRCy76yzPA2lWYkdxoS3b1v0wQ9tXK/kGRMzIk+lGDc j8yS+2XFGWaV5C3b2tQ7hvpCcMfXoFRtoR8v1IIo5zo3O2X5Lr+UVjiRnUJxLNEJLVbmDv 1KSd3xEF0qKSNSOkSoQWkXFZVA/NZ/PTVKA+hGlqJycTIJK7HYmfOjem8p8xFrnP7IS8zu quW1AoU0NXWVfNwU8H1UJZCoEIEKmhj1oeZU71Y0WA/TsA0/htSjzSJLinteZAdQ3Y93ts t01l1mouzaz4XTdCDijp+VP7f5LQNbO9tzPQX1S1wNuj4OaklyRDEMtbm96Tag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707641712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ss2RFetBGggauIJK6TTYeUHHfoO9wqHTCXIvvhlXYNU=; b=vK+8C2gJPbM8FwXIFPr351h8wMkNoCfW8J+PuOkxsKMO0g8e56wWBeg7Vbdi/8PbbPMWrs z5sqdSjjFPKLilu3LLBaErDjelOaJHkmSKG8Mxx7LO9ukW6KM5xfXd7q6/LjlOWNvl1Oq9 imoI4FK0QZRCDTVrONFMRBiwJf2EGeejdjSwiw317kD7dfsyXJ4Vrfjm3SbC+MNioCwV4Y 2hGUfMsH2RffbmC93BObnUGum1dHgTW3QmNXZCRQkf0Bv8QfOywyTEa4FQfSrbjoDVK+7b ZCkhr8dCJMs+r5HoYyS7T/aDkTl2K8GaJzP0RmYp/3FWRuz3f/jojDK4rap/Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TXhHh5nBszss8; Sun, 11 Feb 2024 08:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41B8tCLG095147; Sun, 11 Feb 2024 08:55:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B8tCk6095144; Sun, 11 Feb 2024 08:55:12 GMT (envelope-from git) Date: Sun, 11 Feb 2024 08:55:12 GMT Message-Id: <202402110855.41B8tCk6095144@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: a23e25b39860 - main - security/sslscan: update 2.0.16 -> 2.1.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a23e25b398606f60cb186c1c0b01c7eac2c6c85b Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=a23e25b398606f60cb186c1c0b01c7eac2c6c85b commit a23e25b398606f60cb186c1c0b01c7eac2c6c85b Author: Jamie Landeg-Jones AuthorDate: 2024-02-11 08:52:34 +0000 Commit: Kurt Jaeger CommitDate: 2024-02-11 08:52:34 +0000 security/sslscan: update 2.0.16 -> 2.1.3 - Now uses openssl 3.2.1 PR: 275254 Approved by: gavin (maintainer timeout) Author: Jamie Landeg-Jones --- security/sslscan/Makefile | 4 ++-- security/sslscan/distinfo | 10 +++++----- security/sslscan/files/patch-Makefile | 26 ++++++++++++++------------ 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile index 18733a257fa6..c3a93286e713 100644 --- a/security/sslscan/Makefile +++ b/security/sslscan/Makefile @@ -1,5 +1,5 @@ PORTNAME= sslscan -DISTVERSION= 2.0.16 +DISTVERSION= 2.1.3 CATEGORIES= security MASTER_SITES= https://www.openssl.org/source/:openssl \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/:openssl @@ -15,7 +15,7 @@ USES= gmake perl5 USE_PERL5= build USE_GITHUB= yes GH_ACCOUNT= rbsec -OPENSSL_VERSION= 3.1.0 +OPENSSL_VERSION= 3.2.1 ALL_TARGET= static diff --git a/security/sslscan/distinfo b/security/sslscan/distinfo index 5cc7753c42a2..dbcfa5fa418a 100644 --- a/security/sslscan/distinfo +++ b/security/sslscan/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1683839135 -SHA256 (openssl-3.1.0.tar.gz) = aaa925ad9828745c4cad9d9efeb273deca820f2cdcf2c3ac7d7c1212b7c497b4 -SIZE (openssl-3.1.0.tar.gz) = 15525381 -SHA256 (rbsec-sslscan-2.0.16_GH0.tar.gz) = eae49b9c2023f9c9adeb10c50a6ee3ddf5da7aae20f6a6c59251e7a84aa44131 -SIZE (rbsec-sslscan-2.0.16_GH0.tar.gz) = 113523 +TIMESTAMP = 1707630173 +SHA256 (openssl-3.2.1.tar.gz) = 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 +SIZE (openssl-3.2.1.tar.gz) = 17733249 +SHA256 (rbsec-sslscan-2.1.3_GH0.tar.gz) = 6beec9345635b41fa2c1bbc5f0854f10014e4b2b4179e9e9a3bda6bdb9e1aa41 +SIZE (rbsec-sslscan-2.1.3_GH0.tar.gz) = 113917 diff --git a/security/sslscan/files/patch-Makefile b/security/sslscan/files/patch-Makefile index bba98af1b52f..8319713a5c77 100644 --- a/security/sslscan/files/patch-Makefile +++ b/security/sslscan/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2023-04-08 21:36:58 UTC -+++ Makefile +--- Makefile.orig 2023-11-14 21:36:52.000000000 +0000 ++++ Makefile 2023-11-20 13:57:16.349229000 +0000 @@ -1,12 +1,7 @@ # set gcc as default if CC is not set @@ -14,7 +14,7 @@ # Detect OS OS := $(shell uname) ARCH := $(shell uname -m) -@@ -26,11 +21,11 @@ endif +@@ -26,11 +21,11 @@ SRCS = sslscan.c BINDIR = $(PREFIX)/bin @@ -28,7 +28,7 @@ # for dynamic linking LIBS = -lssl -lcrypto -@@ -58,36 +53,12 @@ endif +@@ -58,38 +53,12 @@ CFLAGS += -std=gnu11 # for static linking @@ -61,12 +61,14 @@ -ifneq (,$(wildcard /usr/bin/nproc)) - NUM_PROCS = `/usr/bin/nproc --all` -endif -- +-ifeq ($(OS), Darwin) +- NUM_PROCS = `sysctl -n hw.ncpu` +-endif - .PHONY: all sslscan clean install uninstall static opensslpull all: sslscan -@@ -114,6 +85,9 @@ ifeq ($(OS), Darwin) +@@ -116,6 +85,9 @@ install sslscan $(DESTDIR)$(BINDIR)/sslscan; install -d $(DESTDIR)$(MAN1DIR)/; install sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1; @@ -76,20 +78,20 @@ else install -D sslscan $(DESTDIR)$(BINDIR)/sslscan; install -D sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1; -@@ -126,11 +100,7 @@ uninstall: +@@ -128,11 +100,7 @@ .openssl.is.fresh: opensslpull true opensslpull: - if [ -d openssl -a -d openssl/.git ]; then \ -- cd ./openssl && git checkout OpenSSL_1_1_1-stable && git pull | grep -q "Already up-to-date." && [ -e ../.openssl.is.fresh ] || touch ../.openssl.is.fresh ; \ +- cd ./openssl && git checkout `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` && git pull | grep -q "Already up-to-date." && [ -e ../.openssl.is.fresh ] || touch ../.openssl.is.fresh ; \ - else \ -- git clone --depth 1 -b OpenSSL_1_1_1-stable https://github.com/openssl/openssl ./openssl && cd ./openssl && touch ../.openssl.is.fresh ; \ +- git clone --depth 1 -b `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort -V | tail -n 1` https://github.com/openssl/openssl ./openssl && cd ./openssl && touch ../.openssl.is.fresh ; \ - fi + true # Need to build OpenSSL differently on OSX ifeq ($(OS), Darwin) -@@ -144,16 +114,15 @@ openssl/Makefile: .openssl.is.fresh +@@ -146,16 +114,15 @@ # Any other *NIX platform else openssl/Makefile: .openssl.is.fresh @@ -99,10 +101,10 @@ openssl/libcrypto.a: openssl/Makefile - $(MAKE) -j $(NUM_PROCS) -C openssl depend -- $(MAKE) -j $(NUM_PROCS) -C openssl all +- $(MAKE) -j $(NUM_PROCS) -C openssl build_libs -# $(MAKE) -j $(NUM_PROCS) -C openssl test # Disabled because this takes 45+ minutes for OpenSSL v1.1.1. + $(MAKE) -C openssl depend -+ $(MAKE) -C openssl build_sw ++ $(MAKE) -C openssl build_libs static: openssl/libcrypto.a - $(MAKE) -j $(NUM_PROCS) sslscan STATIC_BUILD=TRUE