git: 8269bdb998a8 - main - www/vaultwarden-web_vault: Revert borked git add

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sat, 21 Oct 2023 11:53:53 UTC
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8269bdb998a83ceb1204bbaa8b1466035d2f32c8

commit 8269bdb998a83ceb1204bbaa8b1466035d2f32c8
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-10-21 11:53:28 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
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