From 3f69da00f29d049bba67512dc9fc57eb670e049f Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 9 Sep 2023 20:14:00 +0300 Subject: [PATCH] upg iana-etc openssh --- iana-etc/PKGBUILD | 6 +++--- iana-etc/PKGBUILD-arch | 4 ++-- openssh/99-archlinux.conf | 4 ++++ openssh/PKGBUILD | 19 ++++++++----------- openssh/PKGBUILD-arch | 14 +++++--------- 5 files changed, 22 insertions(+), 25 deletions(-) create mode 100644 openssh/99-archlinux.conf diff --git a/iana-etc/PKGBUILD b/iana-etc/PKGBUILD index 7068870..d1c6171 100644 --- a/iana-etc/PKGBUILD +++ b/iana-etc/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=iana-etc -pkgver=20230803 +pkgver=20230907 _protocols=protocol-numbers-20230606 _ports=service-names-port-numbers-${pkgver} pkgrel=01 @@ -55,9 +55,9 @@ arch=('any') license=('custom:none') -sha256sums=(3a7223037e25bb44dca7b381fb5b78f68ec37da6c7626f9e27cc1d0d8c5d2e35 # service-names-port-numbers-20230803.xml +sha256sums=(0575ef913b28f8a9e7f60121038c92678943d4bf7cbdcbfe6d46e1e946577765 # service-names-port-numbers-20230907.xml e398929846d7e7e6d0aaf6f7d6c41e9889752644eed9205cd99c6809fc08a85b # protocol-numbers-20230606.xml dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb) # LICENSE -## 6e84d04053f1b90ce298cefaeb03a8ffa22097ab023face5609269f4d042f61f iana-etc-20230803-01-any.pkg.tar.lz +## f5417c2c0ff150d56e9e7e2c1ffa2ce1d8238a519a3931c254ef774fe3c596d5 iana-etc-20230907-01-any.pkg.tar.lz diff --git a/iana-etc/PKGBUILD-arch b/iana-etc/PKGBUILD-arch index 1ca9ce4..3ccb9f8 100644 --- a/iana-etc/PKGBUILD-arch +++ b/iana-etc/PKGBUILD-arch @@ -3,7 +3,7 @@ # Maintainer: Jelle van der Waa pkgname=iana-etc -pkgver=20230803 +pkgver=20230907 _ports=service-names-port-numbers-${pkgver} _protocols=protocol-numbers-20230606 pkgrel=1 @@ -15,7 +15,7 @@ backup=('etc/'{protocols,services}) source=("https://sources.archlinux.org/other/packages/iana-etc/${_ports}.xml" "https://sources.archlinux.org/other/packages/iana-etc/${_protocols}.xml" 'LICENSE') -sha256sums=('3a7223037e25bb44dca7b381fb5b78f68ec37da6c7626f9e27cc1d0d8c5d2e35' +sha256sums=('0575ef913b28f8a9e7f60121038c92678943d4bf7cbdcbfe6d46e1e946577765' 'e398929846d7e7e6d0aaf6f7d6c41e9889752644eed9205cd99c6809fc08a85b' 'dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb') diff --git a/openssh/99-archlinux.conf b/openssh/99-archlinux.conf new file mode 100644 index 0000000..365f115 --- /dev/null +++ b/openssh/99-archlinux.conf @@ -0,0 +1,4 @@ +# sshd_config defaults on Arch Linux +KbdInteractiveAuthentication no +UsePAM yes +PrintMotd no diff --git a/openssh/PKGBUILD b/openssh/PKGBUILD index cea55f8..812fe0d 100644 --- a/openssh/PKGBUILD +++ b/openssh/PKGBUILD @@ -7,11 +7,10 @@ pkgname=openssh pkgver=9.4p1 -pkgrel=03 # openssl rebuild +pkgrel=04 pkgdesc='SSH protocol implementation for remote login, command execution and file transfer w/o systemd' url='https://www.openssh.com/portable.html' -depends=( - 'glibc' +depends=( 'glibc' 'krb5' 'ldns' 'libedit' @@ -31,7 +30,7 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') #options=('debug') ## uncomment this to have the debug pkg produced source=(https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz{,.asc} # "$pkgname-9.0p1-sshd_config.patch" - '00-archlinux.conf' + '99-archlinux.conf' 'sshd.conf' 'sshd.pam') @@ -91,7 +90,7 @@ package() { cd "${pkgname}-${pkgver}" 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 @@ -114,20 +113,18 @@ package() { arch=(x86_64) # license=('custom:BSD') -license=( - BSD-2-Clause +license=(BSD-2-Clause BSD-3-Clause ISC - MIT -) + MIT) validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # "Damien Miller " sha256sums=(3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85 # openssh-9.4p1.tar.gz d92592d82bee81745a71bbf249ede02afcdbf933f0de18841a7f17b15b975a03 # openssh-9.4p1.tar.gz.asc - 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 # 00-archlinux.conf + 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 # 99-archlinux.conf 76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327 # sshd.conf 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846) # sshd.pam -## 65724af7f52a585e4b7bb9d01b77678fead23e482e8f14364d5bcf16a3bd400e openssh-9.4p1-03-x86_64.pkg.tar.lz +## df0d4ca1c827d67eb4d0bbff1c7af6b974bc83b9fec63f43cfe7c929cabe2a2b openssh-9.4p1-04-x86_64.pkg.tar.lz diff --git a/openssh/PKGBUILD-arch b/openssh/PKGBUILD-arch index 8201cb2..1b529ea 100644 --- a/openssh/PKGBUILD-arch +++ b/openssh/PKGBUILD-arch @@ -6,7 +6,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' @@ -43,11 +43,10 @@ backup=( ) source=( https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz{,.asc} - 00-archlinux.conf + 99-archlinux.conf sshdgenkeys.service sshd.service ssh-agent.service - ssh-agent.socket sshd.conf sshd.pam ) @@ -56,8 +55,7 @@ sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85' '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30' 'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611' 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' - '5a9594548928fce7e8fc707c3a3b45c560b7f16473bbf73a00357184fadca61b' - 'd09197d3891555cbee379541ff8cc439a8456722f0e8cb131966d4d12b0f2c2c' + 'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998' '76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327' '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53' @@ -65,8 +63,7 @@ b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97' '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50' '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e' - '3df44cc0a7baac8ad7606dd8a35b71f4ec0135f50e6432921f95d8be7db3d664ce6b3f59bedddd4bc132f47fb8d5f20cbc616717b76cc32ab6c0df179a3c4199' - 'edf7d6eb62af51e46e2cd04c7545bf57c59629a947c434d5ad65c8f06c36562c2bb96404c615f1a8379d3ae1c4a9b7278d3c7899d2cb308d89425fe37b72db21' + '046ea6bd6aa00440991e5f7998db33864a7baa353ec6071f96a3ccb5cca5b548cb9e75f9dee56022ca39daa977d18452851d91e6ba36a66028b84b375ded9bc5' 'a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca' '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930') validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller @@ -120,7 +117,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 @@ -129,7 +126,6 @@ package() { install -Dm644 ../sshdgenkeys.service -t "$pkgdir"/usr/lib/systemd/system/ install -Dm644 ../sshd.service -t "$pkgdir"/usr/lib/systemd/system/ install -Dm644 ../ssh-agent.service -t "$pkgdir"/usr/lib/systemd/user/ - install -Dm644 ../ssh-agent.socket -t "$pkgdir"/usr/lib/systemd/user/ install -Dm644 ../sshd.conf -t "$pkgdir"/usr/lib/tmpfiles.d/ install -Dm644 ../sshd.pam "$pkgdir"/etc/pam.d/sshd