uppkg -> 9.4p1-2

3 files changed, 62 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ea552db8bc9..a65f4ea0bcf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openssh-dotconfig
 	pkgdesc = Premier connectivity tool for remote login with the SSH protocol - but moved $HOME/.ssh to $HOME/.config/ssh
 	pkgver = 9.4p1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.openssh.com/portable.html
 	arch = x86_64
 	license = custom:BSD
@@ -29,13 +29,16 @@ pkgbase = openssh-dotconfig
 	backup = etc/ssh/ssh_config
 	backup = etc/ssh/sshd_config
 	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.4p1.tar.gz
+	source = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.4p1.tar.gz.asc
 	source = openssh-9.0p1-sshd_config.patch
 	source = 00-archlinux.conf
 	source = sshdgenkeys.service
 	source = sshd.service
 	source = sshd.conf
 	source = sshd.pam
+	validpgpkeys = 7168B983815A5EEF59A4ADFD2A3F414E736060BA
 	sha256sums = 3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85
+	sha256sums = SKIP
 	sha256sums = 27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f
 	sha256sums = 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30
 	sha256sums = e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611
@@ -43,6 +46,7 @@ pkgbase = openssh-dotconfig
 	sha256sums = 76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327
 	sha256sums = 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846
 	b2sums = d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53
+	b2sums = SKIP
 	b2sums = 29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59
 	b2sums = 1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97
 	b2sums = 09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50
diff --git a/PKGBUILD b/PKGBUILD
index a1e0a69e76f9..2ebff3af7753 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=openssh-dotconfig
 pkgver=9.4p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Premier connectivity tool for remote login with the SSH protocol - but moved $HOME/.ssh to $HOME/.config/ssh'
 url='https://www.openssh.com/portable.html'
 license=('custom:BSD')
@@ -38,14 +38,15 @@ backup=(
   etc/ssh/sshd_config
 )
 
-source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname%-*}-${pkgver}.tar.gz"
-		"${pkgname%-*}-9.0p1-sshd_config.patch"
+source=(https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname%-*}-${pkgver}.tar.gz{,.asc}
+        "${pkgname%-*}-9.0p1-sshd_config.patch"
         '00-archlinux.conf'
         'sshdgenkeys.service'
         'sshd.service'
         'sshd.conf'
         'sshd.pam')
 sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85'
+            'SKIP'
 			'27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f'
             '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30'
             'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
@@ -53,12 +54,14 @@ sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85'
             '76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327'
             '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
 b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53'
+        'SKIP'
         '29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59'
         '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97'
 		'09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
         '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
         'a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca'
         '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
+validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')  # Damien Miller <djm@mindrot.org>
 provides=('openssh')
 conflicts=('openssh')
 
diff --git a/keys/pgp/7168B983815A5EEF59A4ADFD2A3F414E736060BA.asc b/keys/pgp/7168B983815A5EEF59A4ADFD2A3F414E736060BA.asc
new file mode 100644
index 000000000000..cbe47db371b8
--- /dev/null
+++ b/keys/pgp/7168B983815A5EEF59A4ADFD2A3F414E736060BA.asc
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=NtKR
+-----END PGP PUBLIC KEY BLOCK-----