joborun-pkg/jobcore
joborun-pkg/jobcore
Template
2
1
Fork 0
Code Issues Pull requests Projects Releases Activity

upg gettext openssh

Browse source
This commit is contained in:
joborun linux 2022-10-11 00:18:04 +03:00
parent 4beb3f6b19
commit edea6cfb11
8 changed files with 154 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gettext/PKGBUILD
View file

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=gettext
pkgver=0.21
pkgver=0.21.1
pkgrel=02
pkgdesc="GNU internationalization library"
url="https://www.gnu.org/software/gettext/"
@ -16,7 +16,7 @@ groups=(base-devel)
depends=(gcc-libs acl sh libunistring libxml2)
makedepends=(gettext emacs-git git)
optdepends=('git: for autopoint infrastructure updates')
options=(!docs)
#options=(!docs)
source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
gettext-0.21-disable-libtextstyle.patch)
@ -65,6 +65,8 @@ validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
'68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
sha256sums=(c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12 # gettext-0.21.tar.gz
ab16c44ecf4dd0228074c2de3e92da4e36f5300a7db575c325f1e0600a6f49f4 # gettext-0.21.tar.gz.sig
sha256sums=(e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45 # gettext-0.21.1.tar.gz
f51d7e1764fc3355d842da5e91e2dfb842dfcf7f81382a901dafb0009593d7d2 # gettext-0.21.1.tar.gz.sig
544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418) # gettext-0.21-disable-libtextstyle.patch

6
gettext/PKGBUILD-arch
View file

@ -1,8 +1,8 @@
# Maintainer:
pkgname=gettext
pkgver=0.21
pkgrel=2
pkgver=0.21.1
pkgrel=1
pkgdesc="GNU internationalization library"
url="https://www.gnu.org/software/gettext/"
arch=(x86_64)
@ -14,7 +14,7 @@ optdepends=('git: for autopoint infrastructure updates')
options=(!docs)
source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
gettext-0.21-disable-libtextstyle.patch)
sha256sums=('c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12'
sha256sums=('e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45'
'SKIP'
'544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418')
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno

3
gettext/deps
View file

@ -4,3 +4,6 @@ emacs-git
git
autoconf
automake

56
openssh/PKGBUILD
View file

@ -2,14 +2,15 @@
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=openssh
pkgver=9.0p1
pkgver=9.1p1
pkgrel=01
pkgdesc='Premier connectivity tool for remote login with the SSH protocol w/o systemd'
url='https://www.openssh.com/portable.html'
arch=('x86_64')
url='https://www.openssh.com/portable.html'
depends=('krb5' 'openssl' 'libedit' 'ldns' 'libxcrypt' 'zlib' 'pam')
makedepends=(linux-lts-headers libfido2 git autoconf automake)
optdepends=('xorg-xauth: X11 forwarding'
@ -17,13 +18,20 @@ optdepends=('xorg-xauth: X11 forwarding'
'libfido2: FIDO/U2F support')
#options=('debug')
#source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
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"
'sshd.conf'
'sshd.pam')
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
install=install
#install=install
prepare() {
patch -Np1 -d "$pkgname-$pkgver" -i ../$pkgname-9.0p1-sshd_config.patch
}
#prepare() {
# cd "${srcdir}/${pkgname}-${pkgver}"
@ -50,22 +58,16 @@ build() {
--with-privsep-user=nobody \
--with-kerberos5=/usr \
--with-xauth=/usr/bin/xauth \
--with-md5-passwords \
--with-pid-dir=/run \
--with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin'
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
# Tests require openssh to be already installed system-wide,
# also connectivity tests will fail under makechrootpkg since
# it runs as nobody which has /bin/false as login shell.
if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
make tests
fi
# NOTE: make t-exec does not work in our build environment
make file-tests interop-tests unit
}
package() {
@ -74,22 +76,17 @@ package() {
make DESTDIR="${pkgdir}" install
ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
install -Dm644 LICENCE -t "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
# install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
# install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
# 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.pam -t "${pkgdir}"/etc/pam.d/sshd
install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
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
sed \
-e '/^#KbdInteractiveAuthentication yes$/c KbdInteractiveAuthentication no' \
-e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
-e '/^#UsePAM no$/c UsePAM yes' \
-i "${pkgdir}"/etc/ssh/sshd_config
}
#---- license gpg-key sha256sums ----
@ -98,7 +95,10 @@ license=('custom:BSD')
validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # "Damien Miller <djm@mindrot.org>"
sha256sums=(03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a # openssh-9.0p1.tar.gz
5db3a2eb3e8e9c8ae62527ea55f5a6fa41c395ebd0bbb65f4b3dfebeeee5fa00 # openssh-9.0p1.tar.gz.asc
sha256sums=(19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 # openssh-9.1p1.tar.gz
abac4673e0862604ab1f69a4597d191940c0cf58679dc5fc81fbdbd8b28ca267 # openssh-9.1p1.tar.gz.asc
27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f # openssh-9.0p1-sshd_config.patch
4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6 # sshd.conf
64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846) # sshd.pam

156
openssh/PKGBUILD-arch
View file

@ -5,112 +5,108 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=9.0p1
pkgver=9.1p1
pkgrel=1
pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
pkgdesc="SSH protocol implementation for remote login, command execution and file transfer"
arch=('x86_64')
url='https://www.openssh.com/portable.html'
license=('custom:BSD')
arch=('x86_64')
depends=('glibc' 'krb5' 'openssl' 'libedit' 'ldns' 'libxcrypt' 'libcrypt.so' 'zlib' 'pam')
makedepends=('linux-headers' 'libfido2')
optdepends=('xorg-xauth: X11 forwarding'
'x11-ssh-askpass: input passphrase in X'
'libfido2: FIDO/U2F support')
depends=(
'glibc'
'krb5' 'libkrb5.so' 'libgssapi_krb5.so'
'ldns'
'libedit'
'libxcrypt' 'libcrypt.so'
'openssl'
'pam' 'libpam.so'
'zlib'
)
makedepends=('libfido2' 'linux-headers')
optdepends=(
'libfido2: FIDO/U2F support'
'x11-ssh-askpass: input passphrase in X'
'xorg-xauth: X11 forwarding'
)
backup=(
'etc/pam.d/sshd'
'etc/ssh/ssh_config'
'etc/ssh/sshd_config'
)
options=('debug')
validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA')
#source=("git://anongit.mindrot.org/openssh.git?signed#tag=V_8_2_P1"
source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
'sshdgenkeys.service'
'sshd.service'
'sshd.conf'
'sshd.pam')
sha1sums=('06dd658874dcd22d66311cf5999bd56c614de509'
'SKIP'
'caaa801da59a5d14c0c29c43e9de5fef281ea03e'
'8640ac6593602e74a863263223e92ab5c4711588'
'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f'
'd93dca5ebda4610ff7647187f8928a3de28703f3')
sha256sums=('03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a'
source=(
"https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
"$pkgname-9.0p1-sshd_config.patch"
'sshdgenkeys.service'
'sshd.service'
'sshd.conf'
'sshd.pam'
)
sha256sums=('19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288'
'SKIP'
'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
'27e43dfd1506c8a821ec8186bae65f2dc43ca038616d6de59f322bd14aa9d07f'
'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611'
'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7'
'4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6'
'64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846')
b2sums=('49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2'
b2sums=('287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5'
'SKIP'
'62f89107d3648a359b0307497a9f105d7ff1dddddb38a64afe3261000b5db494a5530e4b60a9aa1d7be4413599e54b72e2f53f0de8c1ff263a46a70bc5695c29'
'29e1a1c2744e0234830c6f93a46338ea8dc943370e20a24883d207d611025e54643da678f2826050c073a36be48dfdc7329d4cfb144c2ff90607a5f10f73dc59'
'09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50'
'07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e'
'27571f728c3c10834a81652f3917188436474b588f8b047462e44b6c7a424f60d06ce8cb74839b691870177d7261592207d7f35d4ae6c79af87d6a7ea156d395'
'557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930')
validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller <djm@mindrot.org>
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
install=install
# prepare() {
# cd "${srcdir}/${pkgname}-${pkgver}"
# patch goes here
# autoreconf
# }
prepare() {
patch -Np1 -d "$pkgname-$pkgver" -i ../$pkgname-9.0p1-sshd_config.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd "${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--sbindir=/usr/bin \
--libexecdir=/usr/lib/ssh \
--sysconfdir=/etc/ssh \
--disable-strip \
--with-ldns \
--with-libedit \
--with-security-key-builtin \
--with-ssl-engine \
--with-pam \
--with-privsep-user=nobody \
--with-kerberos5=/usr \
--with-xauth=/usr/bin/xauth \
--with-md5-passwords \
--with-pid-dir=/run \
--with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
./configure \
--prefix=/usr \
--sbindir=/usr/bin \
--libexecdir=/usr/lib/ssh \
--sysconfdir=/etc/ssh \
--disable-strip \
--with-ldns \
--with-libedit \
--with-security-key-builtin \
--with-ssl-engine \
--with-pam \
--with-privsep-user=nobody \
--with-kerberos5=/usr \
--with-xauth=/usr/bin/xauth \
--with-pid-dir=/run \
--with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \
make
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd "${pkgname}-${pkgver}"
# Tests require openssh to be already installed system-wide,
# also connectivity tests will fail under makechrootpkg since
# it runs as nobody which has /bin/false as login shell.
if [[ -e /usr/bin/scp && ! -e /.arch-chroot ]]; then
make tests
fi
# NOTE: make t-exec does not work in our build environment
make file-tests interop-tests unit
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd "${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" install
ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
install -Dm644 LICENCE "${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 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf
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 "${pkgdir}"/usr/bin/findssl.sh
install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
sed \
-e '/^#KbdInteractiveAuthentication yes$/c KbdInteractiveAuthentication no' \
-e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
-e '/^#UsePAM no$/c UsePAM yes' \
-i "${pkgdir}"/etc/ssh/sshd_config
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:

2
openssh/deps
View file

@ -5,3 +5,5 @@ automake
libfido2
libedit
ldns

30
openssh/openssh-9.0p1-sshd_config.patch Normal file
View file

@ -0,0 +1,30 @@
diff -ruN a/sshd_config b/sshd_config
--- a/sshd_config 2022-04-06 02:47:48.000000000 +0200
+++ b/sshd_config 2022-10-10 19:55:58.961117951 +0200
@@ -58,7 +58,7 @@
#PermitEmptyPasswords no
# Change to no to disable s/key passwords
-#KbdInteractiveAuthentication yes
+KbdInteractiveAuthentication no
# Kerberos options
#KerberosAuthentication no
@@ -79,7 +79,7 @@
# If you just want the PAM account and session checks to run without
# PAM authentication, then enable this but set PasswordAuthentication
# and KbdInteractiveAuthentication to 'no'.
-#UsePAM no
+UsePAM yes
#AllowAgentForwarding yes
#AllowTcpForwarding yes
@@ -88,7 +88,7 @@
#X11DisplayOffset 10
#X11UseLocalhost yes
#PermitTTY yes
-#PrintMotd yes
+PrintMotd no
#PrintLastLog yes
#TCPKeepAlive yes
#PermitUserEnvironment no

9
openssh/time
View file

@ -1,3 +1,6 @@
real 0m47.883s
user 1m27.338s
sys 0m8.642s
real 3m19.968s
user 3m11.783s
sys 0m9.530s