From d50f5514139e9ea888e802d700568b94baca0f5c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 25 Sep 2023 11:38:43 -0700 Subject: Apply rebuilds. --- 00-archlinux.conf | 4 ---- 99-archlinux.conf | 4 ++++ PKGBUILD | 10 +++++----- sshd.pam | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 00-archlinux.conf create mode 100644 99-archlinux.conf diff --git a/00-archlinux.conf b/00-archlinux.conf deleted file mode 100644 index 365f115..0000000 --- a/00-archlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -# sshd_config defaults on Arch Linux -KbdInteractiveAuthentication no -UsePAM yes -PrintMotd no diff --git a/99-archlinux.conf b/99-archlinux.conf new file mode 100644 index 0000000..365f115 --- /dev/null +++ b/99-archlinux.conf @@ -0,0 +1,4 @@ +# sshd_config defaults on Arch Linux +KbdInteractiveAuthentication no +UsePAM yes +PrintMotd no diff --git a/PKGBUILD b/PKGBUILD index 086697c..5fb5587 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgname=openssh pkgver=9.4p1 -pkgrel=3 +pkgrel=4 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer" arch=(x86_64) url='https://www.openssh.com/portable.html' @@ -52,7 +52,7 @@ backup=( #options=('debug') source=( https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz{,.asc} - 00-archlinux.conf + 99-archlinux.conf sshd.conf sshd.pam ) @@ -60,12 +60,12 @@ sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85' 'SKIP' '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30' '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' - '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') + 'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d') b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53' 'SKIP' '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97' '27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395' - '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930') + 'a61b50849a4efe66b3341fd312531dde54917cf138ddb458973632de7ff815dddeeff432ff84fb0d63d94a46a331b6bb736ae0e260f8cc7f82beb3c0a9c0d602') validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller # https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/RELEASE_KEY.asc @@ -125,7 +125,7 @@ package() { make DESTDIR="$pkgdir" install - install -vDm 644 ../00-archlinux.conf -t "$pkgdir/etc/ssh/sshd_config.d/" + install -vDm 644 ../99-archlinux.conf -t "$pkgdir/etc/ssh/sshd_config.d/" install -vdm 755 "$pkgdir/etc/ssh/ssh_config.d" ln -sf ssh.1.gz "$pkgdir"/usr/share/man/man1/slogin.1.gz diff --git a/sshd.pam b/sshd.pam index 7ecef08..9d354b0 100644 --- a/sshd.pam +++ b/sshd.pam @@ -1,5 +1,4 @@ #%PAM-1.0 -#auth required pam_securetty.so #disable remote root auth include system-remote-login account include system-remote-login password include system-remote-login -- cgit v1.2.1