From nobody Sat Oct 21 11:53:53 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 4SCKc22fJrz4xw2S; Sat, 21 Oct 2023 11:53:54 +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 4SCKc21qD7z3WVJ; Sat, 21 Oct 2023 11:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697889234; 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=bImxHiV+DU9YakAf3mPaTPfvgLgSlrYBXxD9NniJxMs=; b=ERLNtv6Mrh0UFwIsxiBrMneFZJuWlAhIVTy9Uc+j+WoVh6uEyF5+48ufeGqCYX0sw+9Wwb G8nzbAsqeXp3I+a3qii1EPQEKCpSvLVtdi66F9ot4Fb1uSmdwB6znE7vbOrXx6KuBAYNrP aFDg+15kphPszAIN/OfXNB9jpuCG8R3rmAiQ+GbUcxTXAuXQSvOZUzMjHTXefDysc7wPhc bglsgLUFqLTl06WkW+Yj8CJ7KMmzWzZTjFD9qk75WTp4Tez81UxpwsUKSEncvF+cwHEaLB zSja7O2dYo4q+nSjOFB5mqlfX6SVpOCO3ErAgH9gbmoDl9yJETpS6WBxy3n34g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697889234; a=rsa-sha256; cv=none; b=o5lJ5pAsnoiZg64M3qzke0w7oNZs4Ma1ii9fUrxgW9KUovI7WXpSFP9zn67SHfz4zogvxK GDOqCurdge0Qa76NgKDV2IdWVJIf8cqF4v6uNJTTrqbAWZ6EikcNMY9M5hDe6iySpWHj+t 1ozTdOp7v5A2az51C2T9FY79/dE4xUQtwkz/4Q5ogiM4xKo/SlHOP9ON7cBhXILEtBJODq vKN/5dYn9ivQxxF+mEyUbpAsERa1imvwTqn47sv9mZ0y2Ci6hTTRl9B3MMdMjUSHXLzJ0p jco0UKYCrhl4xi54xm68Vas6yyvfxlooychJnW670y5Sg3vh/TQnCJWd45iDwQ== 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=1697889234; 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=bImxHiV+DU9YakAf3mPaTPfvgLgSlrYBXxD9NniJxMs=; b=GF+atYnm4T9sVeecjwcPeh4wRBs/3RmXmAiCiLDswk4GDH7uYbcgwbAgqmwZehGLksCnLQ WfOfz3OE70ceRISE/sYblBgnNyjAmthsqHa7PDVCJjiiuBvB/l/g9M4x8sDsJhWtlMjjUW m114OiShbVCtNpub5XlAPxnuEXO/mgFVUrm6wG2r6kWG1JIAx4rQTh5YAmZFp/T7acZ7lx mbBAoUh7R3M8f3a5ezTQRyf/BBB064v6VGae62OYqzgPCt2pTL/6It3MkSgVQfMorlekhY me9KvI26xJ6wLPugIJs8AP/A4/Mjckub/dj3Gq3ZJXU69jZYRjmxgUhMJc19wQ== 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 4SCKc20XKvz9r; Sat, 21 Oct 2023 11:53:54 +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 39LBrrb4021079; Sat, 21 Oct 2023 11:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LBrrPd021076; Sat, 21 Oct 2023 11:53:53 GMT (envelope-from git) Date: Sat, 21 Oct 2023 11:53:53 GMT Message-Id: <202310211153.39LBrrPd021076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 8269bdb998a8 - main - www/vaultwarden-web_vault: Revert borked git add 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8269bdb998a83ceb1204bbaa8b1466035d2f32c8 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8269bdb998a83ceb1204bbaa8b1466035d2f32c8 commit 8269bdb998a83ceb1204bbaa8b1466035d2f32c8 Author: Bernard Spil AuthorDate: 2023-10-21 11:53:28 +0000 Commit: Bernard Spil CommitDate: 2023-10-21 11:53:28 +0000 www/vaultwarden-web_vault: Revert borked git add This reverts commit 3a3fbae18157d39b68c43c590fa9e977fed9cef4. --- graphics/pecl-imagick/Makefile | 2 +- lang/python311/Makefile | 4 ++-- security/openssh-portable/Makefile | 8 +------- security/openssh-portable/files/extra-patch-blacklistd | 12 ++++++------ www/vaultwarden-web_vault/Makefile | 2 +- www/vaultwarden-web_vault/distinfo | 6 +++--- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index 4c30d266e11a..c0021457cba7 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -9,7 +9,7 @@ WWW= https://pecl.php.net/package/imagick LICENSE= PHP301 -USES= cpe php:pecl localbase magick:nox11 +USES= cpe php:pecl localbase magick CPE_VENDOR= php diff --git a/lang/python311/Makefile b/lang/python311/Makefile index 886b2f26b338..e7deddcbf3e3 100644 --- a/lang/python311/Makefile +++ b/lang/python311/Makefile @@ -106,10 +106,10 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif -#.if ${SSL_DEFAULT:Mlibressl*} +.if ${SSL_DEFAULT:Mlibressl*} EXTRA_PATCHES+= ${PATCHDIR}/libressl CONFIGURE_ENV+= ac_cv_working_openssl_hashlib=yes -#.endif +.endif post-patch: # disable the detection of includes and library from e2fsprogs-libuuid, diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 351a41d6e976..70d027db63a2 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -41,7 +41,7 @@ gssapi_PKGNAMESUFFIX= -portable-gssapi OPTIONS_DEFINE= DOCS PAM TCP_WRAPPERS LIBEDIT BSM \ HPN KERB_GSSAPI \ - LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD BADUSER + LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS LDNS FIDO_U2F .if ${FLAVOR:U} == hpn OPTIONS_DEFAULT+= HPN NONECIPHER @@ -63,7 +63,6 @@ NONECIPHER_DESC= NONE Cipher support XMSS_DESC= XMSS key support (experimental) FIDO_U2F_DESC= FIDO/U2F support (security/libfido2) BLACKLISTD_DESC= FreeBSD blacklistd(8) support -BADUSER_DESC= Treat "Invalid user" as blacklistd AUTH_FAIL OPTIONS_SUB= yes @@ -93,7 +92,6 @@ FIDO_U2F_CONFIGURE_ON= --with-security-key-builtin FIDO_U2F_CONFIGURE_OFF= --disable-security-key BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd -BADUSER_IMPLIES= BLACKLISTD ETCDIR?= ${PREFIX}/etc/ssh @@ -211,10 +209,6 @@ post-patch: @${ECHO_CMD} '#define SSH_VERSION_FREEBSD_PORT "${VERSION_ADDENDUM_DEFAULT}"' >> \ ${WRKSRC}/version.h -post-patch-BADUSER-on: - @${REINPLACE_CMD} \ - -e 's|BLACKLIST_BAD_USER|BLACKLIST_AUTH_FAIL|' ${WRKSRC}/auth.c - post-configure-XMSS-on: @${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h diff --git a/security/openssh-portable/files/extra-patch-blacklistd b/security/openssh-portable/files/extra-patch-blacklistd index 127bfe8bcb3a..7bb88b2961fe 100644 --- a/security/openssh-portable/files/extra-patch-blacklistd +++ b/security/openssh-portable/files/extra-patch-blacklistd @@ -372,12 +372,12 @@ #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 ---- sshd_config.5.orig 2023-03-15 22:28:19.000000000 +0100 -+++ sshd_config.5 2023-06-18 12:46:57.234767000 +0200 -@@ -1855,6 +1855,20 @@ - is to never expire connections for having no open channels. - This option may be useful in conjunction with - .Cm ChannelTimeout . +--- sshd_config.5.orig 2020-11-16 16:57:58.533307000 -0800 ++++ sshd_config.5 2020-11-16 17:00:02.635070000 -0800 +@@ -1703,6 +1703,20 @@ for authentication using + .Cm TrustedUserCAKeys . + For more details on certificates, see the CERTIFICATES section in + .Xr ssh-keygen 1 . +.It Cm UseBlacklist +Specifies whether +.Xr sshd 8 diff --git a/www/vaultwarden-web_vault/Makefile b/www/vaultwarden-web_vault/Makefile index bcde4a5095c1..70728c592c5c 100644 --- a/www/vaultwarden-web_vault/Makefile +++ b/www/vaultwarden-web_vault/Makefile @@ -1,5 +1,5 @@ PORTNAME= vaultwarden -PORTVERSION= 2023.8.2 +PORTVERSION= 2023.7.1 DISTVERSIONPREFIX= v CATEGORIES= www security MASTER_SITES= https://github.com/dani-garcia/bw_web_builds/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ diff --git a/www/vaultwarden-web_vault/distinfo b/www/vaultwarden-web_vault/distinfo index c414f6dad8d1..553f2b0f1a4d 100644 --- a/www/vaultwarden-web_vault/distinfo +++ b/www/vaultwarden-web_vault/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696592157 -SHA256 (bw_web_v2023.8.2.tar.gz) = 99c403b98074e2df4b2c0f55e5e04191912db1f4bf90e5145b5b58889853e9c7 -SIZE (bw_web_v2023.8.2.tar.gz) = 10887487 +TIMESTAMP = 1693656296 +SHA256 (bw_web_v2023.7.1.tar.gz) = 0d7ea02eb13cc7b29c875af7ecc787c0a4990c22df13a024f0589e6faa3703d4 +SIZE (bw_web_v2023.7.1.tar.gz) = 10744083