upg mkinitcpio openssh

This commit is contained in:
joborun linux 2023-12-19 11:59:43 +02:00
parent 41d283bd3d
commit 33df8fad0c
6 changed files with 132 additions and 27 deletions

View file

@ -7,7 +7,7 @@
pkgname=mkinitcpio
pkgver=37.1
pkgrel=01
pkgrel=02
pkgdesc="Modular initramfs image creation utility w/o systemd zstd "
#url='https://github.com/archlinux/mkinitcpio'
#url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
@ -16,7 +16,7 @@ makedepends=('binutils' 'asciidoc' 'sed')
install=mkinitcpio.install
depends=('awk' 'mkinitcpio-busybox>=1.35.0' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem' 'gzip')
checkdepends=('bash-bats' 'bash-bats-assert' 'lzop')
checkdepends=('bats' 'bats-assert' 'lzop')
optdepends=('zstd: Use zstd compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image'
'lzop: Use lzo compression for the initramfs image'
@ -27,16 +27,15 @@ provides=("mkinitcpio=$pkgver-$pkgrel"
#backup=('etc/mkinitcpio.conf')
source=("$url/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
nosystemd.patch
mkinitcpio.conf)
mkinitcpio.conf
test-use-system-library-loading-mechanism.patch)
# "fix-strip.patch::https://github.com/archlinux/mkinitcpio/commit/dece596d569ca90af902bf2403227b478b629c03.patch"
# 0001-functions-fix-overwriting-of-symlinks-with-regular-f.patch)
prepare() {
# patch -Np1 -d "$pkgname-$pkgver" < '0001-functions-fix-overwriting-of-symlinks-with-regular-f.patch'
cd "${pkgname}-${pkgver}"
# patch -Np1 < "$srcdir/fix-strip.patch"
patch -Np1 -i ../nosystemd.patch
patch -Np1 < ../test-use-system-library-loading-mechanism.patch
}
check() {
@ -62,7 +61,8 @@ validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolin
sha256sums=(058f9512bb8559875910bb9b7680606542a499ca0e99184d7ac9c5cb2ba86dbb # mkinitcpio-37.1.tar.gz
0632942ae023f7a2873c208953da88be221e668d41a038b3655849ee5b99202d # mkinitcpio-37.1.tar.gz.sig
c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd # nosystemd.patch
005d909551dec1dbb417457f0277076c5087902e9256eb5f1a77af3798c7c3de) # mkinitcpio.conf
005d909551dec1dbb417457f0277076c5087902e9256eb5f1a77af3798c7c3de # mkinitcpio.conf
4dcd804eda710cfecda21f4c4ea7c6679f59c46a798bf8f2da1fe538553e03e9) # test-use-system-library-loading-mechanism.patch
## 010c73b5da0417066687645ee25062f283f4b6ad98ed182118b2f04604fa6052 mkinitcpio-37.1-01-x86_64.pkg.tar.lz
## ee8a731007243dcce55577208d54ffa6ea9443ac3a3f3329f9d27668caa1668d mkinitcpio-37.1-02-x86_64.pkg.tar.lz

View file

@ -5,14 +5,14 @@
pkgname=mkinitcpio
pkgver=37.1
pkgrel=1
pkgrel=2
pkgdesc="Modular initramfs image creation utility"
arch=('any')
url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
license=('GPL')
depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'systemd')
checkdepends=('bash-bats' 'bash-bats-assert' 'lzop')
checkdepends=('bats' 'bats-assert' 'lzop')
optdepends=('gzip: Use gzip compression for the initramfs image'
'xz: Use lzma or xz compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image'
@ -21,15 +21,23 @@ optdepends=('gzip: Use gzip compression for the initramfs image'
'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
provides=('initramfs')
backup=('etc/mkinitcpio.conf')
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
test-use-system-library-loading-mechanism.patch)
install=mkinitcpio.install
sha512sums=('68fd36eb95317977dfb389be8bd1f6f09d455ca81b55cde8f64245fc59ceee74afa64b55dbb7e8b2e28abe8274397dbba2f4b021499f9ad6d662175ced678585'
'SKIP')
'SKIP'
'c9a0dc49e7a22808f0556c79da3320edb93377d775c91343b2a1380aebde4e255b5e675e53a00192c73e4ea9a98a91b05b56c9d56d9e7537847274710115a6ae')
b2sums=('0b43d0d035fdba6195ca0e8facd654cbcff9c99d34d14b1f493c86cbea335c8f363e6117df7f0307e55b3e684fe7977d89ac226b79ed612270791e084b46aa4f'
'SKIP')
'SKIP'
'11b8297ce18d47a0029490b950180801e5762ad7b7e36383d2f954cbc7aee10d3b901dd2703fd07b23b38aa6b74577b7d88a1d9eb5ff5633a665610c6fbec51b')
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 < ../test-use-system-library-loading-mechanism.patch
}
check() {
make -C "$pkgname-$pkgver" check
}

View file

@ -1,7 +1,7 @@
asciidoc
mkinitcpio-busybox
bash-bats
bash-bats-assert
bats
bats-assert
lzop

View file

