summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/execline/APKBUILD4
-rw-r--r--system/libcap-ng/APKBUILD8
-rw-r--r--system/libcap-ng/fix-includes.patch11
-rw-r--r--system/openssh/APKBUILD4
-rwxr-xr-xsystem/openssh/sshd.initd7
-rw-r--r--system/pcre2/APKBUILD10
-rw-r--r--system/pcre2/CVE-2019-20454.patch50
-rw-r--r--system/perl/APKBUILD4
-rw-r--r--system/psmisc/APKBUILD8
-rw-r--r--system/s6-linux-init/APKBUILD4
-rw-r--r--system/s6/APKBUILD4
-rw-r--r--system/skalibs/APKBUILD5
-rw-r--r--system/vim/APKBUILD2
13 files changed, 30 insertions, 91 deletions
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 6306ef14f..a0fcc2a88 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.7.0.0
+pkgver=2.8.0.0
pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
url="https://skarnet.org/software/$pkgname/"
@@ -62,4 +62,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="e13e4f37ef95284be5c0f9704baf11fe43a402320e3f5a4f3fce4310e6b93c9f1c0424ed12ff9bebd6e3f82abec138c36491f7477912c9bcb30b3499c4d12441 execline-2.7.0.0.tar.gz"
+sha512sums="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz"
diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD
index 507b87368..44479ae49 100644
--- a/system/libcap-ng/APKBUILD
+++ b/system/libcap-ng/APKBUILD
@@ -1,6 +1,6 @@
-# Maintainer:
+# Maintainer: Nathan <ndowens@artixlinux.org>
pkgname=libcap-ng
-pkgver=0.7.10
+pkgver=0.8
pkgrel=0
pkgdesc="POSIX capabilities library"
url="https://people.redhat.com/sgrubb/libcap-ng/index.html"
@@ -12,7 +12,6 @@ makedepends="python3 $depends_dev"
makedepends_host="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz
- fix-includes.patch
"
build() {
@@ -42,5 +41,4 @@ utils() {
mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
}
-sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def libcap-ng-0.7.10.tar.gz
-8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324 fix-includes.patch"
+sha512sums="d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2 libcap-ng-0.8.tar.gz"
diff --git a/system/libcap-ng/fix-includes.patch b/system/libcap-ng/fix-includes.patch
deleted file mode 100644
index 8fbd984b8..000000000
--- a/system/libcap-ng/fix-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru libcap-ng-0.7.4.orig/src/cap-ng.c libcap-ng-0.7.4/src/cap-ng.c
---- libcap-ng-0.7.4.orig/src/cap-ng.c 2014-04-24 15:41:43.000000000 -0300
-+++ libcap-ng-0.7.4/src/cap-ng.c 2015-04-15 08:45:10.783335463 -0300
-@@ -34,6 +34,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <endian.h>
- #include <byteswap.h>
- #ifdef HAVE_SYSCALL_H
- #include <sys/syscall.h>
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD
index 7466d2844..a08c24f79 100644
--- a/system/openssh/APKBUILD
+++ b/system/openssh/APKBUILD
@@ -4,7 +4,7 @@
pkgname=openssh
pkgver=8.1_p1
_myver=${pkgver%_*}${pkgver#*_}
-pkgrel=0
+pkgrel=1
pkgdesc="Port of OpenBSD's free SSH release"
url="https://www.openssh.com/portable.html"
arch="all"
@@ -151,5 +151,5 @@ f3d5960572ddf49635d4edbdff45835df1b538a81840db169c36b39862e6fa8b0393ca90626000b7
9033520d18ccfea87628c78008591ae8a143999868254eabc926ca0665611c9f09c221265b1b6f552b82eca58558244a020d615b55249a02f96e298c1f7ff520 fix-utmpx.patch
34c0673f550e7afcd47eda4fe1da48fb42e5344c95ba8064c9c3c137fda9c43635b0f7b8145d0300f59c79f75a396ebd467afb54cdaa42aa251d624d0752dc84 sftp-interactive.patch
ad5b209f7f3fff69c10bae34da143e071e107a2141eee94f393532d6bb04a36bfe6d9b5d2c08b713f67118503c38d11b4aad689df1df7c8a918d52db8326821d time64-seccomp.patch
-394a420a36880bb0dd37dfd8727cea91fd9de6534050169e21212a46513ef3aaafe2752c338699b3d4ccd14871b26cf01a152df8060cd37f86ce0665fd53c63f sshd.initd
+964c0f8538ba25bdc9cdbd1467bbdfb2090e38492ff0ef7c64473785713fe26d752ea6a7b0ee7a0b34e08f4d3b4bccf6a69e6c456f0c57d0d0c581aa8a046936 sshd.initd
ce0abddbd2004891f88efd8522c4b37a4989290269fab339c0fa9aacc051f7fd3b20813e192e92e0e64315750041cb74012d4321260f4865ff69d7a935b259d4 sshd.confd"
diff --git a/system/openssh/sshd.initd b/system/openssh/sshd.initd
index 065519174..e13924e2c 100755
--- a/system/openssh/sshd.initd
+++ b/system/openssh/sshd.initd
@@ -82,7 +82,12 @@ stop() {
eend $?
if [ "$RC_RUNLEVEL" = "shutdown" ]; then
- _sshd_pids=$(pgrep "${SSHD_BINARY##*/}")
+ local _p _sshd_pids
+ for _p in $(pgrep "${SSHD_BINARY##*/}"); do
+ [ "$(realpath /proc/$_p/exe)" = "${SSHD_BINARY}" ] \
+ || continue
+ _sshd_pids="$_sshd_pids $_p"
+ done
if [ -n "$_sshd_pids" ]; then
ebegin "Shutting down ssh connections"
kill -TERM $_sshd_pids >/dev/null 2>&1
diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD
index 4120d0a7b..75affce0d 100644
--- a/system/pcre2/APKBUILD
+++ b/system/pcre2/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer:
pkgname=pcre2
-pkgver=10.33
-pkgrel=1
+pkgver=10.35
+pkgrel=0
pkgdesc="Perl-compatible regular expression library"
url="https://pcre.org"
arch="all"
@@ -13,12 +13,13 @@ makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
libpcre2-16:_libpcre libpcre2-32:_libpcre"
source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz
- CVE-2019-20454.patch
"
# secfixes:
# 10.33-r1:
# - CVE-2019-20454
+# 10.35-r0:
+# - CVE-2019-20454
case "$CARCH" in
s390x) _enable_jit="";;
@@ -68,5 +69,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="649983c7725e2fd2451ba89243b4c08c408fc279b7be3b2d225045cced3b0667ff6da4c9dd37510eb9e5aed6478aff54c2dbd1d92f4d0f1174579df9ec2c1882 pcre2-10.33.tar.gz
-07c43ccf130c1ed2b4f97036671f92e9c1d0100fd32c053b448e5dbdf976543c12f74568e37b661db7fbd603e815f5683a59cb2a9f9c307505dca3cb36db8120 CVE-2019-20454.patch"
+sha512sums="f9386de9211919da68ad0882dbfb72b344306280b3c4515f496cff4e3ff5c11e29fb71539a357a43a71ef668a742a54cc327a1dc3a00c767fbd0264933beecee pcre2-10.35.tar.gz"
diff --git a/system/pcre2/CVE-2019-20454.patch b/system/pcre2/CVE-2019-20454.patch
deleted file mode 100644
index bdec87294..000000000
--- a/system/pcre2/CVE-2019-20454.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Revision: 1091
-Author: ph10
-Date: Mon May 13 16:26:17 2019 UTC
-URL: https://vcs.pcre.org/pcre2?view=revision&revision=1091
-
-Fix crash when \X is used without UTF in JIT.
-
---- a/testdata/testinput4 2019/05/11 11:43:39 1090
-+++ b/testdata/testinput4 2019/05/13 16:26:17 1091
-@@ -2480,4 +2480,7 @@
- /^(?'אABC'...)(?&אABC)/utf
- 123123123456
-
-+/\X*/
-+ \xF3aaa\xE4\xEA\xEB\xFEa
-+
- # End of testinput4
---- a/testdata/testoutput4 2019/05/11 11:43:39 1090
-+++ b/testdata/testoutput4 2019/05/13 16:26:17 1091
-@@ -4012,4 +4012,8 @@
- 0: 123123
- 1: 123
-
-+/\X*/
-+ \xF3aaa\xE4\xEA\xEB\xFEa
-+ 0: \xf3aaa\xe4\xea\xeb\xfea
-+
- # End of testinput4
-
-Revision: 1092
-Author: ph10
-Date: Mon May 13 16:38:18 2019 UTC
-URL: https://vcs.pcre.org/pcre2?view=revision&revision=1092
-
-Forgot this file in previous commit. Fixes JIT non-UTF bug.
-
---- a/src/pcre2_jit_compile.c 2019/05/13 16:26:17 1091
-+++ b/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092
-@@ -8571,7 +8571,10 @@
- PCRE2_SPTR bptr;
- uint32_t c;
-
--GETCHARINC(c, cc);
-+/* Patch by PH */
-+/* GETCHARINC(c, cc); */
-+
-+c = *cc++;
- #if PCRE2_CODE_UNIT_WIDTH == 32
- if (c >= 0x110000)
- return NULL;
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index 3ffbdffad..40277eb72 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -5,7 +5,7 @@
# Proxy-For: solar
pkgname=perl
pkgver=5.26.3
-pkgrel=1
+pkgrel=2
pkgdesc="Larry Wall's Practical Extraction and Report Language"
url="https://www.perl.org/"
arch="all"
@@ -41,7 +41,7 @@ prepare() {
default_prepare
sed -e 's/less -R/less/g' \
-e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \
- -i ./Configure ||
+ -i ./Configure
# Ensure that we never accidentally bundle zlib or bzip2
rm -rf cpan/Compress-Raw-Zlib/zlib-src
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD
index 4414d28b9..0f53e5ffa 100644
--- a/system/psmisc/APKBUILD
+++ b/system/psmisc/APKBUILD
@@ -15,15 +15,13 @@ makedepends_build="autoconf>=2.69 automake"
makedepends_host="ncurses-dev"
subpackages="$pkgname-doc"
[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang"
-source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver
+source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/psmisc/psmisc/-/archive/v$pkgver/psmisc-v$pkgver.tar.bz2
fix-peekfd-on-ppc.patch
"
+builddir="$srcdir/$pkgname-v$pkgver"
prepare() {
- ln -fs $pkgname-v$pkgver-* "$builddir"
-
default_prepare
-
sh autogen.sh
}
@@ -51,5 +49,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0571aadcd89ecbc89f991a80b02372b3cb881abed97313640bb23905e133473e1c7a51bf8d6c6dbd3d12a013b3aad88d7f94adfcdc3f6f22a53c57e1e0b33016 psmisc-23.3.tar.bz2
+sha512sums="78e8298b4cc2d888159f2689c7957ab5f17c782d6a64642b055a455579d79759a0f62d46e473d9c0dd4e026f4917226b8907afa6178a24a5615194d38b8aed1a psmisc-23.3.tar.bz2
a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch"
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 102b23a4f..e7c6c86ce 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
-pkgver=1.0.6.0
+pkgver=1.0.6.1
pkgrel=0
pkgdesc="A s6-based init system"
url="https://skarnet.org/software/$pkgname/"
@@ -120,7 +120,7 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="9312a7719bd1d10c2846aab996a88b7e55b3a805cbae8f270983ded2707f05bfb76cff211e0a4aee76ec62ed0a23d956fcf56daebf8b2decc499c375c768446d s6-linux-init-1.0.6.0.tar.gz
+sha512sums="0d18b96a70ef39e06e164bb391e22d7b1cce54f941c5526e6a107c7af5b6801b1dd257ba255bc07eff240d48f8ef7f096e180bade25490a86b6326290448d45c s6-linux-init-1.0.6.1.tar.gz
756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init
e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel
7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 4529f6126..489a8ef22 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.10.0.0
+pkgver=2.10.0.2
pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/$pkgname/"
@@ -67,4 +67,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="a3b6603ff7144a41d15e85bbfabc78656a52c0fad18e4195619a9a2c1a84adb84d736bcaa3f082d98dd11d3ac4d4d40988d1206ebaa33a0f9125b29fe380b6f7 s6-2.10.0.0.tar.gz"
+sha512sums="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.tar.gz"
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index 6a09485b8..ee8b7c95d 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
-pkgver=2.10.0.0
+pkgver=2.10.0.2
pkgrel=0
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
@@ -57,5 +57,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-
-sha512sums="e8b36388b24ee8066e48d39650a27030374f263f0ee014eaa79f9d71f2b5647dd1a052cc8ffe0d8457fed8fd1b1fc74980c03dd1182a9d0f1efbe044bff99269 skalibs-2.10.0.0.tar.gz"
+sha512sums="b36b7fefb9df63093f1bd775fe9d2bf7ed588404a99a55b1ecabfc0e3b6eac49989dfb736f7f69a9508e4dfeeb669d48e639964aef5c65c330043c543cd38801 skalibs-2.10.0.2.tar.gz"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index f842cdcf6..cd4a39004 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -49,7 +49,7 @@ build() {
--with-compiledby="Adélie Linux" \
vim_cv_toupper_broken=no \
vim_cv_terminfo=yes \
- vim_cv_tgent=zero \
+ vim_cv_tgetent=zero \
vim_cv_tty_group=world \
vim_cv_getcwd_broken=no \
vim_cv_stat_ignores_slash=no \
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-31 04:06:08 +0000