From nobody Wed Jun 14 22:29:20 2023 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 4QhKpm3577z4cPb7; Wed, 14 Jun 2023 22:29:20 +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 4QhKpm2gbWz4QjM; Wed, 14 Jun 2023 22:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686781760; 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=KMewVp9LacCwvv3icBEWsTEFywvZcBYMSZ6+qlXhmJ8=; b=m8zjj5fcnQkdNQH9HOe59EQvoLE8wIIhKHDq5zHpbZAXpOV9Hyj5nx4GR7c9Acd1sG3av9 GYxaCmdukV2sYDSUErVve7nmeQO7s6oKqi9q8Oe/n4GqBH6KGnMu05l2dasy0HO4c0nc8C H0KQ5n+Unpk8e4WUcXGAKhWv+gZpSeSlF5KOgYNpqpxdPg9hoJWMxNTwEZcuLdXkajcwFz yvAw1ck/uvqFv/FBqnb2ud+ShzkTi9V1NR7IZ+sfWByMJK9yw9fy8IBScOdrOT0LD6+6Mq pZMo/Dt6ArTCZGJ3KpM46GVsDKapL5XHYU3c/Lrl5G3YA+Ph3/ub/76oVUTW8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686781760; 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=KMewVp9LacCwvv3icBEWsTEFywvZcBYMSZ6+qlXhmJ8=; b=uj7pfK+IVRW0ROvrNRhlyMnxf2aVzctxeZUJ5H9In2tI/tzb001AF0AJ07CWSDOdbJYexY wjaNbAKSl/CZc90aY/ZLo7fy3/NYXytyeC3bO3msJrex0TrQvtQE/VlFtXz7B03F4x44r3 dBM/2zg7SFuht2Bcusv/+r7Vca25xL8F1qJ3zO+UgonVU4wyg4eALZW/p78plI1sw0Oisj aHCo5E9Se4rTxI/bsmy+jotFK4CWLSzNq42FY3wV4Y1oM22pxwO5Hm2jiXcS682nG7tqry 6e/42F0M5+IASS2cAh2yI3S6LhazOMUTZJgS23UCgR0dMY3kZV5Hz0I79KUAOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686781760; a=rsa-sha256; cv=none; b=xl0sLkqcTByFE6zElqSVew0vdQQQMoZJaag+YNJJhuIW4f8RltN2MFJM4Vuj2skQGp+5mp EcVeestQXYllRXgacy5tWsTPRdxiZh8vwANCEHpK75w+jFASA/PcLhP11ecNK1lfsLI3B6 vWrPHbKMZdQjhZndyxOeZHTEtg2PUu3+SX1haGlAigc/80G+/gjZrW01ZBIPnWkO//bZZu wYD2Th6M0g1soIej++SgRLlCn7LP9mpiddiSd5oUtA1pAhn2xLJ2aKJ64ivZODq5Kgjw0p fXFZMzgEhsZq97OcJ3uOAvFDWHurW62KGGnHa78N0Vxl9htCM9i1fpTmGgcL4w== 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 4QhKpm1lN2zLmP; Wed, 14 Jun 2023 22:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35EMTKZY089930; Wed, 14 Jun 2023 22:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35EMTKsZ089929; Wed, 14 Jun 2023 22:29:20 GMT (envelope-from git) Date: Wed, 14 Jun 2023 22:29:20 GMT Message-Id: <202306142229.35EMTKsZ089929@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 0ce787f4b326 - main - security/sslscan: fix openssl target detection on powerpc64* and riscv64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ce787f4b32609eac87e9a9d5fb876cb5d1f6627 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ce787f4b32609eac87e9a9d5fb876cb5d1f6627 commit 0ce787f4b32609eac87e9a9d5fb876cb5d1f6627 Author: Piotr Kubaj AuthorDate: 2023-06-14 22:28:48 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-14 22:28:48 +0000 security/sslscan: fix openssl target detection on powerpc64* and riscv64 --- security/sslscan/Makefile | 10 ++++++++++ security/sslscan/files/patch-Makefile | 35 +++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile index 1d619252501b..18733a257fa6 100644 --- a/security/sslscan/Makefile +++ b/security/sslscan/Makefile @@ -19,6 +19,16 @@ OPENSSL_VERSION= 3.1.0 ALL_TARGET= static +.include + +.if ${ARCH} == powerpc64 +MAKE_ENV+= OSSL_TARGET=BSD-ppc64 +.elif ${ARCH} == powerpc64le +MAKE_ENV+= OSSL_TARGET=BSD-ppc64le +.elif ${ARCH} == riscv64 +MAKE_ENV+= OSSL_TARGET=BSD-riscv64 +.endif + post-patch: $(LN) -sf "${WRKDIR}/openssl-${OPENSSL_VERSION}" "${WRKSRC}/openssl" diff --git a/security/sslscan/files/patch-Makefile b/security/sslscan/files/patch-Makefile index 796265235537..bba98af1b52f 100644 --- a/security/sslscan/files/patch-Makefile +++ b/security/sslscan/files/patch-Makefile @@ -1,19 +1,20 @@ ---- Makefile.orig 2023-04-08 22:36:58.000000000 +0100 -+++ Makefile 2023-05-11 22:40:28.158615000 +0100 -@@ -1,11 +1,6 @@ +--- Makefile.orig 2023-04-08 21:36:58 UTC ++++ Makefile +@@ -1,12 +1,7 @@ # set gcc as default if CC is not set -GIT_VERSION = $(shell git describe --tags --always --dirty=-wip) -- ++VERSION = $(shell grep -E -o -m 1 "[0-9]+\.[0-9]+\.[0-9]+" Changelog) + -# Ugly hack to get version if git isn't installed -ifeq ($(GIT_VERSION),) - GIT_VERSION = $(shell grep -E -o -m 1 "[0-9]+\.[0-9]+\.[0-9]+" Changelog) -endif -+VERSION = $(shell grep -E -o -m 1 "[0-9]+\.[0-9]+\.[0-9]+" Changelog) - +- # Detect OS OS := $(shell uname) -@@ -26,11 +21,11 @@ + ARCH := $(shell uname -m) +@@ -26,11 +21,11 @@ endif SRCS = sslscan.c BINDIR = $(PREFIX)/bin @@ -27,7 +28,7 @@ # for dynamic linking LIBS = -lssl -lcrypto -@@ -58,35 +53,11 @@ +@@ -58,36 +53,12 @@ endif CFLAGS += -std=gnu11 # for static linking @@ -52,7 +53,8 @@ -LDFLAGS += -L/usr/local/lib -L/usr/local/ssl/lib -L/usr/local/opt/openssl/lib -L/opt/local/lib -CFLAGS += -I/usr/local/include -I/usr/local/ssl/include -I/usr/local/ssl/include/openssl -I/usr/local/opt/openssl/include -I/opt/local/include -I/opt/local/include/openssl -endif -- ++VERSION := $(VERSION)-static + -# Find the number of processors on the system (used in -j option in building OpenSSL). -# Uses /usr/bin/nproc if available, otherwise defaults to 1. -NUM_PROCS = 1 @@ -60,11 +62,11 @@ - NUM_PROCS = `/usr/bin/nproc --all` -endif - -+VERSION := $(VERSION)-static - +- .PHONY: all sslscan clean install uninstall static opensslpull -@@ -114,6 +85,9 @@ + all: sslscan +@@ -114,6 +85,9 @@ ifeq ($(OS), Darwin) install sslscan $(DESTDIR)$(BINDIR)/sslscan; install -d $(DESTDIR)$(MAN1DIR)/; install sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1; @@ -74,7 +76,7 @@ else install -D sslscan $(DESTDIR)$(BINDIR)/sslscan; install -D sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1; -@@ -126,11 +100,7 @@ +@@ -126,11 +100,7 @@ uninstall: .openssl.is.fresh: opensslpull true opensslpull: @@ -87,7 +89,12 @@ # Need to build OpenSSL differently on OSX ifeq ($(OS), Darwin) -@@ -148,12 +118,11 @@ +@@ -144,16 +114,15 @@ openssl/Makefile: .openssl.is.fresh + # Any other *NIX platform + else + openssl/Makefile: .openssl.is.fresh +- cd ./openssl; ./config -v -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC no-shared enable-weak-ssl-ciphers zlib ++ cd ./openssl; ./config -v -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC no-shared enable-weak-ssl-ciphers zlib $(OSSL_TARGET) endif openssl/libcrypto.a: openssl/Makefile