@ -0,0 +1,100 @@
From eba62eadec261da0e8f1fb9e95849057679daf07 Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Sat, 16 Dec 2023 13:51:25 +0100
Subject: [PATCH] test: use system library loading mechanism instead of
absolute paths
This resolves system libraries automatically from the canonical paths,
or falls back to `BATS_LIB_PATH`.
Previously this was not possible as bats plugins were not packaged at
the appropriate path in /usr/lib/bats/* which resulted in the plugin
auto loading not being able to resolve the libraries. This has been
fixed now, so lets use the recommended way to load libraries.
https://bats-core.readthedocs.io/en/stable/writing-tests.html#bats-load-library-load-system-wide-libraries
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
---
test/cases/bash-completion.bats | 4 ++--
test/cases/extglob.bats | 2 +-
test/cases/functions.bats | 4 ++--
test/cases/parse_cmdline.bats | 4 ++--
test/cases/zsh-completion.bats | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/cases/bash-completion.bats b/test/cases/bash-completion.bats
index 4d358ad..a47a495 100644
--- a/test/cases/bash-completion.bats
+++ b/test/cases/bash-completion.bats
@@ -3,8 +3,8 @@
shopt -s extglob
-load '/usr/lib/bats-assert/load'
-load '/usr/lib/bats-support/load'
+bats_load_library 'bats-assert'
+bats_load_library 'bats-support'
load "../helpers/common"
setup() {
diff --git a/test/cases/extglob.bats b/test/cases/extglob.bats
index 4eeda72..6da116c 100644
--- a/test/cases/extglob.bats
+++ b/test/cases/extglob.bats
@@ -1,6 +1,6 @@
#!/usr/bin/env bats
# SPDX-License-Identifier: GPL-2.0-only
-load '/usr/lib/bats-support/load'
+bats_load_library 'bats-support'
@test "check for syntax errors" {
local bash_scripts=(mkinitcpio lsinitcpio)
diff --git a/test/cases/functions.bats b/test/cases/functions.bats
index c1f4e8b..f3d356c 100644
--- a/test/cases/functions.bats
+++ b/test/cases/functions.bats
@@ -3,8 +3,8 @@
shopt -s extglob
-load '/usr/lib/bats-assert/load'
-load '/usr/lib/bats-support/load'
+bats_load_library 'bats-assert'
+bats_load_library 'bats-support'
load "../helpers/common"
setup() {
diff --git a/test/cases/parse_cmdline.bats b/test/cases/parse_cmdline.bats
index a265d9f..dd603fc 100644
--- a/test/cases/parse_cmdline.bats
+++ b/test/cases/parse_cmdline.bats
@@ -3,8 +3,8 @@
shopt -s extglob
-load '/usr/lib/bats-assert/load'
-load '/usr/lib/bats-support/load'
+bats_load_library 'bats-assert'
+bats_load_library 'bats-support'
load "../helpers/common"
setup() {
diff --git a/test/cases/zsh-completion.bats b/test/cases/zsh-completion.bats
index 3e6526e..500a756 100644
--- a/test/cases/zsh-completion.bats
+++ b/test/cases/zsh-completion.bats
@@ -3,8 +3,8 @@
shopt -s extglob
-load '/usr/lib/bats-assert/load'
-load '/usr/lib/bats-support/load'
+bats_load_library 'bats-assert'
+bats_load_library 'bats-support'
load "../helpers/common"
setup() {
--
2.43.0

View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=openssh
pkgver=9.5p1
pkgrel=02
pkgver=9.6p1
pkgrel=01
pkgdesc='SSH protocol implementation for remote login, command execution and file transfer w/o systemd'
url='https://www.openssh.com/portable.html'
depends=( 'glibc'
@ -121,14 +121,11 @@ license=(BSD-2-Clause
validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # "Damien Miller <djm@mindrot.org>"
sha256sums=(f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b # openssh-9.5p1.tar.gz
88d3935af9dc82fcb34f5c7c7f226e6b750c0859452b691166be0d626d471d31 # openssh-9.5p1.tar.gz.asc
sha256sums=(910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c # openssh-9.6p1.tar.gz
9b1e931cbc811f02e91f7eacd55f8211cc45dade11975462f4b0dcdad29927aa # openssh-9.6p1.tar.gz.asc
78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 # 99-archlinux.conf
76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327 # sshd.conf
64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846) # sshd.pam
## bf94db9df9bade7842a7088ec673be340fd238e6c160bb2935e1e37ae1a3a4af openssh-9.5p1-02-x86_64.pkg.tar.lz
## d8676f03025b98f95396e42ff6b3edbdbe8c7b44455d2e903b70f0a5600f0f7c openssh-9.6p1-01-x86_64.pkg.tar.lz
bf94db9df9bade7842a7088ec673be340fd238e6c160bb2935e1e37ae1a3a4af openssh-9.5p1-02-x86_64.pkg.tar.lz
f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b openssh-9.5p1.tar.gz
88d3935af9dc82fcb34f5c7c7f226e6b750c0859452b691166be0d626d471d31 openssh-9.5p1.tar.gz.asc

View file

@ -5,8 +5,8 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=9.5p1
pkgrel=2
pkgver=9.6p1
pkgrel=1
pkgdesc="SSH protocol implementation for remote login, command execution and file transfer"
arch=(x86_64)
url='https://www.openssh.com/portable.html'
@ -50,7 +50,7 @@ source=(
sshd.conf
sshd.pam
)
sha256sums=('f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b'
sha256sums=('910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c'
'SKIP'
'78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30'
'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
@ -58,7 +58,7 @@ sha256sums=('f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b'
'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998'
'76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327'
'633e24cbfcb045ba777d3e06d5f85dfaa06d44f4727d38c7fb2187c57498221d')
b2sums=('55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796'
b2sums=('dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd'
'SKIP'
'1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97'
'09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'