diff --git a/btrfs-progs/PKGBUILD b/btrfs-progs/PKGBUILD index 2837893..57129af 100644 --- a/btrfs-progs/PKGBUILD +++ b/btrfs-progs/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=btrfs-progs -pkgver=6.1.2 +pkgver=6.1.3 pkgrel=01 pkgdesc='Btrfs filesystem utilities w/o systemd' arch=('x86_64') @@ -69,8 +69,8 @@ license=('GPL2') validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B') -sha256sums=(6be667d97f3d65c0ba57c331c98b0bd3b13cf60d8d31fa8ad25882aad9d79d7a # btrfs-progs-v6.1.2.tar.xz - 2e2b33019c7664e33e134978337a14fe3dc848d6b7207b446c719a299488ce1f # btrfs-progs-v6.1.2.tar.sign +sha256sums=(d37fc9ec4fa5778b20aa7548fe706eb3a300338c1473318271ae54024dac7167 # btrfs-progs-v6.1.3.tar.xz + ff5c6ef08bda034c557abe051210e1b975a280f8d53b57003e51eff2bc82b7a7 # btrfs-progs-v6.1.3.tar.sign bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs 35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs diff --git a/btrfs-progs/PKGBUILD-arch b/btrfs-progs/PKGBUILD-arch index 3eff9a6..c36a528 100644 --- a/btrfs-progs/PKGBUILD-arch +++ b/btrfs-progs/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Tobias Powalowski pkgname=btrfs-progs -pkgver=6.1.2 +pkgver=6.1.3 pkgrel=1 pkgdesc='Btrfs filesystem utilities' arch=('x86_64') @@ -25,9 +25,9 @@ source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs- 'btrfs-scrub@.timer' ) install=btrfs-progs.install -options=(!staticlibs debug) +options=(!staticlibs) sha256sums=('SKIP' - '6be667d97f3d65c0ba57c331c98b0bd3b13cf60d8d31fa8ad25882aad9d79d7a' + 'd37fc9ec4fa5778b20aa7548fe706eb3a300338c1473318271ae54024dac7167' 'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4' '35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5' 'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252' diff --git a/dbus-broker/dbus-broker-32.tar.xz b/dbus-broker/dbus-broker-32.tar.xz deleted file mode 100644 index df5f3fd..0000000 Binary files a/dbus-broker/dbus-broker-32.tar.xz and /dev/null differ diff --git a/e2fsprogs/PKGBUILD-arch.new b/e2fsprogs/PKGBUILD-arch.new deleted file mode 100644 index 20e6200..0000000 --- a/e2fsprogs/PKGBUILD-arch.new +++ /dev/null @@ -1,91 +0,0 @@ -# Maintainer: Ronald van Haren -# Contributor: judd - -pkgbase=e2fsprogs -pkgname=('e2fsprogs' 'fuse2fs') -pkgver=1.46.5 -pkgrel=3 -pkgdesc='Ext2/3/4 filesystem utilities' -arch=('x86_64') -license=('GPL' 'LGPL' 'MIT') -url='http://e2fsprogs.sourceforge.net' -options=('debug') -makedepends=('systemd' 'util-linux' 'fuse') -validpgpkeys=('3AB057B7E78D945C8C5591FBD36F769BC11804F0') # Theodore Ts'o -source=("https://www.kernel.org/pub/linux/kernel/people/tytso/${pkgbase}/v${pkgver}/${pkgbase}-${pkgver}.tar."{xz,sign} - 'MIT-LICENSE') -sha256sums=('2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e' - 'SKIP' - 'cc45386c1d71f438ad648fd7971e49e3074ad9dbacf9dd3a5b4cb61fd294ecbb') - - -prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Remove unnecessary init.d directory - sed -i '/init\.d/s|^|#|' misc/Makefile.in -} - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --with-root-prefix='' \ - --libdir=/usr/lib \ - --sbindir=/usr/bin \ - --enable-elf-shlibs \ - --disable-fsck \ - --disable-uuidd \ - --disable-libuuid \ - --disable-libblkid - make - - # regenerate locale files - find po/ -name '*.gmo' -delete - make -C po update-gmo -} - -package_e2fsprogs() { - depends=('sh' 'util-linux-libs') - provides=('libcom_err.so' - 'libe2p.so' - 'libext2fs.so' - 'libss.so') - backup=('etc/mke2fs.conf' - 'etc/e2scrub.conf') - - unset MAKEFLAGS - - cd "${srcdir}/${pkgbase}-${pkgver}" - - make DESTDIR="${pkgdir}" install install-libs - - sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" - - # remove references to build directory - sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" - sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" - - # remove static libraries with a shared counterpart - rm "${pkgdir}"/usr/lib/lib{com_err,e2p,ext2fs,ss}.a - - # remove fuse2fs which will be packaged separately - rm "${pkgdir}"/usr/{bin/fuse2fs,share/man/man1/fuse2fs.1} - - # install MIT license - install -D -m0644 "${srcdir}/MIT-LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" -} - -package_fuse2fs() { - pkgdesc='Ext2/3/4 filesystem driver for FUSE' - depends=('fuse' 'e2fsprogs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -D -m0755 'misc/fuse2fs' "${pkgdir}/usr/bin/fuse2fs" - install -D -m0644 'misc/fuse2fs.1' "${pkgdir}/usr/share/man/man1/fuse2fs.1" - mkdir -p "${pkgdir}"/usr/share/licenses - ln -s "${pkgbase}" "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/elfutils/PKGBUILD-0 b/elfutils/PKGBUILD-0 deleted file mode 100644 index 2e312aa..0000000 --- a/elfutils/PKGBUILD-0 +++ /dev/null @@ -1,102 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/elfutils" -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgbase=elfutils -pkgname=('debuginfod' 'elfutils' 'libelf') -pkgver=0.186 -pkgrel=02 -pkgdesc='Handle ELF object files and DWARF debugging information' -arch=('x86_64') -url="https://sourceware.org/elfutils/" -makedepends=('bzip2' 'curl' 'gcc-libs' 'libarchive' 'libmicrohttpd' 'sqlite' -'xz' 'zlib' 'zstd' 'gettext' 'autoconf' 'automake') - -options=('staticlibs') -source=("https://sourceware.org/${pkgbase}/ftp/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}) - -prepare() { - cd "$pkgbase-$pkgver" - autoreconf -fiv -} - -build() { - cd "$pkgbase-$pkgver" - CFLAGS+=" -g" # required for test-suite success - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="eu-" \ - --enable-deterministic-archives - make -} - -check() { - cd "$pkgbase-$pkgver" - # Some tests fail due to limited capabilities of build chroot - make check || echo "Known problem: The build environment might lack enough resources." -} - -package_libelf() { - pkgdesc+=" (libraries)" - depends=('gcc-libs' 'libbz2.so' 'libcurl.so' 'xz' 'zlib' 'zstd') - # NOTE: the shared objects can not be added to provides as they are not versioned - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - # remove files provided by elfutils or debuginfod - rm -rvf "${pkgdir}"{/etc,/usr/{bin,share}} - install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" -} - -package_elfutils() { - pkgdesc+=" (utilities)" - depends=('gcc-libs' 'glibc' "libelf=${pkgver}-${pkgrel}") - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" - # remove files provided by libelf - rm -rvf "${pkgdir}/usr/"{include,lib} - # remove files provided by debuginfod - rm -rvf "${pkgdir}/usr/bin/debuginfod"* \ - "${pkgdir}/usr/share/man/man1/debuginfod"* \ - "${pkgdir}/usr/share/man/man3/debuginfod"* \ - "${pkgdir}/usr/share/man/man8/" \ - "${pkgdir}/etc" -} - -package_debuginfod() { - pkgdesc+=" (debuginfod)" - depends=('gcc-libs' 'glibc' 'libarchive.so' "libelf=${pkgver}-${pkgrel}" - 'libmicrohttpd.so' 'sqlite') - optdepends=("elfutils=${pkgver}-${pkgrel}: for translations" ) - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" - # remove files provided by libelf - rm -rvf "${pkgdir}/usr/"{include,lib} - # remove files provided by elfutils - rm -rvf "${pkgdir}/usr/bin/eu-"* \ - "${pkgdir}/usr/share/man/man1/eu-"* \ - "${pkgdir}/usr/share/man/man3/elf_"* \ - "${pkgdir}/usr/share/locale" -} - - -#---- license gpg-key sha512sums ---- - -license=('LGPL3' 'GPL3') - -validpgpkeys=( - '47CC0331081B8BC6D0FD4DA08370665B57816A6A' # Mark J. Wielaard - 'EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A' # Mark Wielaard -) - -sha256sums=(7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 # elfutils-0.186.tar.bz2 - 1865a1f8e11ae50d8c3aa130ed5c3d9ca526d78df754d3f04656c372538cc84c) # elfutils-0.186.tar.bz2.sig diff --git a/elfutils/PKGBUILD-arch-0 b/elfutils/PKGBUILD-arch-0 deleted file mode 100644 index 0a36ab7..0000000 --- a/elfutils/PKGBUILD-arch-0 +++ /dev/null @@ -1,111 +0,0 @@ -# Maintainer: David Runge -# Contributor: Laurent Carlier -# Contributor: Stéphane Gaudreault -# Contributor: Andrej Gelenberg - -pkgbase=elfutils -pkgname=('debuginfod' 'elfutils' 'libelf') -pkgver=0.186 -pkgrel=1 -pkgdesc='Handle ELF object files and DWARF debugging information' -arch=('x86_64') -url="https://sourceware.org/elfutils/" -license=('LGPL3' 'GPL3') -makedepends=('bzip2' 'curl' 'gcc-libs' 'libarchive' 'libmicrohttpd' 'sqlite' -'xz' 'zlib' 'zstd') -options=('staticlibs') -source=("https://sourceware.org/${pkgbase}/ftp/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}) -sha512sums=('c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78' - 'SKIP') -b2sums=('49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9' - 'SKIP') -validpgpkeys=( - '47CC0331081B8BC6D0FD4DA08370665B57816A6A' # Mark J. Wielaard - 'EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A' # Mark Wielaard -) - -prepare() { - ( - cd "$pkgbase-$pkgver" - autoreconf -fiv - ) - - cp -av "$pkgbase-$pkgver" "$pkgbase-test-$pkgver" - -} - -build() { - ( - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="eu-" \ - --enable-deterministic-archives - make - ) - ( - cd "$pkgbase-test-$pkgver" - CFLAGS+=" -g" # required for test-suite success - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="eu-" \ - --enable-deterministic-archives - make - ) -} - -check() { - cd "$pkgbase-test-$pkgver" - make check -} - -package_libelf() { - pkgdesc+=" (libraries)" - depends=('gcc-libs' 'libbz2.so' 'libcurl.so' 'xz' 'zlib' 'zstd') - # NOTE: the shared objects can not be added to provides as they are not versioned - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - # remove files provided by elfutils or debuginfod - rm -rvf "${pkgdir}"{/etc,/usr/{bin,share}} - install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" -} - -package_elfutils() { - pkgdesc+=" (utilities)" - depends=('gcc-libs' 'glibc' "libelf=${pkgver}-${pkgrel}") - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" - # remove files provided by libelf - rm -rvf "${pkgdir}/usr/"{include,lib} - # remove files provided by debuginfod - rm -rvf "${pkgdir}/usr/bin/debuginfod"* \ - "${pkgdir}/usr/share/man/man1/debuginfod"* \ - "${pkgdir}/usr/share/man/man3/debuginfod"* \ - "${pkgdir}/usr/share/man/man7/" \ - "${pkgdir}/usr/share/man/man8/" \ - "${pkgdir}/etc" -} - -package_debuginfod() { - pkgdesc+=" (debuginfod)" - depends=('gcc-libs' 'glibc' 'libarchive.so' "libelf=${pkgver}-${pkgrel}" - 'libmicrohttpd.so' 'sqlite') - optdepends=("elfutils=${pkgver}-${pkgrel}: for translations" ) - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - install -vDm 644 {AUTHORS,ChangeLog,NEWS,NOTES,README} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" - # remove files provided by libelf - rm -rvf "${pkgdir}/usr/"{include,lib} - # remove files provided by elfutils - rm -rvf "${pkgdir}/usr/bin/eu-"* \ - "${pkgdir}/usr/share/man/man1/eu-"* \ - "${pkgdir}/usr/share/man/man3/elf_"* \ - "${pkgdir}/usr/share/locale" -} diff --git a/eudev/PKBUILD-oba-3 b/eudev/PKBUILD-oba-3 deleted file mode 100644 index cf8802f..0000000 --- a/eudev/PKBUILD-oba-3 +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright : Obarun -#------------------------ -# Maintainer : Eric Vidal -# Maintainer : Jean-Michel T.Dydak -#---------------- -# Obarun PkgSrc : https://git.obarun.org/pkg/obcore/eudev -#-------------------------------------------------------------- -# DESCRIPTION ] - -pkgbase=eudev -pkgver=3.2.11 -pkgrel=3 -udevver=243 -url="https://github.com/eudev-project/eudev" - -pkgname=( - 'eudev' - 'libeudev' -) - -track="eudev/releases/download/v$pkgver" -target="eudev-$pkgver" -source=( - "https://github.com/eudev-project/${track}/${target}.tar.gz" - initcpio_hooks - initcpio_install - udev-hwdb.hook -) - -#---------------------- -# BUILD CONFIGURATION ] - -makedepends=( - 'gobject-introspection' - 'gperf' - 'gtk-doc' - 'intltool' - 'kmod' -) - -options=( - '!makeflags' - '!libtool' -) - -#---------------- -# BUILD PREPARE ] - -prepare(){ - cd $pkgbase-$pkgver - - sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ - -e 's/GROUP="tape"/GROUP="storage"/' \ - -e 's/GROUP="cdrom"/GROUP="optical"/' \ - -i rules/*.rules -} - -#---------------- -# BUILD CONTROL ] - -_flags=( - --prefix=/usr - --with-rootprefix=/usr - --sysconfdir=/etc - --libdir=/usr/lib - --bindir=/usr/bin - --sbindir=/usr/bin - --enable-introspection - --enable-kmod - --enable-manpages - --enable-split-usr -) - -#-------- -# BUILD ] - -build() { - cd $pkgbase-$pkgver - - if [ -f "Makefile" ];then - msg2 "Cleaning up..." - make clean - fi - - ./configure "${_flags[@]}" - make -} - -#---------- -# PACKAGE ] - -package_eudev() { - pkgdesc="The userspace dev tools (udev) forked by Gentoo" - backup=( - 'etc/udev/udev.conf' - 'usr/lib/udev/rules.d/80-net-name-slot.rules' - ) - depends=( - 'kbd' - 'kmod' - 'hwdata' - 'util-linux' - 'libeudev' - ) - optdepends=( - 'upower-pm-utils: pm-utils support' - 'libgudev: GObject bindings for libudev' - ) - conflicts=( - 'eudev-git' - 'udev' - 'eudev-libgudev' - ) - replaces=( - 'udev' - ) - provides=( - "udev=$udevver" - ) - - cd $pkgbase-$pkgver - - make DESTDIR="$pkgdir" install - - ## we split this libudev - rm -rv "$pkgdir"/usr/lib/pkgconfig - rm -v "$pkgdir"/usr/include/libudev.h - rm -v "$pkgdir"/usr/lib/libudev*.{so*,a} - - install -Dm644 "$srcdir"/initcpio_hooks "$pkgdir"/usr/lib/initcpio/hooks/udev - install -Dm644 "$srcdir"/initcpio_install "$pkgdir"/usr/lib/initcpio/install/udev - install -Dm644 "$srcdir"/udev-hwdb.hook "$pkgdir"/usr/share/libalpm/hooks/udev-hwdb.hook -} - -package_libeudev() { - pkgdesc="Eudev client libraries" - depends=( - 'glib2' - 'glibc' - ) - provides=( - "libudev=$udevver" - 'libudev.so' - ) - - cd $pkgbase-$pkgver - - make -C src/libudev DESTDIR="$pkgdir" install -} - -#-------------------- -# ARCH LICENSE AUTH ] - -arch=(x86_64) -license=(GPL) - -sha512sums=('') diff --git a/glib2/PKGBUILD-tmp b/glib2/PKGBUILD-tmp deleted file mode 100644 index b77d99e..0000000 --- a/glib2/PKGBUILD-tmp +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/$pkgname" -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgbase=glib2 -pkgname=(glib2 glib2-docs) -pkgver=2.70.3 -pkgrel=01 -pkgdesc="Low level core library" -url="https://wiki.gnome.org/Projects/GLib" -arch=(x86_64) -depends=(pcre libffi util-linux-libs zlib libsysprof-capture) -makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux - meson dbus) -checkdepends=(desktop-file-utils) -source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver" - 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch - glib-compile-schemas.hook gio-querymodules.{hook,script}) - -prepare() { - cd glib - # Suppress noise from glib-compile-schemas.hook - git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch -} - -build() { - CFLAGS+=" -DG_DISABLE_CAST_CHECKS" - arch-meson glib build \ - -D glib_debug=disabled \ - -D selinux=disabled \ - -D man=true \ - -D sysprof=enabled \ - -D gtk_doc=true - meson compile -C build -} - -check() { - meson test -C build --no-suite flaky --no-suite slow --print-errorlogs -} - -package_glib2() { - depends+=(libmount.so libffi.so) - provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so - libgthread-2.0.so) - optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report' - 'libelf: gresource inspection tool') - - meson install -C build --destdir "$pkgdir" - - install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook - install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules" - - python -m compileall -d /usr/share/glib-2.0/codegen \ - "$pkgdir/usr/share/glib-2.0/codegen" - python -O -m compileall -d /usr/share/glib-2.0/codegen \ - "$pkgdir/usr/share/glib-2.0/codegen" - - # Split docs - mkdir -p docs/usr/share - mv {"$pkgdir",docs}/usr/share/gtk-doc -} - -package_glib2-docs() { - pkgdesc="Documentation for GLib" - depends=() - license+=(custom) - - mv -t "$pkgdir" docs/* - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 glib/docs/reference/COPYING -} - -#---- license gpg-key sha256sums ---- - -license=(LGPL) - -validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) - -sha256sums=(SKIP - edb5e34ac0a77431978cab55b98e39754d73455e28a38f5003424e943bbe5fff # 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch - 64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25 # glib-compile-schemas.hook - 2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7 # gio-querymodules.hook - 92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e) # gio-querymodules.script diff --git a/glibc/PKGBUILD-arch.new b/glibc/PKGBUILD-arch.new deleted file mode 100644 index 4f77649..0000000 --- a/glibc/PKGBUILD-arch.new +++ /dev/null @@ -1,247 +0,0 @@ -# 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 -# NOTE: valgrind requires rebuilt with each major glibc version - -pkgbase=glibc -pkgname=(glibc lib32-glibc) -pkgver=2.35 -pkgrel=3 -arch=(x86_64) -url='https://www.gnu.org/software/libc' -license=(GPL LGPL) -makedepends=(git gd lib32-gcc-libs python) -options=(!strip staticlibs !lto) -#_commit=3de512be7ea6053255afed6154db9ee31d4e557a -#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit -source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig} - locale.gen.txt - locale-gen - lib32-glibc.conf - sdt.h sdt-config.h - disable-clone3.diff - 0001-localedef-Update-LC_MONETARY-handling-Bug-28845.patch - 0001-localedata-Do-not-generate-output-if-warnings-were-p.patch -) -validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell - BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar -b2sums=('623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063' - 'SKIP' - '46d533d25c7a2ce4ae75d452eee7ebb8e3ce4d191af9be3daa43718b78cb81d33cfd8046a117a15d87de9f5e940448c66005b0490515bf731c9e4691c53908d6' - '1f6d927b4972220b1c00abee5329c5d6bc01ed5bee57b20db0c7d7433292f7d666b02baf9968267f8e378b1f3bb273e8eef0ccbf22d21400ac36949d7615a474' - '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a' - 'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e' - '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678' - 'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52' - '3c4de02d6308a4d39693e6effa08894ae096397347e439b93b0b5328aba41a373f7f2eeb88c109970f69cca65aaa74ba14e384d6d033f6a913438f4f920854a6' - 'b6014af23688ea971d7af38d58829c8016a0af63770b7f5e8bc986c13ea2cafefe0935ff483b1b37c87ebe3e652b6e0c48ab43dd8ae752d0ed7fecc3751432f4') - -prepare() { - mkdir -p glibc-build lib32-glibc-build - - [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc - cd glibc - - # Disable clone3 syscall for now - # Can be removed when eletron{9,11,12} and discord are removed or patched: - # https://github.com/electron/electron/commit/993ecb5bdd5c57024c8718ca6203a8f924d6d574 - # Patch src: https://patchwork.ozlabs.org/project/glibc/patch/87eebkf8ph.fsf@oldenburg.str.redhat.com/ - patch -Np1 -i "${srcdir}"/disable-clone3.diff - - # Fix C.UTF-8 generation errors - # https://bugs.archlinux.org/task/73797 - patch -Np1 -i "${srcdir}"/0001-localedef-Update-LC_MONETARY-handling-Bug-28845.patch - patch -Np1 -i "${srcdir}"/0001-localedata-Do-not-generate-output-if-warnings-were-p.patch -} - -build() { - local _configure_flags=( - --prefix=/usr - --with-headers=/usr/include - --with-bugurl=https://bugs.archlinux.org/ - --enable-bind-now - --enable-cet - --enable-kernel=4.4 - --enable-multi-arch - --enable-stack-protector=strong - --enable-systemtap - --disable-profile - --disable-crypt - --disable-werror - ) - - cd "$srcdir/glibc-build" - - echo "slibdir=/usr/lib" >> configparms - echo "rtlddir=/usr/lib" >> configparms - echo "sbindir=/usr/bin" >> configparms - echo "rootsbindir=/usr/bin" >> configparms - - # Credits @allanmcrae - # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD - # remove fortify for building libraries - CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/} - - "$srcdir/glibc/configure" \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - "${_configure_flags[@]}" - - # build libraries with fortify disabled - echo "build-programs=no" >> configparms - make -O - - # re-enable fortify for programs - sed -i "/build-programs=/s#no#yes#" configparms - echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms - make -O - - # build info pages manually for reproducibility - make info - - cd "$srcdir/lib32-glibc-build" - export CC="gcc -m32 -mstackrealign" - export CXX="g++ -m32 -mstackrealign" - - echo "slibdir=/usr/lib32" >> configparms - echo "rtlddir=/usr/lib32" >> configparms - echo "sbindir=/usr/bin" >> configparms - echo "rootsbindir=/usr/bin" >> configparms - - "$srcdir/glibc/configure" \ - --host=i686-pc-linux-gnu \ - --libdir=/usr/lib32 \ - --libexecdir=/usr/lib32 \ - "${_configure_flags[@]}" - - # build libraries with fortify disabled - echo "build-programs=no" >> configparms - make -O - - # re-enable fortify for programs - sed -i "/build-programs=/s#no#yes#" configparms - echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=2" >> configparms - make -O - -} - -# Credits for skip_test() and check() @allanmcrae -# https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/glibc/PKGBUILD -skip_test() { - test=$1 - file=$2 - sed -i "s/\b$test\b//" $srcdir/glibc/$file -} - -check() { - cd glibc-build - - # adjust/remove buildflags that cause false-positive testsuite failures - sed -i '/FORTIFY/d' configparms # failure to build testsuite - sed -i 's/-Werror=format-security/-Wformat-security/' config.make # failure to build testsuite - sed -i '/CFLAGS/s/-fno-plt//' config.make # 16 failures - sed -i '/CFLAGS/s/-fexceptions//' config.make # 1 failure - LDFLAGS=${LDFLAGS/,-z,now/} # 10 failures - - # The following tests fail due to restrictions in the Arch build system - # The correct fix is to add the following to the systemd-nspawn call: - # --system-call-filter="@clock @memlock @pkey" - skip_test test-errno-linux sysdeps/unix/sysv/linux/Makefile - skip_test tst-ntp_gettime sysdeps/unix/sysv/linux/Makefile - skip_test tst-ntp_gettimex sysdeps/unix/sysv/linux/Makefile - skip_test tst-mlock2 sysdeps/unix/sysv/linux/Makefile - skip_test tst-pkey sysdeps/unix/sysv/linux/Makefile - skip_test tst-adjtime time/Makefile - skip_test tst-clock2 time/Makefile - - make -O check -} - -package_glibc() { - pkgdesc='GNU C Library' - depends=('linux-api-headers>=4.10' tzdata filesystem) - optdepends=('gd: for memusagestat' - 'perl: for mtrace') - install=glibc.install - backup=(etc/gai.conf - etc/locale.gen - etc/nscd.conf) - - make -C glibc-build install_root="$pkgdir" install - rm -f "$pkgdir"/etc/ld.so.cache - - # Shipped in tzdata - rm -f "$pkgdir"/usr/bin/{tzselect,zdump,zic} - - cd glibc - - install -dm755 "$pkgdir"/usr/lib/{locale,systemd/system,tmpfiles.d} - install -m644 nscd/nscd.conf "$pkgdir/etc/nscd.conf" - install -m644 nscd/nscd.service "$pkgdir/usr/lib/systemd/system" - install -m644 nscd/nscd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/nscd.conf" - install -dm755 "$pkgdir/var/db/nscd" - - install -m644 posix/gai.conf "$pkgdir"/etc/gai.conf - - install -m755 "$srcdir/locale-gen" "$pkgdir/usr/bin" - - # Create /etc/locale.gen - install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen" - sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ - "$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen" - - if check_option 'debug' n; then - find "$pkgdir"/usr/bin -type f -executable -exec strip $STRIP_BINARIES {} + 2> /dev/null || true - find "$pkgdir"/usr/lib -name '*.a' -type f -exec strip $STRIP_STATIC {} + 2> /dev/null || true - - # Do not strip these for gdb and valgrind functionality, but strip the rest - find "$pkgdir"/usr/lib \ - -not -name 'ld-*.so*' \ - -not -name 'libc.so*' \ - -not -name 'libpthread.so*' \ - -not -name 'libthread_db.so*' \ - -name '*.so*' -type f -exec strip $STRIP_SHARED {} + 2> /dev/null || true - fi - - # Provide tracing probes to libstdc++ for exceptions, possibly for other - # libraries too. Useful for gdb's catch command. - install -Dm644 "$srcdir/sdt.h" "$pkgdir/usr/include/sys/sdt.h" - install -Dm644 "$srcdir/sdt-config.h" "$pkgdir/usr/include/sys/sdt-config.h" -} - -package_lib32-glibc() { - pkgdesc='GNU C Library (32-bit)' - depends=("glibc=$pkgver") - options+=('!emptydirs') - - cd lib32-glibc-build - - make install_root="$pkgdir" install - rm -rf "$pkgdir"/{etc,sbin,usr/{bin,sbin,share},var} - - # We need to keep 32 bit specific header files - find "$pkgdir/usr/include" -type f -not -name '*-32.h' -delete - - # Dynamic linker - install -d "$pkgdir/usr/lib" - ln -s ../lib32/ld-linux.so.2 "$pkgdir/usr/lib/" - - # Add lib32 paths to the default library search path - install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" - - # Symlink /usr/lib32/locale to /usr/lib/locale - ln -s ../lib/locale "$pkgdir/usr/lib32/locale" - - if check_option 'debug' n; then - find "$pkgdir"/usr/lib32 -name '*.a' -type f -exec strip $STRIP_STATIC {} + 2> /dev/null || true - find "$pkgdir"/usr/lib32 \ - -not -name 'ld-*.so*' \ - -not -name 'libc.so*' \ - -not -name 'libpthread.so*' \ - -not -name 'libthread_db.so*' \ - -name '*.so*' -type f -exec strip $STRIP_SHARED {} + 2> /dev/null || true - fi -} diff --git a/gnupg/PKGBUILD-arch.new b/gnupg/PKGBUILD-arch.new deleted file mode 100644 index 824cfe8..0000000 --- a/gnupg/PKGBUILD-arch.new +++ /dev/null @@ -1,76 +0,0 @@ -# Maintainer: Levente Polyak -# Maintainer: Lukas Fleischer -# Contributor: Gaetan Bisson -# Contributor: Tobias Powalowski -# Contributor: Andreas Radke -# Contributor: Judd Vinet - -pkgname=gnupg -pkgver=2.2.32 -pkgrel=2 -pkgdesc='Complete and free implementation of the OpenPGP standard' -url='https://www.gnupg.org/' -license=('GPL') -arch=('x86_64') -checkdepends=('openssh') -makedepends=('libldap' 'libusb-compat' 'pcsclite') -depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry' - 'bzip2' 'libbz2.so' 'readline' 'libreadline.so' 'gnutls' 'sqlite' - 'zlib' 'glibc') -optdepends=('libldap: gpg2keys_ldap' - 'libusb-compat: scdaemon' - 'pcsclite: scdaemon') -validpgpkeys=( - 'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig) - '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) - '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key) - '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) -) -source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'drop-import-clean.patch' - 'avoid-beta-warning.patch') -sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614' - 'SKIP' - '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc' - '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d') - -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../avoid-beta-warning.patch - patch -p1 -i ../drop-import-clean.patch - - # improve reproducibility - rm doc/gnupg.info* - - ./autogen.sh -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/gnupg \ - --enable-maintainer-mode \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg "${pkgdir}"/usr/bin/gpg2 - ln -s gpgv "${pkgdir}"/usr/bin/gpgv2 - - install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user" -} - -# vim: ts=2 sw=2 noet: diff --git a/gnupg/install b/gnupg/install deleted file mode 100644 index 1f19b99..0000000 --- a/gnupg/install +++ /dev/null @@ -1,31 +0,0 @@ -_global_units() { - _units=(dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket) - _dir=/etc/systemd/user/sockets.target.wants - - case $1 in - enable) - mkdir -p $_dir - for _u in "${_units[@]}"; do - ln -sf /usr/lib/systemd/user/$_u $_dir/$_u - done - ;; - disable) - for _u in "${_units[@]}"; do - rm -f $_dir/$_u - done - rmdir -p --ignore-fail-on-non-empty $_dir - ;; - esac -} - -post_install() { - # See FS#42798 and FS#47371 - dirmngr /dev/null - - # Let systemd supervise daemons by default - _global_units enable -} - -pre_remove() { - _global_units disable -} diff --git a/gnupg/install.4systemdonly b/gnupg/install.4systemdonly deleted file mode 100644 index 1f19b99..0000000 --- a/gnupg/install.4systemdonly +++ /dev/null @@ -1,31 +0,0 @@ -_global_units() { - _units=(dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket) - _dir=/etc/systemd/user/sockets.target.wants - - case $1 in - enable) - mkdir -p $_dir - for _u in "${_units[@]}"; do - ln -sf /usr/lib/systemd/user/$_u $_dir/$_u - done - ;; - disable) - for _u in "${_units[@]}"; do - rm -f $_dir/$_u - done - rmdir -p --ignore-fail-on-non-empty $_dir - ;; - esac -} - -post_install() { - # See FS#42798 and FS#47371 - dirmngr /dev/null - - # Let systemd supervise daemons by default - _global_units enable -} - -pre_remove() { - _global_units disable -} diff --git a/gpgme/python310.patch b/gpgme/python310.patch deleted file mode 100644 index b8e0923..0000000 --- a/gpgme/python310.patch +++ /dev/null @@ -1,332 +0,0 @@ -diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure ---- gpgme-1.16.0.orig/configure 2021-06-24 20:10:50.000000000 +0300 -+++ gpgme-1.16.0/configure 2021-12-01 00:12:24.383952330 +0200 -@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -19666,7 +19666,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -19933,7 +19933,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -20296,7 +20296,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -20563,7 +20563,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -20926,7 +20926,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -21193,7 +21193,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -21556,7 +21556,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -21823,7 +21823,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -22186,7 +22186,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -22453,7 +22453,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -22816,7 +22816,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -23083,7 +23083,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING: - - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5 --$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5 -+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; } - prog="import sys - # split strings by '.' and convert to numeric. Append some zeros - # because we need at least 4 digits for the hex conversion. - # map returns an iterator in Python 3.0 and a list in 2.x --minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] -+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0] - minverhex = 0 - # xrange is not present in Python 3.0 and range returns an iterator - for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -@@ -23318,19 +23318,19 @@ fi - else - # Otherwise, try each interpreter until we find one that satisfies - # VERSION. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5 --$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5 -+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; } - if ${am_cv_pathless_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 - else - -- for am_cv_pathless_PYTHON in python3.9 none; do -+ for am_cv_pathless_PYTHON in python3.10 none; do - test "$am_cv_pathless_PYTHON" = none && break - prog="import sys - # split strings by '.' and convert to numeric. Append some zeros - # because we need at least 4 digits for the hex conversion. - # map returns an iterator in Python 3.0 and a list in 2.x --minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] -+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0] - minverhex = 0 - # xrange is not present in Python 3.0 and range returns an iterator - for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -23446,7 +23446,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -23713,7 +23713,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - -@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT - if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 - else -- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 - $as_echo "$am_cv_python_version" >&6; } -@@ -24076,7 +24076,7 @@ else: - # - try: - from platform import python_implementation -- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': -+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': - can_use_sysconfig = 0 - except ImportError: - pass" -@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 - $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else -@@ -24343,7 +24343,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[:3])"` -+ print (sys.version[:4])"` - fi - fi - diff --git a/iproute2/PKGBUILD-arch.new b/iproute2/PKGBUILD-arch.new deleted file mode 100644 index 9bb09c2..0000000 --- a/iproute2/PKGBUILD-arch.new +++ /dev/null @@ -1,69 +0,0 @@ -# Maintainer: Christian Hesse -# Maintainer: Ronald van Haren -# Contributor: Judd Vinet - -pkgname=iproute2 -pkgver=6.1.0 -pkgrel=3 -pkgdesc='IP Routing Utilities' -arch=('x86_64') -license=('GPL2') -url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git' -depends=('glibc' 'iptables' 'libelf' 'libbpf') -makedepends=('db5.3') -optdepends=('db5.3: userspace arp daemon' - 'libcap: tipc' - 'linux-atm: ATM support') -provides=('iproute') -backup=('etc/iproute2/bpf_pinning' - 'etc/iproute2/ematch_map' - 'etc/iproute2/group' - 'etc/iproute2/nl_protos' - 'etc/iproute2/rt_dsfield' - 'etc/iproute2/rt_protos' - 'etc/iproute2/rt_realms' - 'etc/iproute2/rt_scopes' - 'etc/iproute2/rt_tables') -makedepends=('linux-atm') -options=('staticlibs' 'debug') -validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger -source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} - '0001-make-iproute2-fhs-compliant.patch' - 'bdb5.3.patch') -sha256sums=('5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab' - 'SKIP' - '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d' - '908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # set correct fhs structure - patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch - - # use Berkeley DB 5.3 - patch -Np1 -i "${srcdir}"/bdb5.3.patch - - # do not treat warnings as errors - sed -i 's/-Werror//' Makefile - -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export CFLAGS+=' -ffat-lto-objects' - - ./configure - make DBM_INCLUDE='/usr/include/db5.3' -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install - - # libnetlink isn't installed, install it FS#19385 - install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" - install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" -} diff --git a/iptables/PKGBUILD b/iptables/PKGBUILD index 8349694..95c4704 100644 --- a/iptables/PKGBUILD +++ b/iptables/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=iptables pkgname=(iptables iptables-nft) -pkgver=1.8.8 -pkgrel=03 +pkgver=1.8.9 +pkgrel=01 epoch=1 pkgdesc='Linux kernel packet control tool - w/o ipv6 & systemd' arch=(x86_64) @@ -16,9 +16,9 @@ url='https://www.netfilter.org/projects/iptables/index.html' depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash) makedepends=(linux-api-headers) backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules) -source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.bz2{,.sig} +source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.xz{,.sig} empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules - iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e + iptables-format-security-libxt_NAT.patch::https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc iptables-apply-default-path.patch) prepare() { @@ -29,8 +29,7 @@ prepare() { rm include/linux/types.h ln -rs libiptc/linux_list.h include/libiptc - patch -p1 -i ../iptables-format-security.patch # Fix build with -Werror=format-security - + patch -p1 -i ../iptables-format-security-libxt_NAT.patch # Fix build with -Werror=format-security # use Arch path patch -p0 -i ../iptables-apply-default-path.patch @@ -97,19 +96,15 @@ license=(GPL2) validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4' '37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team -sha256sums=(71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f # iptables-1.8.8.tar.bz2 - b2352cadec0594289948d9f43868057fdf2a34e5e6dd5420be862c631e177c00 # iptables-1.8.8.tar.bz2.sig - 630d774f089703c2c7370db6d7c188dae25d00c26feaa3d3de8eb52519033948 # empty.rules - 9e83d7ae39d31881790f814930d44acbaeab1520adb2fb4fcb80f0bbfab174b9 # simple_firewall.rules - 09b90da35c2c8cb0fbda63b300f06d2387a102ca53a40980ef0b49829e249528 # empty-filter.rules - 92755648f456e235d17a8faeb5f46d27af66eb4db10ea4bac0abd3e35e2dae07 # empty-mangle.rules - 52bd70dff3e1e1a64127ad7ed86840834b79756c3bdb6947b7c6279ffe95dd48 # empty-nat.rules - 5768a471c0559848635c39d270e456bfa5c43eda65f5f6f666fea2d277183a37 # empty-raw.rules - 91161a73f323016a9efc5eabd16243d20f8ca2467995cf0eabfb95f845090121 # empty-security.rules - 9d9e23d6452632e7944d942ccbf6c82deb327780a084611aa7444eb88c596a70 # iptables-format-security.patch +sha256sums=(ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f # iptables-1.8.9.tar.xz + 868cceb5bb6a44b89d6f22f0be3291056df1fbc300542dbb7a62f6539bf28673 # iptables-1.8.9.tar.xz.sig + 630d774f089703c2c7370db6d7c188dae25d00c26feaa3d3de8eb52519033948 # empty.rules + 9e83d7ae39d31881790f814930d44acbaeab1520adb2fb4fcb80f0bbfab174b9 # simple_firewall.rules + 09b90da35c2c8cb0fbda63b300f06d2387a102ca53a40980ef0b49829e249528 # empty-filter.rules + 92755648f456e235d17a8faeb5f46d27af66eb4db10ea4bac0abd3e35e2dae07 # empty-mangle.rules + 52bd70dff3e1e1a64127ad7ed86840834b79756c3bdb6947b7c6279ffe95dd48 # empty-nat.rules + 5768a471c0559848635c39d270e456bfa5c43eda65f5f6f666fea2d277183a37 # empty-raw.rules + 91161a73f323016a9efc5eabd16243d20f8ca2467995cf0eabfb95f845090121 # empty-security.rules + 3784e61958cf96a8e5e04df885defadf1cd70caa1e9d6c6f144bdbc64441eabe # iptables-format-security-libxt_NAT.patch 770ceaedce26d05eb1b9d0c4c65f5b8e92facd1dc0652a29c859336d6bc347f6) # iptables-apply-default-path.patch - -# fd3fc7e49b7f145d7cb4082ac165196a452a929ec53138e75383595008bca480 iptables-1:1.8.8-03-x86_64.pkg.tar.xz -# f4bdf87ae9e79dffe8448b9acbe155e764330d1095aaef2c0fc5e3eaf2f92562 iptables-nft-1:1.8.8-03-x86_64.pkg.tar.xz - diff --git a/iptables/PKGBUILD-arch b/iptables/PKGBUILD-arch index e6a7dca..06f889c 100644 --- a/iptables/PKGBUILD-arch +++ b/iptables/PKGBUILD-arch @@ -3,8 +3,8 @@ pkgbase=iptables pkgname=(iptables iptables-nft) -pkgver=1.8.8 -pkgrel=3 +pkgver=1.8.9 +pkgrel=1 epoch=1 pkgdesc='Linux kernel packet control tool' arch=(x86_64) @@ -13,12 +13,12 @@ url='https://www.netfilter.org/projects/iptables/index.html' depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash) makedepends=(linux-api-headers) backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules) -source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.bz2{,.sig} +source=(https://www.netfilter.org/projects/iptables/files/$pkgbase-$pkgver.tar.xz{,.sig} empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules {arp,eb,ip,ip6}tables.service iptables-{legacy,nft}-flush - iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e + iptables-format-security-libxt_NAT.patch::https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc iptables-apply-default-path.patch) -sha256sums=('71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f' +sha256sums=('ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f' 'SKIP' '630d774f089703c2c7370db6d7c188dae25d00c26feaa3d3de8eb52519033948' '9e83d7ae39d31881790f814930d44acbaeab1520adb2fb4fcb80f0bbfab174b9' @@ -33,7 +33,7 @@ sha256sums=('71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f' 'c37c69db5077a061fd72fc3b199712f1bed8688de8008f219223fadd6fa6c06f' '40680b3c877926a2bac698ea58f52d1d4b3ab152ee68ccd7fa7ca51aeedc3b2d' '6d3e7bdeebdaeaf83ed448f4d42a979c8c59fb5e919f6f860ed340c2c9afef1a' - '9d9e23d6452632e7944d942ccbf6c82deb327780a084611aa7444eb88c596a70' + '3784e61958cf96a8e5e04df885defadf1cd70caa1e9d6c6f144bdbc64441eabe' '770ceaedce26d05eb1b9d0c4c65f5b8e92facd1dc0652a29c859336d6bc347f6') validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4' '37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team @@ -46,7 +46,7 @@ prepare() { rm include/linux/types.h ln -rs libiptc/linux_list.h include/libiptc - patch -p1 -i ../iptables-format-security.patch # Fix build with -Werror=format-security + patch -p1 -i ../iptables-format-security-libxt_NAT.patch # Fix build with -Werror=format-security # use Arch path patch -p0 -i ../iptables-apply-default-path.patch diff --git a/iptables/clean b/iptables/clean index 96955eb..613aa43 100644 --- a/iptables/clean +++ b/iptables/clean @@ -1 +1 @@ -rm -rvf {src,pkg,iptables*tar.bz2*} +rm -rvf {src,pkg,iptables*tar.xz*} diff --git a/iptables/iptables-format-security-libxt_NAT.patch b/iptables/iptables-format-security-libxt_NAT.patch new file mode 100644 index 0000000..339a312 --- /dev/null +++ b/iptables/iptables-format-security-libxt_NAT.patch @@ -0,0 +1,29 @@ +From ed4082a7405a5838c205a34c1559e289949200cc Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Thu, 12 Jan 2023 14:38:44 +0100 +Subject: extensions: NAT: Fix for -Werror=format-security + +Have to pass either a string literal or format string to xt_xlate_add(). + +Fixes: f30c5edce0413 ("extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE") +Signed-off-by: Phil Sutter +--- + extensions/libxt_NAT.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extensions/libxt_NAT.c b/extensions/libxt_NAT.c +index da9f2201..2a634398 100644 +--- a/extensions/libxt_NAT.c ++++ b/extensions/libxt_NAT.c +@@ -424,7 +424,7 @@ __NAT_xlate(struct xt_xlate *xl, const struct nf_nat_range2 *r, + if (r->flags & NF_NAT_RANGE_PROTO_OFFSET) + return 0; + +- xt_xlate_add(xl, tgt); ++ xt_xlate_add(xl, "%s", tgt); + if (strlen(range_str)) + xt_xlate_add(xl, " to %s", range_str); + if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) { +-- +cgit v1.2.3 + diff --git a/jobo-setup/jobo-setup.sh b/jobo-setup/jobo-setup.sh deleted file mode 100644 index 6d5cd67..0000000 --- a/jobo-setup/jobo-setup.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -echo " -# This script should run after the base has been installed and should run within the chroot -# environment of the installation. -# -# The script can alway be run again to reconfigure the system, such if other partitions to -# be mounted are created, if s6/66 are added together with runit, or runit is removed in place -# of s6/66. The script should always run as root or using "sudo sh jobo-setup.sh" or simply -# "sudo jobo-setup" -# -# Please report any problems, bugs, issues that may arise from its use so we can make -# adjustments and reissue. -# -# We hope you find it helpful. -# -" - diff --git a/jobo66/install b/jobo66/install deleted file mode 100644 index e4dc5f5..0000000 --- a/jobo66/install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo "1 This is a metapackage for joborun's boot-66serv to replace boot@-66serv by Obarun" - echo "Read more on the cohabitation of runit and 66" - more /etc/66/jobo66.txt -} - -post_upgrade() { - post_install -} diff --git a/krb5/krb5-config_LDFLAGS.patch b/krb5/krb5-config_LDFLAGS.patch deleted file mode 100644 index 1b85086..0000000 --- a/krb5/krb5-config_LDFLAGS.patch +++ /dev/null @@ -1,12 +0,0 @@ -Bug #448778 ---- krb5-1.11/src/build-tools/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 -+++ krb5-1.11/src/build-tools/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 -@@ -217,7 +217,7 @@ - -e 's#\$(PROG_RPATH)#'$libdir'#' \ - -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ - -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ -- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ -+ -e 's#\$(LDFLAGS)##' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)##'` - diff --git a/libffi/PKGBUILD-arch.new b/libffi/PKGBUILD-arch.new deleted file mode 100644 index 9e0603b..0000000 --- a/libffi/PKGBUILD-arch.new +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Levente Polyak -# Contributor: Bartłomiej Piotrowski -# Contributor: Stéphane Gaudreault -# Contributor: Jan de Groot - -pkgname=libffi -pkgver=3.4.2 -pkgrel=4 -pkgdesc='Portable foreign function interface library' -arch=('x86_64') -url='https://sourceware.org/libffi/' -license=('MIT') -depends=('glibc') -checkdepends=('dejagnu') -provides=('libffi.so') -source=(https://github.com/libffi/libffi/releases/download/v$pkgver/libffi-$pkgver.tar.gz) -sha256sums=('540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620') -b2sums=('a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308') - -build() { - cd $pkgname-$pkgver - # remove --disable-exec-static-tramp once ghc and gobject-introspection - # work fine with it enabled (https://github.com/libffi/libffi/pull/647) - ./configure \ - --prefix=/usr \ - --disable-static \ - --disable-multi-os-directory \ - --disable-exec-static-tramp \ - --enable-pax_emutramp - make -} - -check() { - make -C $pkgname-$pkgver check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname - install -Dm 644 README.md -t "$pkgdir"/usr/share/doc/$pkgname -} - -# vim: ts=2 sw=2 et: diff --git a/libusb/0001-core-Install-first-context-as-implicit-default.patch b/libusb/0001-core-Install-first-context-as-implicit-default.patch deleted file mode 100644 index 54fb98e..0000000 --- a/libusb/0001-core-Install-first-context-as-implicit-default.patch +++ /dev/null @@ -1,109 +0,0 @@ -From d46cbbac4851ce6e49d8dacb0daa328453eb8a84 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Tue, 22 Feb 2022 11:45:38 +0100 -Subject: [PATCH] core: Install first context as implicit default - -There was a behaviour change in libusb, which triggers issues when the -API is misused. This caused gutenprint to crash, see -https://bugzilla.redhat.com/show_bug.cgi?id=2055504 - -For now, work around this by installing an implicit default. But, change -the code to log an error in case this "feature" is being used. ---- - libusb/core.c | 16 +++++++++++++--- - libusb/libusbi.h | 15 ++++++++++++++- - tests/umockdev.c | 31 +++++++++++++++++++++++++++++++ - 3 files changed, 58 insertions(+), 4 deletions(-) - -diff --git a/libusb/core.c b/libusb/core.c -index 1c1ada1..c75ddae 100644 ---- a/libusb/core.c -+++ b/libusb/core.c -@@ -41,6 +41,7 @@ static libusb_log_cb log_handler; - #endif - - struct libusb_context *usbi_default_context; -+struct libusb_context *usbi_fallback_context; - static int default_context_refcnt; - static usbi_mutex_static_t default_context_lock = USBI_MUTEX_INITIALIZER; - static struct usbi_option default_context_options[LIBUSB_OPTION_MAX]; -@@ -2284,7 +2285,7 @@ int API_EXPORTED libusb_init(libusb_context **ctx) - - usbi_mutex_static_lock(&default_context_lock); - -- if (!ctx && usbi_default_context) { -+ if (!ctx && default_context_refcnt > 0) { - usbi_dbg(usbi_default_context, "reusing default context"); - default_context_refcnt++; - usbi_mutex_static_unlock(&default_context_lock); -@@ -2354,9 +2355,15 @@ int API_EXPORTED libusb_init(libusb_context **ctx) - goto err_io_exit; - } - -- if (ctx) -+ if (ctx) { - *ctx = _ctx; - -+ if (!usbi_fallback_context) { -+ usbi_fallback_context = _ctx; -+ usbi_warn(usbi_fallback_context, "installing new context as implicit default"); -+ } -+ } -+ - usbi_mutex_static_unlock(&default_context_lock); - - return 0; -@@ -2429,6 +2436,8 @@ void API_EXPORTED libusb_exit(libusb_context *ctx) - - if (!ctx) - usbi_default_context = NULL; -+ if (ctx == usbi_fallback_context) -+ usbi_fallback_context = NULL; - - usbi_mutex_static_unlock(&default_context_lock); - -@@ -2575,7 +2584,8 @@ static void log_v(struct libusb_context *ctx, enum libusb_log_level level, - #else - enum libusb_log_level ctx_level; - -- ctx = usbi_get_context(ctx); -+ ctx = ctx ? ctx : usbi_default_context; -+ ctx = ctx ? ctx : usbi_fallback_context; - if (ctx) - ctx_level = ctx->debug; - else -diff --git a/libusb/libusbi.h b/libusb/libusbi.h -index 5f0d5c2..580add8 100644 ---- a/libusb/libusbi.h -+++ b/libusb/libusbi.h -@@ -436,13 +436,26 @@ struct libusb_context { - }; - - extern struct libusb_context *usbi_default_context; -+extern struct libusb_context *usbi_fallback_context; - - extern struct list_head active_contexts_list; - extern usbi_mutex_static_t active_contexts_lock; - - static inline struct libusb_context *usbi_get_context(struct libusb_context *ctx) - { -- return ctx ? ctx : usbi_default_context; -+ static int warned = 0; -+ -+ if (!ctx) { -+ ctx = usbi_default_context; -+ } -+ if (!ctx) { -+ ctx = usbi_fallback_context; -+ if (ctx && warned == 0) { -+ usbi_err(ctx, "API misuse! Using non-default context as implicit default."); -+ warned = 1; -+ } -+ } -+ return ctx; - } - - enum usbi_event_flags { --- -2.35.1 - diff --git a/libusb/REPLACED-build b/libusb/REPLACED-build deleted file mode 100644 index ccb1693..0000000 --- a/libusb/REPLACED-build +++ /dev/null @@ -1 +0,0 @@ -this pkgrel is based more on the AUR pkg built from git as libusb stable appeared having some trouble with devices this later build seems to solve. This PKGBUILD is a merge between Arch - nosystemd and AUR libusb-git pkg diff --git a/libusb/libusb-1.0.24-descriptor_parsing.patch b/libusb/libusb-1.0.24-descriptor_parsing.patch deleted file mode 100644 index cdccbc2..0000000 --- a/libusb/libusb-1.0.24-descriptor_parsing.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index fb2ed53a..4d2dc8d6 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, - uint8_t *buffer, size_t len) - { - struct usbi_descriptor_header *header; -- int offset = 0; -+ int offset; -+ -+ /* Start seeking past the config descriptor */ -+ offset = LIBUSB_DT_CONFIG_SIZE; -+ buffer += LIBUSB_DT_CONFIG_SIZE; -+ len -= LIBUSB_DT_CONFIG_SIZE; - - while (len > 0) { - if (len < 2) { -@@ -718,7 +723,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - } - - if (priv->sysfs_dir) { -- /* -+ /* - * In sysfs wTotalLength is ignored, instead the kernel returns a - * config descriptor with verified bLength fields, with descriptors - * with an invalid bLength removed. -@@ -727,8 +732,7 @@ static int parse_config_descriptors(struct libusb_device *dev) - int offset; - - if (num_configs > 1 && idx < num_configs - 1) { -- offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE, -- remaining - LIBUSB_DT_CONFIG_SIZE); -+ offset = seek_to_next_config(ctx, buffer, remaining); - if (offset < 0) - return offset; - sysfs_config_len = (uint16_t)offset; diff --git a/linux-api-headers/PKGBUILD.5.12.3 b/linux-api-headers/PKGBUILD.5.12.3 deleted file mode 100644 index ffe2285..0000000 --- a/linux-api-headers/PKGBUILD.5.12.3 +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/$pkgname" -#-----------------------------------------| DESCRIPTION |--------------------------------------- -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=linux-api-headers -pkgver=5.12.3 -pkgrel=01 -pkgdesc='Kernel headers sanitized for use in userspace' -arch=(any) -url='https://www.gnu.org/software/libc' -makedepends=(rsync) -source=(https://www.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver}.tar.{xz,sign}) - -build() { - cd linux-$pkgver - - make mrproper - make headers_check -} - -package() { - cd linux-$pkgver - make INSTALL_HDR_PATH="$pkgdir/usr" headers_install - - # use headers from libdrm - rm -r "$pkgdir/usr/include/drm" -} - -#---- license gpg-key sha256sums ---- - -license=(GPL2) - -validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman - -sha512sums=('295a943bb0d2366715c844a6e2ca424d17f4caceab8c9e095250851857928902a5deb8aa51cff5c3c7e982d168f79f4df3a39bdd47ec22b51237c91732dc8af0' # linux-5.12.3.tar.xz - '2739dc235a48203113af4e6c9ab595c13cfad3b80e6dccd2f62c168eb667e4aacbeedaecc14e5195222043acef2344d8cf552ad9ac54756f677958ebeadbe30b') # linux-5.12.3.tar.sign - -sha256sums=(133714a87a8b0ed1959587a8a5aff9faf47dd0fc8feeac08cca408f7e392878d # linux-5.12.3.tar.xz - 804c5bd021e8ed2814d7d6b2fd639780704a091479c59d347ffc4fe3c1685640) # linux-5.12.3.tar.sign -####### diffs between old and new Arch PKGBUILD ---- PKGBUILD-arch 2021-10-05 08:55:48.000000000 +0000 -+++ PKGBUILD-arch.new 2022-02-10 12:12:01.792299607 +0000 -@@ -1,10 +1,12 @@ --# Maintainer: Bartłomiej Piotrowski -+# Maintainer: Giancarlo Razzolini -+# Maintainer: Frederik Schwan -+# Contributor: Bartłomiej Piotrowski - # Contributor: Allan McRae - --# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -+# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc - - pkgname=linux-api-headers --pkgver=5.12.3 -+pkgver=5.16.8 - pkgrel=1 - pkgdesc='Kernel headers sanitized for use in userspace' - arch=(any) -@@ -12,7 +14,7 @@ - license=(GPL2) - makedepends=(rsync) - source=(https://www.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver}.tar.{xz,sign}) --sha256sums=('133714a87a8b0ed1959587a8a5aff9faf47dd0fc8feeac08cca408f7e392878d' -+sha256sums=('52aa5f05ee8addcc1ec0020f50e5f88ea1a308c2afac4a2305e1e4cf42580316' - 'SKIP') - validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman -scan for systemd ipv6 service & socket -##### systemd crap in new PKGBUILD ### diff --git a/linux-firmware/PKGBUILD-20190923 b/linux-firmware/PKGBUILD-20190923 deleted file mode 100644 index d9fcf08..0000000 --- a/linux-firmware/PKGBUILD-20190923 +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/$pkgname" -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgbase=linux-firmware -pkgname=(linux-firmware amd-ucode) -#_tag=20211027 -_tag=20190923 -#pkgver=20211027.1d00989 -pkgver=20190923.417a9c6 - -pkgrel=01 -pkgdesc="Firmware files for Linux" -url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" -arch=('any') -makedepends=('git') -options=(!strip) -source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed") - -_backports=( -) - -prepare() { - cd ${pkgname} - - local _c - for _c in "${_backports[@]}"; do - git log --oneline -1 "${_c}" - git cherry-pick -n "${_c}" - done -} - -pkgver() { - cd ${pkgname} - - # Commit date + short rev - echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD) -} - -build() { - mkdir -p kernel/x86/microcode - cat ${pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin - - # Reproducibility: set the timestamp on the bin file - if [[ -n ${SOURCE_DATE_EPOCH} ]]; then - touch -d @${SOURCE_DATE_EPOCH} kernel/x86/microcode/AuthenticAMD.bin - fi - - # Reproducibility: strip the inode and device numbers from the cpio archive - echo kernel/x86/microcode/AuthenticAMD.bin | - bsdtar --uid 0 --gid 0 -cnf - -T - | - bsdtar --null -cf - --format=newc @- > amd-ucode.img -} - -package_linux-firmware() { - cd ${pkgname} - - make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install - - # Trigger a microcode reload for configurations not using early updates - echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' | - install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" - - install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN* WHENCE -} - -package_amd-ucode() { - pkgdesc="Microcode update image for AMD CPUs" - license=(custom) - - install -Dt "${pkgdir}/boot" -m644 amd-ucode.img - - install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/LICENSE.amd-ucode -} - -#---- license gpg-key sha256sums ---- - -license=('GPL2' 'GPL3' 'custom') - -validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer - -sha256sums=(SKIP) diff --git a/linux-lts/PKGBUILD-arch-51090 b/linux-lts/PKGBUILD-arch-51090 deleted file mode 100644 index b8a9b46..0000000 --- a/linux-lts/PKGBUILD-arch-51090 +++ /dev/null @@ -1,198 +0,0 @@ -# Maintainer: Andreas Radke - -pkgbase=linux-lts -pkgver=5.10.90 -pkgrel=1 -pkgdesc='LTS Linux' -url="https://www.kernel.org/" -arch=(x86_64) -license=(GPL2) -makedepends=( - bc kmod libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme python-six graphviz imagemagick -) -options=('!strip') -_srcname=linux-$pkgver -source=( - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} - config # the main kernel config file - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman -) -# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725' - 'SKIP' - '80de9382be09f765b5cb1c11e21a09c99f75a0000bcc10def0542228644ea828' - '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig -#return 1 - make -s kernelrelease > version - echo "Prepared $pkgbase version $( - -pkgbase=linux-lts -pkgver=5.15.90 -pkgrel=1 -pkgdesc='LTS Linux' -url="https://www.kernel.org/" -arch=(x86_64) -license=(GPL2) -makedepends=( - bc libelf pahole cpio perl tar xz - xmlto 'python-sphinx<6.0.0' python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra -) -options=('!strip') -_srcname=linux-$pkgver -source=( - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} - config # the main kernel config file - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch - 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch - 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch - 0005-lg-laptop-Recognize-more-models.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman -) -# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('e6fd430022686753af7516fe7544f96aab379509dc5b7829017bdcd92b393b42' - 'SKIP' - '07b5630e34b64e49f51b2df6ef1d40248e4c779e621bab0b558d230fd354bfb8' - '3b5cfc9ca9cf778ea2c4b619b933cda26519969df2d764b5a687f63cf59974cd' - 'c175fbb141c3cec013c799f694d88310375ac5456042f6a4a1adc7667836d786' - '8357f000b2b622e73dcfd41c2bad42b5e99fffe8f7ee64f774aa771f86cef43c' - '5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde' - '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig - diff -u ../config .config || : - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( -Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH] ZEN: Add sysctl and CONFIG to disallow unprivileged - CLONE_NEWUSER - -Our default behavior continues to match the vanilla kernel. ---- - include/linux/user_namespace.h | 4 ++++ - init/Kconfig | 16 ++++++++++++++++ - kernel/fork.c | 14 ++++++++++++++ - kernel/sysctl.c | 12 ++++++++++++ - kernel/user_namespace.c | 7 +++++++ - 5 files changed, 53 insertions(+) - -diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 7616c7bf4b24..bdbfcfe5df1e 100644 ---- a/include/linux/user_namespace.h -+++ b/include/linux/user_namespace.h -@@ -109,6 +109,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type); - - #ifdef CONFIG_USER_NS - -+extern int unprivileged_userns_clone; -+ - static inline struct user_namespace *get_user_ns(struct user_namespace *ns) - { - if (ns) -@@ -142,6 +144,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); - struct ns_common *ns_get_owner(struct ns_common *ns); - #else - -+#define unprivileged_userns_clone 0 -+ - static inline struct user_namespace *get_user_ns(struct user_namespace *ns) - { - return &init_user_ns; -diff --git a/init/Kconfig b/init/Kconfig -index fc4c9f416fad..3707cc8b4d7b 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1172,6 +1172,22 @@ config USER_NS - - If unsure, say N. - -+config USER_NS_UNPRIVILEGED -+ bool "Allow unprivileged users to create namespaces" -+ default y -+ depends on USER_NS -+ help -+ When disabled, unprivileged users will not be able to create -+ new namespaces. Allowing users to create their own namespaces -+ has been part of several recent local privilege escalation -+ exploits, so if you need user namespaces but are -+ paranoid^Wsecurity-conscious you want to disable this. -+ -+ This setting can be overridden at runtime via the -+ kernel.unprivileged_userns_clone sysctl. -+ -+ If unsure, say Y. -+ - config PID_NS - bool "PID Namespaces" - default y -diff --git a/kernel/fork.c b/kernel/fork.c -index 7c044d377926..3c70b2fe5946 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -97,6 +97,10 @@ - #include - #include - -+#ifdef CONFIG_USER_NS -+#include -+#endif -+ - #include - #include - #include -@@ -1871,6 +1875,10 @@ static __latent_entropy struct task_struct *copy_process( - if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) - return ERR_PTR(-EINVAL); - -+ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) -+ if (!capable(CAP_SYS_ADMIN)) -+ return ERR_PTR(-EPERM); -+ - /* - * Thread groups must share signals as well, and detached threads - * can only be started up within the thread group. -@@ -2936,6 +2944,12 @@ int ksys_unshare(unsigned long unshare_flags) - if (unshare_flags & CLONE_NEWNS) - unshare_flags |= CLONE_FS; - -+ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) { -+ err = -EPERM; -+ if (!capable(CAP_SYS_ADMIN)) -+ goto bad_unshare_out; -+ } -+ - err = check_unshare_flags(unshare_flags); - if (err) - goto bad_unshare_out; -diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index b9306d2bb426..891b250db88e 100644 ---- a/kernel/sysctl.c -+++ b/kernel/sysctl.c -@@ -103,6 +103,9 @@ - #ifdef CONFIG_LOCKUP_DETECTOR - #include - #endif -+#ifdef CONFIG_USER_NS -+#include -+#endif - - #if defined(CONFIG_SYSCTL) - -@@ -1902,6 +1905,15 @@ static struct ctl_table kern_table[] = { - .proc_handler = proc_dointvec, - }, - #endif -+#ifdef CONFIG_USER_NS -+ { -+ .procname = "unprivileged_userns_clone", -+ .data = &unprivileged_userns_clone, -+ .maxlen = sizeof(int), -+ .mode = 0644, -+ .proc_handler = proc_dointvec, -+ }, -+#endif - #ifdef CONFIG_PROC_SYSCTL - { - .procname = "tainted", -diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index ce396ea4de60..c3a6ef1f10ed 100644 ---- a/kernel/user_namespace.c -+++ b/kernel/user_namespace.c -@@ -21,6 +21,13 @@ - #include - #include - -+/* sysctl */ -+#ifdef CONFIG_USER_NS_UNPRIVILEGED -+int unprivileged_userns_clone = 1; -+#else -+int unprivileged_userns_clone; -+#endif -+ - static struct kmem_cache *user_ns_cachep __read_mostly; - static DEFINE_MUTEX(userns_state_mutex); - diff --git a/linux-lts/linux-lts510/PKGBUILD b/linux-lts/linux-lts510/PKGBUILD deleted file mode 100644 index c747038..0000000 --- a/linux-lts/linux-lts510/PKGBUILD +++ /dev/null @@ -1,198 +0,0 @@ -# Maintainer: Jonathon Fernyhough -# Contributor: Andreas Radke - -pkgbase=linux-lts510 -pkgver=5.10.153 -pkgrel=1 -pkgdesc='LTS 5.10 Linux' -url="https://www.kernel.org/" -arch=(x86_64) -license=(GPL2) -makedepends=( - bc kmod libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme python-six graphviz imagemagick -) -options=('!strip') -_srcname=linux-$pkgver -source=( - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} - config # the main kernel config file - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman -) -# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('3cf2e4519fe451caef0ee0a8beac694612267325f7055fc38d6a990a762f1662' - 'SKIP' - '2367f59976f6fc902d226229564a98f5d1df3a91e742a292c3deccc3e4a8ffc0' - '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( -Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH] ZEN: Add sysctl and CONFIG to disallow unprivileged - CLONE_NEWUSER - -Our default behavior continues to match the vanilla kernel. ---- - include/linux/user_namespace.h | 4 ++++ - init/Kconfig | 16 ++++++++++++++++ - kernel/fork.c | 14 ++++++++++++++ - kernel/sysctl.c | 12 ++++++++++++ - kernel/user_namespace.c | 7 +++++++ - 5 files changed, 53 insertions(+) - -diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 7616c7bf4b24..bdbfcfe5df1e 100644 ---- a/include/linux/user_namespace.h -+++ b/include/linux/user_namespace.h -@@ -109,6 +109,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_type type); - - #ifdef CONFIG_USER_NS - -+extern int unprivileged_userns_clone; -+ - static inline struct user_namespace *get_user_ns(struct user_namespace *ns) - { - if (ns) -@@ -142,6 +144,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); - struct ns_common *ns_get_owner(struct ns_common *ns); - #else - -+#define unprivileged_userns_clone 0 -+ - static inline struct user_namespace *get_user_ns(struct user_namespace *ns) - { - return &init_user_ns; -diff --git a/init/Kconfig b/init/Kconfig -index fc4c9f416fad..3707cc8b4d7b 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1172,6 +1172,22 @@ config USER_NS - - If unsure, say N. - -+config USER_NS_UNPRIVILEGED -+ bool "Allow unprivileged users to create namespaces" -+ default y -+ depends on USER_NS -+ help -+ When disabled, unprivileged users will not be able to create -+ new namespaces. Allowing users to create their own namespaces -+ has been part of several recent local privilege escalation -+ exploits, so if you need user namespaces but are -+ paranoid^Wsecurity-conscious you want to disable this. -+ -+ This setting can be overridden at runtime via the -+ kernel.unprivileged_userns_clone sysctl. -+ -+ If unsure, say Y. -+ - config PID_NS - bool "PID Namespaces" - default y -diff --git a/kernel/fork.c b/kernel/fork.c -index 7c044d377926..3c70b2fe5946 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -97,6 +97,10 @@ - #include - #include - -+#ifdef CONFIG_USER_NS -+#include -+#endif -+ - #include - #include - #include -@@ -1871,6 +1875,10 @@ static __latent_entropy struct task_struct *copy_process( - if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) - return ERR_PTR(-EINVAL); - -+ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) -+ if (!capable(CAP_SYS_ADMIN)) -+ return ERR_PTR(-EPERM); -+ - /* - * Thread groups must share signals as well, and detached threads - * can only be started up within the thread group. -@@ -2936,6 +2944,12 @@ int ksys_unshare(unsigned long unshare_flags) - if (unshare_flags & CLONE_NEWNS) - unshare_flags |= CLONE_FS; - -+ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) { -+ err = -EPERM; -+ if (!capable(CAP_SYS_ADMIN)) -+ goto bad_unshare_out; -+ } -+ - err = check_unshare_flags(unshare_flags); - if (err) - goto bad_unshare_out; -diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index b9306d2bb426..891b250db88e 100644 ---- a/kernel/sysctl.c -+++ b/kernel/sysctl.c -@@ -103,6 +103,9 @@ - #ifdef CONFIG_LOCKUP_DETECTOR - #include - #endif -+#ifdef CONFIG_USER_NS -+#include -+#endif - - #if defined(CONFIG_SYSCTL) - -@@ -1902,6 +1905,15 @@ static struct ctl_table kern_table[] = { - .proc_handler = proc_dointvec, - }, - #endif -+#ifdef CONFIG_USER_NS -+ { -+ .procname = "unprivileged_userns_clone", -+ .data = &unprivileged_userns_clone, -+ .maxlen = sizeof(int), -+ .mode = 0644, -+ .proc_handler = proc_dointvec, -+ }, -+#endif - #ifdef CONFIG_PROC_SYSCTL - { - .procname = "tainted", -diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index ce396ea4de60..c3a6ef1f10ed 100644 ---- a/kernel/user_namespace.c -+++ b/kernel/user_namespace.c -@@ -21,6 +21,13 @@ - #include - #include - -+/* sysctl */ -+#ifdef CONFIG_USER_NS_UNPRIVILEGED -+int unprivileged_userns_clone = 1; -+#else -+int unprivileged_userns_clone; -+#endif -+ - static struct kmem_cache *user_ns_cachep __read_mostly; - static DEFINE_MUTEX(userns_state_mutex); - diff --git a/linux-lts/reference-material/linux-lts510/PKGBUILD b/linux-lts/reference-material/linux-lts510/PKGBUILD deleted file mode 100644 index 08296ba..0000000 --- a/linux-lts/reference-material/linux-lts510/PKGBUILD +++ /dev/null @@ -1,198 +0,0 @@ -# Maintainer: Jonathon Fernyhough -# Contributor: Andreas Radke - -pkgbase=linux-lts510 -pkgver=5.10.102 -pkgrel=1 -pkgdesc='LTS 5.10 Linux' -url="https://www.kernel.org/" -arch=(x86_64) -license=(GPL2) -makedepends=( - bc kmod libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme python-six graphviz imagemagick -) -options=('!strip') -_srcname=linux-$pkgver -source=( - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} - config # the main kernel config file - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman -) -# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('e6414895b1c2e406a41a8744160e2b4ef2095e6cebe5363be460d1b198f0e379' - 'SKIP' - '2367f59976f6fc902d226229564a98f5d1df3a91e742a292c3deccc3e4a8ffc0' - '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( - -pkgbase=linux-lts -pkgver=5.15.63 -pkgrel=1 -pkgdesc='LTS Linux' -url="https://www.kernel.org/" -arch=(x86_64) -license=(GPL2) -makedepends=( - bc libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra -) -options=('!strip') -_srcname=linux-$pkgver -source=( - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} - config # the main kernel config file - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch - 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch - 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch - 0005-lg-laptop-Recognize-more-models.patch - 0006-Fix-NFSv4-mount-regression.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman -) -# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('6dd3cd1e5a629d0002bc6c6ec7e8ea96710104f38664122dd56c83dfd4eb7341' - 'SKIP' - '67b7379830e81ae0f3f787a8855e91a5b50df5a6c31e6ad9807c2db84281393a' - '7bd64ff894475b3415d792ba8466ba7e8f872af56dbf1aeed0d261fe4008b8b5' - '39649dc1dfcb06b411ad124e123769e955a78961b4ea17538c0919a930925549' - '56c12551e859cc67520909e64feecbf1b190cee8addef150c5b9d1bb1d40981e' - '5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde' - '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9' - '95dad02b01937681af0a207e22a6bf64c33e067bf7a14cb98262dd8f69194eb8') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig - diff -u ../config .config || : - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( - -pkgbase=linux-lts -pkgver=5.15.70 -pkgrel=1 -pkgdesc='LTS Linux' -url="https://www.kernel.org/" -arch=(x86_64) -license=(GPL2) -makedepends=( - bc libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra -) -options=('!strip') -_srcname=linux-$pkgver -source=( - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} - config # the main kernel config file - 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch - 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch - 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch - 0005-lg-laptop-Recognize-more-models.patch - 0006-Fix-NFSv4-mount-regression.patch -) -validpgpkeys=( - 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds - '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman -) -# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('1a7c26f0253407bb222786c8cbf2ee6235acebe8ea641fe0bc2360acce970d76' - 'SKIP' - 'f2d7225bc54cdca2b12baab9140cc4f32dca12e460f8a0dbb0ebb1a2c8ea6a34' - '7bd64ff894475b3415d792ba8466ba7e8f872af56dbf1aeed0d261fe4008b8b5' - '39649dc1dfcb06b411ad124e123769e955a78961b4ea17538c0919a930925549' - '56c12551e859cc67520909e64feecbf1b190cee8addef150c5b9d1bb1d40981e' - '5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde' - '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9' - '95dad02b01937681af0a207e22a6bf64c33e067bf7a14cb98262dd8f69194eb8') - -export KBUILD_BUILD_HOST=archlinux -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux}" > localversion.20-pkgname - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config .config - make olddefconfig - diff -u ../config .config || : - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( If your /usr is on a separate partition, you must add the "usr" hook\n' - printf ' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n' - fi - - if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then - printf '==> The "block" hook has replaced several hooks:\n' - printf ' fw, sata, pata, scsi, virtio, mmc, usb\n' - printf ' Replace any and all of these in /etc/mkinitcpio.conf with a single\n' - printf ' instance of the "block" hook\n' - fi -} diff --git a/nss/PKGBUILD-arch.new b/nss/PKGBUILD-arch.new deleted file mode 100644 index 454ff18..0000000 --- a/nss/PKGBUILD-arch.new +++ /dev/null @@ -1,101 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot - -pkgbase=nss -pkgname=(nss ca-certificates-mozilla) -pkgver=3.82 -pkgrel=1 -pkgdesc="Network Security Services" -url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" -arch=(x86_64) -license=(MPL GPL) -depends=('nspr>=4.34' sqlite zlib sh 'p11-kit>=0.23.19') -makedepends=(perl python gyp mercurial) -options=(debug) -_revision=dba0f1c0f2388f75f345ba188cbb99cf04ded59f -source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision" - certdata2pem.py bundle.sh) -sha256sums=('SKIP' - 'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c' - '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd') - -pkgver() { - cd nss - hg id -t -r. | sed 's/^NSS_//;s/_RTM$//;s/_/./g' -} - -prepare() { - mkdir -p certs - ln -srft certs nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} -} - -build() { - cd certs - ../certdata2pem.py - - cd .. - ./bundle.sh - - cd nss - ./build.sh \ - --target x64 \ - --opt \ - --system-sqlite \ - --system-nspr \ - --enable-libpkix \ - --disable-tests -} - -package_nss() { - local nsprver="$(pkg-config --modversion nspr)" - local libdir=/usr/lib - - sed nss/pkg/pkg-config/nss.pc.in \ - -e "s,%libdir%,$libdir,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,$nsprver,g" \ - -e "s,%NSS_VERSION%,$pkgver,g" | - install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc" - - ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc" - - install -Dt "$pkgdir$libdir" dist/Release/lib/*.so - - local vmajor vminor vpatch - { read vmajor; read vminor; read vpatch; } \ - < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h) - - sed nss/pkg/pkg-config/nss-config.in \ - -e "s,@libdir@,$libdir,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,$vmajor,g" \ - -e "s,@MOD_MINOR_VERSION@,$vminor,g" \ - -e "s,@MOD_PATCH_VERSION@,$vpatch,g" | - install -D /dev/stdin "$pkgdir/usr/bin/nss-config" - - install -Dt "$pkgdir/usr/bin" \ - dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap} - - install -Dt "$pkgdir/usr/include/nss" -m644 dist/public/nss/*.h - - install -Dt "$pkgdir/usr/share/man/man1" -m644 \ - nss/doc/nroff/{*util,signtool,signver,ssltap}.1 - - # Replace built-in trust with p11-kit connection - ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so" - ln -sf p11-kit-trust.so "$pkgdir$libdir/libnssckbi.so" -} - -package_ca-certificates-mozilla() { - pkgdesc="Mozilla's set of trusted CA certificates" - depends=('ca-certificates-utils>=20181109-3') - - install -Dm644 ca-bundle.trust.p11-kit \ - "$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit" -} - -# vim:set sw=2 et: diff --git a/obarun/66-tools/PKGBUILD b/obarun/66-tools/PKGBUILD index 468a1e5..149ca5f 100644 --- a/obarun/66-tools/PKGBUILD +++ b/obarun/66-tools/PKGBUILD @@ -8,13 +8,13 @@ pkgname=66-tools pkgver=0.0.8.0 -pkgrel=03 +pkgrel=04 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.11.2.0' 'execline>=2.8.3.0' 'oblibs>=0.1.4.0' 'lowdown') -depends=('skalibs>=2.11.2.0' 'execline>=2.8.3.0' 'oblibs>=0.1.4.0') +makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 'oblibs>=0.1.4.0' 'lowdown') +depends=('skalibs>=2.13.0.0' 'execline>=2.9.1.0' 'oblibs>=0.1.4.0') groups=('s6-suite') _flags=( diff --git a/obarun/66/PKGBUILD b/obarun/66/PKGBUILD index 24723ad..529fe55 100644 --- a/obarun/66/PKGBUILD +++ b/obarun/66/PKGBUILD @@ -8,7 +8,7 @@ pkgname=66 pkgver=0.6.2.0 -pkgrel=05 +pkgrel=06 # change in uid for s6log pkgdesc="Small tools built around s6 and s6-rc programs" url='https://git.obarun.org/Obarun/66.git' @@ -16,8 +16,8 @@ source=("${pkgname}::git+${url}#tag=v$pkgver" 66.install) # direct: https://git.obarun.org/pkg/obcore/66/-/raw/master/trunk/66.install -makedepends=('git' 'skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-rc>=0.5.2.3' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') -depends=('skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-rc>=0.5.2.3' 'oblibs>=0.1.4.0') +depends=( 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0' 's6-rc>=0.5.3.3' 'oblibs>=0.1.4.0') +makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0' 's6-rc>=0.5.3.3' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers') arch=(x86_64) backup=('etc/66/init.conf' diff --git a/obarun/oblibs/PKGBUILD b/obarun/oblibs/PKGBUILD index fd8fadd..643944b 100644 --- a/obarun/oblibs/PKGBUILD +++ b/obarun/oblibs/PKGBUILD @@ -9,13 +9,13 @@ pkgname=oblibs pkgdesc='Obarun C library' pkgver=0.1.4.0 -pkgrel=03 +pkgrel=04 url='https://git.obarun.org/Obarun/oblibs.git' track=tag arch=(x86_64) groups=(s6-suite) -depends=("skalibs>=2.11.2.0" "execline>=2.8.3.0") -makedepends=(git "skalibs>=2.11.2.0" "execline>=2.8.3.0") +depends=("skalibs>=2.13.0.0" "execline>=2.9.1.0") +makedepends=(git "skalibs>=2.13.0.0" "execline>=2.9.1.0") target="v${pkgver}" source=("$pkgname::git+https://git.obarun.org/Obarun/${pkgname}#${track}=${target}") @@ -39,3 +39,5 @@ package() { license=('ISC') sha256sums=(SKIP) + + diff --git a/obarun/oblibs/oblibs/HEAD b/obarun/oblibs/oblibs/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/obarun/oblibs/oblibs/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/obarun/oblibs/oblibs/config b/obarun/oblibs/oblibs/config new file mode 100644 index 0000000..b8506df --- /dev/null +++ b/obarun/oblibs/oblibs/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = https://git.obarun.org/Obarun/oblibs + fetch = +refs/*:refs/* + mirror = true diff --git a/obarun/oblibs/oblibs/description b/obarun/oblibs/oblibs/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/obarun/oblibs/oblibs/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/obarun/oblibs/oblibs/hooks/applypatch-msg.sample b/obarun/oblibs/oblibs/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/obarun/oblibs/oblibs/hooks/commit-msg.sample b/obarun/oblibs/oblibs/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/obarun/oblibs/oblibs/hooks/fsmonitor-watchman.sample b/obarun/oblibs/oblibs/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..23e856f --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/obarun/oblibs/oblibs/hooks/post-update.sample b/obarun/oblibs/oblibs/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/obarun/oblibs/oblibs/hooks/pre-applypatch.sample b/obarun/oblibs/oblibs/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/obarun/oblibs/oblibs/hooks/pre-commit.sample b/obarun/oblibs/oblibs/hooks/pre-commit.sample new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/obarun/oblibs/oblibs/hooks/pre-merge-commit.sample b/obarun/oblibs/oblibs/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/obarun/oblibs/oblibs/hooks/pre-push.sample b/obarun/oblibs/oblibs/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/obarun/oblibs/oblibs/hooks/pre-rebase.sample b/obarun/oblibs/oblibs/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/obarun/oblibs/oblibs/hooks/pre-receive.sample b/obarun/oblibs/oblibs/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/obarun/oblibs/oblibs/hooks/prepare-commit-msg.sample b/obarun/oblibs/oblibs/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/obarun/oblibs/oblibs/hooks/push-to-checkout.sample b/obarun/oblibs/oblibs/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/obarun/oblibs/oblibs/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/obarun/oblibs/oblibs/info/exclude b/obarun/oblibs/oblibs/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/obarun/oblibs/oblibs/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/obarun/oblibs/oblibs/objects/pack/pack-00c02929557881e6de52cdd529f6cbe0f48c0b28.idx b/obarun/oblibs/oblibs/objects/pack/pack-00c02929557881e6de52cdd529f6cbe0f48c0b28.idx new file mode 100644 index 0000000..e7dab1b Binary files /dev/null and b/obarun/oblibs/oblibs/objects/pack/pack-00c02929557881e6de52cdd529f6cbe0f48c0b28.idx differ diff --git a/obarun/oblibs/oblibs/objects/pack/pack-00c02929557881e6de52cdd529f6cbe0f48c0b28.pack b/obarun/oblibs/oblibs/objects/pack/pack-00c02929557881e6de52cdd529f6cbe0f48c0b28.pack new file mode 100644 index 0000000..50b2a62 Binary files /dev/null and b/obarun/oblibs/oblibs/objects/pack/pack-00c02929557881e6de52cdd529f6cbe0f48c0b28.pack differ diff --git a/obarun/oblibs/oblibs/packed-refs b/obarun/oblibs/oblibs/packed-refs new file mode 100644 index 0000000..2e56f0e --- /dev/null +++ b/obarun/oblibs/oblibs/packed-refs @@ -0,0 +1,29 @@ +# pack-refs with: peeled fully-peeled sorted +afeaf4cb6dfda3abf84e36e9bf36f8142a01958c refs/heads/dev +defa7fc34b9ad0e503a2ba3112361f2ad7332d57 refs/heads/master +f00654e861acd824ae0fadf852fb1eda589628a9 refs/tags/v0.0.0.1 +b41cc03f40ecf51e36cde7bf52d9ada8a1fb9cdc refs/tags/v0.0.0.2 +94cb838642fffde778a668df5d325fc38ec687c1 refs/tags/v0.0.0.3 +9d225eee4b8c1c52dcea1a5f4485bd150985a4f7 refs/tags/v0.0.1.0 +d082ebdf94a61fb3dedbe76b9fd4db8cdc5ea746 refs/tags/v0.0.1.1 +22e8bc13f56b64345499762ba0560dc04f294168 refs/tags/v0.0.1.2 +84e4c21ec2fdfb96faab864bffd2bf42de69e1ce refs/tags/v0.0.1.3 +1ca57f06f745148ee7fc265c6a7e2b80c3f9e550 refs/tags/v0.0.2.0 +24e253b12fdb93013c99dc00e5eea9dad96f55f3 refs/tags/v0.0.2.1 +d7ac051d257b9a1cf8e1f2434aafff2d7f757694 refs/tags/v0.0.3.0 +8298c6e785daedae4cb89c7871ead219c4b3a5f4 refs/tags/v0.0.3.1 +f71778e6bdec97d79f55ba8b0c9f6752ee92af5a refs/tags/v0.0.3.2 +71cd7c593353762464daf9a4f857a6cadd5ed568 refs/tags/v0.0.4.0 +d5d38eb21f231cd550803d2d1ab1ee69ca9fd568 refs/tags/v0.0.5.0 +ba106fe76f6d722b0051d19adb591543a9e0a1d5 refs/tags/v0.0.5.1 +f3b3d0c31f508696bc66643a0cd8b6ec675cc6a8 refs/tags/v0.0.6.0 +fab4f4183a7a9da1fecefee0198681d265ff0a60 refs/tags/v0.0.6.1 +bbfa553c76867f6775f4c7b6bc6a576cbefa4817 refs/tags/v0.0.7.0 +48623ac1ffbda547aba955bb742952c0bd2fc3b8 refs/tags/v0.0.8.0 +1b93f91cb492293ffa6d0885867ccfdaa9f2800d refs/tags/v0.0.9.0 +dca71aa86aca934428285e9fd95991faf0301e8a refs/tags/v0.1.0.0 +b3f44c138fe495178f649cee9b05b0cabea960f3 refs/tags/v0.1.1.0 +07d68f1772237c8cdf7495a227782b6a4262f735 refs/tags/v0.1.1.1 +10ec0338809317393656f852531a8b7b22823a35 refs/tags/v0.1.2.0 +085c996d3f2236fcdd20f55357e31261aa979d7c refs/tags/v0.1.3.0 +7d81196db058b12d548f7e5cbf046422fbf176b8 refs/tags/v0.1.4.0 diff --git a/pacman/makepkg.conf-arch.new b/pacman/makepkg.conf-arch.new deleted file mode 100644 index f270d8e..0000000 --- a/pacman/makepkg.conf-arch.new +++ /dev/null @@ -1,159 +0,0 @@ -#!/hint/bash -# -# /etc/makepkg.conf -# - -######################################################################### -# SOURCE ACQUISITION -######################################################################### -# -#-- The download utilities that makepkg should use to acquire sources -# Format: 'protocol::agent' -DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' - 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' - 'scp::/usr/bin/scp -C %u %o') - -# Other common tools: -# /usr/bin/snarf -# /usr/bin/lftpget -c -# /usr/bin/wget - -#-- The package required by makepkg to download VCS sources -# Format: 'protocol::package' -VCSCLIENTS=('bzr::bzr' - 'fossil::fossil' - 'git::git' - 'hg::mercurial' - 'svn::subversion') - -######################################################################### -# ARCHITECTURE, COMPILE FLAGS -######################################################################### -# -CARCH="x86_64" -CHOST="x86_64-pc-linux-gnu" - -#-- Compiler and Linker Flags -#CPPFLAGS="" -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection" -CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -LTOFLAGS="-flto=auto" -#RUSTFLAGS="-C opt-level=2" -#-- Make Flags: change this for DistCC/SMP systems -#MAKEFLAGS="-j2" -#-- Debugging flags -DEBUG_CFLAGS="-g" -DEBUG_CXXFLAGS="$DEBUG_CFLAGS" -#DEBUG_RUSTFLAGS="-C debuginfo=2" - -######################################################################### -# BUILD ENVIRONMENT -######################################################################### -# -# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign) -# A negated environment option will do the opposite of the comments below. -# -#-- distcc: Use the Distributed C/C++/ObjC compiler -#-- color: Colorize output messages -#-- ccache: Use ccache to cache compilation -#-- check: Run the check() function if present in the PKGBUILD -#-- sign: Generate PGP signature file -# -BUILDENV=(!distcc color !ccache check !sign) -# -#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, -#-- specify a space-delimited list of hosts running in the DistCC cluster. -#DISTCC_HOSTS="" -# -#-- Specify a directory for package building. -#BUILDDIR=/tmp/makepkg - -######################################################################### -# GLOBAL PACKAGE OPTIONS -# These are default values for the options=() settings -######################################################################### -# -# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto) -# A negated option will do the opposite of the comments below. -# -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- staticlibs: Leave static library (.a) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -#-- debug: Add debugging flags as specified in DEBUG_* variables -#-- lto: Add compile flags for building with link time optimization -# -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto) - -#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 -INTEGRITY_CHECK=(sha256) -#-- Options to be used when stripping binaries. See `man strip' for details. -STRIP_BINARIES="--strip-all" -#-- Options to be used when stripping shared libraries. See `man strip' for details. -STRIP_SHARED="--strip-unneeded" -#-- Options to be used when stripping static libraries. See `man strip' for details. -STRIP_STATIC="--strip-debug" -#-- Manual (man and info) directories to compress (if zipman is specified) -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -#-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) -#-- Directory to store source code in for debug packages -DBGSRCDIR="/usr/src/debug" - -######################################################################### -# PACKAGE OUTPUT -######################################################################### -# -# Default: put built package and cached source in build directory -# -#-- Destination: specify a fixed directory where all packages will be placed -#PKGDEST=/home/packages -#-- Source cache: specify a fixed directory where source files will be cached -#SRCDEST=/home/sources -#-- Source packages: specify a fixed directory where all src packages will be placed -#SRCPKGDEST=/home/srcpackages -#-- Log files: specify a fixed directory where all log files will be placed -#LOGDEST=/home/makepkglogs -#-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe " -#-- Specify a key to use for package signing -#GPGKEY="" - -######################################################################### -# COMPRESSION DEFAULTS -######################################################################### -# -COMPRESSGZ=(gzip -c -f -n) -COMPRESSBZ2=(bzip2 -c -f) -COMPRESSXZ=(xz -c -z -) -COMPRESSZST=(zstd -c -z -q -) -COMPRESSLRZ=(lrzip -q) -COMPRESSLZO=(lzop -q) -COMPRESSZ=(compress -c -f) -COMPRESSLZ4=(lz4 -q) -COMPRESSLZ=(lzip -c -f) - -######################################################################### -# EXTENSION DEFAULTS -######################################################################### -# -PKGEXT='.pkg.tar.zst' -SRCEXT='.src.tar.gz' - -######################################################################### -# OTHER -######################################################################### -# -#-- Command used to run pacman as root, instead of trying sudo and su -#PACMAN_AUTH=() diff --git a/pacman/pacman.conf.1 b/pacman/pacman.conf.1 deleted file mode 100644 index 1cbcc0a..0000000 --- a/pacman/pacman.conf.1 +++ /dev/null @@ -1,246 +0,0 @@ -# -# /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 = systemd systemd-libs elogind libelogind - -#IgnoreGroup = - -#NoUpgrade = -NoExtract = usr/lib/libsystemd*.* usr/lib/systemd* etc/systemd* - -# Misc options -#UseSyslog -Color -#NoProgressBar -CheckSpace -VerbosePkgLists -ParallelDownloads = 1 -ILoveCandy - -# 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 Joborun Obarun and Arch Linux -# packagers with `pacman-key --populate joborun obarun archlinux`. -# For joborun install joborun-keyring -# for obarun install obarun-keyring -# for arch-linux install archlinux-keyring -# -# 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. -# ### you can switch the following to optional after installing the joborun-keyring -# but as of this edition 02-13-2021 not all our issued packages are signed, we -# have begun this process and soon they will all be signed. -# - -[jobcore] -SigLevel = Never -#Server = file:///var/cache/jobcore/ -Server = https://osdn.net/projects/joborun/storage/jobcore/ - -[jobextra] -SigLevel = Never -#Server = file:///var/cache/jobextra/ -Server = https://osdn.net/projects/joborun/storage/jobextra/ - -#### Obarun begins here ####### - -#[obcore-testing] -#Server = https://repo.obarun.org/obcore-testing - -[obcore] -Server = https://repo.obarun.org/obcore - -#[obextra-testing] -#Server = https://repo.obarun.org/obextra-testing - -[obextra] -Server = https://repo.obarun.org/obextra - -#[obcommunity-testing] -#Server = https://repo.obarun.org/obcommunity-testing - -[obcommunity] -Server = https://repo.obarun.org/obcommunity - -#[obmultilib-testing] -#Server = https://repo.obarun.org/obmultilib-testing - -#[obmultilib] -#Server = https://repo.obarun.org/obmultilib - -#[observice-testing] -#Server = https://repo.obarun.org/observice-testing - -[observice] -Server = https://repo.obarun.org/observice - -#### Arch begins here ####### - -[testing] -SigLevel = DatabaseOptional -Include = /etc/pacman.d/mirrorlist - -[core] -SigLevel = DatabaseOptional -Include = /etc/pacman.d/mirrorlist - -[extra] -SigLevel = DatabaseOptional -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#SigLevel = DatabaseOptional -#Include = /etc/pacman.d/mirrorlist - -[community] -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. - -#[multilib-testing] -#SigLevel = DatabaseOptional -#Include = /etc/pacman.d/mirrorlist - -[multilib] -SigLevel = DatabaseOptional -Include = /etc/pacman.d/mirrorlist - -#### Spark-Linux begins here ####### - -#[spark-testing] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-spark -#Server = https://mirror.fleshless.org/spark/$repo - -#[spark] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-spark -#Server = https://mirror.fleshless.org/spark/$repo - -#[spark-extra] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-spark -#Server = https://mirror.fleshless.org/spark/$repo - -#### Artix begins here ####### - -#[gremlins] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -#[system] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -#[world] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -#[galaxy-gremlins] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -#[galaxy] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[lib32-gremlins] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -#[lib32] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/mirrorlist-artix -#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch - -#### Archstrike and Blackarch begin here ####### - -#[archstrike-testing] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/archstrike-mirrorlist -#Server = https://mirror.archstrike.org/$arch/$repo - -#[archstrike] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/archstrike-mirrorlist -#Server = https://mirror.archstrike.org/$arch/$repo - -#[blackarch] -#SigLevel = Never -##SigLevel = DatabaseOptional -##Include = /etc/pacman.d/blackarch-mirrorlist -#Server = https://blackarch.org/blackarch/$repo/os/$arch - -# 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/pambase/system-auth.1 b/pambase/system-auth.1 deleted file mode 100644 index a30490b..0000000 --- a/pambase/system-auth.1 +++ /dev/null @@ -1,27 +0,0 @@ -#%PAM-1.0 - -auth required pam_faillock.so preauth -# Optionally use requisite above if you do not want to prompt for the password -# on locked accounts. --auth [success=2 default=ignore] pam_systemd_home.so -auth [success=1 default=bad] pam_unix.so try_first_pass nullok -auth [default=die] pam_faillock.so authfail -auth optional pam_permit.so -auth required pam_env.so -auth required pam_faillock.so authsucc -# If you drop the above call to pam_faillock.so the lock will be done also -# on non-consecutive authentication failures. - --account [success=1 default=ignore] pam_systemd_home.so -account required pam_unix.so -account optional pam_permit.so -account required pam_time.so - --password [success=1 default=ignore] pam_systemd_home.so -password required pam_unix.so try_first_pass nullok shadow sha512 -password optional pam_permit.so - --session optional pam_systemd_home.so -session required pam_limits.so -session required pam_unix.so -session optional pam_permit.so diff --git a/pambase/system-login.1 b/pambase/system-login.1 deleted file mode 100644 index 63e6fed..0000000 --- a/pambase/system-login.1 +++ /dev/null @@ -1,19 +0,0 @@ -#%PAM-1.0 - -auth required pam_shells.so -auth requisite pam_nologin.so -auth include system-auth - -account required pam_access.so -account required pam_nologin.so -account include system-auth - -password include system-auth - -session optional pam_loginuid.so -session optional pam_keyinit.so force revoke -session include system-auth -session optional pam_motd.so -session optional pam_mail.so dir=/var/spool/mail standard quiet --session optional pam_systemd.so -session required pam_env.so user_readenv=1 diff --git a/pcre2/PKGBUILD b/pcre2/PKGBUILD index 36df988..d2d4306 100644 --- a/pcre2/PKGBUILD +++ b/pcre2/PKGBUILD @@ -6,12 +6,12 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pcre2 -pkgver=10.41 -pkgrel=01 +pkgver=10.42 +pkgrel=02 pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version' arch=('x86_64') url='https://www.pcre.org/' -depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash') +depends=('readline' 'zlib' 'bzip2' 'bash') provides=(libpcre2-{8,16,32,posix}.so) options=(staticlibs) #options=(debug staticlibs) ### uncomment this to have the corresponding debug pkg produced @@ -53,9 +53,7 @@ license=('BSD') validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel -sha256sums=(0f78cebd3e28e346475fb92e95fe9999945b4cbaad5f3b42aca47b887fb53308 # pcre2-10.41.tar.bz2 - 806cd96b8473275b1578e4c03f53febb26a7c3498c42ab1bc2ce901cc0a09f57) # pcre2-10.41.tar.bz2.sig - - +sha256sums=(8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 # pcre2-10.42.tar.bz2 + a782dfc68ca6b0a15eaf6d4704a21cbe686037133a7e93beba1635caca4dab7c) # pcre2-10.42.tar.bz2.sig diff --git a/pcre2/PKGBUILD-arch b/pcre2/PKGBUILD-arch index 1d7ca8b..6979a2a 100644 --- a/pcre2/PKGBUILD-arch +++ b/pcre2/PKGBUILD-arch @@ -6,17 +6,17 @@ # Contributor: John Proctor pkgname=pcre2 -pkgver=10.41 -pkgrel=1 +pkgver=10.42 +pkgrel=2 pkgdesc='A library that implements Perl 5-style regular expressions. 2nd version' arch=('x86_64') url='https://www.pcre.org/' license=('BSD') -depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash') +depends=('readline' 'zlib' 'bzip2' 'bash') provides=(libpcre2-{8,16,32,posix}.so) -options=(debug staticlibs) +options=(staticlibs) source=("https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}) -sha512sums=('328f331a56f152424f6021b37f8dcf660842c55d43ff39f1b49115f0d05ed651d0bbb66b43c0ed61d65022030615768b92ce5e6218a54e4e17152ec473cca68d' +sha512sums=('72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3' 'SKIP') validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel diff --git a/pcre2/deps b/pcre2/deps index 139597f..b28b04f 100644 --- a/pcre2/deps +++ b/pcre2/deps @@ -1,2 +1,3 @@ + diff --git a/python/failing-note b/python/failing-note deleted file mode 100644 index fec16c3..0000000 --- a/python/failing-note +++ /dev/null @@ -1,19 +0,0 @@ ----------------------------------------------------------------------- -Ran 210 tests in 0.282s - -OK (skipped=26) - -== Tests result: FAILURE == - -415 tests OK. - -1 test failed: - test_signal - -9 tests skipped: - test_devpoll test_gdb test_kqueue test_msilib test_startfile - test_winconsoleio test_winreg test_winsound test_zipfile64 - -Total duration: 27 min 30 sec -Tests result: FAILURE - diff --git a/runit-service-scripts/PKGBUILD-01 b/runit-service-scripts/PKGBUILD-01 deleted file mode 100644 index 56f6a21..0000000 --- a/runit-service-scripts/PKGBUILD-01 +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" -# Website : https://pozol.eu -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=runit-service-scripts -pkgver=20220202 -pkgrel=04 -pkgdesc="A collection of services for runit - similar to Artix Linux" -arch=(x86_64) -group=(base) -depends=('runit' 'runit-rc') -backup=("etc/runit/sv" "etc/runit/runsvdir/default") -makedepends=() -url="https://osdn.net/projects/joborun/storage" -source=($url/tarballs/runit-sv.tar.xz) -install=rss.install - -package() { - cd $srcdir - mkdir -p $pkgdir/etc/runit/sv - mkdir -p $pkgdir/etc/runit/runsvdir/default - msg 'Copying services library to /etc/runit/sv/ ...' - cp -r etc/runit/sv/* $pkgdir/etc/runit/sv - msg 'Copying links to default service /etc/runit/runsvdir/default ...' - cp -r etc/runit/runsvdir/default/* $pkgdir/etc/runit/runsvdir/default/ -# We currently decided against the default use of syslog-ng and since it is not -# installed by base it gives runit a hard time trying to run in error - rm $pkgdir/etc/runit/runsvdir/default/syslog-ng -} - -#---- license gpg-key sha256sums ---- - -license=(GPL) - -sha256sums=(a19353583c3b895b5e65e08e2ea9a0336e310999e5cd0a4e8954d4f9e972e80f) # runit-sv.tar.xz diff --git a/shadow/PKGBUILD.stable b/shadow/PKGBUILD.stable deleted file mode 100644 index 8bb9571..0000000 --- a/shadow/PKGBUILD.stable +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/$pkgname" -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=shadow -pkgver=4.8.1 -pkgrel=04 -pkgdesc="Password and account management tool suite with support for shadow files and PAM" -arch=('x86_64') -url='https://github.com/shadow-maint/shadow' -# libcap-ng needed by install scriptlet for 'filecap' -depends=('pam' 'acl' 'libacl.so' 'audit' 'libaudit.so' 'libcap-ng' 'libcap-ng.so' - 'libxcrypt' 'libcrypt.so') -makedepends=(automake autoconf gettext) -backup=(etc/login.defs - etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel} - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chgpasswd,groupmems} - etc/default/useradd) -options=(strip debug) -source=("https://github.com/shadow-maint/shadow/releases/download/$pkgver/shadow-$pkgver.tar.xz"{,.asc} - LICENSE - chgpasswd - chpasswd - defaults.pam - login.defs - newusers - passwd - useradd.defaults) -install=shadow.install - -build() { - cd "$pkgname-$pkgver" - - autoreconf -fsiv - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --disable-account-tools-setuid \ - --with-libpam \ - --with-group-name-max-length=32 \ - --with-audit \ - --without-selinux \ - --without-systemd - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # license - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" - - # useradd defaults - install -Dm600 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" - -# # systemd units -# install -D -m644 "$srcdir/shadow.timer" "$pkgdir/usr/lib/systemd/system/shadow.timer" -# install -D -m644 "$srcdir/shadow.service" "$pkgdir/usr/lib/systemd/system/shadow.service" -# install -d -m755 "$pkgdir/usr/lib/systemd/system/timers.target.wants" -# ln -s ../shadow.timer "$pkgdir/usr/lib/systemd/system/timers.target.wants/shadow.timer" - - # login.defs - install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - - # PAM config - custom - rm "$pkgdir/etc/pam.d"/* - install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers} - - # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" - - # we use the 'useradd' PAM file for other similar utilities - for file in chage groupadd groupdel groupmod shadow \ - useradd usermod userdel; do - install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" - done - - # Remove evil/broken tools - rm "$pkgdir"/usr/sbin/logoutd - - # Remove utilities provided by util-linux - rm \ - "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \ - "$pkgdir"/usr/sbin/{vipw,vigr} - - # but we keep newgrp, as sg is really an alias to it - mv "$pkgdir"/usr/bin/{newgrp,sg} - - # ...and their many man pages - find "$pkgdir"/usr/share/man \ - '(' -name 'chsh.1' -o \ - -name 'chfn.1' -o \ - -name 'su.1' -o \ - -name 'logoutd.8' -o \ - -name 'login.1' -o \ - -name 'nologin.8' -o \ - -name 'vipw.8' -o \ - -name 'vigr.8' -o \ - -name 'newgrp.1' ')' \ - -delete - rmdir \ - "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ - "$pkgdir"/usr/share/man/{fi,ko/man8} - - # move everything else to /usr/bin, because this isn't handled by ./configure - mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin - rmdir "$pkgdir/usr/sbin" -} - -#---- license gpg-key sha256sums ---- -license=('BSD') -validpgpkeys=('D5C2F9BFCA128BBA22A77218872F702C4D6E25A8' # Christian Perrier - 'F1D08DB778185BF784002DFFE9FEEA06A85E3F9D') # Serge Hallyn - -sha256sums=(a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 # shadow-4.8.1.tar.xz - 1b75fc2f98f1b1f3ca28c7d2570673c14e331e3edc843f018827b0d09320906a # shadow-4.8.1.tar.xz.asc - b085972a9378ecbe6cafee1a2e9baba1082531c77376c0aa14ad6e5c7392814c # LICENSE - a955ecbd82a801102fad756bb98dca778c1eba14a3367c601d6237b75642c36b # chgpasswd - 7409cd2ab04592859d95986467123e356ada4e11413b314ad84e32dc24ca8c92 # chpasswd - fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20 # defaults.pam - 63bb1d7a51a1ddbac7809ce3c6f07b995b4751dbb3d31e216cf91bed9a2aef53 # login.defs - 7409cd2ab04592859d95986467123e356ada4e11413b314ad84e32dc24ca8c92 # newusers - 75428a0f016cccbd9091c012b4d6b778d6ef8d97b607849b5ba1aca0314ed75b # passwd - 3dc50e83da9a4e7012da7ca14d34b50b36a0a56010314b19f7ef76757fe8d595) # useradd.defaults - diff --git a/skarnet/bldstack3.sh b/skarnet/bldstack3.sh new file mode 100644 index 0000000..47ec35b --- /dev/null +++ b/skarnet/bldstack3.sh @@ -0,0 +1,36 @@ +#!/usr/bin/bash +#export pkg=none +for pkg in $(cat skalist3) ; do + echo $pkg + cd $pkg + sudo pacman -S $(cat deps) --noconfirm + #sudo pacman -U /tmp/s6/$(cat deps | grep -v git) + # nano PKGBUILD + rm -rf {src,pkg} + /usr/local/bin/mkpkg +# grep $(grep _pkgver=v PKGBUILD | cut -b 10-) $pkg/packed-refs >>PKGBUILD +# nano PKGBUILD +# read + ls -altr /var/cache/jobcore/$pkg* + ls -altr *.pkg.tar.xz + read + echo compare our version with latest in source + # grep pkgver PKGBUILD + # cat $pkg/packed-refs + read + sudo mv *.pkg.tar.xz /tmp/s6/ + ls -altr /tmp/s6/$pkg* + read +# sh clean + sudo pacman -Rnsu $(cat deps) --noconfirm + /usr/local/bin/ckchroot + read + pwd + rm -rf {src,pkg} + ls -altr + cd .. +# sudo mv *pkg.tar.xz /var/cache/jobcore/ +# /usr/local/bin/repojobcore +# read + echo next +done diff --git a/skarnet/cleanstack.sh b/skarnet/cleanstack.sh new file mode 100644 index 0000000..213a6da --- /dev/null +++ b/skarnet/cleanstack.sh @@ -0,0 +1,13 @@ +#!/usr/bin/bash +#export pkg=none +for pkg in $(cat skalist) ; do + echo $pkg + cd $pkg + sh clean + ls -lh + cd .. +# sudo mv *pkg.tar.xz /var/cache/jobcore/ +# /usr/local/bin/repojobcore + read + echo next +done diff --git a/skarnet/execline/PKGBUILD b/skarnet/execline/PKGBUILD index e01a700..d4aaa33 100644 --- a/skarnet/execline/PKGBUILD +++ b/skarnet/execline/PKGBUILD @@ -7,15 +7,16 @@ # Maintainer: Eric Vidal pkgname=execline -pkgver=2.8.3.0 -_pkgver=v2.8.3.0 +pkgver=2.9.1.0 +_pkgver=v2.9.1.0 pkgrel=01 pkgdesc="An interpreter-less scripting language." arch=(x86_64) url="http://skarnet.org/software/execline/" groups=(s6-suite) -depends=('skalibs>=2.11.2.0') -makedepends=('git' 'skalibs>=2.11.2.0') +depends=('skalibs>=2.13.0.0') +makedepends=('git' 'skalibs>=2.13.0.0') +# a0b46c927ebb2c60ac850964aa0b3cb28f6c8d74 refs/tags/v2.9.1.0 source=("$pkgname::git+git://git.skarnet.org/execline#tag=${_pkgver}") _pkgver() { @@ -51,3 +52,4 @@ package() { license=('ISC') sha256sums=(SKIP) + diff --git a/skarnet/execline/time b/skarnet/execline/time index 60a64ce..f882114 100644 --- a/skarnet/execline/time +++ b/skarnet/execline/time @@ -1,4 +1,6 @@ -real 0m5.548s -user 0m9.293s -sys 0m1.480s + +real 0m14.556s +user 0m7.118s +sys 0m1.810s + diff --git a/skarnet/mdevd/PKGBUILD b/skarnet/mdevd/PKGBUILD index 6530182..34061a1 100644 --- a/skarnet/mdevd/PKGBUILD +++ b/skarnet/mdevd/PKGBUILD @@ -7,17 +7,16 @@ # Maintainer: Eric Vidal pkgname=mdevd -pkgver=0.1.5.2 +pkgver=0.1.6.1 pkgrel=01 pkgdesc="a mdev-compatible hotplug manager daemon" arch=(x86_64) url="http://skarnet.org/software/mdevd/" -makedepends=('git' 'skalibs>=2.11.2.0') -depends=('skalibs>=2.11.2.0') +makedepends=('git' 'skalibs>=2.13.0.0') +depends=('skalibs>=2.13.0.0') groups=('s6-suite') +#commit=0838e7bd13c9f847c06d015d86a8a1ff403a2e8f # refs/tags/v0.1.6.1 source=("$pkgname::git+git://git.skarnet.org/mdevd#tag=v${pkgver}") -#source=("$pkgname::git+git://git.skarnet.org/mdevd#commit=$_commit") -#_commit= # tag build() { cd ${srcdir}/${pkgname} diff --git a/skarnet/s6-dns/PKGBUILD b/skarnet/s6-dns/PKGBUILD index fc37241..a3483e3 100644 --- a/skarnet/s6-dns/PKGBUILD +++ b/skarnet/s6-dns/PKGBUILD @@ -7,17 +7,17 @@ # Maintainer: Eric Vidal pkgname=s6-dns -pkgver=2.3.5.3 -_pkgver=v2.3.5.3 +pkgver=2.3.5.5 +_pkgver=v2.3.5.5 pkgrel=01 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.11.2.0') -depends=('skalibs>=2.11.2.0') +makedepends=('git' 'skalibs>=2.13.0.0') +depends=('skalibs>=2.13.0.0') groups=(s6-suite) source=("$pkgname::git+git://git.skarnet.org/s6-dns#tag=${_pkgver}") -#_commit=129a05f5a6a60be4b2037f2b6d72711cfdbb1908 # tag 2.2.0.1 +#_commit=070fb7154e7d0d0065b701ff6c41682b5f6ab2d9 # refs/tags/v2.3.5.5 #source=("$pkgname::git+git://git.skarnet.org/s6-dns#commit=$_commit") _pkgver() { diff --git a/skarnet/s6-linux-utils/PKGBUILD b/skarnet/s6-linux-utils/PKGBUILD index 8f55e7f..091d03d 100644 --- a/skarnet/s6-linux-utils/PKGBUILD +++ b/skarnet/s6-linux-utils/PKGBUILD @@ -8,14 +8,15 @@ pkgname=s6-linux-utils pkgdesc="A set of tiny Linux-specific utilities" -_pkgver=v2.5.1.7 -pkgver=2.5.1.7 +_pkgver=v2.6.0.1 +pkgver=2.6.0.1 pkgrel=01 url="http://skarnet.org/software/${pkgname}/" arch=(x86_64) -depends=('skalibs>=2.11.2.0') -makedepends=(git 'skalibs>=2.11.2.0') +depends=('skalibs>=2.13.0.0') +makedepends=(git 'skalibs>=2.13.0.0') groups=('s6-suite') +# commit=2d46f7275ca14573f018d4951de595c3188de48d # refs/tags/v2.6.0.1 source=("$pkgname::git+git://git.skarnet.org/s6-linux-utils#tag=$_pkgver") _pkgver() { @@ -52,3 +53,4 @@ package() { license=(ISC) sha256sums=(SKIP) + diff --git a/skarnet/s6-networking/PKGBUILD b/skarnet/s6-networking/PKGBUILD index 175010d..a468dd8 100644 --- a/skarnet/s6-networking/PKGBUILD +++ b/skarnet/s6-networking/PKGBUILD @@ -7,17 +7,17 @@ # Maintainer: Eric Vidal pkgname=s6-networking -_pkgver=v2.5.1.0 -pkgver=2.5.1.0 -pkgrel=01 +_pkgver=v2.5.1.2 +pkgver=2.5.1.2 +pkgrel=02 pkgdesc="Small network and client-server tools" arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=(git 'skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-dns>=2.3.5.3' ) +makedepends=(git 'skalibs>=2.13.0.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-dns>=2.3.5.3' ) depends=('skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-dns>=2.3.5.3' ) optdepends=('libressl: For build a secure communication tools') groups=(s6-suite) -#_commit=61da214808d289f1521a5bd421e105828229b818 # tag 2.3.0.2 +#_commit=4cf18919482e3495810c8e3693ea368bdc5753a1 # refs/tags/v2.5.1.2 #source=("$pkgname::git+git://git.skarnet.org/s6-networking#commit=$_commit") source=("$pkgname::git+git://git.skarnet.org/s6-networking#tag=${_pkgver}") @@ -57,3 +57,4 @@ package() { license=('ISC') sha256sums=(SKIP) + diff --git a/skarnet/s6-portable-utils/PKGBUILD b/skarnet/s6-portable-utils/PKGBUILD index 7729026..bd48617 100644 --- a/skarnet/s6-portable-utils/PKGBUILD +++ b/skarnet/s6-portable-utils/PKGBUILD @@ -7,16 +7,16 @@ # Maintainer: Eric Vidal pkgname=s6-portable-utils -_pkgver=v2.2.4.0 -pkgver=2.2.4.0 +_pkgver=v2.2.5.1 +pkgver=2.2.5.1 pkgrel=01 pkgdesc="A set of tiny general Unix utilities" arch=(x86_64) url="http://skarnet.org/software/${pkgname}/" -depends=('git' 'skalibs>=2.11.2.0') -depends=('skalibs>=2.11.2.0') +depends=('git' 'skalibs>=2.13.0.0') +depends=('skalibs>=2.13.0.0') groups=(s6-suite) -#_commit=8e32ad68593aeb3c9ffd664aabc421d2eddc0467 # tag 2.2.1.1 +#_commit=cfb15f58292c012090b12c2a73a6454ec88ec915 refs/tags/v2.2.5.1 #source=("$pkgname::git+git://git.skarnet.org/s6-portable-utils#commit=$_commit") source=("$pkgname::git+git://git.skarnet.org/s6-portable-utils#tag=${_pkgver}") diff --git a/skarnet/s6-rc/PKGBUILD b/skarnet/s6-rc/PKGBUILD index 66589ec..c20f908 100644 --- a/skarnet/s6-rc/PKGBUILD +++ b/skarnet/s6-rc/PKGBUILD @@ -7,18 +7,18 @@ # Maintainer: Eric Vidal pkgname=s6-rc -_pkgver=v0.5.3.1 -pkgver=0.5.3.1 +_pkgver=v0.5.3.3 +pkgver=0.5.3.3 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.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0') -depends=('skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0') +makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0') +depends=('skalibs>=2.13.0.0' 'execline>=2.9.1.0' 's6>=2.11.2.0') groups=('base' 's6-suite') source=("$pkgname::git+git://git.skarnet.org/s6-rc#tag=${_pkgver}") -#_commit=f01bb649f33d9005e30ec2e82fef05f25b9a8dff # tag 0.3.0.1 +#_commit=d8c8f84dbb09a87bcdf7764a279f2b02244078ae # refs/tags/v0.5.3.3 #source=("$pkgname::git+git://git.skarnet.org/s6-rc#commit=$_commit") _pkgver() { diff --git a/skarnet/s6/PKGBUILD b/skarnet/s6/PKGBUILD index 2ea1aae..5542242 100644 --- a/skarnet/s6/PKGBUILD +++ b/skarnet/s6/PKGBUILD @@ -7,16 +7,16 @@ # Maintainer: Eric Vidal pkgname=s6 -_pkgver=v2.11.1.0 -pkgver=2.11.1.0 +_pkgver=v2.11.2.0 +pkgver=2.11.2.0 pkgrel=01 pkgdesc="A process supervision suite" arch=(x86_64) url="http://skarnet.org/software/s6/" -makedepends=('git' 'skalibs>=2.11.2.0' 'execline>=2.8.3.0') -depends=('skalibs>=2.11.2.0' 'execline>=2.8.1.0') +makedepends=('git' 'skalibs>=2.13.0.0' 'execline>=2.9.1.0') +depends=('skalibs>=2.13.0.0' 'execline>=2.9.1.0') groups=('base' 's6-suite') -#_commit=6c65c3dd94ce2e6a054d9358795ba1f17de03cad # tag 2.8.0.0 +#_commit=24cb21d4aa3e364529d62c2c7310c189443c0843 # refs/tags/v2.11.2.0 #source=("$pkgname::git+git://git.skarnet.org/s6#commit=$_commit") source=("$pkgname::git+git://git.skarnet.org/s6#tag=${_pkgver}") diff --git a/skarnet/s6/time b/skarnet/s6/time index aba3cdd..18848aa 100644 --- a/skarnet/s6/time +++ b/skarnet/s6/time @@ -1,4 +1,6 @@ -real 0m8.002s -user 0m16.611s -sys 0m2.314s + +real 0m25.313s +user 0m13.044s +sys 0m2.901s + diff --git a/skarnet/skalibs/PKGBUILD b/skarnet/skalibs/PKGBUILD index 72a5fac..52d74eb 100644 --- a/skarnet/skalibs/PKGBUILD +++ b/skarnet/skalibs/PKGBUILD @@ -7,8 +7,8 @@ # Maintainer: Eric Vidal pkgname=skalibs -pkgver=2.11.2.0 -_pkgver=v2.11.2.0 +pkgver=2.13.0.0 +_pkgver=v2.13.0.0 pkgrel=01 pkgdesc="A general-purpose low-level C library" arch=(x86_64) @@ -16,7 +16,7 @@ url="http://www.skarnet.org/software/skalibs/" groups=('base' 's6-suite') makedepends=('git') source=("$pkgname::git+git://git.skarnet.org/skalibs#tag=v${pkgver}") -#_commit=e99801ab4bdd096b5e2e3e4619f1a8317a8aedf8 # tag 2.8.0.0 fix stralloc_reverse +# ea786d9a88c5cdd3faef8662e614d1c293fd48ad refs/tags/v2.13.0.0 #source=("$pkgname::git+git://git.skarnet.org/skalibs#commit=$_commit") _pkgver() { @@ -48,3 +48,4 @@ package() { license=('ISC') sha256sums=(SKIP) + diff --git a/skarnet/skalist.0 b/skarnet/skalist.0 new file mode 100644 index 0000000..a23915a --- /dev/null +++ b/skarnet/skalist.0 @@ -0,0 +1,9 @@ +skalibs +execline +mdevd +s6-portable-utils +s6 +s6-rc +s6-linux-utils +s6-dns +s6-networking diff --git a/skarnet/skalist.new b/skarnet/skalist.new index a0d3461..fc5be6a 100644 --- a/skarnet/skalist.new +++ b/skarnet/skalist.new @@ -1,5 +1,18 @@ -skalibs-2.11.2.0 (minor) -execline-2.8.3.0 (minor) -s6-2.11.1.0 (minor) -s6-portable-utils-2.2.4.0 (minor) -s6-linux-init-1.0.7.3 (release) + +skalibs-2.13.0.0 (major) +nsss-0.2.0.2 (release) +utmps-0.1.2.1 (release) +execline-2.9.1.0 (minor) +s6-2.11.2.0 (minor) +s6-rc-0.5.3.3 (release) +s6-linux-init-1.0.8.1 (release) +s6-portable-utils-2.2.5.1 (release) +s6-linux-utils-2.6.0.1 (release) +s6-dns-2.3.5.5 (release) +s6-networking-2.5.1.2 (release) +mdevd-0.1.6.1 (release) +smtpd-starttls-proxy-0.0.1.2 (release) +bcnm-0.0.1.6 (release) +dnsfunnel-0.0.1.5 (release) + + diff --git a/sqlite/ck3-256-sums.sh b/sqlite/ck3-256-sums.sh deleted file mode 100644 index 76b8f74..0000000 --- a/sqlite/ck3-256-sums.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/zsh -#https://www.sqlite.org/download.html -# sqlite-src-3380000.zip -#(12.62 MiB) Snapshot of the complete (raw) source tree for SQLite version 3.38.0. See How To Compile SQLite for usage details. -#(sha3: 6ca8644dceebc513d50a6207beb59fe1a374a9d4b8a18ced7070b9eac552e0e1) -echo "6ca8644dceebc513d50a6207beb59fe1a374a9d4b8a18ced7070b9eac552e0e1 sqlite-src-3380000.zip" >sha3sums -# -#Documentation -# sqlite-doc-3380000.zip -#(10.11 MiB) Documentation as a bundle of static HTML files. -#(sha3: 77fb846eed41423572ec99f218e4de3bafee0b5da988598eaafcb9a504ec68d3) -echo "77fb846eed41423572ec99f218e4de3bafee0b5da988598eaafcb9a504ec68d3 sqlite-doc-3380000.zip" >>sha3sums -sha3sum -a 256 *src*.zip >> sha3sums -sha3sum -a 256 *doc*.zip >> sha3sums -cat sha3sums - diff --git a/sqlite/sha3.sums b/sqlite/sha3.sums deleted file mode 100644 index 8e7eb2d..0000000 --- a/sqlite/sha3.sums +++ /dev/null @@ -1,16 +0,0 @@ -https://www.sqlite.org/download.html - - sqlite-doc-3390300.zip - (9.83 MiB) Documentation as a bundle of static HTML files. - (sha3: 6be3dd3bdc8c599c2fe25c4113b996f0bc8a9f5cf6d4d8c5928a4fcbf60d86cf) - - sqlite-src-3390300.zip - (12.78 MiB) Snapshot of the complete (raw) source tree for SQLite version 3.39.3. See How To Compile - SQLite for usage details. - (sha3: a0feba46846ca1cbb74406998aaa637cfec9ead8b32c419a95c23d293bf929b0) - - -sha3-256sum *.zip -6be3dd3bdc8c599c2fe25c4113b996f0bc8a9f5cf6d4d8c5928a4fcbf60d86cf sqlite-doc-3390300.zip -a0feba46846ca1cbb74406998aaa637cfec9ead8b32c419a95c23d293bf929b0 sqlite-src-3390300.zip - diff --git a/sqlite/sha3sums b/sqlite/sha3sums deleted file mode 100644 index 3b0b7f6..0000000 --- a/sqlite/sha3sums +++ /dev/null @@ -1,4 +0,0 @@ -6ca8644dceebc513d50a6207beb59fe1a374a9d4b8a18ced7070b9eac552e0e1 sqlite-src-3380000.zip -77fb846eed41423572ec99f218e4de3bafee0b5da988598eaafcb9a504ec68d3 sqlite-doc-3380000.zip -90414a9df4a59b0a08aa618581aff99b8a655892a15755a52d15d68bf0700915 sqlite-src-3380100.zip -f04ea3bf295aa691f481d7609d4f02dbb2861efc21a6b556cfb95925288d553d sqlite-doc-3380100.zip diff --git a/wireless-regdb/crda.conf.d b/wireless-regdb/crda.conf.d deleted file mode 100644 index 8511238..0000000 --- a/wireless-regdb/crda.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Wireless regulatory domain configuration -# - diff --git a/wpa_supplicant/PKGBUILD.old b/wpa_supplicant/PKGBUILD.old deleted file mode 100644 index 9329dd6..0000000 --- a/wpa_supplicant/PKGBUILD.old +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/bash -# JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run -# PkgSource : url="https://gittea.disroot.org/joborun/jobcore/$pkgname" -#-----------------------------------------| DESCRIPTION |--------------------------------------- - -pkgname=wpa_supplicant -pkgver=2.9 -pkgrel=08 -epoch=2 -pkgdesc='A utility providing key negotiation for WPA wireless networks' -url='https://w1.fi/wpa_supplicant/' -arch=(x86_64) -depends=(openssl libdbus readline libnl) -install=wpa_supplicant.install -source=( - https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc} - https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch - CVE-2019-16275.patch - tls.patch # More permissive TLS fallback - roam-properties.patch # https://bugs.archlinux.org/task/65482 - config -) - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - cd "$srcdir/$pkgname-$pkgver/$pkgname" - cp "$srcdir/config" ./.config -} - -build() { - cd "$srcdir/$pkgname-$pkgver/$pkgname" - - make LIBDIR=/usr/lib BINDIR=/usr/bin - make LIBDIR=/usr/lib BINDIR=/usr/bin eapol_test -} - -package() { - cd "$srcdir/$pkgname-$pkgver/$pkgname" - make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="$pkgdir" install - install -Dm755 eapol_test "$pkgdir/usr/bin/eapol_test" - - install -d -m755 "$pkgdir/etc/wpa_supplicant" - install -Dm644 wpa_supplicant.conf \ - "$pkgdir/usr/share/doc/wpa_supplicant/wpa_supplicant.conf" - - - install -Dm644 dbus/dbus-wpa_supplicant.conf \ -"$pkgdir/usr/share/dbus-1/system.d/wpa_supplicant.conf" - install -d -m755 "$pkgdir/usr/share/man/man"{5,8} - install -m644 doc/docbook/*.5 "$pkgdir/usr/share/man/man5/" - install -m644 doc/docbook/*.8 "$pkgdir/usr/share/man/man8/" - rm -f "$pkgdir/usr/share/man/man8/wpa_"{priv,gui}.8 -} - -#---- license gpg-key sha256sums ---- - -license=(GPL) - -validpgpkeys=('EC4AA0A991A5F2464582D52D2B6EF432EFC895FA') # Jouni Malinen - -sha256sums=(fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 # wpa_supplicant-2.9.tar.gz - 40f998be534b0ca674f643d3fbbf9536d264b148f272688582e8685eb6927e9d # wpa_supplicant-2.9.tar.gz.asc - c4d65cc13863e0237d0644198558e2c47b4ed91e2b2be4516ff590724187c4a5 # 0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch - bf91a135e717265969f1ab0319297c9d2e6f695928a17e3b3fa5accc8ef7b297 # CVE-2019-16275.patch - 449c7dad67b246b5b93e796f57c2f90c5c32cfc5b16f7aa4f17802dc260d3414 # tls.patch - 1ad3b61397c4a1dbafbf89059bccdda07cfe7eaff9f23ee25bed7bdd82c2bd87 # roam-properties.patch - 6f71a04875465178992e78216603d3c4735ee717a31738a6e30702c7a81c6c4e) # config diff --git a/wpa_supplicant/wpa_supplicant_config.0 b/wpa_supplicant/wpa_supplicant_config.0 deleted file mode 100644 index 2032857..0000000 --- a/wpa_supplicant/wpa_supplicant_config.0 +++ /dev/null @@ -1,637 +0,0 @@ -# Example wpa_supplicant build time configuration -# -# This file lists the configuration options that are used when building the -# wpa_supplicant binary. All lines starting with # are ignored. Configuration -# option lines must be commented out complete, if they are not to be included, -# i.e., just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cases, these lines should use += in order not -# to override previous values of the variables. - - -# Uncomment following two lines and fix the paths if you have installed OpenSSL -# or GnuTLS in non-default location -#CFLAGS += -I/usr/local/openssl/include -#LIBS += -L/usr/local/openssl/lib - -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but -# the kerberos files are not in the default include path. Following line can be -# used to fix build issues on such systems (krb5.h not found). -#CFLAGS += -I/usr/include/kerberos - -# Driver interface for generic Linux wireless extensions -# Note: WEXT is deprecated in the current Linux kernel version and no new -# functionality is added to it. nl80211-based interface is the new -# replacement for WEXT and its use allows wpa_supplicant to properly control -# the driver to improve existing functionality like roaming and to support new -# functionality. -CONFIG_DRIVER_WEXT=y - -# Driver interface for Linux drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y - -# QCA vendor extensions to nl80211 -CONFIG_DRIVER_NL80211_QCA=y - -# driver_nl80211.c requires libnl. If you are compiling it yourself -# you may need to point hostapd to your version of libnl. -# -#CFLAGS += -I$ -#LIBS += -L$ - -# Use libnl v2.0 (or 3.0) libraries. -#CONFIG_LIBNL20=y - -# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) -CONFIG_LIBNL32=y - - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib -#LIBS_p += -L/usr/local/lib -#LIBS_c += -L/usr/local/lib - -# Driver interface for Windows NDIS -#CONFIG_DRIVER_NDIS=y -#CFLAGS += -I/usr/include/w32api/ddk -#LIBS += -L/usr/local/lib -# For native build using mingw -#CONFIG_NATIVE_WINDOWS=y -# Additional directories for cross-compilation on Linux host for mingw target -#CFLAGS += -I/opt/mingw/mingw32/include/ddk -#LIBS += -L/opt/mingw/mingw32/lib -#CC=mingw32-gcc -# By default, driver_ndis uses WinPcap for low-level operations. This can be -# replaced with the following option which replaces WinPcap calls with NDISUIO. -# However, this requires that WZC is disabled (net stop wzcsvc) before starting -# wpa_supplicant. -# CONFIG_USE_NDISUIO=y - -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - -# Driver interface for MACsec capable Qualcomm Atheros drivers -#CONFIG_DRIVER_MACSEC_QCA=y - -# Driver interface for Linux MACsec drivers -CONFIG_DRIVER_MACSEC_LINUX=y - -# Driver interface for the Broadcom RoboSwitch family -#CONFIG_DRIVER_ROBOSWITCH=y - -# Driver interface for no driver (e.g., WPS ER only) -CONFIG_DRIVER_NONE=y - -# Solaris libraries -#LIBS += -lsocket -ldlpi -lnsl -#LIBS_c += -lsocket - -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method or -# MACsec is included) -CONFIG_IEEE8021X_EAPOL=y - -# EAP-MD5 -CONFIG_EAP_MD5=y - -# EAP-MSCHAPv2 -CONFIG_EAP_MSCHAPV2=y - -# EAP-TLS -CONFIG_EAP_TLS=y - -# EAL-PEAP -CONFIG_EAP_PEAP=y - -# EAP-TTLS -CONFIG_EAP_TTLS=y - -# EAP-FAST -CONFIG_EAP_FAST=y - -# EAP-TEAP -# Note: The current EAP-TEAP implementation is experimental and should not be -# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number -# of conflicting statements and missing details and the implementation has -# vendor specific workarounds for those and as such, may not interoperate with -# any other implementation. This should not be used for anything else than -# experimentation and interoperability testing until those issues has been -# resolved. -#CONFIG_EAP_TEAP=y - -# EAP-GTC -CONFIG_EAP_GTC=y - -# EAP-OTP -CONFIG_EAP_OTP=y - -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -CONFIG_EAP_SIM=y - -# Enable SIM simulator (Milenage) for EAP-SIM -#CONFIG_SIM_SIMULATOR=y - -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) -CONFIG_EAP_PSK=y - -# EAP-pwd (secure authentication using only a password) -CONFIG_EAP_PWD=y - -# EAP-PAX -CONFIG_EAP_PAX=y - -# LEAP -CONFIG_EAP_LEAP=y - -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) -CONFIG_EAP_AKA=y - -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). -# This requires CONFIG_EAP_AKA to be enabled, too. -CONFIG_EAP_AKA_PRIME=y - -# Enable USIM simulator (Milenage) for EAP-AKA -#CONFIG_USIM_SIMULATOR=y - -# EAP-SAKE -CONFIG_EAP_SAKE=y - -# EAP-GPSK -CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -CONFIG_EAP_GPSK_SHA256=y - -# EAP-TNC and related Trusted Network Connect support (experimental) -CONFIG_EAP_TNC=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y -# Enable WPS external registrar functionality -CONFIG_WPS_ER=y -# Disable credentials for an open network by default when acting as a WPS -# registrar. -CONFIG_WPS_REG_DISABLE_OPEN=y -# Enable WPS support with NFC config method -CONFIG_WPS_NFC=y - -# EAP-IKEv2 -CONFIG_EAP_IKEV2=y - -# EAP-EKE -CONFIG_EAP_EKE=y - -# MACsec -CONFIG_MACSEC=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - -# PC/SC interface for smartcards (USIM, GSM SIM) -# Enable this if EAP-SIM or EAP-AKA is included -#CONFIG_PCSC=y - -# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) -CONFIG_HT_OVERRIDES=y - -# Support VHT overrides (disable VHT, mask MCS rates, etc.) -CONFIG_VHT_OVERRIDES=y - -# Development testing -#CONFIG_EAPOL_TEST=y - -# Select control interface backend for external programs, e.g, wpa_cli: -# unix = UNIX domain sockets (default for Linux/*BSD) -# udp = UDP sockets using localhost (127.0.0.1) -# udp6 = UDP IPv6 sockets using localhost (::1) -# named_pipe = Windows Named Pipe (default for Windows) -# udp-remote = UDP sockets with remote access (only for tests systems/purpose) -# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose) -# y = use default (backwards compatibility) -# If this option is commented out, control interface is not included in the -# build. -CONFIG_CTRL_IFACE=y - -# Include support for GNU Readline and History Libraries in wpa_cli. -# When building a wpa_cli binary for distribution, please note that these -# libraries are licensed under GPL and as such, BSD license may not apply for -# the resulting binary. -CONFIG_READLINE=y - -# Include internal line edit mode in wpa_cli. This can be used as a replacement -# for GNU Readline to provide limited command line editing and history support. -#CONFIG_WPA_CLI_EDIT=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 35-50 kB in code size. -#CONFIG_NO_WPA=y - -# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support -# This option can be used to reduce code size by removing support for -# converting ASCII passphrases into PSK. If this functionality is removed, the -# PSK can only be configured as the 64-octet hexstring (e.g., from -# wpa_passphrase). This saves about 0.5 kB in code size. -#CONFIG_NO_WPA_PASSPHRASE=y - -# Simultaneous Authentication of Equals (SAE), WPA3-Personal -CONFIG_SAE=y - -# Disable scan result processing (ap_scan=1) to save code size by about 1 kB. -# This can be used if ap_scan=1 mode is never enabled. -#CONFIG_NO_SCAN_PROCESSING=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file -# path is given on command line, not here; this option is just used to -# select the backend that allows configuration files to be used) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Remove configuration write functionality (i.e., to allow the configuration -# file to be updated based on runtime configuration changes). The runtime -# configuration can still be changed, the changes are just not going to be -# persistent over restarts. This option can be used to reduce code size by -# about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y - -# Remove support for configuration blobs to reduce code size by about 1.5 kB. -#CONFIG_NO_CONFIG_BLOBS=y - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -CONFIG_MAIN=main - -# Select wrapper for operating system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -CONFIG_ELOOP=eloop - -# Should we use poll instead of select? Select is used by default. -#CONFIG_ELOOP_POLL=y - -# Should we use epoll instead of select? Select is used by default. -#CONFIG_ELOOP_EPOLL=y - -# Should we use kqueue instead of select? Select is used by default. -#CONFIG_ELOOP_KQUEUE=y - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) -# none = Empty template -CONFIG_L2_PACKET=linux - -# Disable Linux packet socket workaround applicable for station interface -# in a bridge for EAPOL frames. This should be uncommented only if the kernel -# is known to not have the regression issue in packet socket behavior with -# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). -#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y - -# Support Operating Channel Validation -#CONFIG_OCV=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS -# internal = Internal TLSv1 implementation (experimental) -# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental) -# none = Empty template -CONFIG_TLS=openssl - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) -# can be enabled to get a stronger construction of messages when block ciphers -# are used. It should be noted that some existing TLS v1.0 -based -# implementation may not be compatible with TLS v1.1 message (ClientHello is -# sent prior to negotiating which version will be used) -CONFIG_TLSV11=y - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) -# can be enabled to enable use of stronger crypto algorithms. It should be -# noted that some existing TLS v1.0 -based implementation may not be compatible -# with TLS v1.2 message (ClientHello is sent prior to negotiating which version -# will be used) -CONFIG_TLSV12=y - -# Select which ciphers to use by default with OpenSSL if the user does not -# specify them. -#CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:!EXP:!LOW" -CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT@SECLEVEL=1" - -# If CONFIG_TLS=internal is used, additional library and include paths are -# needed for LibTomMath. Alternatively, an integrated, minimal version of -# LibTomMath can be used. See beginning of libtommath.c for details on benefits -# and drawbacks of this option. -#CONFIG_INTERNAL_LIBTOMMATH=y -#ifndef CONFIG_INTERNAL_LIBTOMMATH -#LTM_PATH=/usr/src/libtommath-0.39 -#CFLAGS += -I$(LTM_PATH) -#LIBS += -L$(LTM_PATH) -#LIBS_p += -L$(LTM_PATH) -#endif -# At the cost of about 4 kB of additional binary size, the internal LibTomMath -# can be configured to include faster routines for exptmod, sqr, and div to -# speed up DH and RSA calculation considerably -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y - -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. -# This is only for Windows builds and requires WMI-related header files and -# WbemUuid.Lib from Platform SDK even when building with MinGW. -#CONFIG_NDIS_EVENTS_INTEGRATED=y -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" - -# Add support for new DBus control interface -# (fi.w1.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# Add introspection support for new DBus control interface -CONFIG_CTRL_IFACE_DBUS_INTRO=y - -# Add support for loading EAP methods dynamically as shared libraries. -# When this option is enabled, each EAP method can be either included -# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to -# be loaded in the beginning of the wpa_supplicant configuration file -# (see load_dynamic_eap parameter in the example file) before being used in -# the network blocks. -# -# Note that some shared parts of EAP methods are included in the main program -# and in order to be able to use dynamic EAP methods using these parts, the -# main program must have been build with the EAP method enabled (=y or =dyn). -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries -# unless at least one of them was included in the main build to force inclusion -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included -# in the main build to be able to load these methods dynamically. -# -# Please also note that using dynamic libraries will increase the total binary -# size. Thus, it may not be the best option for targets that have limited -# amount of memory/flash. -#CONFIG_DYNAMIC_EAP_METHODS=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode -CONFIG_IEEE80211R=y - -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -CONFIG_DEBUG_FILE=y - -# Send debug messages to syslog instead of stdout -CONFIG_DEBUG_SYSLOG=y -# Set syslog facility for debug messages -CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON - -# Add support for sending all debug messages (regardless of debug verbosity) -# to the Linux kernel tracing facility. This helps debug the entire stack by -# making it easy to record everything happening from the driver up into the -# same file, e.g., using trace-cmd. -CONFIG_DEBUG_LINUX_TRACING=y - -# Add support for writing debug log to Android logcat instead of standard -# output -#CONFIG_ANDROID_LOG=y - -# Enable privilege separation (see README 'Privilege separation' for details) -#CONFIG_PRIVSEP=y - -# Enable mitigation against certain attacks against TKIP by delaying Michael -# MIC error reports by a random amount of time between 0 and 60 seconds -CONFIG_DELAYED_MIC_ERROR_REPORT=y - -# Enable tracing code for developer debugging -# This tracks use of memory allocations and other registrations and reports -# incorrect use with a backtrace of call (or allocation) location. -#CONFIG_WPA_TRACE=y -# For BSD, uncomment these. -#LIBS += -lexecinfo -#LIBS_p += -lexecinfo -#LIBS_c += -lexecinfo - -# Use libbfd to get more details for developer debugging -# This enables use of libbfd to get more detailed symbols for the backtraces -# generated by CONFIG_WPA_TRACE=y. -#CONFIG_WPA_TRACE_BFD=y -# For BSD, uncomment these. -#LIBS += -lbfd -liberty -lz -#LIBS_p += -lbfd -liberty -lz -#LIBS_c += -lbfd -liberty -lz - -# wpa_supplicant depends on strong random number generation being available -# from the operating system. os_get_random() function is used to fetch random -# data when needed, e.g., for key generation. On Linux and BSD systems, this -# works by reading /dev/urandom. It should be noted that the OS entropy pool -# needs to be properly initialized before wpa_supplicant is started. This is -# important especially on embedded devices that do not have a hardware random -# number generator and may by default start up with minimal entropy available -# for random number generation. -# -# As a safety net, wpa_supplicant is by default trying to internally collect -# additional entropy for generating random data to mix in with the data fetched -# from the OS. This by itself is not considered to be very strong, but it may -# help in cases where the system pool is not initialized properly. However, it -# is very strongly recommended that the system pool is initialized with enough -# entropy either by using hardware assisted random number generator or by -# storing state over device reboots. -# -# wpa_supplicant can be configured to maintain its own entropy store over -# restarts to enhance random number generation. This is not perfect, but it is -# much more secure than using the same sequence of random numbers after every -# reboot. This can be enabled with -e command line option. The -# specified file needs to be readable and writable by wpa_supplicant. -# -# If the os_get_random() is known to provide strong random data (e.g., on -# Linux/BSD, the board in question is known to have reliable source of random -# data from /dev/urandom), the internal wpa_supplicant random pool can be -# disabled. This will save some in binary size and CPU use. However, this -# should only be considered for builds that are known to be used on devices -# that meet the requirements described above. -CONFIG_NO_RANDOM_POOL=y - -# Should we attempt to use the getrandom(2) call that provides more reliable -# yet secure randomness source than /dev/random on Linux 3.17 and newer. -# Requires glibc 2.25 to build, falls back to /dev/random if unavailable. -CONFIG_GETRANDOM=y - -# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) -CONFIG_IEEE80211AC=y - -# Wireless Network Management (IEEE Std 802.11v-2011) -# Note: This is experimental and not complete implementation. -#CONFIG_WNM=y - -# Interworking (IEEE 802.11u) -# This can be used to enable functionality to improve interworking with -# external networks (GAS/ANQP to learn more about the networks and network -# selection based on available credentials). -CONFIG_INTERWORKING=y - -# Hotspot 2.0 -CONFIG_HS20=y - -# Enable interface matching in wpa_supplicant -#CONFIG_MATCH_IFACE=y - -# Disable roaming in wpa_supplicant -#CONFIG_NO_ROAMING=y - -# AP mode operations with wpa_supplicant -# This can be used for controlling AP mode operations with wpa_supplicant. It -# should be noted that this is mainly aimed at simple cases like -# WPA2-Personal while more complex configurations like WPA2-Enterprise with an -# external RADIUS server can be supported with hostapd. -CONFIG_AP=y - -# P2P (Wi-Fi Direct) -# This can be used to enable P2P support in wpa_supplicant. See README-P2P for -# more information on P2P operations. -CONFIG_P2P=y - -# Enable TDLS support -CONFIG_TDLS=y - -# Wi-Fi Display -# This can be used to enable Wi-Fi Display extensions for P2P using an external -# program to control the additional information exchanges in the messages. -CONFIG_WIFI_DISPLAY=y - -# Autoscan -# This can be used to enable automatic scan support in wpa_supplicant. -# See wpa_supplicant.conf for more information on autoscan usage. -# -# Enabling directly a module will enable autoscan support. -# For exponential module: -CONFIG_AUTOSCAN_EXPONENTIAL=y -# For periodic module: -CONFIG_AUTOSCAN_PERIODIC=y - -# Password (and passphrase, etc.) backend for external storage -# These optional mechanisms can be used to add support for storing passwords -# and other secrets in external (to wpa_supplicant) location. This allows, for -# example, operating system specific key storage to be used -# -# External password backend for testing purposes (developer use) -#CONFIG_EXT_PASSWORD_TEST=y -# File-based backend to read passwords from an external file. -#CONFIG_EXT_PASSWORD_FILE=y - -# Enable Fast Session Transfer (FST) -CONFIG_FST=y - -# Enable CLI commands for FST testing -#CONFIG_FST_TEST=y - -# OS X builds. This is only for building eapol_test. -#CONFIG_OSX=y - -# Automatic Channel Selection -# This will allow wpa_supplicant to pick the channel automatically when channel -# is set to "0". -# -# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative -# to "channel=0". This would enable us to eventually add other ACS algorithms in -# similar way. -# -# Automatic selection is currently only done through initialization, later on -# we hope to do background checks to keep us moving to more ideal channels as -# time goes by. ACS is currently only supported through the nl80211 driver and -# your driver must have survey dump capability that is filled by the driver -# during scanning. -# -# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with -# a newly to create wpa_supplicant.conf variable acs_num_scans. -# -# Supported ACS drivers: -# * ath9k -# * ath5k -# * ath10k -# -# For more details refer to: -# http://wireless.kernel.org/en/users/Documentation/acs -CONFIG_ACS=y - -# Support Multi Band Operation -#CONFIG_MBO=y - -# Fast Initial Link Setup (FILS) (IEEE 802.11ai) -#CONFIG_FILS=y -# FILS shared key authentication with PFS -#CONFIG_FILS_SK_PFS=y - -# Support RSN on IBSS networks -# This is needed to be able to use mode=1 network profile with proto=RSN and -# key_mgmt=WPA-PSK (i.e., full key management instead of WPA-None). -CONFIG_IBSS_RSN=y - -# External PMKSA cache control -# This can be used to enable control interface commands that allow the current -# PMKSA cache entries to be fetched and new entries to be added. -CONFIG_PMKSA_CACHE_EXTERNAL=y - -# Mesh Networking (IEEE 802.11s) -#CONFIG_MESH=y - -# Background scanning modules -# These can be used to request wpa_supplicant to perform background scanning -# operations for roaming within an ESS (same SSID). See the bgscan parameter in -# the wpa_supplicant.conf file for more details. -# Periodic background scans based on signal strength -CONFIG_BGSCAN_SIMPLE=y -# Learn channels used by the network and try to avoid bgscans on other -# channels (experimental) -CONFIG_BGSCAN_LEARN=y - -# Opportunistic Wireless Encryption (OWE) -# Experimental implementation of draft-harkins-owe-07.txt -CONFIG_OWE=y - -# Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect) -CONFIG_DPP=y -# DPP version 2 support -CONFIG_DPP2=y -# DPP version 3 support (experimental and still changing; do not enable for -# production use) -#CONFIG_DPP3=y - -# Wired equivalent privacy (WEP) -# WEP is an obsolete cryptographic data confidentiality algorithm that is not -# considered secure. It should not be used for anything anymore. The -# functionality needed to use WEP is available in the current wpa_supplicant -# release under this optional build parameter. This functionality is subject to -# be completely removed in a future release. -#CONFIG_WEP=y - -# Remove all TKIP functionality -# TKIP is an old cryptographic data confidentiality algorithm that is not -# considered secure. It should not be used anymore for anything else than a -# backwards compatibility option as a group cipher when connecting to APs that -# use WPA+WPA2 mixed mode. For now, the default wpa_supplicant build includes -# support for this by default, but that functionality is subject to be removed -# in the future. -#CONFIG_NO_TKIP=y - -# Pre-Association Security Negotiation (PASN) -# Experimental implementation based on IEEE P802.11z/D2.6 and the protocol -# design is still subject to change. As such, this should not yet be enabled in -# production use. -#CONFIG_PASN=y -CONFIG_IPV6=y diff --git a/zstd/PKGBUILD b/zstd/PKGBUILD index 4e8032c..31f74d2 100644 --- a/zstd/PKGBUILD +++ b/zstd/PKGBUILD @@ -6,7 +6,7 @@ pkgname=zstd pkgver=1.5.2 -pkgrel=07 +pkgrel=08 pkgdesc='Zstandard - not so Fast unreal-time FACEBOOK compression... - avoid as possible' url='https://facebook.github.io/zstd/' arch=(x86_64) @@ -31,7 +31,9 @@ build() { cmake -S build/cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + -DZSTD_ZLIB_SUPPORT=ON \ + -DZSTD_LZMA_SUPPORT=ON \ + -DZSTD_LZ4_SUPPORT=ON \ -DZSTD_BUILD_CONTRIB=ON \ -DZSTD_BUILD_STATIC=OFF \ -DZSTD_BUILD_TESTS=ON \ @@ -60,3 +62,6 @@ validpgpkeys=(4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD) sha256sums=(3ea06164971edec7caa2045a1932d757c1815858e4c2b68c7ef812647535c23f # zstd-1.5.2.tar.zst 3cb520bcb25100eaa9f0b8c00a94f640a4fa1e359dbca34f832817e577080f32) # zstd-1.5.2.tar.zst.sig + + +# 5b988ecfe7ebf47d51edae0af5ec319c2b84a8c2ff046a41d97ae8882e163026 zstd-1.5.2-08-x86_64.pkg.tar.xz diff --git a/zstd/PKGBUILD-arch b/zstd/PKGBUILD-arch index 4a241c1..0f96121 100644 --- a/zstd/PKGBUILD-arch +++ b/zstd/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgname=zstd pkgver=1.5.2 -pkgrel=7 +pkgrel=8 pkgdesc='Zstandard - Fast real-time compression algorithm' url='https://facebook.github.io/zstd/' arch=(x86_64) @@ -13,7 +13,6 @@ license=(BSD GPL2) depends=(glibc gcc-libs zlib xz lz4) makedepends=(cmake gtest ninja) provides=(libzstd.so) -options=(debug) source=(https://github.com/facebook/zstd/releases/download/v${pkgver}/zstd-${pkgver}.tar.zst{,.sig}) sha256sums=('3ea06164971edec7caa2045a1932d757c1815858e4c2b68c7ef812647535c23f' 'SKIP') @@ -36,7 +35,9 @@ build() { cmake -S build/cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + -DZSTD_ZLIB_SUPPORT=ON \ + -DZSTD_LZMA_SUPPORT=ON \ + -DZSTD_LZ4_SUPPORT=ON \ -DZSTD_BUILD_CONTRIB=ON \ -DZSTD_BUILD_STATIC=OFF \ -DZSTD_BUILD_TESTS=ON \ diff --git a/zstd/deps b/zstd/deps index 33074c2..9bb44be 100644 --- a/zstd/deps +++ b/zstd/deps @@ -2,3 +2,4 @@ gtest cmake ninja +