From nobody Sat Oct 21 14:44:19 2023 X-Original-To: dev-commits-ports-all@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 4SCPNh4gf8z4y63w; Sat, 21 Oct 2023 14:44: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 4SCPNh3srkz4M9Z; Sat, 21 Oct 2023 14:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899460; 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=99nL1SJ/8i65p/wyePEN3XjQolLXwBeT4Dy8Nf96GJc=; b=mvDbp6KplHsIgmsBteZdiVVx6N2T8hk3bk26Z98TdabtjPydsy9ucndflaoL2cfq5JUdKp QpgDm6Pq6r2eBwfstDFqrMRHz4F0SYX27d5pQ6mLwIZbTvttLAAl1d33i0D61fnI1zXS6P hAmrv32w0YbuxCAOMxo+rI1QQzP0pNQ/mJ8fhg3A884fNrrIky5kgHbkjSErWQfdIGOdzb O1WYE2SBfUsu1nW5+1+bJziaRSb/e7LHU1P5p5XemPGX3yqWllnuIvR9osgZr/huRKxzh6 Cw1LnyxIlHy91U1wNSsTLJJaK0es/T5D+2M4XPnfBJhkLqWAvjDWPcUH8jMHEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899460; a=rsa-sha256; cv=none; b=SUnN03FrJpByREtkooCZ/AbohKW+nRFfblyP3ymHiKwlu/O35O0u9iSJKbBUdoKYnZpfZM 1CapRiPNfKHXLrYGsqosd5sNcdJefaTwI8T4I5R35xk2f5VwruNUQsQfLpVAq0i784bvcL S8vxEsVP61l1TjahSo3w5KVM1KkabwVAsa8lHpSzKGktTERsWjFAFpAx7fnm8XtOInghXF YyR79o+LCjDyIGEvKO5sa5i4F8vJnnx8fVxAGhHJxDkaNbwOajVbb048e2Q94SVG1fCeKv cBiafnysmDQymKL7ZjWD+3Lqe0Dnuo3nFg/5vnK2tAX1gI/jeu7+6AJ1CdY3mQ== 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=1697899460; 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=99nL1SJ/8i65p/wyePEN3XjQolLXwBeT4Dy8Nf96GJc=; b=HwoCyroS2+L6ma0m6MLnS8jwkeoIvDUXZ3Nh3gPHPd8DA9f4mhOVkObBJ/4ulIaQ7JseoZ 0fvZazXYNxTjKjSXm8eip6j1Zr/od6fxf/htDkH8mOX7h90Udagi7XQWhrtrlORYpRb0CG gM1DTs/5WR0HyOBSeQ/04Ag0vHwXLvmhqcQYcauOUszJqo8iq6LvG4Ks+RDSrDIILJZwUO qKV8pZq40jywwnODY+oOj3Jimi/4YPEKzywYxr2RKGiEPSk3nkEHI8qx4nU0moSKATjymp +7aIAn6IzJdWo/foXlZ4aDSCtlOrv55nZAVZHMihlVXiSjuaGyj+L5h/XLudnw== 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 4SCPNg6H0Sz4pv; Sat, 21 Oct 2023 14:44:19 +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 39LEiJJm005368; Sat, 21 Oct 2023 14:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEiJkB005365; Sat, 21 Oct 2023 14:44:19 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:44:19 GMT Message-Id: <202310211444.39LEiJkB005365@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 415739996a5c - main - security/dropbear: Unbundle libtom* libs by default List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 415739996a5c72024a6edbc4f74baba96107c164 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=415739996a5c72024a6edbc4f74baba96107c164 commit 415739996a5c72024a6edbc4f74baba96107c164 Author: Daniel Engberg AuthorDate: 2023-10-21 14:29:07 +0000 Commit: Daniel Engberg CommitDate: 2023-10-21 14:43:22 +0000 security/dropbear: Unbundle libtom* libs by default Add option to use libtom* libraries from ports tree and set as default PR: 274351 Reviewed by: pkubaj (maintainer) --- security/dropbear/Makefile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index b4d920a1c25f..eaabbf3b315e 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -1,5 +1,6 @@ PORTNAME= dropbear PORTVERSION= 2022.83 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://matt.ucc.asn.au/dropbear/releases/ @@ -18,9 +19,9 @@ GNU_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} ALL_TARGET= all scp -OPTIONS_DEFINE= SMALL_CODE STATIC X11FWD +OPTIONS_DEFINE= SMALL_CODE PORTS_LIBTOM STATIC X11FWD OPTIONS_DEFAULT= AES128 AES256 CURVE25519 ECDSA ED25519 GCM \ - GROUP14_SHA256 GROUP16 RSA SHA2_256 + GROUP14_SHA256 GROUP16 PORTS_LIBTOM RSA SHA2_256 OPTIONS_MULTI= ENC KEY KEX MAC MODE OPTIONS_MULTI_ENC= 3DES AES128 AES256 CHACHA20POLY1305 OPTIONS_MULTI_KEY= DSS ECDSA ED25519 RSA @@ -46,6 +47,7 @@ GROUP14_SHA256_DESC= Enable Group14 Diffie-Helman with SHA256 GROUP16_DESC= Enable Group16 Diffie-Hellman GROUP1_DESC= Enable Group1 Diffie-Hellman (insecure) MD5_DESC= Enable MD5 MAC (broken) +PORTS_LIBTOM_DESC= Use libtomcrypt/libtommath in ports tree RSA_DESC= Enable RSA public key support RSA_SHA1_DESC= Enable RSA SHA1 MAC (insecure) SHA1_96_DESC= Enable SHA1_96 MAC (less secure) @@ -58,8 +60,24 @@ X11FWD_DESC= Enable X11 forwarding 3DES_IMPLIES= CTR CBC_IMPLIES= CTR +PORTS_LIBTOM_USES= localbase:ldflags +PORTS_LIBTOM_CONFIGURE_ON= --disable-bundled-libtom +PORTS_LIBTOM_CONFIGURE_OFF= --enable-bundled-libtom + STATIC_CONFIGURE_ENABLE= static +.include + +.if ${PORT_OPTIONS:MPORTS_LIBTOM} && ${PORT_OPTIONS:MSTATIC} +BUILD_DEPENDS= ${LOCALBASE}/lib/libtomcrypt.a:security/libtomcrypt \ + ${LOCALBASE}/lib/libtommath.a:math/libtommath +.endif + +.if ${PORT_OPTIONS:MPORTS_LIBTOM} && ! ${PORT_OPTIONS:MSTATIC} +LIB_DEPENDS= libtomcrypt.so:security/libtomcrypt \ + libtommath.so:math/libtommath +.endif + post-patch: @${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \ s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/default_options.h