Re: [PR PATCH] [Updated] openssh: restore upstream's default for PermitRootLogin

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages openssh-root-login
https://github.com/void-linux/void-packages/pull/17596

openssh: restore upstream's default for PermitRootLogin
restore upstream's default for PermitRootLogin, which currently is 'prohibt-password'.

Should be discussed in conjunction with https://github.com/void-linux/void-mklive/pull/100.

A patch file from https://github.com/void-linux/void-packages/pull/17596.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh-root-login-17596.patch --]
[-- Type: text/x-diff, Size: 1289 bytes --]

From d9b72e43d3d3df23237d56a2381d6a2b0e722a1f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 18 Dec 2019 14:52:57 +0100
Subject: [PATCH] openssh: restore PermitRootLogin to default

which currently is 'prohibt-password'.

This reverts ca84fd0a9aea0dd94dde6fd1f9a6a509cec5a789.
---
 srcpkgs/openssh/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 5dc97b69ca4..6ac5ad0060c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.1p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -53,12 +53,11 @@ post_install() {
 	vman contrib/ssh-copy-id.1
 	vlicense LICENCE
 
-	sed -i \
+	# configure to use PAM
+	vsed -i ${DESTDIR}/etc/ssh/sshd_config \
 		-e 's|^#\(UsePAM\) no|\1 yes|g' \
-		-e 's|^#\(PermitRootLogin\) .*|\1 yes|g' \
 		-e 's|^#\(ChallengeResponseAuthentication\) yes|\1 no|g' \
-		-e 's|^#\(PrintMotd\) yes|\1 no|g' \
-		${DESTDIR}/etc/ssh/sshd_config
+		-e 's|^#\(PrintMotd\) yes|\1 no|g'
 
 	vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd
 	vsv sshd