From nobody Mon Jan 8 00:08:12 2024 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 4T7ZCJ5VrXz56MfD; Mon, 8 Jan 2024 00:08:12 +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 4T7ZCJ4qHqz4bb6; Mon, 8 Jan 2024 00:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704672492; 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=7bvGl+JzTld93qmO25FYBcC5v5Kur0/7ClA4iusbQwY=; b=slaMfoTDdPz3itepPgRORCm+71srMKd4nqJ31hb83jnaQWp0lN/goqUKF95qxojr/D3f5/ tHsvxf5+fy8kCsm7qfnCf09INargbG2Z1T3y3/lRBk6vWukNHdI8AyUJzuGNeHWhYyXj57 h38MOp5Dkdjnvt/71XOQvX7s18rbHB7yB0nlKBrOg9lT3kRhLgDYcfWebciK5hDTS4nqwv FI2ruAjyCMbVT6DHLNssa0G/iKkSgV4PjSmfHGeCWXrkMwj7q7NbIeCedUsBs4YhbP0C7v pAwobJexNv6qo3HZjC5o7KSVqN6ysk1VZTgLteWzYs5faDj4/t9dIweIZ9gqjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704672492; 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=7bvGl+JzTld93qmO25FYBcC5v5Kur0/7ClA4iusbQwY=; b=NP6auCYXocBeC+LTI6RxCWRSH6+goOh5H1iZpJbEnFtAaEnotwbdfDcka/KF6omnrfP6Rz PH7NhxrG68CJLD4J1gF3XaRsdB5mh7nTXKiicnmFckpdZzQaFtqx9HAO8JG09pufbS64G9 S7Izk9ehQAPD0slPoF/i7ku86BneDrZNahiWvJ2VcGqaLVt5cGWV1VBLicIxkV/SjtJvW3 vHpDHN4bR4kEocbmusff5+5GY5O5uiyovvd6r9O9igak/nTEnjgx8keKNQQkPDtNz53Hri yL02eLX4l+rUcVnVr45dLgE72hk4CVAP5WUycKq3pkLqPAR06uYuZuEtbK6CpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704672492; a=rsa-sha256; cv=none; b=O8/ISHEF3canIR7/742LJk4Tq8upnh+qbdl2XmBW0QAJ8yTMJRlTnXbtv7rIw7Ypl6KuSv FzWIruEm3mUbw8OaU9ORljwOusZWmxeg8iJY/MX7Qje+kzHX1quIlcpCbScO1oT7I5CMqx B7xdaEBhejHWLp/k7wVnAK2IfNDGLOyigrm5oPitONYvGcDk9GETQ9ILuXswj/kwpiuhy2 Fuj3vl3CMCJDJ2yMnDX1I5IQ+EguYDFUOI6tcvgfsD58yV2k10IQCHoBq432sknISCCyl+ rBlwa9cvFIBkD7rmljKb/rTOlrnqLowEKAl7UHpfTE5fm03vzSgyN5UVqIjv7g== 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 4T7ZCJ3lQkzlZD; Mon, 8 Jan 2024 00:08: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 40808C5h053630; Mon, 8 Jan 2024 00:08:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40808CXg053627; Mon, 8 Jan 2024 00:08:12 GMT (envelope-from git) Date: Mon, 8 Jan 2024 00:08:12 GMT Message-Id: <202401080008.40808CXg053627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Martin Matuska Subject: git: fc281da4dc2a - main - ftp/proftpd: update to 1.3.8b and add libsodium support 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: mm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc281da4dc2af0f1aaac1fc3ca29fa6f04dcdcc9 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc281da4dc2af0f1aaac1fc3ca29fa6f04dcdcc9 commit fc281da4dc2af0f1aaac1fc3ca29fa6f04dcdcc9 Author: Martin Matuska AuthorDate: 2024-01-08 00:00:42 +0000 Commit: Martin Matuska CommitDate: 2024-01-08 00:08:05 +0000 ftp/proftpd: update to 1.3.8b and add libsodium support Provides mitigation for "Terrapin" SSH attack. Support stronger key algorithms using libsodium by default. PR: 265590, 276168 Security: CVE-2023-48795 --- databases/proftpd-mod_sql_tds/distinfo | 6 +++--- ftp/proftpd-mod_vroot/distinfo | 6 +++--- ftp/proftpd/Makefile | 13 +++++++++---- ftp/proftpd/distinfo | 6 +++--- security/proftpd-mod_clamav/distinfo | 6 +++--- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/databases/proftpd-mod_sql_tds/distinfo b/databases/proftpd-mod_sql_tds/distinfo index 157516e79f7e..09787482e586 100644 --- a/databases/proftpd-mod_sql_tds/distinfo +++ b/databases/proftpd-mod_sql_tds/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1674382163 -SHA256 (proftpd-1.3.8.tar.gz) = f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 -SIZE (proftpd-1.3.8.tar.gz) = 19744412 +TIMESTAMP = 1704671177 +SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 +SIZE (proftpd-1.3.8b.tar.gz) = 19752808 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 SIZE (mod_sql_tds-4.13.tar.gz) = 11688 diff --git a/ftp/proftpd-mod_vroot/distinfo b/ftp/proftpd-mod_vroot/distinfo index dd2c8a49c26d..78c16eec8682 100644 --- a/ftp/proftpd-mod_vroot/distinfo +++ b/ftp/proftpd-mod_vroot/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1674423179 -SHA256 (proftpd-1.3.8.tar.gz) = f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 -SIZE (proftpd-1.3.8.tar.gz) = 19744412 +TIMESTAMP = 1704671206 +SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 +SIZE (proftpd-1.3.8b.tar.gz) = 19752808 SHA256 (proftpd-mod_vroot-0.9.5.tar.gz) = 148384a33ee388bbb5dda36a09a944b2c528e1d46dc47e4d3aaedc37b14439be SIZE (proftpd-mod_vroot-0.9.5.tar.gz) = 95664 diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 7fb934c4f629..d28e1f5a0211 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -2,7 +2,7 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ @@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.8 +PROFTPD_VERSION= 1.3.8b CPE_VENDOR= proftpd CPE_PRODUCT= proftpd @@ -87,8 +87,8 @@ PLIST_FILES+= libexec/proftpd/${m}.a \ libexec/proftpd/${m}.so .endfor .else -OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE REDIS -OPTIONS_DEFAULT= PCRE2 +OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE REDIS LIBSODIUM +OPTIONS_DEFAULT= PCRE2 LIBSODIUM OPTIONS_RADIO+= PCREVER OPTIONS_RADIO_PCREVER= PCRE1 PCRE2 @@ -99,6 +99,7 @@ PCREVER_DESC= PCRE library to use PCRE1_DESC= ${PCRE_DESC} PCRE2_DESC= ${PCRE_DESC} version 2 REDIS_DESC= Redis support using hiredis +LIBSODIUM_DESC= Stronger key algorithm support using libsodium PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" OPTIONS_SUB= yes @@ -172,6 +173,10 @@ REDIS_CONFIGURE_ENABLE= redis REDIS_VARS= MODULES+="mod_redis mod_tls_redis mod_wrap2_redis" \ LIBS+="-L${LOCALBASE}/lib -lhiredis" +LIBSODIUM_CONFIGURE_ENABLE= sodium +LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium +LIBSODIUM_VARS= LIBS+="-L${LOCALBASE}/lib -lsodium" + .include # Generate modules configuration string diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo index a82c201a7496..79f324d42cbc 100644 --- a/ftp/proftpd/distinfo +++ b/ftp/proftpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674381181 -SHA256 (proftpd-1.3.8.tar.gz) = f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 -SIZE (proftpd-1.3.8.tar.gz) = 19744412 +TIMESTAMP = 1704667613 +SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 +SIZE (proftpd-1.3.8b.tar.gz) = 19752808 diff --git a/security/proftpd-mod_clamav/distinfo b/security/proftpd-mod_clamav/distinfo index 86e000a4d1e8..3c27e9963c6a 100644 --- a/security/proftpd-mod_clamav/distinfo +++ b/security/proftpd-mod_clamav/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1674382108 -SHA256 (proftpd-1.3.8.tar.gz) = f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 -SIZE (proftpd-1.3.8.tar.gz) = 19744412 +TIMESTAMP = 1704671194 +SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 +SIZE (proftpd-1.3.8b.tar.gz) = 19752808 SHA256 (mod_clamav-v0.14rc2.tar.gz) = 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721