From 0607c834416ad05051146ca43e48b7d4f12f3772 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 27 May 2023 18:43:04 +0300 Subject: [PATCH] numerous upgrades --- binutils/PKGBUILD | 14 +- binutils/PKGBUILD-arch.new | 126 ++++++ curl/PKGBUILD | 26 +- diffutils/PKGBUILD | 19 +- diffutils/PKGBUILD-arch | 12 +- glib2/PKGBUILD | 6 +- glib2/PKGBUILD-arch | 4 +- glib2/key | 2 +- ncurses/PKGBUILD | 39 +- ncurses/PKGBUILD-arch | 28 +- ncurses/clean | 2 +- ncurses/deps | 1 - ncurses/time | 6 +- obarun/66-tools/PKGBUILD | 12 +- obarun/66/PKGBUILD | 14 +- obarun/boot-66serv/PKGBUILD | 9 +- obarun/new.stack | 14 + obarun/oblibs/PKGBUILD | 12 +- obarun/void.pklist | 17 + pacman/PKGBUILD | 16 +- pacman/PKGBUILD-arch | 4 +- pacman/pacman.conf | 25 +- pacman/pacman.conf-arch | 9 +- pacman/pacman.conf-arch.change | 25 ++ pacman/pacman.conf-arch.old | 97 +++++ pam/PKGBUILD | 13 +- pam/PKGBUILD-arch | 8 +- pam/deps | 1 - ...788b83b302207a67b82786f4fd79e3538f30.patch | 86 +++++ patch/PKGBUILD | 33 +- patch/PKGBUILD-arch | 6 +- patch/deps | 1 + patch/test-read-only.patch | 36 ++ patch/time | 8 +- skarnet/execline/PKGBUILD | 19 +- skarnet/mdevd/PKGBUILD | 13 +- skarnet/mdevd/clean | 1 + skarnet/new.stack | 13 + skarnet/s6-dns/PKGBUILD | 13 +- skarnet/s6-linux-utils/PKGBUILD | 15 +- skarnet/s6-networking/PKGBUILD | 13 +- skarnet/s6-portable-utils/PKGBUILD | 16 +- skarnet/s6-rc/PKGBUILD | 15 +- skarnet/s6/PKGBUILD | 15 +- skarnet/skalibs/PKGBUILD | 11 +- skarnet/skalist | 2 +- skarnet/void.pklist | 17 + usbutils/PKGBUILD | 13 +- usbutils/PKGBUILD-arch | 6 +- util-linux/.gitignore | 3 + ...t-call-hooks-after-mount-type-helper.patch | 82 ++++ ...ck-for-availability-of-mount-setattr.patch | 98 +++++ util-linux/configure | 364 ++++++++++++++++++ util-linux/diff.contents | 116 ++++++ xfsprogs/PKGBUILD | 4 +- xfsprogs/PKGBUILD-arch | 4 +- xfsprogs/deps | 4 +- 57 files changed, 1359 insertions(+), 229 deletions(-) create mode 100644 binutils/PKGBUILD-arch.new create mode 100644 obarun/new.stack create mode 100644 obarun/void.pklist create mode 100644 pacman/pacman.conf-arch.change create mode 100644 pacman/pacman.conf-arch.old create mode 100644 patch/61d7788b83b302207a67b82786f4fd79e3538f30.patch create mode 100644 patch/test-read-only.patch create mode 100644 skarnet/new.stack create mode 100644 skarnet/void.pklist create mode 100644 util-linux/.gitignore create mode 100644 util-linux/0001-libmount-don-t-call-hooks-after-mount-type-helper.patch create mode 100644 util-linux/0002-libmount-check-for-availability-of-mount-setattr.patch create mode 100644 util-linux/configure create mode 100644 util-linux/diff.contents diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD index 7aeb9f2..40e61e4 100644 --- a/binutils/PKGBUILD +++ b/binutils/PKGBUILD @@ -7,11 +7,9 @@ pkgname=binutils pkgver=2.40 -#_commit=65dbb94214516c915df5e0fe554ea165557e7ec7 -_commit=ded035f913e4d8c989880cf5928b6b5fca9466ae -pkgrel=05 +_commit=0dc8f96598ae1facd1933323e0c633b1ed3ca4e7 +pkgrel=06 pkgdesc='A set of programs to assemble and manipulate binary and object files' -arch=(x86_64) #url='https://www.gnu.org/software/binutils' url='https://ftp.gnu.org/gnu/binutils' groups=( jobbot ) @@ -23,7 +21,7 @@ conflicts=(binutils-multilib) replaces=(binutils-multilib) backup=('etc/gprofng.rc') options=(staticlibs !distcc !ccache) -#options=(staticlibs !distcc !ccache debug) ## uncomment this line to have the debug pkg produced +# options=(staticlibs !distcc !ccache debug) ## uncomment this line to have the debug pkg produced # the above was removed by arch in version 2.40-1 source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit} gold-warn-unsupported.patch) @@ -130,7 +128,9 @@ EOS install -Dm644 -t "${pkgdir}"/usr/share/licenses/${pkgname}/ FSFAP } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3' 'GPL' 'FDL1.3' 'custom:FSFAP') @@ -139,4 +139,4 @@ validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F) sha256sums=(SKIP 2d430b66f84a19c154725ec535280c493be1d34f1a90f95208dce02fecd0e4e4) # gold-warn-unsupported.patch -## e7fd8e9c4dd8df101e00cc446717b490fb372a7ce798887fd50fc47e38b384d8 binutils-2.40-05-x86_64.pkg.tar.lz +## diff --git a/binutils/PKGBUILD-arch.new b/binutils/PKGBUILD-arch.new new file mode 100644 index 0000000..de66f93 --- /dev/null +++ b/binutils/PKGBUILD-arch.new @@ -0,0 +1,126 @@ +# Maintainer: Giancarlo Razzolini +# Maintainer: Frederik Schwan +# Contributor: Bartłomiej Piotrowski +# Contributor: Allan McRae + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc + +pkgname=binutils +pkgver=2.40 +_commit=0dc8f96598ae1facd1933323e0c633b1ed3ca4e7 +pkgrel=6 +pkgdesc='A set of programs to assemble and manipulate binary and object files' +arch=(x86_64) +url='https://www.gnu.org/software/binutils/' +license=('GPL3' 'GPL' 'FDL1.3' 'custom:FSFAP') +depends=(glibc jansson libelf zlib zstd) +makedepends=(git) +checkdepends=(dejagnu debuginfod bc) +optdepends=('debuginfod: for debuginfod server/client functionality') +conflicts=(binutils-multilib) +replaces=(binutils-multilib) +backup=('etc/gprofng.rc') +options=(staticlibs !distcc !ccache) +source=(git+https://sourceware.org/git/binutils-gdb.git#commit=${_commit} + gold-warn-unsupported.patch) +sha256sums=('SKIP' + '2d430b66f84a19c154725ec535280c493be1d34f1a90f95208dce02fecd0e4e4') +validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F) + +prepare() { + [[ ! -d binutils-gdb ]] && ln -s binutils-${pkgver} binutils-gdb + mkdir -p binutils-build + + cd binutils-gdb + + # Turn off development mode (-Werror, gas run-time checks, date in sonames) + sed -i '/^development=/s/true/false/' bfd/development.sh + + # Creds @Fedora + # Change the gold configuration script to only warn about + # unsupported targets. This allows the binutils to be built with + # BPF support enabled. + patch -Np1 -i "${srcdir}"/gold-warn-unsupported.patch +} + +build() { + cd binutils-build + + "${srcdir}"/binutils-gdb/configure \ + --prefix=/usr \ + --sysconfdir="${pkgdir}"/etc \ + --with-lib-path=/usr/lib:/usr/local/lib \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-cet \ + --enable-colored-disassembly \ + --enable-default-execstack=no \ + --enable-deterministic-archives \ + --enable-gold \ + --enable-install-libiberty \ + --enable-jansson \ + --enable-ld=default \ + --enable-new-dtags \ + --enable-pgo-build=lto \ + --enable-plugins \ + --enable-relro \ + --enable-shared \ + --enable-targets=x86_64-pep,bpf-unknown-none \ + --enable-threads \ + --disable-gdb \ + --disable-gdbserver \ + --disable-libdecnumber \ + --disable-readline \ + --disable-sim \ + --disable-werror \ + --with-debuginfod \ + --with-pic \ + --with-system-zlib + + make -O tooldir=/usr + + # Extract the FSF All Permissive License + # + # used for some linker scripts. + tail -n 5 "${srcdir}"/binutils-gdb/ld/scripttempl/README > FSFAP +} + +check() { + cd binutils-build + + # Use minimal flags for testsuite + # ld testsuite uses CFLAGS_FOR_TARGET and requires -g + # gold testsuite requires CXXFLAGS/CFLAGS with default PIE/PIC disabled + make -O CFLAGS_FOR_TARGET="-O2 -g" \ + CXXFLAGS="-O2 -no-pie -fno-PIC" \ + CFLAGS="-O2 -no-pie" \ + LDFLAGS="" \ + check || true +} + +package() { + cd binutils-build + make prefix="${pkgdir}"/usr tooldir="${pkgdir}"/usr install + + # install PIC version of libiberty + install -m644 libiberty/pic/libiberty.a "${pkgdir}"/usr/lib + + # Remove unwanted files + rm -f "${pkgdir}"/usr/share/man/man1/{dlltool,windres,windmc}* + + # No shared linking to these files outside binutils + rm -f "${pkgdir}"/usr/lib/lib{bfd,opcodes}.so + tee "${pkgdir}"/usr/lib/libbfd.so << EOS +/* GNU ld script */ + +INPUT( /usr/lib/libbfd.a -lsframe -liberty -lz -lzstd -ldl ) +EOS + + tee "${pkgdir}"/usr/lib/libopcodes.so << EOS +/* GNU ld script */ + +INPUT( /usr/lib/libopcodes.a -lbfd ) +EOS + + # install FSF All Permissive License + install -Dm644 -t "${pkgdir}"/usr/share/licenses/${pkgname}/ FSFAP +} diff --git a/curl/PKGBUILD b/curl/PKGBUILD index 37e4f14..2e9ca67 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -_tag='189aed698b23f7a1390d1b561ba73d02e66d96d2' # git rev-parse v${_tag_name} -_tag_name='8_1_0' +_tag='4ac817f9884c538e1343219facae19d93a42778c' # git rev-parse v${_tag_name} +_tag_name='8_1_1' pkgver="${_tag_name//_/.}" -pkgrel=02 +pkgrel=01 pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd' url='https://curl.se' #options=(debug) # uncomment this to produce debug package @@ -23,13 +23,13 @@ provides=('libcurl.so') # '0001-Revert-http2-minor-buffer-and-error-path-fixes.patch') source=("git+https://github.com/bagder/curl.git#tag=${_tag}?signed") -_backports=( - # http2: double http request parser max line length - '77c9a9845bbee66f3aff158b8452dc8cd963cbd5' - - # urlapi: allow numerical parts in the host name - '92772e6d395bbdda0e7822d980caf86e8c4aa51c' -) +#_backports=( +# # http2: double http request parser max line length +# '77c9a9845bbee66f3aff158b8452dc8cd963cbd5' +# +# # urlapi: allow numerical parts in the host name +# '92772e6d395bbdda0e7822d980caf86e8c4aa51c' +#) _reverts=( @@ -179,7 +179,7 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg sha256sums=(SKIP) -## ec2ae453726909775b1d7373642848668428ee0ef4a49259c67e0b3363ebb6cf curl-8.1.0-02-x86_64.pkg.tar.lz -## 8d42b2184f09cffdc7bcc320a7ba4e2b473a0466d4fba3ff5134e1b2d899d53e libcurl-compat-8.1.0-02-x86_64.pkg.tar.lz -## a03d5bfaca789055eb04bfc3a3a59b158c5a3e9f7775e5edacea9aaadef84c2d libcurl-gnutls-8.1.0-02-x86_64.pkg.tar.lz +## d2fc6613a92080a2aee99896b54aeb76be81938f5681c06b0a9932925dfaa519 curl-8.1.1-01-x86_64.pkg.tar.lz +## 7fabcb99186ef4291552f8150d12006006f3c6f6a5d73472f4e9fd20fd5add69 libcurl-compat-8.1.1-01-x86_64.pkg.tar.lz +## 6b451c7fba614ec7c17c1f88a5eb10f2c927a02b6299f28ee71a9664365a8caa libcurl-gnutls-8.1.1-01-x86_64.pkg.tar.lz diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD index 39849f7..027bb6b 100644 --- a/diffutils/PKGBUILD +++ b/diffutils/PKGBUILD @@ -6,16 +6,13 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=diffutils -pkgver=3.9 +pkgver=3.10 pkgrel=01 pkgdesc='Utility programs used for creating patch files' -arch=('x86_64') groups=( jobbot ) url='https://www.gnu.org/software/diffutils' depends=('glibc' 'bash') -source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - 01-fix-colors-test.patch - 02-fix-bug-where-D-does-not-work.patch) +source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) prepare() { cd $pkgname-$pkgver @@ -46,15 +43,17 @@ package() { make DESTDIR="$pkgdir" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL3') validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering -sha256sums=(d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1 # diffutils-3.9.tar.xz - 0380dd1b297da094898c1c653dd3266def05c1492a794ec634e802976165ba3e # diffutils-3.9.tar.xz.sig - bc0b6db1f90808551e376b98a5f5e235b7a33d0f09a780a2d6be476f64678ef7 # 01-fix-colors-test.patch - a96a96267b65b5a17b0acad2064f9edede3f54462146850f9f0b5ea8ef0e7bf4) # 02-fix-bug-where-D-does-not-work.patch +sha256sums=(90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e # diffutils-3.10.tar.xz + a94faf8f1baa04ff220f7b2ccb137c16337284e023ebc4a1d5df475c08d810f7) # diffutils-3.10.tar.xz.sig +## bbf965200f1b1ac26e8353f0962d5a757b6ecbe13b497c50161ead49c89f1888 diffutils-3.10-01-x86_64.pkg.tar.lz + diff --git a/diffutils/PKGBUILD-arch b/diffutils/PKGBUILD-arch index fe93713..d6559ce 100644 --- a/diffutils/PKGBUILD-arch +++ b/diffutils/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Andreas Radke pkgname=diffutils -pkgver=3.9 +pkgver=3.10 pkgrel=1 pkgdesc='Utility programs used for creating patch files' arch=('x86_64') @@ -11,13 +11,9 @@ url='https://www.gnu.org/software/diffutils' license=('GPL3') depends=('glibc' 'bash') validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering -source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - '01-fix-colors-test.patch' - '02-fix-bug-where-D-does-not-work.patch') -sha256sums=('d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1' - 'SKIP' - 'bc0b6db1f90808551e376b98a5f5e235b7a33d0f09a780a2d6be476f64678ef7' - 'a96a96267b65b5a17b0acad2064f9edede3f54462146850f9f0b5ea8ef0e7bf4') +source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +sha256sums=('90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e' + 'SKIP') prepare() { cd $pkgname-$pkgver diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD index 0a718bd..35bb198 100644 --- a/glib2/PKGBUILD +++ b/glib2/PKGBUILD @@ -8,7 +8,7 @@ #pkgbase=glib2 #pkgname=(glib2 glib2-docs) pkgname=glib2 -pkgver=2.76.2 +pkgver=2.76.3 pkgrel=01 pkgdesc="Low level core library" url="https://wiki.gnome.org/Projects/GLib" @@ -18,7 +18,7 @@ makedepends=(gettext shared-mime-info python libelf git util-linux #checkdepends=(desktop-file-utils glib2) #options=(debug staticlibs) ### uncomment this to have the debug pkg produced options=(staticlibs) -_commit=41ae5b5632ce9f6b2b5613ec1912821f769166c2 # tags/2.76.2^0 +_commit=69e209764bcfef599a21b32f82f88f1906bf197c # tags/2.76.3^0 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" "git+https://gitlab.gnome.org/GNOME/gvdb.git" 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch @@ -125,4 +125,4 @@ sha256sums=(SKIP # 92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e # gio-querymodules.script 64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook -## c0b0fe332950fa3ffdcd455f24430f4ae4584a00026ff08f8c4f341bdd9285ca glib2-2.76.2-01-x86_64.pkg.tar.lz +## 0b00625fee16f28c46e6a41cc7ff0db3456137bf6cb76e0cd7fd9d3ec3ee646a glib2-2.76.3-01-x86_64.pkg.tar.lz diff --git a/glib2/PKGBUILD-arch b/glib2/PKGBUILD-arch index c711a7f..739db47 100644 --- a/glib2/PKGBUILD-arch +++ b/glib2/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.76.2 +pkgver=2.76.3 pkgrel=1 pkgdesc="Low level core library" url="https://wiki.gnome.org/Projects/GLib" @@ -35,7 +35,7 @@ options=( debug staticlibs ) -_commit=41ae5b5632ce9f6b2b5613ec1912821f769166c2 # tags/2.76.2^0 +_commit=69e209764bcfef599a21b32f82f88f1906bf197c # tags/2.76.3^0 source=( "git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" "git+https://gitlab.gnome.org/GNOME/gvdb.git" diff --git a/glib2/key b/glib2/key index ec0b31e..f3f3c39 100644 --- a/glib2/key +++ b/glib2/key @@ -1 +1 @@ -gpg -v --recv-key 92C957F278E2A1AA +gpg -v --recv-key F0942E894B2EAFA0 diff --git a/ncurses/PKGBUILD b/ncurses/PKGBUILD index 9e8ecec..0173ed7 100644 --- a/ncurses/PKGBUILD +++ b/ncurses/PKGBUILD @@ -6,10 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=ncurses -pkgver=6.4 +pkgver=6.4_20230520 pkgrel=01 pkgdesc='System V Release 4.0 curses emulation library' -arch=(x86_64) _url='https://invisible-island.net/ncurses/ncurses.html' url="https://invisible-mirror.net/archives" depends=(glibc gcc-libs) @@ -18,27 +17,29 @@ optdepends=('bash: for ncursesw6-config') provides=(libncurses++w.so libformw.so libmenuw.so libpanelw.so libncursesw.so) replaces=(alacritty-terminfo) #options=(debug) # uncomment this to produce the debug pkg -source=( - $url/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} +source=($url/$pkgname/current/$pkgname-${pkgver/_/-}.tgz{,.asc} $pkgname-6.3-libs.patch - $pkgname-6.3-pkgconfig.patch -) + $pkgname-6.3-pkgconfig.patch) prepare() { # do not link against test libraries - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-6.3-libs.patch + patch -Np1 -d $pkgname-${pkgver/_/-} -i ../$pkgname-6.3-libs.patch # do not leak build-time LDFLAGS into the pkgconfig files: # https://bugs.archlinux.org/task/68523 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-6.3-pkgconfig.patch + patch -Np1 -d $pkgname-${pkgver/_/-} -i ../$pkgname-6.3-pkgconfig.patch # NOTE: can't run autoreconf because the autotools setup is custom and ancient } + build() { - cd $pkgname-$pkgver + cd $pkgname-${pkgver/_/-} ./configure --prefix=/usr \ --enable-widec \ --enable-pc-files \ + --disable-root-access \ + --disable-root-environ \ + --disable-setuid-environ \ --mandir=/usr/share/man \ --with-cxx-binding \ --with-cxx-shared \ @@ -53,8 +54,11 @@ build() { } package() { - make DESTDIR="$pkgdir" install -C $pkgname-$pkgver - install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" + local _pkgver=${pkgver/_*/} + + make DESTDIR="$pkgdir" install -C $pkgname-${pkgver/_/-} + install -vDm 644 $pkgname-${pkgver/_/-}/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" + # fool packages looking to link to non-wide-character ncurses libraries for lib in ncurses ncurses++ form panel menu; do @@ -69,21 +73,24 @@ package() { # tic and ticinfo functionality is built in by default # make sure that anything linking against it links against libncursesw.so instead for lib in tic tinfo; do - printf "INPUT(libncursesw.so.%s)\n" "${pkgver:0:1}" > "$pkgdir/usr/lib/lib${lib}.so" - ln -sv libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${pkgver:0:1}" + printf "INPUT(libncursesw.so.%s)\n" "${_pkgver:0:1}" > "$pkgdir/usr/lib/lib${lib}.so" + ln -sv libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${_pkgver:0:1}" ln -sv ncursesw.pc "$pkgdir/usr/lib/pkgconfig/${lib}.pc" done } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(MIT) validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas Dickey -sha256sums=(6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159 # ncurses-6.4.tar.gz - f9096c5311eab61908c142e77e58f503f9228e13d351365b3c331ca5ad5a67db # ncurses-6.4.tar.gz.asc +sha256sums=(a04f69bde2f1b1325d1fb460db7cea28b6da97786ead8ce645daacfb0bcbc004 # ncurses-6.4-20230520.tgz + 9d4311c1ee185968471d08506a02ae24a4256dca259e1a57b876300566e37c0a # ncurses-6.4-20230520.tgz.asc dc4261b6642058a9df1c0945e2409b24f84673ddc3a665d8a15ed3580e51ee25 # ncurses-6.3-libs.patch b8544a607dfbeffaba2b087f03b57ed1fa81286afca25df65f61b04b5f3b3738) # ncurses-6.3-pkgconfig.patch +## 908fdf74b6a93f800bd89d4c8f19eef7a786f16acc5d34001be4af4995fabd07 ncurses-6.4_20230520-01-x86_64.pkg.tar.lz diff --git a/ncurses/PKGBUILD-arch b/ncurses/PKGBUILD-arch index dcbb5fb..5050e31 100644 --- a/ncurses/PKGBUILD-arch +++ b/ncurses/PKGBUILD-arch @@ -4,7 +4,7 @@ # Contributor: judd pkgname=ncurses -pkgver=6.4 +pkgver=6.4_20230520 pkgrel=1 pkgdesc='System V Release 4.0 curses emulation library' arch=(x86_64) @@ -15,17 +15,16 @@ makedepends=(autoconf-archive) optdepends=('bash: for ncursesw6-config') provides=(libncurses++w.so libformw.so libmenuw.so libpanelw.so libncursesw.so) replaces=(alacritty-terminfo) -options=(debug) source=( - https://invisible-mirror.net/archives/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} + https://invisible-mirror.net/archives/$pkgname/current/$pkgname-${pkgver/_/-}.tgz{,.asc} $pkgname-6.3-libs.patch $pkgname-6.3-pkgconfig.patch ) -sha512sums=('1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34' +sha512sums=('bbb1dd33f4c701165b7612657a7577d3175b94c5815a89eaab3a8774510feb9322d284896dba8d3896f6dd89a8b98031829a76f7e3397aebb6cf2a71e989f93c' 'SKIP' 'adb02b838c40f1e58a1b31c26d5cd0f2a1c43f3b6d68e839981764c0f6c905a9eb51dd36ff018628fdeb20747cc7467727d57135408ab4848259384077a52b28' '2d2c0ec3c880e638ab4aa3dbff5e28e4cd233153e24816bd87e077f848aa3edd5114cd0f2a7f6e8869dd1861a2746e512886c18264ff1676927dcc320c5ef958') -b2sums=('47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3' +b2sums=('d5e88198140ab6471a36bef08685e17ac2e43b4e66b53abaa961d5f8912eb3eae3784db194436c2b3e5f2deaeefaaed93e0550bcab0456f1486fc35d0cdac440' 'SKIP' '31bb10e82dd018a75e57252052650d9f0f5eb5e7e887118c2ea40032b11f59ec6aa4d9bae804c615cbecdf3382f3434e0c9e9e8440fdefe66a507be020b8965c' 'fb6cf606cf3db7f6b306272696a63bce83d52cfa91e850f9a7bdb9d3d8455a26943529a9cf79731dddc7f763c27211a9afab9c4c31dbb6d12fd720eb390eb0a3') @@ -33,16 +32,19 @@ validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03') # Thomas Dickey "$pkgdir/usr/lib/lib${lib}.so" - ln -sv libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${pkgver:0:1}" + printf "INPUT(libncursesw.so.%s)\n" "${_pkgver:0:1}" > "$pkgdir/usr/lib/lib${lib}.so" + ln -sv libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${_pkgver:0:1}" ln -sv ncursesw.pc "$pkgdir/usr/lib/pkgconfig/${lib}.pc" done } diff --git a/ncurses/clean b/ncurses/clean index af8b46d..b8063a2 100644 --- a/ncurses/clean +++ b/ncurses/clean @@ -1 +1 @@ -rm -rf {src,pkg,*tar.gz*} +rm -rf {src,pkg,*tar.gz*,*tgz*} diff --git a/ncurses/deps b/ncurses/deps index bfc8f9f..e4aae0c 100644 --- a/ncurses/deps +++ b/ncurses/deps @@ -1,4 +1,3 @@ autoconf-archive - diff --git a/ncurses/time b/ncurses/time index 6def541..4173782 100644 --- a/ncurses/time +++ b/ncurses/time @@ -1,6 +1,6 @@ -real 1m58.530s -user 1m45.410s -sys 0m12.764s +real 2m13.024s +user 1m52.675s +sys 0m19.966s diff --git a/obarun/66-tools/PKGBUILD b/obarun/66-tools/PKGBUILD index e73e968..bf0834a 100644 --- a/obarun/66-tools/PKGBUILD +++ b/obarun/66-tools/PKGBUILD @@ -8,13 +8,12 @@ pkgname=66-tools pkgver=0.0.8.0 -pkgrel=05 +pkgrel=07 pkgdesc="small tools and helpers for service scripts execution" -arch=(x86_64) url='https://git.obarun.org/Obarun/66-tools.git' source=("${pkgname}::git+${url}#tag=v$pkgver") -makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 'oblibs>=0.1.4.0' 'lowdown') -depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0' 'oblibs>=0.1.4.0') +makedepends=('git' 'skalibs>=2.13.1.1' 'execline>=2.9.3.0' 'oblibs>=0.1.4.0' 'lowdown') +depends=('skalibs>=2.13.1.1' 'execline>=2.9.3.0' 'oblibs>=0.1.4.0') groups=('s6-suite') _flags=( @@ -41,9 +40,12 @@ package() { install -Dm 0644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) +## e293ee65788b417d9f732ada37ba7bacc8624528b24db74936322c1a1352d870 66-tools-0.0.8.0-07-x86_64.pkg.tar.lz diff --git a/obarun/66/PKGBUILD b/obarun/66/PKGBUILD index 61f65c9..469617d 100644 --- a/obarun/66/PKGBUILD +++ b/obarun/66/PKGBUILD @@ -8,18 +8,15 @@ pkgname=66 pkgver=0.6.2.0 -pkgrel=07 +pkgrel=08 # change in uid for s6log pkgdesc="Small tools built around s6 and s6-rc programs" url='https://git.obarun.org/Obarun/66.git' source=("${pkgname}::git+${url}#tag=v$pkgver" 66.install) # direct: https://git.obarun.org/pkg/obcore/66/-/raw/master/trunk/66.install - -depends=( 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-rc>=0.5.4.0' 'oblibs>=0.1.4.0') -makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-rc>=0.5.4.0' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') -arch=(x86_64) - +depends=( 'skalibs>=2.13.1.1' 'execline>=2.9.3.0' 's6>=2.11.3.2' 's6-rc>=0.5.4.1' 'oblibs>=0.1.4.0') +makedepends=('git' 'skalibs>=2.13.1.1' 'execline>=2.9.3.0' 's6>=2.11.3.2' 's6-rc>=0.5.4.1' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') backup=('etc/66/init.conf' 'etc/66/rc.init' 'etc/66/rc.init.container' @@ -65,10 +62,13 @@ package() { install -Dm 0644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP 2560ad31407cf17fbec2e52526cb1515424b9436cb4c1664e64578b5d78326a3) # 66.install +## 7abba5ffe815e5f6fecb13581cdcd9196502ad5896a50be1a18ca2db49bd32f8 66-0.6.2.0-08-x86_64.pkg.tar.lz diff --git a/obarun/boot-66serv/PKGBUILD b/obarun/boot-66serv/PKGBUILD index d899c01..07c1555 100644 --- a/obarun/boot-66serv/PKGBUILD +++ b/obarun/boot-66serv/PKGBUILD @@ -4,13 +4,13 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/obarun/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- +# Maintainer : Eric Vidal pkgname=boot-66serv pkgdesc="Complete and portable set of services to properly boot a machine with 66 tools" pkgver=2.4.1 _pkgver=v2.4.1 -pkgrel=05 -arch=('x86_64') +pkgrel=06 groups=('s6-suite') backup=('etc/66/rc.local') url="https://git.obarun.org/obmods/${pkgname}" @@ -36,10 +36,13 @@ package() { make DESTDIR="${pkgdir}" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=('x86_64') license=('0BSD') sha256sums=(SKIP f7e81047005998f6db00c187835c9aa3248d73c2f50b97617e48851825f65ad6) # boot.install +## 1a265b56499e3f63d7d511c497e3f60a51dd98b938503c6e8c24656eafe57ab6 boot-66serv-2.4.1-06-x86_64.pkg.tar.lz diff --git a/obarun/new.stack b/obarun/new.stack new file mode 100644 index 0000000..01ab69a --- /dev/null +++ b/obarun/new.stack @@ -0,0 +1,14 @@ +skalibs/skalibs-2.13.1.1-01-x86_64.pkg.tar.lz +execline/execline-2.9.3.0-02-x86_64.pkg.tar.lz +mdevd/mdevd-0.1.6.2-02-x86_64.pkg.tar.lz +s6-portable-utils/s6-portable-utils-2.3.0.2-01-x86_64.pkg.tar.lz +s6/s6-2.11.3.2-01-x86_64.pkg.tar.lz +s6-rc/s6-rc-0.5.4.1-01-x86_64.pkg.tar.lz +s6-linux-utils/s6-linux-utils-2.6.1.2-01-x86_64.pkg.tar.lz +s6-dns/s6-dns-2.3.5.5-02-x86_64.pkg.tar.lz +s6-networking/s6-networking-2.5.1.3-02-x86_64.pkg.tar.lz +oblibs/oblibs-0.1.4.0-06-x86_64.pkg.tar.lz +66/66-0.6.2.0-08-x86_64.pkg.tar.lz +66-tools/66-tools-0.0.8.0-07-x86_64.pkg.tar.lz +boot-66serv/boot-66serv-2.4.1-06-x86_64.pkg.tar.lz + diff --git a/obarun/oblibs/PKGBUILD b/obarun/oblibs/PKGBUILD index c4a8661..c3ad6ee 100644 --- a/obarun/oblibs/PKGBUILD +++ b/obarun/oblibs/PKGBUILD @@ -9,13 +9,12 @@ pkgname=oblibs pkgdesc='Obarun C library' pkgver=0.1.4.0 -pkgrel=05 +pkgrel=06 url='https://git.obarun.org/Obarun/oblibs.git' track=tag -arch=(x86_64) groups=(s6-suite) -depends=("skalibs>=2.13.1.0" "execline>=2.9.2.0") -makedepends=(git "skalibs>=2.13.1.0" "execline>=2.9.2.0") +depends=("skalibs>=2.13.1.1" "execline>=2.9.3.0") +makedepends=(git "skalibs>=2.13.1.1" "execline>=2.9.3.0") target="v${pkgver}" source=("$pkgname::git+https://git.obarun.org/Obarun/${pkgname}#${track}=${target}") @@ -34,10 +33,13 @@ package() { install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('ISC') sha256sums=(SKIP) +## 54aacf87c190eb5610aef44bdd0d6ee1724fa16051881089caad3b9d4297f152 oblibs-0.1.4.0-06-x86_64.pkg.tar.lz diff --git a/obarun/void.pklist b/obarun/void.pklist new file mode 100644 index 0000000..3dffa7e --- /dev/null +++ b/obarun/void.pklist @@ -0,0 +1,17 @@ +[*] skalibs-2.13.1.0_1 General purpose libraries for building software from skarnet.org +[*] execline-2.9.2.0_1 Non-interactive scripting language +[*] s6-2.11.3.0_1 Small suite of programs for UNIX, designed to allow process supervision +[*] s6-dns-2.3.5.5_1 Suite of DNS client programs and libraries for Unix systems +[*] s6-linux-utils-2.6.1.0_1 Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.) +[*] s6-networking-2.5.1.3_1 Suite of small network utilities for Unix systems +[*] s6-portable-utils-2.3.0.0_1 Tiny portable generic utilities (s6-cat, s6-chmod, etc.) +[*] s6-rc-0.5.4.1_1 Service manager of the s6 init system + +[*] oblibs-0.1.4.0_3 Obarun library +[*] 66-0.6.2.0_4 Small tools built around s6 and s6-rc programs +[*] 66-devel-0.6.2.0_4 Small tools built around s6 and s6-rc programs - development files +[*] 66-0.6.2.0_4 Small tools built around s6 and s6-rc programs +[*] 66-devel-0.6.2.0_4 Small tools built around s6 and s6-rc programs - development files +[*] 66-tools-0.0.8.0_3 Small tools and helpers for service scripts execution +[*] boot-66serv-2.4.1.20230311_1 Stage 1 boot for 66 + diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index b0c912d..d5614fe 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -7,20 +7,20 @@ pkgname=pacman pkgver=6.0.2 -pkgrel=09 +pkgrel=011 pkgdesc="A library-based package manager with dependency support" url="https://www.archlinux.org/pacman/" groups=(base jobbot) depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist' - 'gawk' 'coreutils' 'gnupg' 'grep' 'archlinux-keyring' - 'obarun-keyring' 'joborun-keyring' 'lzip') + 'gawk' 'coreutils' 'gnupg' 'grep' 'archlinux-keyring' + 'obarun-keyring' 'joborun-keyring' 'lzip') # NOTE: Joborun linux is switching default pkg compression to lzip at level -5 # which matches current xz compression ratio but at a fraction of RAM use # and relatively even speed. So lzip becomes a standard system dependency # as it will also be used by pacman during installation. Gradually all # pkgs will be publicized as *.pkg.tar.lz For now there will be mixed. -makedepends=('meson' 'asciidoc' 'doxygen' 'cmake' 'bash-completion') +makedepends=('meson' 'asciidoc' 'doxygen') checkdepends=('python' 'fakechroot') optdepends=('perl-locale-gettext: translation support in makepkg-template') provides=('libalpm.so') @@ -81,7 +81,7 @@ package() { install -dm755 "$pkgdir/etc" install -m644 "$srcdir/pacman.conf" "$pkgdir/etc" install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc" - rm -rf $pkgdir/usr/share/libalpm/hooks +# rm -rf $pkgdir/usr/share/libalpm/hooks } #---- arch license gpg-key & sha256sums ---- @@ -99,9 +99,7 @@ sha256sums=(7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 # d2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114 # pacman-always-create-directories-from-debugedit-fixup.patch f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0 # pacman-fix-unique-source-paths.patch d87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312 # pacman-strip-include-o-files-similar-to-kernel-modules.patch - 7acd7be22d7975afc561c273f0c714ac6fe1a5117b2a1b6e61921fffc5f0a193 # pacman.conf + 58382a43dc8e0248451bed90c835a985a5ff85f462d9c0ce3452453bf8d871f0 # pacman.conf 57908e7e19d841e0be54f3024c3018ce3ed6de5ea1d7750bac550f3e1e90d8c7) # makepkg.conf -## b74f3737312d73dabaedc3450e4528afef466b9fb1170bfd15e5ac56d8aba6ce pacman-6.0.2-08-x86_64.pkg.tar.lz - - +## 5b12955bebac69e4f7d716c48a207003b770a8922e155fe0f32c86cb37f518f5 pacman-6.0.2-011-x86_64.pkg.tar.lz diff --git a/pacman/PKGBUILD-arch b/pacman/PKGBUILD-arch index 7e7cf3f..8cfba72 100644 --- a/pacman/PKGBUILD-arch +++ b/pacman/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=pacman pkgver=6.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -33,7 +33,7 @@ sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' 'd2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114' 'f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0' 'd87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312' - '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7' + '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6') prepare() { diff --git a/pacman/pacman.conf b/pacman/pacman.conf index eab47a0..551108e 100644 --- a/pacman/pacman.conf +++ b/pacman/pacman.conf @@ -43,7 +43,7 @@ ILoveCandy # After you install all 3 keyrings you can switch Siglevel to Required for Obarun and Archlinux # We have not begun signing packages yet, it will be done late in the beta phase # We turn it to never for now to avoid pacman problems with properly installing keys. -SigLevel = Never +SigLevel = Never #LocalFileSigLevel = Optional #RemoteFileSigLevel = Required @@ -81,7 +81,6 @@ SigLevel = Never # packages ( /var/cache/{jobcore,jobextra,jobcomm} ) you can # comment ours and uncomment your own. - [jobcore] #Server = file:///var/cache/jobcore/ Server = https://free.nchc.org.tw/osdn/storage/g/j/jo/joborun/jobcore/ @@ -136,10 +135,12 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/ #### Arch begins here ####### # As we build testing pkgs as soon as they appear but we -# don't cover all of extra testing should be enabled +# don't cover all of extra, testing should be enabled # to cover combatibility with Arch's extra/testing pkgs +# community and community-testing no longer exist, all +# packages have been moved to extra or AUR -[testing] +[core-testing] SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist @@ -147,17 +148,21 @@ Include = /etc/pacman.d/mirrorlist SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist +[extra-testing] +SigLevel = DatabaseOptional +Include = /etc/pacman.d/mirrorlist + [extra] SigLevel = DatabaseOptional Include = /etc/pacman.d/mirrorlist -[community-testing] -SigLevel = DatabaseOptional -Include = /etc/pacman.d/mirrorlist +#[core-staging] +#SigLevel = DatabaseOptional +#Include = /etc/pacman.d/mirrorlist -[community] -SigLevel = DatabaseOptional -Include = /etc/pacman.d/mirrorlist +#[extra-staging] +#SigLevel = DatabaseOptional +#Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. diff --git a/pacman/pacman.conf-arch b/pacman/pacman.conf-arch index 3982bbe..4cfecc5 100644 --- a/pacman/pacman.conf-arch +++ b/pacman/pacman.conf-arch @@ -69,19 +69,16 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -#[testing] +#[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] +#[extra-testing] #Include = /etc/pacman.d/mirrorlist -[community] +[extra] Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, diff --git a/pacman/pacman.conf-arch.change b/pacman/pacman.conf-arch.change new file mode 100644 index 0000000..a37d5d0 --- /dev/null +++ b/pacman/pacman.conf-arch.change @@ -0,0 +1,25 @@ +--- pacman.conf-arch 2022-03-30 23:37:39.319409767 +0300 ++++ pacman.conf.1 2023-05-25 18:49:54.708305904 +0300 +@@ -69,19 +69,16 @@ + # repo name header and Include lines. You can add preferred servers immediately + # after the header, and they will be used before the default mirrors. + +-#[testing] ++#[core-testing] + #Include = /etc/pacman.d/mirrorlist + + [core] + Include = /etc/pacman.d/mirrorlist + +-[extra] +-Include = /etc/pacman.d/mirrorlist +- +-#[community-testing] ++#[extra-testing] + #Include = /etc/pacman.d/mirrorlist + +-[community] ++[extra] + Include = /etc/pacman.d/mirrorlist + + # If you want to run 32 bit applications on your x86_64 system, diff --git a/pacman/pacman.conf-arch.old b/pacman/pacman.conf-arch.old new file mode 100644 index 0000000..4cfecc5 --- /dev/null +++ b/pacman/pacman.conf-arch.old @@ -0,0 +1,97 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#NoProgressBar +CheckSpace +#VerbosePkgLists +#ParallelDownloads = 5 + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[core-testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +#[extra-testing] +#Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/pam/PKGBUILD b/pam/PKGBUILD index 876ac2b..be0aa9a 100644 --- a/pam/PKGBUILD +++ b/pam/PKGBUILD @@ -7,15 +7,14 @@ pkgname=pam pkgver=1.5.3 -pkgrel=01 +pkgrel=03 pkgdesc="PAM (Pluggable Authentication Modules) library - w/o systemd" url="http://linux-pam.org" depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so') makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') provides=('libpam.so' 'libpamc.so' 'libpam_misc.so') -backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.pwhistory.conf,init,pam_env.conf,time.conf} etc/environment) - -source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz{,.asc} +backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment) +source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver{,-docs}.tar.xz{,.asc} $pkgname.tmpfiles) options=('!emptydirs') @@ -71,8 +70,8 @@ validpgpkeys=(8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB # Thorsten Kukuk sha256sums=(7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283 # Linux-PAM-1.5.3.tar.xz ce5690766060d60a8f0fba447f480d8d49988821740698cbdf2ecfd84dc8895c # Linux-PAM-1.5.3.tar.xz.asc + fe7493aa0a281f8cfe81814768329f953098d0fd8073da1dc0bd64494d022d4d # Linux-PAM-1.5.3-docs.tar.xz + eabd232fa4d59e151bc2cffd3f2cefc8f82440113fa4650159b85435542bd60f # Linux-PAM-1.5.3-docs.tar.xz.asc 5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac) # pam.tmpfiles -## 8f94f7d4af1fb44973d83c2fdf364d8a97520c62ad7c8fb50b44aea861d52554 pam-1.5.3-01-x86_64.pkg.tar.lz logind-disabled -## f3841a27ea28dfccfe516f12240903c412f8ebd0854ad2d939cdadb7a725b49d pam-1.5.3-01-x86_64.pkg.tar.lz logind enabled - +## 0f3dc4a95d0e43139f72bba9d592f6d28db318f153d98250caa6172bf1000176 pam-1.5.3-03-x86_64.pkg.tar.lz diff --git a/pam/PKGBUILD-arch b/pam/PKGBUILD-arch index 9b16037..695c72c 100644 --- a/pam/PKGBUILD-arch +++ b/pam/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=pam pkgver=1.5.3 -pkgrel=1 +pkgrel=3 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('x86_64') license=('GPL2') @@ -12,8 +12,8 @@ url="http://linux-pam.org" depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so') makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') provides=('libpam.so' 'libpamc.so' 'libpam_misc.so') -backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.pwhistory.conf,init,pam_env.conf,time.conf} etc/environment) -source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz{,.asc} +backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment) +source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver{,-docs}.tar.xz{,.asc} $pkgname.tmpfiles) validpgpkeys=( '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk @@ -21,6 +21,8 @@ validpgpkeys=( ) sha256sums=('7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283' + 'SKIP' + 'fe7493aa0a281f8cfe81814768329f953098d0fd8073da1dc0bd64494d022d4d' 'SKIP' '5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac') diff --git a/pam/deps b/pam/deps index 4d38d3f..0f6ef96 100644 --- a/pam/deps +++ b/pam/deps @@ -3,4 +3,3 @@ docbook-xml docbook-xsl - diff --git a/patch/61d7788b83b302207a67b82786f4fd79e3538f30.patch b/patch/61d7788b83b302207a67b82786f4fd79e3538f30.patch new file mode 100644 index 0000000..a42c306 --- /dev/null +++ b/patch/61d7788b83b302207a67b82786f4fd79e3538f30.patch @@ -0,0 +1,86 @@ +From 61d7788b83b302207a67b82786f4fd79e3538f30 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Thu, 27 Jun 2019 11:10:43 +0200 +Subject: [PATCH] Don't crash when RLIMIT_NOFILE is set to RLIM_INFINITY + +* src/safe.c (min_cached_fds): Define minimum number of cached dir file +descriptors. +(max_cached_fds): Change type to rlim_t to allow storing RLIM_INFINITY. +(init_dirfd_cache): Set max_cached_fds to RLIM_INFINITY when RLIMIT_NOFILE is +RLIM_INFINITY. Set the initial hash table size to min_cached_fds, independent +of RLIMIT_NOFILE: patches commonly only affect one or a few files, so a small +hash table will usually suffice; if needed, the hash table will grow. +(insert_cached_dirfd): Don't shrink the cache when max_cached_fds is +RLIM_INFINITY. +--- + src/safe.c | 36 +++++++++++++++++++++++------------- + 1 file changed, 23 insertions(+), 13 deletions(-) + +diff --git a/src/safe.c b/src/safe.c +index 5a7202f..f147b0e 100644 +--- a/src/safe.c ++++ b/src/safe.c +@@ -67,7 +67,8 @@ struct cached_dirfd { + }; + + static Hash_table *cached_dirfds = NULL; +-static size_t max_cached_fds; ++static rlim_t min_cached_fds = 8; ++static rlim_t max_cached_fds; + LIST_HEAD (lru_list); + + static size_t hash_cached_dirfd (const void *entry, size_t table_size) +@@ -98,11 +99,17 @@ static void init_dirfd_cache (void) + { + struct rlimit nofile; + +- max_cached_fds = 8; + if (getrlimit (RLIMIT_NOFILE, &nofile) == 0) +- max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds); ++ { ++ if (nofile.rlim_cur == RLIM_INFINITY) ++ max_cached_fds = RLIM_INFINITY; ++ else ++ max_cached_fds = MAX (nofile.rlim_cur / 4, min_cached_fds); ++ } ++ else ++ max_cached_fds = min_cached_fds; + +- cached_dirfds = hash_initialize (max_cached_fds, ++ cached_dirfds = hash_initialize (min_cached_fds, + NULL, + hash_cached_dirfd, + compare_cached_dirfds, +@@ -148,20 +155,23 @@ static void insert_cached_dirfd (struct cached_dirfd *entry, int keepfd) + if (cached_dirfds == NULL) + init_dirfd_cache (); + +- /* Trim off the least recently used entries */ +- while (hash_get_n_entries (cached_dirfds) >= max_cached_fds) ++ if (max_cached_fds != RLIM_INFINITY) + { +- struct cached_dirfd *last = +- list_entry (lru_list.prev, struct cached_dirfd, lru_link); +- if (&last->lru_link == &lru_list) +- break; +- if (last->fd == keepfd) ++ /* Trim off the least recently used entries */ ++ while (hash_get_n_entries (cached_dirfds) >= max_cached_fds) + { +- last = list_entry (last->lru_link.prev, struct cached_dirfd, lru_link); ++ struct cached_dirfd *last = ++ list_entry (lru_list.prev, struct cached_dirfd, lru_link); + if (&last->lru_link == &lru_list) + break; ++ if (last->fd == keepfd) ++ { ++ last = list_entry (last->lru_link.prev, struct cached_dirfd, lru_link); ++ if (&last->lru_link == &lru_list) ++ break; ++ } ++ remove_cached_dirfd (last); + } +- remove_cached_dirfd (last); + } + + /* Only insert if the parent still exists. */ diff --git a/patch/PKGBUILD b/patch/PKGBUILD index 5701330..136bac7 100644 --- a/patch/PKGBUILD +++ b/patch/PKGBUILD @@ -7,9 +7,8 @@ pkgname=patch pkgver=2.7.6 -pkgrel=09 +pkgrel=010 pkgdesc='A utility to apply patch files to original sources' -arch=('x86_64') url='https://www.gnu.org/software/patch/' groups=( jobbot ) depends=('glibc' 'attr') @@ -23,6 +22,8 @@ source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} '19599883ffb6a450d2884f081f8ecf68edbed7ee.patch' # Fix memory leaks introduced in CVE-2018-1000165 'https://github.com/mirror/patch/commit/369dcccdfa6336e5a873d6d63705cfbe04c55727.patch' 'https://github.com/mirror/patch/commit/9c986353e420ead6e706262bf204d6e03322c300.patch' # CVE-2018-6952 + 'test-read-only.patch' + 'https://github.com/mirror/patch/commit/61d7788b83b302207a67b82786f4fd79e3538f30.patch' # FS#78539 ) prepare() { @@ -55,22 +56,24 @@ package() { make DESTDIR="$pkgdir" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL') validpgpkeys=('259B3792B3D6D319212CC4DCD5BF9FEB0313653A') # Andreas Gruenbacher -sha256sums=(ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd # patch-2.7.6.tar.xz - 2398352147c006e0737430247960d1c75ce33377a3278023cdc34ebd4a810cd9 # patch-2.7.6.tar.xz.sig - 38d28c34524c6ac4585d47e0fe8349508e9e4b014872798cb2bf2bc48e5af2d4 # f290f48a621867084884bfff87f8093c15195e6a.patch - b7829673090bcd74110ac040cc6e503113ef770e48d34758c04418cf9c8bfa87 # b5a91a01e5d0897facdd0f49d64b76b0f02b43e1.patch - 9158cb3cd4bed0c4fe5a7f1254e0e2642e0ad583dc8b5df8ee296a13d695270d # 123eaff0d5d1aebe128295959435b9ca5909c26d.patch - 473f8a7fa8152a3c7803633e2a3072dab545b74377ea618451ceda4283643364 # 3fcd042d26d70856e826a42b5f93dc4854d80bf0.patch - 6d64a8b8ddfb802ec0aa804388eb5ef51ac808c7a5c111d10490c270eb4fe727 # 19599883ffb6a450d2884f081f8ecf68edbed7ee.patch - e1fc8a8aa2cad71b2a6207241ea71a33a7e3dacb8533ad54af35170c5a6562d1 # 369dcccdfa6336e5a873d6d63705cfbe04c55727.patch - 4b9e81985ca057fa39daed34a4710eb113f08b3d1ce77a7121ddd8e3fae8007a) # 9c986353e420ead6e706262bf204d6e03322c300.patch - -## 294453ff99739a20eb1ba1b9dbfdb990f5480f84b0e1346a26fc747d18a585b4 patch-2.7.6-09-x86_64.pkg.tar.lz - +sha256sums=(ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd # patch-2.7.6.tar.xz + 2398352147c006e0737430247960d1c75ce33377a3278023cdc34ebd4a810cd9 # patch-2.7.6.tar.xz.sig + 38d28c34524c6ac4585d47e0fe8349508e9e4b014872798cb2bf2bc48e5af2d4 # f290f48a621867084884bfff87f8093c15195e6a.patch + b7829673090bcd74110ac040cc6e503113ef770e48d34758c04418cf9c8bfa87 # b5a91a01e5d0897facdd0f49d64b76b0f02b43e1.patch + 9158cb3cd4bed0c4fe5a7f1254e0e2642e0ad583dc8b5df8ee296a13d695270d # 123eaff0d5d1aebe128295959435b9ca5909c26d.patch + 473f8a7fa8152a3c7803633e2a3072dab545b74377ea618451ceda4283643364 # 3fcd042d26d70856e826a42b5f93dc4854d80bf0.patch + 6d64a8b8ddfb802ec0aa804388eb5ef51ac808c7a5c111d10490c270eb4fe727 # 19599883ffb6a450d2884f081f8ecf68edbed7ee.patch + e1fc8a8aa2cad71b2a6207241ea71a33a7e3dacb8533ad54af35170c5a6562d1 # 369dcccdfa6336e5a873d6d63705cfbe04c55727.patch + 4b9e81985ca057fa39daed34a4710eb113f08b3d1ce77a7121ddd8e3fae8007a # 9c986353e420ead6e706262bf204d6e03322c300.patch + cce641860eeb7d02f7f3430337e35b76d3c87b615a53dbdf0b0f588f0f9dc57b # test-read-only.patch + 2107c03d5e207e56fb2e6ac281a1778343b58536c3a053d24d258f80c3976c42) +## 348355c1bae1d498542ef727d151a9429be841bcda076106d3a1aefacc6ec05f patch-2.7.6-010-x86_64.pkg.tar.lz diff --git a/patch/PKGBUILD-arch b/patch/PKGBUILD-arch index 1697d28..cb206bd 100644 --- a/patch/PKGBUILD-arch +++ b/patch/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgname=patch pkgver=2.7.6 -pkgrel=9 +pkgrel=10 pkgdesc='A utility to apply patch files to original sources' arch=('x86_64') url='https://www.gnu.org/software/patch/' @@ -23,6 +23,7 @@ source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} 'https://github.com/mirror/patch/commit/369dcccdfa6336e5a873d6d63705cfbe04c55727.patch' 'https://github.com/mirror/patch/commit/9c986353e420ead6e706262bf204d6e03322c300.patch' # CVE-2018-6952 'test-read-only.patch' + 'https://github.com/mirror/patch/commit/61d7788b83b302207a67b82786f4fd79e3538f30.patch' # FS#78539 ) sha256sums=('ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd' 'SKIP' @@ -33,7 +34,8 @@ sha256sums=('ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd' '6d64a8b8ddfb802ec0aa804388eb5ef51ac808c7a5c111d10490c270eb4fe727' 'e1fc8a8aa2cad71b2a6207241ea71a33a7e3dacb8533ad54af35170c5a6562d1' '4b9e81985ca057fa39daed34a4710eb113f08b3d1ce77a7121ddd8e3fae8007a' - 'cce641860eeb7d02f7f3430337e35b76d3c87b615a53dbdf0b0f588f0f9dc57b') + 'cce641860eeb7d02f7f3430337e35b76d3c87b615a53dbdf0b0f588f0f9dc57b' + '2107c03d5e207e56fb2e6ac281a1778343b58536c3a053d24d258f80c3976c42') prepare() { cd $pkgname-$pkgver diff --git a/patch/deps b/patch/deps index 60809bb..d727117 100644 --- a/patch/deps +++ b/patch/deps @@ -3,3 +3,4 @@ autoconf automake +gettext diff --git a/patch/test-read-only.patch b/patch/test-read-only.patch new file mode 100644 index 0000000..57efb65 --- /dev/null +++ b/patch/test-read-only.patch @@ -0,0 +1,36 @@ +# Remove read-only-files test. +# Fail to build on btrfs with compression enabled. +# +# [44] patch -p0 --read-only=fail < f.diff || echo "Status: $?" -- ok +# [54] patch -f -p0 --read-only=warn < f.diff || echo "Status: $?" -- FAILED +# --- expected +# +++ got +# @@ -1,4 +1,4 @@ +# File f is read-only; trying to patch anyway +# patching file f +# -File f is read-only; trying to patch anyway +# -patching file f +# +/home/seblu/arch/packages/core/patch/trunk/src/patch-2.7.6/src/patch: setting attribute btrfs.compression for btrfs.compression: Permission denied +# +Status: 2 +# [65] patch -f -p0 --read-only=ignore < f.diff || echo "Status: $?" -- FAILED +# --- expected +# +++ got +# @@ -1,2 +1,3 @@ +# patching file f +# -patching file f +# +/home/seblu/arch/packages/core/patch/trunk/src/patch-2.7.6/src/patch: setting attribute btrfs.compression for btrfs.compression: Permission denied +# +Status: 2 +# 3 tests (1 passed, 2 failed) +# FAIL read-only-files (exit status: 1) + + +--- a/tests/Makefile.am 2023-02-12 21:53:41.703257940 +0100 ++++ b/tests/Makefile.am 2023-02-12 22:01:28.252357777 +0100 +@@ -55,7 +55,6 @@ + preserve-c-function-names \ + preserve-mode-and-timestamp \ + quoted-filenames \ +- read-only-files \ + reject-format \ + remember-backup-files \ + remember-reject-files \ diff --git a/patch/time b/patch/time index be21440..3124e07 100644 --- a/patch/time +++ b/patch/time @@ -1,4 +1,6 @@ -real 0m34.770s -user 0m33.993s -sys 0m4.388s + +real 0m39.527s +user 0m32.108s +sys 0m5.317s + diff --git a/skarnet/execline/PKGBUILD b/skarnet/execline/PKGBUILD index 6c8cbbd..82ed582 100644 --- a/skarnet/execline/PKGBUILD +++ b/skarnet/execline/PKGBUILD @@ -4,19 +4,17 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=execline -pkgver=2.9.2.0 -_pkgver=v2.9.2.0 -pkgrel=01 +pkgver=2.9.3.0 +_pkgver=v2.9.3.0 +pkgrel=02 pkgdesc="An interpreter-less scripting language." -arch=(x86_64) url="http://skarnet.org/software/execline/" groups=(s6-suite) -depends=('skalibs>=2.13.1.0') -makedepends=('git' 'skalibs>=2.13.1.0') -# a0b46c927ebb2c60ac850964aa0b3cb28f6c8d74 refs/tags/v2.9.1.0 +depends=('skalibs>=2.13.1.1') +makedepends=('git' 'skalibs>=2.13.1.1') +# a0b46c927ebb2c60ac850964aa0b3cb28f6c8d74 refs/tags/v2.9.1.0 ## if you wanted a specific tag source=("$pkgname::git+git://git.skarnet.org/execline#tag=${_pkgver}") _pkgver() { @@ -47,9 +45,12 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname%-*}/COPYING" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('ISC') sha256sums=(SKIP) +## a7745d8b9bbec2c8eb5516da4944ff9bfc78a1934545cdb7122b72608bf76560 execline-2.9.3.0-02-x86_64.pkg.tar.lz diff --git a/skarnet/mdevd/PKGBUILD b/skarnet/mdevd/PKGBUILD index f6184da..c489a9d 100644 --- a/skarnet/mdevd/PKGBUILD +++ b/skarnet/mdevd/PKGBUILD @@ -4,16 +4,14 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=mdevd pkgver=0.1.6.2 -pkgrel=01 +pkgrel=02 pkgdesc="a mdev-compatible hotplug manager daemon" -arch=(x86_64) url="http://skarnet.org/software/mdevd/" -makedepends=('git' 'skalibs>=2.13.1.0') -depends=('skalibs>=2.13.1.0') +makedepends=('git' 'skalibs>=2.13.1.1') +depends=('skalibs>=2.13.1.1') groups=('s6-suite') #commit=0838e7bd13c9f847c06d015d86a8a1ff403a2e8f # refs/tags/v0.1.6.1 source=("$pkgname::git+git://git.skarnet.org/mdevd#tag=v${pkgver}") @@ -41,9 +39,12 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) +## d784948ce8d8003c154d9ce741794e158af0482e94706a544dfca512eebd22d3 mdevd-0.1.6.2-02-x86_64.pkg.tar.lz diff --git a/skarnet/mdevd/clean b/skarnet/mdevd/clean index 88ae146..b1ac731 100644 --- a/skarnet/mdevd/clean +++ b/skarnet/mdevd/clean @@ -1 +1,2 @@ + rm -rf {src,pkg,mdevd} diff --git a/skarnet/new.stack b/skarnet/new.stack new file mode 100644 index 0000000..63babb6 --- /dev/null +++ b/skarnet/new.stack @@ -0,0 +1,13 @@ +skalibs/skalibs-2.13.1.1-01-x86_64.pkg.tar.lz +execline/execline-2.9.3.0-02-x86_64.pkg.tar.lz +mdevd/mdevd-0.1.6.2-02-x86_64.pkg.tar.lz +s6-portable-utils/s6-portable-utils-2.3.0.2-01-x86_64.pkg.tar.lz +s6/s6-2.11.3.2-01-x86_64.pkg.tar.lz +s6-rc/s6-rc-0.5.4.1-01-x86_64.pkg.tar.lz +s6-linux-utils/s6-linux-utils-2.6.1.2-01-x86_64.pkg.tar.lz +s6-dns/s6-dns-2.3.5.5-02-x86_64.pkg.tar.lz +s6-networking/s6-networking-2.5.1.3-02-x86_64.pkg.tar.lz +oblibs/oblibs-0.1.4.0-06-x86_64.pkg.tar.lz +66/66-0.6.2.0-08-x86_64.pkg.tar.lz +66-tools/66-tools-0.0.8.0-07-x86_64.pkg.tar.lz +boot-66serv/boot-66serv-2.4.1-06-x86_64.pkg.tar.lz diff --git a/skarnet/s6-dns/PKGBUILD b/skarnet/s6-dns/PKGBUILD index 075a933..9a739e0 100644 --- a/skarnet/s6-dns/PKGBUILD +++ b/skarnet/s6-dns/PKGBUILD @@ -4,17 +4,15 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=s6-dns pkgver=2.3.5.5 _pkgver=v2.3.5.5 -pkgrel=01 +pkgrel=02 pkgdesc="A suite of DNS client programs and libraries for Unix systems" -arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.13.1.0') -depends=('skalibs>=2.13.1.0') +makedepends=('git' 'skalibs>=2.13.1.1') +depends=('skalibs>=2.13.1.1') groups=(s6-suite) source=("$pkgname::git+git://git.skarnet.org/s6-dns#tag=${_pkgver}") #_commit=070fb7154e7d0d0065b701ff6c41682b5f6ab2d9 # refs/tags/v2.3.5.5 @@ -49,9 +47,12 @@ package() { } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) +## 8589604bbfd820312c8723315a55ed42e087b7d36fc4250dc5c7545b87e82aff s6-dns-2.3.5.5-02-x86_64.pkg.tar.lz diff --git a/skarnet/s6-linux-utils/PKGBUILD b/skarnet/s6-linux-utils/PKGBUILD index b2cb7f3..73357c8 100644 --- a/skarnet/s6-linux-utils/PKGBUILD +++ b/skarnet/s6-linux-utils/PKGBUILD @@ -4,17 +4,15 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer : Eric Vidal pkgname=s6-linux-utils pkgdesc="A set of tiny Linux-specific utilities" -_pkgver=v2.6.1.0 -pkgver=2.6.1.0 +_pkgver=v2.6.1.2 +pkgver=2.6.1.2 pkgrel=01 url="http://skarnet.org/software/${pkgname}/" -arch=(x86_64) -depends=('skalibs>=2.13.1.0') -makedepends=(git 'skalibs>=2.13.1.0') +depends=('skalibs>=2.13.1.1') +makedepends=(git 'skalibs>=2.13.1.1') groups=('s6-suite') # commit=2d46f7275ca14573f018d4951de595c3188de48d # refs/tags/v2.6.0.1 source=("$pkgname::git+git://git.skarnet.org/s6-linux-utils#tag=$_pkgver") @@ -48,9 +46,12 @@ package() { } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) +## ded98ac99e70563cf28ea5c4b3a9a8df58c1fa17ba39cf3dd122edf0b75e9226 s6-linux-utils-2.6.1.2-01-x86_64.pkg.tar.lz diff --git a/skarnet/s6-networking/PKGBUILD b/skarnet/s6-networking/PKGBUILD index db6143b..41e91a3 100644 --- a/skarnet/s6-networking/PKGBUILD +++ b/skarnet/s6-networking/PKGBUILD @@ -4,17 +4,15 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=s6-networking _pkgver=v2.5.1.3 pkgver=2.5.1.3 -pkgrel=01 +pkgrel=02 pkgdesc="Small network and client-server tools" -arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=(git 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-dns>=2.3.5.5' ) -depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0' 's6-dns>=2.3.5.5' ) +makedepends=(git 'skalibs>=2.13.1.1' 'execline>=2.9.3.0' 's6>=2.11.3.2' 's6-dns>=2.3.5.5' ) +depends=('skalibs>=2.13.1.1' 'execline>=2.9.3.0' 's6>=2.11.3.2' 's6-dns>=2.3.5.5' ) optdepends=('libressl: For build a secure communication tools') groups=(s6-suite) #_commit=4cf18919482e3495810c8e3693ea368bdc5753a1 # refs/tags/v2.5.1.2 @@ -52,9 +50,12 @@ package() { } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('ISC') sha256sums=(SKIP) +## a4088a0e705368bfed8b205fcdba7aa77aad7da777006b0d707e2e399636ba17 s6-networking-2.5.1.3-02-x86_64.pkg.tar.lz diff --git a/skarnet/s6-portable-utils/PKGBUILD b/skarnet/s6-portable-utils/PKGBUILD index 43dbfa4..ac53c3c 100644 --- a/skarnet/s6-portable-utils/PKGBUILD +++ b/skarnet/s6-portable-utils/PKGBUILD @@ -4,17 +4,15 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/sharnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=s6-portable-utils -_pkgver=v2.3.0.0 -pkgver=2.3.0.0 +_pkgver=v2.3.0.2 +pkgver=2.3.0.2 pkgrel=01 pkgdesc="A set of tiny general Unix utilities" -arch=(x86_64) url="http://skarnet.org/software/${pkgname}/" -depends=('git' 'skalibs>=2.13.1.0') -depends=('skalibs>=2.13.1.0') +depends=('git' 'skalibs>=2.13.1.1') +depends=('skalibs>=2.13.1.1') groups=(s6-suite) #_commit=cfb15f58292c012090b12c2a73a6454ec88ec915 refs/tags/v2.2.5.1 #source=("$pkgname::git+git://git.skarnet.org/s6-portable-utils#commit=$_commit") @@ -49,10 +47,14 @@ package() { ln -sf /usr/bin/eltest $pkgdir/usr/bin/s6-test } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) #sudo sed -i 's/s6-test/test/' /usr/lib/66/module/boot@/service/system/system-fsck + +## 0e221af16be962eb9e55863bd6b4d5d6fa4740b970231cca74b27f54e85381b1 s6-portable-utils-2.3.0.2-01-x86_64.pkg.tar.lz diff --git a/skarnet/s6-rc/PKGBUILD b/skarnet/s6-rc/PKGBUILD index 129d909..4b29491 100644 --- a/skarnet/s6-rc/PKGBUILD +++ b/skarnet/s6-rc/PKGBUILD @@ -4,18 +4,16 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=s6-rc -_pkgver=v0.5.4.0 -pkgver=0.5.4.0 +_pkgver=v0.5.4.1 +pkgver=0.5.4.1 pkgrel=01 pkgdesc="A dependency-based init script management system" -arch=(x86_64) url="http://skarnet.org/software/${pkgname}/" #install=s6-rc.install -makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0') -depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0' 's6>=2.11.3.0') +makedepends=('git' 'skalibs>=2.13.1.1' 'execline>=2.9.2.0' 's6>=2.11.3.2') +depends=('skalibs>=2.13.1.1' 'execline>=2.9.2.0' 's6>=2.11.3.2') groups=('base' 's6-suite') source=("$pkgname::git+git://git.skarnet.org/s6-rc#tag=${_pkgver}") #_commit=d8c8f84dbb09a87bcdf7764a279f2b02244078ae # refs/tags/v0.5.3.3 @@ -51,9 +49,12 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) +## 00b06113c52164441f4f298d59e5df2559746e2339a9cc0eee9f7e8ac50eb4cf s6-rc-0.5.4.1-01-x86_64.pkg.tar.lz diff --git a/skarnet/s6/PKGBUILD b/skarnet/s6/PKGBUILD index 1939df4..fbf5b6f 100644 --- a/skarnet/s6/PKGBUILD +++ b/skarnet/s6/PKGBUILD @@ -4,17 +4,15 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=s6 -_pkgver=v2.11.3.0 -pkgver=2.11.3.0 +_pkgver=v2.11.3.2 +pkgver=2.11.3.2 pkgrel=01 pkgdesc="A process supervision suite" -arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.13.1.0' 'execline>=2.9.2.0') -depends=('skalibs>=2.13.1.0' 'execline>=2.9.2.0') +makedepends=('git' 'skalibs>=2.13.1.1' 'execline>=2.9.2.0') +depends=('skalibs>=2.13.1.1' 'execline>=2.9.2.0') groups=('base' 's6-suite') #_commit=24cb21d4aa3e364529d62c2c7310c189443c0843 # refs/tags/v2.11.2.0 #source=("$pkgname::git+git://git.skarnet.org/s6#commit=$_commit") @@ -49,9 +47,12 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(ISC) sha256sums=(SKIP) +## 037cfcc5cfda0d226861ea11d0fb6ff47a7fd5ee240b7180a85e7297c84c4013 s6-2.11.3.2-01-x86_64.pkg.tar.lz diff --git a/skarnet/skalibs/PKGBUILD b/skarnet/skalibs/PKGBUILD index 12e90f2..e4ee0c4 100644 --- a/skarnet/skalibs/PKGBUILD +++ b/skarnet/skalibs/PKGBUILD @@ -4,14 +4,12 @@ # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/skarnet/$pkgname" # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# Maintainer: Eric Vidal pkgname=skalibs -pkgver=2.13.1.0 -_pkgver=v2.13.1.0 +pkgver=2.13.1.1 +_pkgver=v2.13.1.1 pkgrel=01 pkgdesc="A general-purpose low-level C library" -arch=(x86_64) url="http://www.skarnet.org/software/skalibs/" groups=('base' 's6-suite') makedepends=('git') @@ -43,9 +41,12 @@ package() { install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('ISC') sha256sums=(SKIP) +## 18a42c5bf7dabe52c93f04e8e339539a46bf8688dfaaf5d8e12a9703e58818e1 skalibs-2.13.1.1-01-x86_64.pkg.tar.lz diff --git a/skarnet/skalist b/skarnet/skalist index a23915a..067597c 100644 --- a/skarnet/skalist +++ b/skarnet/skalist @@ -1,9 +1,9 @@ skalibs +s6-linux-utils execline mdevd s6-portable-utils s6 s6-rc -s6-linux-utils s6-dns s6-networking diff --git a/skarnet/void.pklist b/skarnet/void.pklist new file mode 100644 index 0000000..3dffa7e --- /dev/null +++ b/skarnet/void.pklist @@ -0,0 +1,17 @@ +[*] skalibs-2.13.1.0_1 General purpose libraries for building software from skarnet.org +[*] execline-2.9.2.0_1 Non-interactive scripting language +[*] s6-2.11.3.0_1 Small suite of programs for UNIX, designed to allow process supervision +[*] s6-dns-2.3.5.5_1 Suite of DNS client programs and libraries for Unix systems +[*] s6-linux-utils-2.6.1.0_1 Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.) +[*] s6-networking-2.5.1.3_1 Suite of small network utilities for Unix systems +[*] s6-portable-utils-2.3.0.0_1 Tiny portable generic utilities (s6-cat, s6-chmod, etc.) +[*] s6-rc-0.5.4.1_1 Service manager of the s6 init system + +[*] oblibs-0.1.4.0_3 Obarun library +[*] 66-0.6.2.0_4 Small tools built around s6 and s6-rc programs +[*] 66-devel-0.6.2.0_4 Small tools built around s6 and s6-rc programs - development files +[*] 66-0.6.2.0_4 Small tools built around s6 and s6-rc programs +[*] 66-devel-0.6.2.0_4 Small tools built around s6 and s6-rc programs - development files +[*] 66-tools-0.0.8.0_3 Small tools and helpers for service scripts execution +[*] boot-66serv-2.4.1.20230311_1 Stage 1 boot for 66 + diff --git a/usbutils/PKGBUILD b/usbutils/PKGBUILD index e870590..fabccdc 100644 --- a/usbutils/PKGBUILD +++ b/usbutils/PKGBUILD @@ -7,15 +7,15 @@ pkgname=usbutils pkgver=015 -pkgrel=02 +pkgrel=03 pkgdesc="A collection of USB tools to query connected USB devices w/o systemd" -arch=(x86_64) url="https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" depends=(glibc hwdata) #makedepends=(git libusb) makedepends=(libusb) optdepends=('python: for lsusb.py usage' - 'coreutils: for lsusb.py usage') + 'coreutils: for lsusb.py usage' + 'sh: for usb-devices') #source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git#commit=79b796f9") source=(https://www.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar{.xz,.sign}) @@ -39,10 +39,13 @@ package() { # cd "$pkgname" cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + install -vDm 755 usbreset -t "$pkgdir/usr/bin" install -vDm 644 NEWS -t "${pkgdir}/usr/share/doc/${pkgname}/" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL2' 'GPL3') @@ -56,4 +59,4 @@ b2sums=('1074c7159e9e6729f03f98e1f38fa0b3fef3e744b5297e6d97a5fc44ea374e2d5a0c481 sha256sums=(c3b451bb1f4ff9f6356cac5a6956a9ac8e85d81651af56a29e689f94fa6fda6e # usbutils-015.tar.xz 6d01cfd835f504e1e0f0dbc09bbcf99c7abf6de6bd446af957771b2b6f8bc742) # usbutils-015.tar.sign - +## 88b3d3cdd22aa7d37c0f37bf21fface5630f6ceca196a6df1a78fd7a6417524f usbutils-015-03-x86_64.pkg.tar.lz diff --git a/usbutils/PKGBUILD-arch b/usbutils/PKGBUILD-arch index f62963d..6282be8 100644 --- a/usbutils/PKGBUILD-arch +++ b/usbutils/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgname=usbutils pkgver=015 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of USB tools to query connected USB devices" arch=(x86_64) url="https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/" @@ -14,8 +14,9 @@ license=(GPL2 GPL3) depends=(glibc hwdata) makedepends=(libusb systemd) optdepends=( - 'python: for lsusb.py usage' 'coreutils: for lsusb.py usage' + 'python: for lsusb.py usage' + 'sh: for usb-devices' ) source=(https://www.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar{.xz,.sign}) sha512sums=('cda0070138400703d7429d39dee49130aedaa704292531e6af57b347cc62422ca609540650926e74335f71d67d7d4655418be4824e1eb8a2b065c7b395feaa87' @@ -45,5 +46,6 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + install -vDm 755 usbreset -t "$pkgdir/usr/bin" install -vDm 644 NEWS -t "$pkgdir/usr/share/doc/$pkgname/" } diff --git a/util-linux/.gitignore b/util-linux/.gitignore new file mode 100644 index 0000000..2aace83 --- /dev/null +++ b/util-linux/.gitignore @@ -0,0 +1,3 @@ +/PKGBUILD +/PKGBUILD-arch +/PKGBUILD-oba diff --git a/util-linux/0001-libmount-don-t-call-hooks-after-mount-type-helper.patch b/util-linux/0001-libmount-don-t-call-hooks-after-mount-type-helper.patch new file mode 100644 index 0000000..3a4f7a9 --- /dev/null +++ b/util-linux/0001-libmount-don-t-call-hooks-after-mount-type-helper.patch @@ -0,0 +1,82 @@ +From f94a7760ed7ce81389a6059f020238981627a70d Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 25 May 2023 11:48:24 +0200 +Subject: [PATCH] libmount: don't call hooks after mount. helper + +In case more filesystems are specified (or when libmount follows +/{etc,proc}/filesystems) then the library may try to use and +initialize the new API because for some filesystems, we need +exec(/sbin/mount.) and for another fsopen(). + +The hooks that use the API have to smart and detect that the mount +operation was done in external /sbin/mount. helper. And in this +case, the new API file descriptors must be ignored. + +The exception is propagation flags, mount(8) can set the flags after +exec(/sbin/mount.), for example, "mount -t ntfs --make-private". + +Fixes: https://github.com/util-linux/util-linux/issues/2267 +Signed-off-by: Karel Zak +--- + libmount/src/context_mount.c | 2 ++ + libmount/src/hook_mount.c | 13 +++++++++++++ + 2 files changed, 15 insertions(+) + +diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c +index cbb4f1fdfa..40f9ed0733 100644 +--- a/libmount/src/context_mount.c ++++ b/libmount/src/context_mount.c +@@ -508,6 +508,8 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) + assert(cxt->fs); + assert((cxt->flags & MNT_FL_MOUNTFLAGS_MERGED)); + ++ mnt_context_reset_status(cxt); ++ + if (try_type) { + rc = mnt_context_prepare_helper(cxt, "mount", try_type); + if (rc) +diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c +index 924c714448..91483afa68 100644 +--- a/libmount/src/hook_mount.c ++++ b/libmount/src/hook_mount.c +@@ -239,6 +239,10 @@ static int hook_create_mount(struct libmnt_context *cxt, + int rc = 0; + + assert(cxt); ++ ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + assert(cxt->fs); + + api = get_sysapi(cxt); +@@ -309,6 +313,9 @@ static int hook_reconfigure_mount(struct libmnt_context *cxt, + + assert(cxt); + ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + api = get_sysapi(cxt); + assert(api); + assert(api->fd_tree >= 0); +@@ -379,6 +386,9 @@ static int hook_set_vfsflags(struct libmnt_context *cxt, + uint64_t set = 0, clr = 0; + int rc = 0; + ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + DBG(HOOK, ul_debugobj(hs, "setting VFS flags")); + + ol = mnt_context_get_optlist(cxt); +@@ -471,6 +481,9 @@ static int hook_attach_target(struct libmnt_context *cxt, + const char *target; + int rc = 0; + ++ if (mnt_context_helper_executed(cxt)) ++ return 0; ++ + target = mnt_fs_get_target(cxt->fs); + if (!target) + return -EINVAL; diff --git a/util-linux/0002-libmount-check-for-availability-of-mount-setattr.patch b/util-linux/0002-libmount-check-for-availability-of-mount-setattr.patch new file mode 100644 index 0000000..10a6f41 --- /dev/null +++ b/util-linux/0002-libmount-check-for-availability-of-mount-setattr.patch @@ -0,0 +1,98 @@ +commit 1bd85b64632280d6bf0e86b4ff29da8b19321c5f +Author: Thomas Weißschuh +Date: Sat May 20 06:38:20 2023 +0200 + + libmount: check for availability of mount_setattr + + If mount_setattr is not available but needed fall back to the legacy + mount API. + + Fixes #2247 + + Signed-off-by: Thomas Weißschuh + +diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c +index a324637cb..01de9e1c5 100644 +--- a/libmount/src/hook_mount.c ++++ b/libmount/src/hook_mount.c +@@ -510,6 +510,15 @@ static inline int fsopen_is_supported(void) + return rc; + } + ++static inline int mount_setattr_is_supported(void) ++{ ++ int rc; ++ ++ errno = 0; ++ rc = mount_setattr(-1, NULL, 0, NULL, 0); ++ return !(rc == -1 && errno == ENOSYS); ++} ++ + /* + * open_tree() and fsopen() + */ +@@ -675,9 +684,14 @@ static int hook_prepare(struct libmnt_context *cxt, + /* call mount_setattr() */ + if (!rc + && cxt->helper == NULL +- && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) ++ && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) { ++ if (!mount_setattr_is_supported()) { ++ hookset_deinit(cxt, hs); ++ return 1; ++ } + rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT, NULL, + hook_set_vfsflags); ++ } + + /* call move_mount() to attach target */ + if (!rc +@@ -688,9 +702,14 @@ static int hook_prepare(struct libmnt_context *cxt, + hook_attach_target); + + /* set propagation (has to be attached to VFS) */ +- if (!rc && mnt_optlist_get_propagation(ol)) ++ if (!rc && mnt_optlist_get_propagation(ol)) { ++ if (!mount_setattr_is_supported()) { ++ hookset_deinit(cxt, hs); ++ return 1; ++ } + rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT_POST, NULL, + hook_set_propagation); ++ } + + DBG(HOOK, ul_debugobj(hs, "prepare mount done [rc=%d]", rc)); + return rc; +diff --git a/tests/expected/mount/fallback-mount_setattr b/tests/expected/mount/fallback-mount_setattr +new file mode 100644 +index 000000000..3e18ebf09 +--- /dev/null ++++ b/tests/expected/mount/fallback-mount_setattr +@@ -0,0 +1 @@ ++private +diff --git a/tests/ts/mount/fallback b/tests/ts/mount/fallback +index 6033eb575..b225be189 100755 +--- a/tests/ts/mount/fallback ++++ b/tests/ts/mount/fallback +@@ -68,5 +68,21 @@ $TS_CMD_UMOUNT $MOUNTPOINT + ts_finalize_subtest + + ++ts_init_subtest "mount_setattr" ++"$TS_CMD_MOUNT" "$DEVICE" "$MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts" ++$TS_CMD_ENOSYS -s mount_setattr -- \ ++ "$TS_CMD_MOUNT" -o remount,ro "$MOUNTPOINT" \ ++ >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_FINDMNT --kernel --mountpoint "$MOUNTPOINT" --options "ro" &> /dev/null ++[ "$?" == "0" ] || ts_die "Cannot find read-only in $MOUNTPOINT in /proc/self/mountinfo" ++$TS_CMD_ENOSYS -s mount_setattr -- \ ++ "$TS_CMD_MOUNT" --make-slave "$MOUNTPOINT" \ ++ >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_FINDMNT -n --kernel --mountpoint "$MOUNTPOINT" -o PROPAGATION >> $TS_OUTPUT ++$TS_CMD_UMOUNT $MOUNTPOINT ++ts_finalize_subtest ++ ++ + ts_finalize + diff --git a/util-linux/configure b/util-linux/configure new file mode 100644 index 0000000..278c75d --- /dev/null +++ b/util-linux/configure @@ -0,0 +1,364 @@ +`configure' configures util-linux 2.39 to adapt to many kinds of systems. + +Usage: src/util-linux-2.39/configure [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print `checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for `--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or `..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [/usr] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, `make install' will install all the files in +`/usr/bin', `/usr/lib' etc. You can specify +an installation prefix other than `/usr' using `--prefix', +for instance `--prefix=$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/util-linux] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-werror make all compiler warnings into errors + --enable-asan compile with Address Sanitizer + --enable-ubsan compile with UBsan + --enable-fuzzing-engine compile with fuzzing engine + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-symvers disable library symbol versioning [default=auto] + --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --disable-largefile omit support for large files + --disable-assert turn off assertions + --disable-nls do not use Native Language Support + --disable-rpath do not hardcode runtime library paths + --enable-static-programs=LIST + link static the programs in LIST (comma-separated, + supported for blkid, fdisk, losetup, mount, nsenter, + sfdisk, umount, unshare) + --disable-all-programs disable everything, might be overridden by + --enable- + --disable-asciidoc do not generate man pages from asciidoc + --disable-poman generate translated man pages + --disable-tls disable use of thread local support + --disable-widechar do not compile wide character support + --disable-libuuid do not build libuuid and uuid utilities + --enable-libuuid-force-uuidd + support uuidd even though the daemon is not built + --disable-libblkid do not build libblkid and many related utilities + --disable-libmount do not build libmount + --disable-libmount-mountfd-support + do not use new mount API based on FDs + --disable-libsmartcols do not build libsmartcols + --disable-libfdisk do not build libfdisk + --disable-fdisks do not build fdisk(8), sfdisk(8) and cfdisk(8) + --disable-mount do not build mount(8) and umount(8) + --disable-losetup do not build losetup + --disable-zramctl do not build zramctl + --disable-fsck do not build fsck + --disable-partx do not build addpart, delpart, partx + --disable-uuidd do not build the uuid daemon + --disable-uuidgen do not build uuidgen + --disable-blkid do not build blkid(8) + --disable-wipefs do not build wipefs + --disable-mountpoint do not build mountpoint + --disable-fallocate do not build fallocate + --disable-unshare do not build unshare + --disable-nsenter do not build nsenter + --disable-setpriv do not build setpriv + --disable-hardlink do not build hardlink + --disable-eject do not build eject + --disable-agetty do not build agetty + --disable-plymouth_support + do not care about plymouth in sylogin(8) and + agetty(8) + --disable-cramfs do not build fsck.cramfs, mkfs.cramfs + --disable-bfs do not build mkfs.bfs + --disable-minix do not build fsck.minix, mkfs.minix + --enable-fdformat build fdformat + --disable-hwclock do not build hwclock + --disable-hwclock-cmos do not use CMOS clock + --disable-hwclock-gplv3 do not use datetime parsing GPLv3 code + --disable-mkfs do not build mkfs(8) + --disable-fstrim do not build fstrim(8) + --disable-swapon do not build swapon(8) and swapoff(8) + --disable-lscpu do not build lscpu + --disable-lsfd do not build lsfd + --disable-lslogins do not build lslogins + --disable-wdctl do not build wdctl + --disable-cal do not build cal + --disable-logger do not build logger + --disable-whereis do not build whereis + --disable-pipesz do not build pipesz + --disable-switch_root do not build switch_root + --disable-pivot_root do not build pivot_root + --disable-lsmem do not build lsmem + --disable-chmem do not build chmem + --disable-ipcmk do not build ipcmk + --disable-ipcrm do not build ipcrm + --disable-ipcs do not build ipcs + --disable-irqtop do not build irqtop + --disable-lsirq do not build lsirq + --disable-lsns do not build lsns + --disable-rfkill do not build rfkill + --disable-scriptutils do not build script, scriptreplay and scriptlive + --enable-tunelp build tunelp + --disable-kill do not build kill + --disable-last do not build last + --disable-utmpdump do not build utmpdump + --enable-line build line + --disable-mesg do not build mesg + --disable-raw do not build raw + --disable-rename do not build rename + --enable-vipw build vipw + --enable-newgrp build newgrp + --disable-chfn-chsh-password + do not require the user to enter the password in + chfn and chsh + --disable-chfn-chsh do not build chfn and chsh + --disable-chsh-only-listed + chsh: allow shells not in /etc/shells + --disable-login do not build login + --enable-login-chown-vcs + let login chown /dev/vcsN + --enable-login-stat-mail + let login stat() the mailbox + --disable-nologin do not build nologin + --disable-sulogin do not build sulogin + --disable-su do not build su + --disable-runuser do not build runuser + --disable-ul do not build ul + --disable-more do not build more + --enable-pg build pg + --disable-setterm do not build setterm + --disable-schedutils do not build chrt, ionice, taskset + --disable-wall do not build wall + --enable-write build write + --disable-bash-completion + do not install bash completion files + --disable-pylibmount do not build pylibmount + --disable-pg-bell let pg not ring the bell on invalid keys + --enable-fs-paths-default=paths + default search path for fs helpers + [/sbin:/sbin/fs.d:/sbin/fs] + --enable-fs-paths-extra=paths + additional search paths for fs helpers + --disable-use-tty-group do not install wall and write setgid tty + --enable-sulogin-emergency-mount + use emergency mount of /dev and /proc for sulogin + --enable-usrdir-path use only /usr paths in PATH env. variable + (recommended on systems with /bin -> /usr/bin + symlinks) + --disable-makeinstall-chown + do not do chown-like operations during "make + install" + --disable-makeinstall-setuid + do not do setuid chmod operations during "make + install" + --disable-colors-default + do not colorize output from utils by default + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + --with-pkgconfigdir pkg-config installation directory + ['${usrlib_execdir}/pkgconfig'] + --with-html-dir=PATH path to installed docs + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib + --without-libintl-prefix don't search for libintl in includedir and libdir + --without-util compile without libutil + --with-selinux compile with SELinux support + --with-audit compile with audit support + --without-udev compile without udev support + --without-ncursesw do not build with wide-char ncurses + --with-ncurses build with non-wide ncurses + --with-slang compile cfdisk with slang rather than ncurses + --without-tinfo compile without libtinfo + --without-readline do not build with GNU Readline support + --with-utempter compile script(1) with libutempter + --without-cap-ng compile without libcap-ng + --without-libz compile without libz + --without-libmagic compile without libmagic + --without-user compile without libuser (remote chsh) + --without-btrfs do not build with btrfs support + --without-systemd do not build with systemd support + --with-systemdsystemunitdir=DIR + directory for systemd unit files (requires systemd + support) + --with-smack build with SMACK support + --without-econf do not use libeconf + --with-vendordir=DIR Directory for distribution provided configuration + files + --with-bashcompletiondir=DIR + Bash completions directory + --without-python do not build python bindings, use + --with-python={2,3} to force version + --with-python-sys-prefix + use Python's sys.prefix and sys.exec_prefix values + --with-python_prefix override the default PYTHON_PREFIX + --with-python_exec_prefix + override the default PYTHON_EXEC_PREFIX + --with-cryptsetup compile with cryptsetup support + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + SYSCONFSTATICDIR + Path to static system configuration, default ${prefix}/lib + YACC The `Yet Another Compiler Compiler' implementation to use. + Defaults to the first program found out of: `bison -y', `byacc', + `yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a + default value of `-d' given by some make applications. + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + CXXCPP C++ preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + SELINUX_CFLAGS + C compiler flags for SELINUX, overriding pkg-config + SELINUX_LIBS + linker flags for SELINUX, overriding pkg-config + NCURSESW_CFLAGS + C compiler flags for NCURSESW, overriding pkg-config + NCURSESW_LIBS + linker flags for NCURSESW, overriding pkg-config + NCURSES_CFLAGS + C compiler flags for NCURSES, overriding pkg-config + NCURSES_LIBS + linker flags for NCURSES, overriding pkg-config + TINFOW_CFLAGS + C compiler flags for TINFOW, overriding pkg-config + TINFOW_LIBS linker flags for TINFOW, overriding pkg-config + TINFO_CFLAGS + C compiler flags for TINFO, overriding pkg-config + TINFO_LIBS linker flags for TINFO, overriding pkg-config + LIBUSER_CFLAGS + C compiler flags for LIBUSER, overriding pkg-config + LIBUSER_LIBS + linker flags for LIBUSER, overriding pkg-config + SYSTEMD_CFLAGS + C compiler flags for SYSTEMD, overriding pkg-config + SYSTEMD_LIBS + linker flags for SYSTEMD, overriding pkg-config + SYSTEMD_DAEMON_CFLAGS + C compiler flags for SYSTEMD_DAEMON, overriding pkg-config + SYSTEMD_DAEMON_LIBS + linker flags for SYSTEMD_DAEMON, overriding pkg-config + SYSTEMD_JOURNAL_CFLAGS + C compiler flags for SYSTEMD_JOURNAL, overriding pkg-config + SYSTEMD_JOURNAL_LIBS + linker flags for SYSTEMD_JOURNAL, overriding pkg-config + with_systemdsystemunitdir + value of systemdsystemunitdir for systemd, overriding pkg-config + ECONF_CFLAGS + C compiler flags for ECONF, overriding pkg-config + ECONF_LIBS linker flags for ECONF, overriding pkg-config + with_bashcompletiondir + value of completionsdir for bash-completion, overriding + pkg-config + PYTHON the Python interpreter + PYTHON_CFLAGS + C compiler flags for PYTHON, overriding pkg-config + PYTHON_LIBS linker flags for PYTHON, overriding pkg-config + CRYPTSETUP_CFLAGS + C compiler flags for CRYPTSETUP, overriding pkg-config + CRYPTSETUP_LIBS + linker flags for CRYPTSETUP, overriding pkg-config + SUID_CFLAGS CFLAGS used for binaries which are usually with the suid bit + SUID_LDFLAGS + LDFLAGS used for binaries which are usually with the suid bit + DAEMON_CFLAGS + CFLAGS used for binaries which are usually executed as daemons + DAEMON_LDFLAGS + LDFLAGS used for binaries which are usually executed as daemons + SOLIB_CFLAGS + CFLAGS used for shared libraries + SOLIB_LDFLAGS + LDFLAGS used for shared libraries + ADJTIME_PATH + Path to hwclock adjtime file, default /etc/adjtime + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +util-linux home page: . diff --git a/util-linux/diff.contents b/util-linux/diff.contents new file mode 100644 index 0000000..6363dbb --- /dev/null +++ b/util-linux/diff.contents @@ -0,0 +1,116 @@ +--- /tmp/38.1 2023-05-27 03:51:44.030956474 +0300 ++++ /tmp/39 2023-05-27 03:52:38.154460545 +0300 +@@ -13,6 +13,7 @@ + util-linux /usr/bin/agetty + util-linux /usr/bin/blkdiscard + util-linux /usr/bin/blkid ++util-linux /usr/bin/blkpr + util-linux /usr/bin/blkzone + util-linux /usr/bin/blockdev + util-linux /usr/bin/cal +@@ -31,6 +32,7 @@ + util-linux /usr/bin/delpart + util-linux /usr/bin/dmesg + util-linux /usr/bin/eject ++util-linux /usr/bin/fadvise + util-linux /usr/bin/fallocate + util-linux /usr/bin/fdisk + util-linux /usr/bin/fincore +@@ -87,6 +89,7 @@ + util-linux /usr/bin/nologin + util-linux /usr/bin/nsenter + util-linux /usr/bin/partx ++util-linux /usr/bin/pipesz + util-linux /usr/bin/pivot_root + util-linux /usr/bin/prlimit + util-linux /usr/bin/readprofile +@@ -123,6 +126,7 @@ + util-linux /usr/bin/uuidparse + util-linux /usr/bin/vigr + util-linux /usr/bin/vipw ++util-linux /usr/bin/waitpid + util-linux /usr/bin/wall + util-linux /usr/bin/wdctl + util-linux /usr/bin/whereis +@@ -159,6 +163,7 @@ + util-linux /usr/share/bash-completion/completions/delpart + util-linux /usr/share/bash-completion/completions/dmesg + util-linux /usr/share/bash-completion/completions/eject ++util-linux /usr/share/bash-completion/completions/fadvise + util-linux /usr/share/bash-completion/completions/fallocate + util-linux /usr/share/bash-completion/completions/fdisk + util-linux /usr/share/bash-completion/completions/fincore +@@ -208,6 +213,7 @@ + util-linux /usr/share/bash-completion/completions/newgrp + util-linux /usr/share/bash-completion/completions/nsenter + util-linux /usr/share/bash-completion/completions/partx ++util-linux /usr/share/bash-completion/completions/pipesz + util-linux /usr/share/bash-completion/completions/pivot_root + util-linux /usr/share/bash-completion/completions/prlimit + util-linux /usr/share/bash-completion/completions/readprofile +@@ -239,6 +245,7 @@ + util-linux /usr/share/bash-completion/completions/uuidd + util-linux /usr/share/bash-completion/completions/uuidgen + util-linux /usr/share/bash-completion/completions/uuidparse ++util-linux /usr/share/bash-completion/completions/waitpid + util-linux /usr/share/bash-completion/completions/wall + util-linux /usr/share/bash-completion/completions/wdctl + util-linux /usr/share/bash-completion/completions/whereis +@@ -295,6 +302,9 @@ + util-linux /usr/share/locale/ja/ + util-linux /usr/share/locale/ja/LC_MESSAGES/ + util-linux /usr/share/locale/ja/LC_MESSAGES/util-linux.mo ++util-linux /usr/share/locale/ko/ ++util-linux /usr/share/locale/ko/LC_MESSAGES/ ++util-linux /usr/share/locale/ko/LC_MESSAGES/util-linux.mo + util-linux /usr/share/locale/nl/ + util-linux /usr/share/locale/nl/LC_MESSAGES/ + util-linux /usr/share/locale/nl/LC_MESSAGES/util-linux.mo +@@ -310,9 +320,15 @@ + util-linux /usr/share/locale/ru/ + util-linux /usr/share/locale/ru/LC_MESSAGES/ + util-linux /usr/share/locale/ru/LC_MESSAGES/util-linux.mo ++util-linux /usr/share/locale/sk/ ++util-linux /usr/share/locale/sk/LC_MESSAGES/ ++util-linux /usr/share/locale/sk/LC_MESSAGES/util-linux.mo + util-linux /usr/share/locale/sl/ + util-linux /usr/share/locale/sl/LC_MESSAGES/ + util-linux /usr/share/locale/sl/LC_MESSAGES/util-linux.mo ++util-linux /usr/share/locale/sr/ ++util-linux /usr/share/locale/sr/LC_MESSAGES/ ++util-linux /usr/share/locale/sr/LC_MESSAGES/util-linux.mo + util-linux /usr/share/locale/sv/ + util-linux /usr/share/locale/sv/LC_MESSAGES/ + util-linux /usr/share/locale/sv/LC_MESSAGES/util-linux.mo +@@ -344,6 +360,7 @@ + util-linux /usr/share/man/man1/column.1.gz + util-linux /usr/share/man/man1/dmesg.1.gz + util-linux /usr/share/man/man1/eject.1.gz ++util-linux /usr/share/man/man1/fadvise.1.gz + util-linux /usr/share/man/man1/fallocate.1.gz + util-linux /usr/share/man/man1/fincore.1.gz + util-linux /usr/share/man/man1/flock.1.gz +@@ -374,6 +391,7 @@ + util-linux /usr/share/man/man1/namei.1.gz + util-linux /usr/share/man/man1/newgrp.1.gz + util-linux /usr/share/man/man1/nsenter.1.gz ++util-linux /usr/share/man/man1/pipesz.1.gz + util-linux /usr/share/man/man1/prlimit.1.gz + util-linux /usr/share/man/man1/rename.1.gz + util-linux /usr/share/man/man1/renice.1.gz +@@ -393,6 +411,7 @@ + util-linux /usr/share/man/man1/utmpdump.1.gz + util-linux /usr/share/man/man1/uuidgen.1.gz + util-linux /usr/share/man/man1/uuidparse.1.gz ++util-linux /usr/share/man/man1/waitpid.1.gz + util-linux /usr/share/man/man1/wall.1.gz + util-linux /usr/share/man/man1/whereis.1.gz + util-linux /usr/share/man/man1/write.1.gz +@@ -405,6 +424,7 @@ + util-linux /usr/share/man/man8/agetty.8.gz + util-linux /usr/share/man/man8/blkdiscard.8.gz + util-linux /usr/share/man/man8/blkid.8.gz ++util-linux /usr/share/man/man8/blkpr.8.gz + util-linux /usr/share/man/man8/blkzone.8.gz + util-linux /usr/share/man/man8/blockdev.8.gz + util-linux /usr/share/man/man8/cfdisk.8.gz diff --git a/xfsprogs/PKGBUILD b/xfsprogs/PKGBUILD index e3658b5..785aab6 100644 --- a/xfsprogs/PKGBUILD +++ b/xfsprogs/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=xfsprogs -pkgver=6.2.0 +pkgver=6.3.0 pkgrel=01 pkgdesc="XFS filesystem utilities w/o systemd" # url="https://xfs.org" @@ -57,4 +57,4 @@ validpgpkeys=(2B8185919E8D248981869DED20AE1692E13DDEE0 # Eric Sandeen pkgname=xfsprogs -pkgver=6.2.0 +pkgver=6.3.0 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('x86_64') @@ -14,7 +14,7 @@ optdepends=('icu: for xfs_scrub' makedepends=('git' 'icu') options=('!makeflags') source=("git+https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git?signed#tag=v${pkgver}") -md5sums=('SKIP') +b2sums=('SKIP') validpgpkeys=( '2B8185919E8D248981869DED20AE1692E13DDEE0' # Eric Sandeen '4020459E58C1A52511F5399113F703E6C11CF6F0' # Carlos Maiolino diff --git a/xfsprogs/deps b/xfsprogs/deps index d726f81..26076c5 100644 --- a/xfsprogs/deps +++ b/xfsprogs/deps @@ -5,6 +5,6 @@ liburcu automake autoconf gettext - - libxml2 + +