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
2024Q2
Martin Matuska 2024-01-08 01:00:42 +01:00
parent a310d1ba5b
commit fc281da4dc
5 changed files with 21 additions and 16 deletions

View File

@ -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

View File

@ -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

View File

@ -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 <bsd.port.options.mk>
# Generate modules configuration string

View File

@ -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

View File

@ -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