From nobody Sun Oct 9 17:51:31 2022 X-Original-To: dev-commits-ports-main@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 4MlqNg67J5z4fBq3; Sun, 9 Oct 2022 17:51:31 +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 4MlqNg5fMKz3BmW; Sun, 9 Oct 2022 17:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665337891; 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=zyopUho3GAgDflYs8gOaOVTNvDQ7xEQ2rQMQfNv808w=; b=bAXp+HwfMriA/dQeJDo5sasMicZoJZryS3NvFoYsUL4HMz7WOroM/NfyVbDJXr9k70Z9hV MkxNgfy++VX6nHKYtW8eGa3sfGNUiEopgLp3z7SSfVlENF1X1YBzzBlwwfDhzsLSMt4qRL J2rX/bzOarOYR28dfazMutWxSG19TwJSgiXZNyB0O6YP7/q4AczgUVuAIJDLQf2Qk54TkY WTbbh9uBOpqee7MLPfvN5rBrxGMjwDU/ZeUNA9Z/YEa1wyM0T1FY84ekKHpVEpcZlH7Zwn Ayq2Wx5Ceww3I5crzTECgdpyOL7OlTyqIh9ZtMkHa3jGUFoUhkm1Ix7QfAPW4w== 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 4MlqNg4k1YzML3; Sun, 9 Oct 2022 17:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 299HpVKu016970; Sun, 9 Oct 2022 17:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299HpVue016969; Sun, 9 Oct 2022 17:51:31 GMT (envelope-from git) Date: Sun, 9 Oct 2022 17:51:31 GMT Message-Id: <202210091751.299HpVue016969@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 810702f66629 - main - security/openssh-portable: Fix BLACKLISTD patch List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 810702f666291eb5948623e9cfb05598421cdf01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665337891; 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=zyopUho3GAgDflYs8gOaOVTNvDQ7xEQ2rQMQfNv808w=; b=Kzi86og+Ar1G97lI+maX0QqPrGIZgoQQMeEmtg0KCpWSmUBtxdEmJ5BU25RUS9YMtTnnyd yCh6UggyXAQo69JZosKJ1a2/pBjama7ys+ipUojDVB2OkgVnEQA1TYqd8eb0I3yap/0DNY wxc3UzQxB2SESOHi4qycBu6Fyl6XbwQaG+jBQhQcIEfmnWlcNyDoaJL7g6Zk/CuVf0Ye/A I6Nyzhum14QHBJLNUriyB0vTbmog1kp7L4uRYFtXO4ZvVyMypeUjKJRqyhYrwY3y474zKJ HkRKchJpmdpJPjJfm09p9LizZ23XKHlJ0rbVlM/j8k7i6XPACq6hIy3IZZrUGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665337891; a=rsa-sha256; cv=none; b=DuIMVmCRJVaOvIN6L0zTRP4+em+QQfnmzRAoi8KCj/x+jyilvCS/sB868fzIHcfGz4OIrR ESWP4TByUtCeHt/1Ade4tascPNhFL219Bvycn86WDjRjs1SBdYLuHUipJr1Vg7MvsHsoEB 0MbsCy27KuVjYNRBrJRq3mRnETm0+UQ42TR0DZRE2p97J5wZ+NYcaqCE0ZcwARf5m9DG4k rkMUfOgm5KtYQZBs6VYhl4jS2OiBjIFe5NGPm4qGV80VXCEkembueVCojyoQFGfhJSnzE6 HhL/MxiRjqngX5Y6SqC7qqAXIKw7JXudoY5XytazCkbCDlR6/sQne90X8oL9CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=810702f666291eb5948623e9cfb05598421cdf01 commit 810702f666291eb5948623e9cfb05598421cdf01 Author: Bryan Drewery AuthorDate: 2022-10-09 17:50:37 +0000 Commit: Bryan Drewery CommitDate: 2022-10-09 17:51:28 +0000 security/openssh-portable: Fix BLACKLISTD patch Reported by: Chad J. Milios --- security/openssh-portable/files/extra-patch-blacklistd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/openssh-portable/files/extra-patch-blacklistd b/security/openssh-portable/files/extra-patch-blacklistd index a8e9505fef74..7bb88b2961fe 100644 --- a/security/openssh-portable/files/extra-patch-blacklistd +++ b/security/openssh-portable/files/extra-patch-blacklistd @@ -351,15 +351,15 @@ if (use_privsep) { if (privsep_preauth(ssh) == 1) ---- Makefile.in.orig 2020-11-16 16:27:13.408700000 -0800 -+++ Makefile.in 2020-11-16 16:28:28.083007000 -0800 -@@ -180,6 +180,8 @@ FIXPATHSCMD = $(SED) $(PATHSUBS) +--- Makefile.in.orig 2022-10-03 07:51:42.000000000 -0700 ++++ Makefile.in 2022-10-09 10:50:06.401377000 -0700 +@@ -185,6 +185,8 @@ FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(S FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \ @UNSUPPORTED_ALGORITHMS@ +LIBSSH_OBJS+= blacklist.o + - all: configure-check $(CONFIGFILES) $(MANPAGES) $(TARGETS) + all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) $(LIBSSH_OBJS): Makefile.in config.h --- sshd_config.orig 2020-11-16 16:57:14.276036000 -0800