upg libaio openssh

This commit is contained in:
joborun linux 2024-02-20 15:27:59 +02:00
parent ee55c1ca90
commit 98162ae413
7 changed files with 130 additions and 66 deletions

View File

@ -7,35 +7,30 @@
pkgname=libaio
pkgver=0.3.113
pkgrel=02
pkgrel=03
pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
url="https://pagure.io/libaio"
depends=(glibc)
provides=(libaio.so)
# LTO is not supported: https://pagure.io/libaio/issue/10
# options=(debug) # uncomment to build debug package
#source=(https://releases.pagure.org/libaio/${pkgname}-${pkgver}.tar.gz) # previous source
source=(https://pagure.io/libaio/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz)
options=(!lto)
source=($url/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz)
prepare() {
# -Werror, not even once
sed 's/-Werror//' -i $pkgname-$pkgname-$pkgver/harness/Makefile
# remove failing test until upstream fixes it
rm -frv $pkgname-$pkgname-$pkgver/harness/cases/21.t
}
build() {
# libaio is a thin wrapper around kernel syscalls, it does not use stdlib and
# other helpers like stack protection libraries
CFLAGS="-march=${CARCH/_/-} -mtune=generic -O2 -pipe"
make -C $pkgname-$pkgname-$pkgver
}
check() {
# cd "$srcdir/$pkgname-$pkgver"
# ### keep tjos fix for next time it fails, you mever know with this one
# # work around gcc warning (-Werror) in test suite
# sed -i '/strncpy/s#sizeof(TEMPLATE)#sizeof(template)#' harness/cases/19.t
# sed -i '/strncpy/s#sizeof(TEMPLATE)#sizeof(temp_file)#' harness/cases/21.t
# make partcheck
## make partcheck -k -C $pkgname-$pkgver
make partcheck -k -C $pkgname-$pkgname-$pkgver
}
@ -49,10 +44,9 @@ package() {
arch=(x86_64)
license=(LGPL2.1)
license=(LGPL-2.0-or-later)
sha256sums=(716c7059703247344eb066b54ecbc3ca2134f0103307192e6c2b7dab5f9528ab) # libaio-libaio-0.3.113.tar.gz
## feffe99338315fbb29828cb10004d40a38617a2e2399d32b9fcb39beb44eaf50 libaio-0.3.113-02-x86_64.pkg.tar.lz
## 46cd88db16a1f810d325ec3bbe1672097fe5c596ee354c8a1cef3bd85a8a9d6e libaio-0.3.113-03-x86_64.pkg.tar.lz

View File

@ -4,26 +4,28 @@
pkgname=libaio
pkgver=0.3.113
pkgrel=2
pkgrel=3
pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
arch=(x86_64)
url="https://pagure.io/libaio"
license=(LGPL2.1)
license=(LGPL-2.0-or-later)
depends=(glibc)
provides=(libaio.so)
source=(https://pagure.io/libaio/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz)
# LTO is not supported: https://pagure.io/libaio/issue/10
options=(!lto)
source=($url/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz)
sha512sums=('8058c927de0b5f7079fc232d2be23272537694bf271488af1dc0330b58afc307931792ab138512c5e00aa3ea921935a6d862f575fb0cc2bf323de63d8df208cd')
b2sums=('e06c1c1cc118c15f6bed1abfa97368d7ccc0d2e716a233cd4141936fb382e40909c340a6c882b18ee9461aaa23dd77a6644a38bdb5a00c1444538a2e0ab816d4')
prepare() {
# -Werror, not even once
sed 's/-Werror//' -i $pkgname-$pkgname-$pkgver/harness/Makefile
# remove failing test until upstream fixes it
rm -frv $pkgname-$pkgname-$pkgver/harness/cases/21.t
}
build() {
# libaio is a thin wrapper around kernel syscalls, it does not use stdlib and
# other helpers like stack protection libraries
CFLAGS="-march=${CARCH/_/-} -mtune=generic -O2 -pipe"
make -C $pkgname-$pkgname-$pkgver
}

View File

@ -7,18 +7,19 @@
pkgname=openssh
pkgver=9.6p1
pkgrel=01
pkgdesc='SSH protocol implementation for remote login, command execution and file transfer w/o systemd'
pkgrel=03
pkgdesc="SSH protocol implementation for remote login, command execution and file transfer w/o systemd"
url='https://www.openssh.com/portable.html'
depends=( 'glibc'
'krb5'
'ldns'
'libedit'
'libxcrypt'
'openssl'
'pam'
'zlib')
makedepends=(linux-lts-headers libfido2 autoconf automake)
depends=(glibc)
makedepends=(autoconf automake
krb5
libedit
libfido2
libxcrypt
linux-headers
openssl
pam
zlib)
optdepends=('sh: for ssh-copy-id and findssl.sh'
'libfido2: FIDO/U2F support'
'x11-ssh-askpass: input passphrase in X'
@ -30,8 +31,9 @@ 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"
'99-archlinux.conf'
'sshd.conf'
99-archlinux.conf
$pkgname.tmpfiles
# 'sshd.conf'
'sshd.pam')
@ -48,6 +50,18 @@ prepare() {
# 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
# extract separate licenses
sed -n '89,113p' LICENCE > ../rijndael.Public-Domain.txt
sed -n '116,145p' LICENCE > ../ssh.BSD-3-Clause.txt
sed -n '148,209p' LICENCE > ../BSD-2-Clause.txt
sed -n '213,218p' LICENCE > ../snprintf.Public-Domain.txt
sed -n '222,258p' LICENCE > ../openbsd-compat.BSD-3-Clause.txt
sed -n '260,278p' LICENCE > ../openbsd-compat.ISC.txt
sed -n '280,308p' LICENCE > ../openbsd-compat.MIT.txt
sed -n '280,308p' LICENCE > ../openbsd-compat.MIT.txt
sed -n '310,338p' LICENCE > ../blowfish.BSD-3-Clause.txt
sed -n '340,368p' LICENCE > ../replacement.BSD-2-Clause.txt
}
#prepare() {
@ -67,7 +81,6 @@ build() {
--libexecdir=/usr/lib/ssh \
--sysconfdir=/etc/ssh \
--disable-strip \
--with-ldns \
--with-libedit \
--with-security-key-builtin \
--with-ssl-engine \
@ -88,44 +101,62 @@ check() {
}
package() {
cd "${pkgname}-${pkgver}"
depends+=(
krb5 libkrb5.so libgssapi_krb5.so
libedit libedit.so
libxcrypt libcrypt.so
openssl libcrypto.so
pam libpam.so
zlib libz.so
)
cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
make DESTDIR="$pkgdir" install
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
install -Dm644 LICENCE -t "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
# ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
install -Dm644 LICENCE -t "$pkgdir/usr/share/licenses/$pkgname/"
install -Dm644 ../*.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
# We are including the service files as guid in making runit 66 services, especially the
# sshdgenkeys service
# install -Dm644 ../sshdgenkeys.service -t "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
# install -Dm644 ../sshd.service -t "${pkgdir}"/usr/lib/systemd/system/sshd.service
install -Dm644 ../sshd.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
# install -Dm644 ../sshd.conf -t "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
# factory files
install -Dm644 ../sshd.pam "$pkgdir"/usr/share/factory/etc/pam.d/sshd
install -Dm644 "$pkgdir/etc/ssh/moduli" -t "$pkgdir"/usr/share/factory/etc/ssh/
install -Dm644 "$pkgdir/etc/ssh/ssh_config" -t "$pkgdir"/usr/share/factory/etc/ssh/
install -Dm644 "$pkgdir/etc/ssh/sshd_config" -t "$pkgdir"/usr/share/factory/etc/ssh/
install -vDm 644 ../99-archlinux.conf -t "$pkgdir/usr/share/factory/etc/ssh/sshd_config.d/"
install -Dm755 contrib/findssl.sh -t "${pkgdir}"/usr/bin/findssl.sh
install -Dm755 contrib/ssh-copy-id -t "${pkgdir}"/usr/bin/ssh-copy-id
install -Dm644 contrib/ssh-copy-id.1 -t "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
install -vDm 644 ../$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
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/
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
# license=('custom:BSD')
license=(BSD-2-Clause
BSD-3-Clause
ISC
MIT)
MIT
LicenseRef-Public-Domain)
validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # "Damien Miller <djm@mindrot.org>"
sha256sums=(910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c # openssh-9.6p1.tar.gz
9b1e931cbc811f02e91f7eacd55f8211cc45dade11975462f4b0dcdad29927aa # openssh-9.6p1.tar.gz.asc
78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 # 99-archlinux.conf
76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327 # sshd.conf
975904668c3c98fff5dbf840717ae959593fa05e90e215e67bf7ee24369d6369 # openssh.tmpfiles
64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846) # sshd.pam
## d8676f03025b98f95396e42ff6b3edbdbe8c7b44455d2e903b70f0a5600f0f7c openssh-9.6p1-01-x86_64.pkg.tar.lz
## 9d5c4c2a14bdaa5067102b014012240a8fbc14e124d2493f8bd4381f1d0f4508 openssh-9.6p1-03-x86_64.pkg.tar.lz

View File

@ -1,3 +1,4 @@
# Maintainer: David Runge <dvzrv@archlinux.org>
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Maintainer: Giancarlo Razzolini <grazzolini@archlinux.org>
# Contributor: Gaetan Bisson <bisson@archlinux.org>
@ -6,7 +7,7 @@
pkgname=openssh
pkgver=9.6p1
pkgrel=1
pkgrel=3
pkgdesc="SSH protocol implementation for remote login, command execution and file transfer"
arch=(x86_64)
url='https://www.openssh.com/portable.html'
@ -14,21 +15,21 @@ license=(
BSD-2-Clause
BSD-3-Clause
ISC
LicenseRef-Public-Domain
MIT
)
depends=(
glibc
krb5 libkrb5.so libgssapi_krb5.so
ldns
libedit
libxcrypt libcrypt.so
openssl
pam libpam.so
zlib
)
makedepends=(
krb5
libedit
libfido2
libxcrypt
linux-headers
openssl
pam
zlib
)
optdepends=(
'libfido2: FIDO/U2F support'
@ -44,27 +45,27 @@ backup=(
source=(
https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$pkgver.tar.gz{,.asc}
99-archlinux.conf
$pkgname.tmpfiles
sshdgenkeys.service
sshd.service
ssh-agent.service
sshd.conf
sshd.pam
)
sha256sums=('910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c'
'SKIP'
'78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30'
'975904668c3c98fff5dbf840717ae959593fa05e90e215e67bf7ee24369d6369'
'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998'
'76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327'
'633e24cbfcb045ba777d3e06d5f85dfaa06d44f4727d38c7fb2187c57498221d')
b2sums=('dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd'
'SKIP'
'1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97'
'43bf32158d6b14cf298e5e92a54d93577d6a45b32b3c0fad7a3722e55a53e446fd30df10002bc945c71528904bb397aaadc4f439dd81e5a87263a31b1daa7fc2'
'09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
'07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
'046ea6bd6aa00440991e5f7998db33864a7baa353ec6071f96a3ccb5cca5b548cb9e75f9dee56022ca39daa977d18452851d91e6ba36a66028b84b375ded9bc5'
'a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca'
'1d24cc029eccf71cee54dda84371cf9aa8d805433e751575ab237df654055dd869024b50facd8b73390717e63100c76bca28b493e0c8be9791c76a2e0d60990a')
validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller <djm@mindrot.org>
@ -79,6 +80,18 @@ prepare() {
# 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
# extract separate licenses
sed -n '89,113p' LICENCE > ../rijndael.Public-Domain.txt
sed -n '116,145p' LICENCE > ../ssh.BSD-3-Clause.txt
sed -n '148,209p' LICENCE > ../BSD-2-Clause.txt
sed -n '213,218p' LICENCE > ../snprintf.Public-Domain.txt
sed -n '222,258p' LICENCE > ../openbsd-compat.BSD-3-Clause.txt
sed -n '260,278p' LICENCE > ../openbsd-compat.ISC.txt
sed -n '280,308p' LICENCE > ../openbsd-compat.MIT.txt
sed -n '280,308p' LICENCE > ../openbsd-compat.MIT.txt
sed -n '310,338p' LICENCE > ../blowfish.BSD-3-Clause.txt
sed -n '340,368p' LICENCE > ../replacement.BSD-2-Clause.txt
}
build() {
@ -88,7 +101,6 @@ build() {
--libexecdir=/usr/lib/ssh
--sysconfdir=/etc/ssh
--disable-strip
--with-ldns
--with-libedit
--with-security-key-builtin
--with-ssl-engine
@ -113,6 +125,15 @@ check() {
}
package() {
depends+=(
krb5 libkrb5.so libgssapi_krb5.so
libedit libedit.so
libxcrypt libcrypt.so
openssl libcrypto.so
pam libpam.so
zlib libz.so
)
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
@ -120,15 +141,23 @@ package() {
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
install -Dm644 LICENCE -t "$pkgdir/usr/share/licenses/$pkgname/"
install -Dm644 ../*.txt -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 ../ssh-agent.service -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
# factory files
install -Dm644 ../sshd.pam "$pkgdir"/usr/share/factory/etc/pam.d/sshd
install -Dm644 "$pkgdir/etc/ssh/moduli" -t "$pkgdir"/usr/share/factory/etc/ssh/
install -Dm644 "$pkgdir/etc/ssh/ssh_config" -t "$pkgdir"/usr/share/factory/etc/ssh/
install -Dm644 "$pkgdir/etc/ssh/sshd_config" -t "$pkgdir"/usr/share/factory/etc/ssh/
install -vDm 644 ../99-archlinux.conf -t "$pkgdir/usr/share/factory/etc/ssh/sshd_config.d/"
install -vDm 644 ../$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
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/

View File

@ -1,8 +1,7 @@
linux-lts-headers
linux-headers
autoconf
automake
libfido2
libedit
ldns

9
openssh/openssh.tmpfiles Normal file
View File

@ -0,0 +1,9 @@
C /etc/pam.d/sshd
C /etc/ssh/moduli
C /etc/ssh/ssh_config
C /etc/ssh/sshd_config
C /etc/ssh/sshd_config.d/99-archlinux.conf
d /etc/ssh/ssh_config.d
d /etc/ssh/sshd_config.d
d /var/empty

View File

@ -1,6 +1,6 @@
real 3m59.496s
user 3m47.827s
sys 0m12.459s
real 3m4.560s
user 2m55.883s
sys 0m10.568s