openssh-selinux 9.4p1-2 update

1 files changed, 59 insertions, 45 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2d559f9a431f..9ad85fd4d681 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,64 +11,77 @@
 # If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname=openssh-selinux
-pkgver=9.3p2
-pkgrel=1
+pkgver=9.4p1
+pkgrel=2
 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer, with SELinux support"
-arch=('x86_64' 'aarch64')
+arch=(x86_64 aarch64)
 url='https://www.openssh.com/portable.html'
-license=('custom:BSD')
+license=(custom:BSD)
 depends=(
-  'glibc'
-  'krb5' 'libkrb5.so' 'libgssapi_krb5.so'
-  'ldns'
-  'libedit'
-  'libxcrypt' 'libcrypt.so'
-  'openssl'
-  'pam' 'libpam.so'
-  'zlib'
-  'libselinux'
+  glibc
+  krb5 libkrb5.so libgssapi_krb5.so
+  ldns
+  libedit
+  libxcrypt libcrypt.so
+  openssl
+  pam libpam.so
+  zlib
+  libselinux
+)
+makedepends=(
+  libfido2
+  linux-headers
 )
-makedepends=('libfido2' 'linux-headers')
 optdepends=(
   'libfido2: FIDO/U2F support'
+  'sh: for ssh-copy-id and findssl.sh'
   'x11-ssh-askpass: input passphrase in X'
   'xorg-xauth: X11 forwarding'
 )
 backup=(
-  'etc/pam.d/sshd'
-  'etc/ssh/ssh_config'
-  'etc/ssh/sshd_config'
+  etc/pam.d/sshd
+  etc/ssh/ssh_config
+  etc/ssh/sshd_config
 )
 conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
 provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
           "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
 groups=('selinux')
 source=(
-  "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz"{,.asc}
-  "${pkgname/-selinux}-9.0p1-sshd_config.patch"
-  'sshdgenkeys.service'
-  'sshd.service'
-  'sshd.conf'
-  'sshd.pam'
+  https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz{,.asc}
+  00-archlinux.conf
+  sshdgenkeys.service
+  sshd.service
+  sshd.conf
+  sshd.pam
 )
-sha256sums=('200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8'
+sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85'
             'SKIP'
-            '27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f'
+            '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30'
             'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
             'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
-            '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
+            '76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
-b2sums=('38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f'
+b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53'
         'SKIP'
-        '29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59'
+        '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97'
         '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
         '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
-        '27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395'
+        'a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca'
         '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
 validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')  # Damien Miller <djm@mindrot.org>
 
 prepare() {
-  patch -Np1 -d "${pkgname/-selinux}-$pkgver" -i ../${pkgname/-selinux}-9.0p1-sshd_config.patch
+  cd ${pkgname/-selinux}-$pkgver
+  # remove variable (but useless) first line in config (related to upstream VCS)
+  sed '/^#.*\$.*\$$/d' -i ssh{,d}_config
+
+  # prepend configuration option to include drop-in configuration files for sshd_config
+  printf "# Include drop-in configurations\nInclude /etc/ssh/sshd_config.d/*.conf\n" | cat - sshd_config > sshd_config.tmp
+  mv -v sshd_config.tmp sshd_config
+  # prepend configuration option to include drop-in configuration files for ssh_config
+  printf "# Include drop-in configurations\nInclude /etc/ssh/ssh_config.d/*.conf\n" | cat - ssh_config > ssh_config.tmp
+  mv -v ssh_config.tmp ssh_config
 }
 
 build() {
@@ -91,35 +104,36 @@ build() {
     --with-selinux
   )
 
-  cd "${pkgname/-selinux}-${pkgver}"
+  cd ${pkgname/-selinux}-$pkgver
 
   ./configure "${configure_options[@]}"
   make
 }
 
 check() {
-  cd "${pkgname/-selinux}-${pkgver}"
-
   # NOTE: make t-exec does not work in our build environment
-  make file-tests interop-tests unit
+  make file-tests interop-tests unit -C ${pkgname/-selinux}-$pkgver
 }
 
 package() {
-  cd "${pkgname/-selinux}-${pkgver}"
+  cd ${pkgname/-selinux}-$pkgver
+
+  make DESTDIR="$pkgdir" install
 
-  make DESTDIR="${pkgdir}" install
+  install -vDm 644 ../00-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
-  install -Dm644 LICENCE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  ln -sf ssh.1.gz "$pkgdir"/usr/share/man/man1/slogin.1.gz
+  install -Dm644 LICENCE -t "$pkgdir/usr/share/licenses/$pkgname/"
 
-  install -Dm644 ../sshdgenkeys.service -t "${pkgdir}"/usr/lib/systemd/system/
-  install -Dm644 ../sshd.service -t "${pkgdir}"/usr/lib/systemd/system/
-  install -Dm644 ../sshd.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/
-  install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
+  install -Dm644 ../sshdgenkeys.service -t "$pkgdir"/usr/lib/systemd/system/
+  install -Dm644 ../sshd.service -t "$pkgdir"/usr/lib/systemd/system/
+  install -Dm644 ../sshd.conf -t "$pkgdir"/usr/lib/tmpfiles.d/
+  install -Dm644 ../sshd.pam "$pkgdir"/etc/pam.d/sshd
 
-  install -Dm755 contrib/findssl.sh -t "${pkgdir}"/usr/bin/
-  install -Dm755 contrib/ssh-copy-id -t "${pkgdir}"/usr/bin/
-  install -Dm644 contrib/ssh-copy-id.1 -t "${pkgdir}"/usr/share/man/man1/
+  install -Dm755 contrib/findssl.sh -t "$pkgdir"/usr/bin/
+  install -Dm755 contrib/ssh-copy-id -t "$pkgdir"/usr/bin/
+  install -Dm644 contrib/ssh-copy-id.1 -t "$pkgdir"/usr/share/man/man1/
 }
 
 # vim: ts=2 sw=2 et: