From ab358d9f548bd4ab6e1afab848f805ba4e56910f Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Tue, 24 May 2022 14:03:11 +0300 Subject: [PATCH] upg various --- binutils/PKGBUILD | 24 ++++--- binutils/clean | 2 +- binutils/deps | 1 + binutils/time | 16 ++++- curl/PKGBUILD | 7 +- curl/PKGBUILD-arch | 4 +- curl/deps | 1 + curl/time | 7 +- gcc/PKGBUILD | 69 +++++++++--------- gcc/PKGBUILD-arch | 62 ++++++++-------- gcc/time | 16 +++-- glibc/PKGBUILD | 70 +++++-------------- glibc/PKGBUILD-arch | 54 ++------------ gmp/PKGBUILD | 8 ++- gmp/PKGBUILD-arch | 3 +- gmp/deps | 1 + gnutls/PKGBUILD | 19 +++-- gnutls/PKGBUILD-arch | 15 ++-- gnutls/deps | 2 +- iptables/PKGBUILD | 18 +++-- iptables/PKGBUILD-arch | 13 ++-- iptables/deps | 1 + iptables/iptables-format-security.patch | 28 ++++++++ lvm2/PKGBUILD | 8 +-- lvm2/PKGBUILD-arch | 4 +- lvm2/deps | 2 + ...238f25ab8aff7689d7a09d66dc1583ecd6cb.patch | 49 +++++++++++++ python/PKGBUILD | 12 ++-- python/PKGBUILD-arch | 11 ++- python/deps | 1 + zsh/PKGBUILD | 12 ++-- zsh/PKGBUILD-arch | 8 +-- zsh/clean | 2 +- 33 files changed, 310 insertions(+), 240 deletions(-) create mode 100644 iptables/iptables-format-security.patch create mode 100644 python/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch diff --git a/binutils/PKGBUILD b/binutils/PKGBUILD index 9333222..b66711b 100644 --- a/binutils/PKGBUILD +++ b/binutils/PKGBUILD @@ -1,17 +1,15 @@ #!/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 +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/attr" #-----------------------------------------| DESCRIPTION |--------------------------------------- # # toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc pkgname=binutils pkgver=2.38 -#_commit=cb5f6a3e146cc70bc2d864989386df80acec5d3e _commit=9c67f6382ac2c90fbde5729feaf7d59ce662147a -pkgrel=05 +pkgrel=06 pkgdesc='A set of programs to assemble and manipulate binary and object files' arch=(x86_64) #url='https://www.gnu.org/software/binutils' @@ -25,6 +23,7 @@ conflicts=(binutils-multilib) replaces=(binutils-multilib) options=(staticlibs !distcc !ccache) #options=(staticlibs !distcc !ccache debug) +#_commit=cb5f6a3e146cc70bc2d864989386df80acec5d3e #source=(git+https://sourceware.org/git/binutils-gdb.git#commit=$_commit) #source=($url/$pkgname-$pkgver.tar.xz{,.sig} # gold-warn-unsupported.patch @@ -46,6 +45,10 @@ prepare() { # unsupported targets. This allows the binutils to be built with # BPF support enabled. patch -Np1 -i "${srcdir}"/gold-warn-unsupported.patch + +# # fix incorrect "undefined reference" errors +# # https://sourceware.org/bugzilla/show_bug.cgi?id=28879 +# patch -Np1 -i "${srcdir}"/fix-incorrect-undefined-symbol.patch } build() { @@ -87,6 +90,10 @@ build() { #check() { # cd binutils-build # +## # current testsuite failure in debuginfod (objdump) +## # https://sourceware.org/bugzilla/show_bug.cgi?id=28029 +## sed -i '/test_fetch_debuglink $OBJDUMP/d' \ +## $srcdir/binutils-gdb/binutils/testsuite/binutils-all/debuginfod.exp # # Use minimal flags for testsuite # # ld testsuite uses CFLAGS_FOR_TARGET and requires -g # # gold testsuite requires CXXFLAGS/CFLAGS with default PIE/PIC disabled @@ -122,9 +129,8 @@ license=('GPL3' 'GPL' 'FDL1.3' 'custom:FSFAP') validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F) -sha256sums=(#e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024 # binutils-2.38.tar.xz - #41301d67da78df1ad6df04aefe9e7bea8235484b0323cee52caa8f7435385014 # binutils-2.38.tar.xz.sig - SKIP +sha256sums=(SKIP +# e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024 # binutils-2.38.tar.xz +# 41301d67da78df1ad6df04aefe9e7bea8235484b0323cee52caa8f7435385014 # binutils-2.38.tar.xz.sig 2d430b66f84a19c154725ec535280c493be1d34f1a90f95208dce02fecd0e4e4) # gold-warn-unsupported.patch # fd33b2f8cac7561cecf3fdbb5a50fd2f2dfa6420516cbe57c47784a06fa16bf6) # fix-incorrect-undefined-symbol.patch - diff --git a/binutils/clean b/binutils/clean index ddfdd0d..354edb7 100644 --- a/binutils/clean +++ b/binutils/clean @@ -1 +1 @@ -rm -rvf {pkg,src,*tar.xz*} +rm -rvf {pkg,src,*tar.xz*,binutils-gdb} diff --git a/binutils/deps b/binutils/deps index 3655ce0..b5bd69b 100644 --- a/binutils/deps +++ b/binutils/deps @@ -5,4 +5,5 @@ libmicrohttpd git + bison diff --git a/binutils/time b/binutils/time index b8156dd..b36bec8 100644 --- a/binutils/time +++ b/binutils/time @@ -1,4 +1,14 @@ +real 2m47.361s +user 9m4.310s +sys 0m34.455s + + +real 2m47.361s +user 9m4.310s +sys 0m34.455s + + +real 13m35.011s +user 36m42.774s +sys 2m9.604s -real 11m8.176s -user 31m49.721s -sys 1m39.198s diff --git a/curl/PKGBUILD b/curl/PKGBUILD index 9fae4a4..90ab02d 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -pkgver=7.83.0 +pkgver=7.83.1 pkgrel=01 pkgdesc='An URL retrieval utility and library - w/o ipv6 & zstd' arch=('x86_64') @@ -123,5 +123,6 @@ license=('MIT') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg -sha256sums=(c0e64302a33d2fb79e0fc4e674260a22941e92ee2f11b894bf94d32b8f5531af # curl-7.83.0.tar.gz - f6ca16283d7713e38a4210044c9dc06ba6ac1d924a7ed4f47abcf95d626ba365) # curl-7.83.0.tar.gz.asc +sha256sums=(93fb2cd4b880656b4e8589c912a9fd092750166d555166370247f09d18f5d0c0 # curl-7.83.1.tar.gz + b8bd927f15bd02cb0bd831ce6d7c9f7406a1b6d8fb2d1bd1c10f16144d8491c4) # curl-7.83.1.tar.gz.asc + diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch index 065b8ca..3e0c9f6 100644 --- a/curl/PKGBUILD-arch +++ b/curl/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -pkgver=7.83.0 +pkgver=7.83.1 pkgrel=1 pkgdesc='An URL retrieval utility and library' arch=('x86_64') @@ -18,7 +18,7 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so' 'openssl' 'zlib' 'zstd' 'libzstd.so') provides=('libcurl.so') source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}) -sha512sums=('ef5a7e03ebff688538bc44d110982a6ace88d847878cb8cfbf1b0b3f5c34ffd116b2423754f23e36792592ae6ccbcd88f32e6e9ba9983c78b92dc866c059b4ba' +sha512sums=('0b909b7ed55f9a9789584fd9d2033d5838dcf29e33adf6657258e97ebe7c91b26282007687a729c8385594fd8220bd718fd008154926b87b8da254d586fab3c7' 'SKIP') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg diff --git a/curl/deps b/curl/deps index 8b13789..139597f 100644 --- a/curl/deps +++ b/curl/deps @@ -1 +1,2 @@ + diff --git a/curl/time b/curl/time index f607e8b..28bf8d1 100644 --- a/curl/time +++ b/curl/time @@ -1,5 +1,4 @@ -real 1m59.832s -user 4m7.754s -sys 0m27.322s - +real 2m35.662s +user 5m4.474s +sys 0m34.113s diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD index 906b6fe..63aa7bc 100644 --- a/gcc/PKGBUILD +++ b/gcc/PKGBUILD @@ -11,7 +11,7 @@ pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go libgccjit) pkgver=12.1.0 _majorver=${pkgver%%.*} -pkgrel=01 +pkgrel=03 pkgdesc='The GNU Compiler Collection' arch=(x86_64) url='https://gcc.gnu.org' @@ -41,9 +41,8 @@ _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*} # _commit=6beb39ee6c465c21d0cc547fd66b445100cdcc35 # source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig} - c89 - c99 - gcc-ada-repro.patch + c89 c99 + gcc-ada-repro.patch ) prepare() { @@ -67,34 +66,35 @@ prepare() { } build() { - local _confflags="--prefix=/usr \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --with-linker-hash-style=gnu \ - --with-system-zlib \ - --enable-__cxa_atexit \ - --enable-cet=auto \ - --enable-checking=release \ - --enable-clocale=gnu \ - --enable-default-pie \ - --enable-default-ssp \ - --enable-gnu-indirect-function \ - --enable-gnu-unique-object \ - --enable-linker-build-id \ - --enable-lto \ - --enable-multilib \ - --enable-plugin \ - --enable-shared \ - --enable-threads=posix \ - --disable-libssp \ - --disable-libstdcxx-pch \ - --disable-werror \ - --with-zstd=no \ - --with-build-config=bootstrap-lto \ - --enable-link-serialization=1" + local _confflags=( + --prefix=/usr + --libdir=/usr/lib + --libexecdir=/usr/lib + --mandir=/usr/share/man + --infodir=/usr/share/info + --with-bugurl=https://bugs.archlinux.org/ + --with-linker-hash-style=gnu + --with-system-zlib + --enable-__cxa_atexit + --enable-cet=auto + --enable-checking=release + --enable-clocale=gnu + --enable-default-pie + --enable-default-ssp + --enable-gnu-indirect-function + --enable-gnu-unique-object + --enable-linker-build-id + --enable-lto + --enable-multilib + --enable-plugin + --enable-shared + --enable-threads=posix + --disable-libssp + --disable-libstdcxx-pch + --disable-werror + --with-build-config=bootstrap-lto + --enable-link-serialization=1 + ) cd gcc-build @@ -107,7 +107,7 @@ build() { "$srcdir/gcc/configure" \ --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ --enable-bootstrap \ - $_confflags + "${_confflags[@]:?_confflags unset}" # see https://bugs.archlinux.org/task/71777 for rationale re *FLAGS handling make -O STAGE1_CFLAGS="-O2" \ @@ -127,7 +127,7 @@ build() { --enable-languages=jit \ --disable-bootstrap \ --enable-host-shared \ - $_confflags + "${_confflags[@]:?_confflags unset}" # see https://bugs.archlinux.org/task/71777 for rationale re *FLAGS handling make -O STAGE1_CFLAGS="-O2" \ @@ -444,3 +444,4 @@ sha256sums=(62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b # g de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931 # c89 2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a # c99 1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f) # gcc-ada-repro.patch + diff --git a/gcc/PKGBUILD-arch b/gcc/PKGBUILD-arch index 97e827c..71009ce 100644 --- a/gcc/PKGBUILD-arch +++ b/gcc/PKGBUILD-arch @@ -10,7 +10,7 @@ pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go libgccjit) pkgver=12.1.0 _majorver=${pkgver%%.*} -pkgrel=1 +pkgrel=2 pkgdesc='The GNU Compiler Collection' arch=(x86_64) license=(GPL3 LGPL FDL custom) @@ -71,33 +71,35 @@ prepare() { } build() { - local _confflags="--prefix=/usr \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --with-linker-hash-style=gnu \ - --with-system-zlib \ - --enable-__cxa_atexit \ - --enable-cet=auto \ - --enable-checking=release \ - --enable-clocale=gnu \ - --enable-default-pie \ - --enable-default-ssp \ - --enable-gnu-indirect-function \ - --enable-gnu-unique-object \ - --enable-linker-build-id \ - --enable-lto \ - --enable-multilib \ - --enable-plugin \ - --enable-shared \ - --enable-threads=posix \ - --disable-libssp \ - --disable-libstdcxx-pch \ - --disable-werror \ - --with-build-config=bootstrap-lto \ - --enable-link-serialization=1" + local _confflags=( + --prefix=/usr + --libdir=/usr/lib + --libexecdir=/usr/lib + --mandir=/usr/share/man + --infodir=/usr/share/info + --with-bugurl=https://bugs.archlinux.org/ + --with-linker-hash-style=gnu + --with-system-zlib + --enable-__cxa_atexit + --enable-cet=auto + --enable-checking=release + --enable-clocale=gnu + --enable-default-pie + --enable-default-ssp + --enable-gnu-indirect-function + --enable-gnu-unique-object + --enable-linker-build-id + --enable-lto + --enable-multilib + --enable-plugin + --enable-shared + --enable-threads=posix + --disable-libssp + --disable-libstdcxx-pch + --disable-werror + --with-build-config=bootstrap-lto + --enable-link-serialization=1 + ) cd gcc-build @@ -110,7 +112,7 @@ build() { "$srcdir/gcc/configure" \ --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ --enable-bootstrap \ - $_confflags + "${_confflags[@]:?_confflags unset}" # see https://bugs.archlinux.org/task/71777 for rationale re *FLAGS handling make -O STAGE1_CFLAGS="-O2" \ @@ -130,7 +132,7 @@ build() { --enable-languages=jit \ --disable-bootstrap \ --enable-host-shared \ - $_confflags + "${_confflags[@]:?_confflags unset}" # see https://bugs.archlinux.org/task/71777 for rationale re *FLAGS handling make -O STAGE1_CFLAGS="-O2" \ diff --git a/gcc/time b/gcc/time index 08370b7..7268bcb 100644 --- a/gcc/time +++ b/gcc/time @@ -1,15 +1,21 @@ + +11.2-02 wo/check +real 307m5.649s +user 980m28.884s +sys 78m37.832s + 11.2-04 w/check real 359m5.233s user 1252m12.024s sys 36m29.926s -11.2-02 w/check -real 307m5.649s -user 980m28.884s -sys 78m37.832s - 12.1 real 260m23.165s user 838m9.459s sys 21m5.755s +12.1-03 wo/check +real 256m21.812s +user 854m7.059s +sys 20m56.386s + diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD index cc89bbf..1c0b7d4 100644 --- a/glibc/PKGBUILD +++ b/glibc/PKGBUILD @@ -11,29 +11,27 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.35 -pkgrel=04 + +_commit=28ea43f8d64f0dd1f2de75525157730e1532e600 +pkgrel=05 arch=(x86_64) url='https://www.gnu.org/software/libc' makedepends=(git gd lib32-gcc-libs python) #optdepends=('perl: for mtrace') -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 - 0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch +#options=(debug staticlibs !lto) +options=(staticlibs !lto) +source=(git+https://sourceware.org/git/glibc.git#commit=${_commit} + locale.gen.txt + locale-gen + lib32-glibc.conf + sdt.h sdt-config.h + disable-clone3.diff ) prepare() { mkdir -p glibc-build lib32-glibc-build - [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc + [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc cd glibc # Disable clone3 syscall for now @@ -41,15 +39,6 @@ prepare() { # 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 - - # Fix Sefault introduced by new DFS algorithm - # https://bugs.archlinux.org/task/73938 - patch -Np1 -i "${srcdir}"/0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch } build() { @@ -187,19 +176,6 @@ package_glibc() { 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" @@ -229,15 +205,6 @@ package_lib32-glibc() { # 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 } #---- license gpg-key sha256sums ---- @@ -247,14 +214,15 @@ license=(GPL LGPL) validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar -sha256sums=(5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e # glibc-2.35.tar.xz - 853aaaf17d7366817e814057a467625ee7c0b26240e8b878db0f33c389c7bcb6 # glibc-2.35.tar.xz.sig +sha256sums=(SKIP +#5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e # glibc-2.35.tar.xz +# 853aaaf17d7366817e814057a467625ee7c0b26240e8b878db0f33c389c7bcb6 # glibc-2.35.tar.xz.sig d42648cea552ba5353a32e264686e992263289d5cc86207314dffc54ab514981 # locale.gen.txt 83f108f915863c7ed0338e2d3e8f2e071a531a090ef8f8b2eb3a956a3c4f04d7 # locale-gen c27424154a6096ae32c0824b785e05de6acef33d9224fd6147d1936be9b4962b # lib32-glibc.conf 774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70 # sdt.h cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0 # sdt-config.h - f5df8fc95592cce7825744aeb8c9699a5b4b5b7ccf7bcf554355167c3a7e375e # disable-clone3.diff - 0fbfee1dbe867c1e1d135d3bdc6fbe32d5629aa5eff555123355d21341271a82 # 0001-localedef-Update-LC_MONETARY-handling-Bug-28845.patch - 2a3da2150c45d2ee811d6e837838029927eb40e50c901452e155545fa5144c54 # 0001-localedata-Do-not-generate-output-if-warnings-were-p.patch - 85e19a5bb247a7c523781efb28509420a67f32bae0c13633c1c22dc921187840) # 0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch + f5df8fc95592cce7825744aeb8c9699a5b4b5b7ccf7bcf554355167c3a7e375e) # disable-clone3.diff +# 0fbfee1dbe867c1e1d135d3bdc6fbe32d5629aa5eff555123355d21341271a82 # 0001-localedef-Update-LC_MONETARY-handling-Bug-28845.patch +# 2a3da2150c45d2ee811d6e837838029927eb40e50c901452e155545fa5144c54 # 0001-localedata-Do-not-generate-output-if-warnings-were-p.patch +# 85e19a5bb247a7c523781efb28509420a67f32bae0c13633c1c22dc921187840) # 0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch diff --git a/glibc/PKGBUILD-arch b/glibc/PKGBUILD-arch index 22342a6..aa64c04 100644 --- a/glibc/PKGBUILD-arch +++ b/glibc/PKGBUILD-arch @@ -9,42 +9,34 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.35 -pkgrel=4 +_commit=28ea43f8d64f0dd1f2de75525157730e1532e600 +pkgrel=5 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} +options=(debug staticlibs !lto) +source=(git+https://sourceware.org/git/glibc.git#commit=${_commit} 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 - 0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch ) validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar -b2sums=('623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063' - 'SKIP' +b2sums=('SKIP' '46d533d25c7a2ce4ae75d452eee7ebb8e3ce4d191af9be3daa43718b78cb81d33cfd8046a117a15d87de9f5e940448c66005b0490515bf731c9e4691c53908d6' '1f6d927b4972220b1c00abee5329c5d6bc01ed5bee57b20db0c7d7433292f7d666b02baf9968267f8e378b1f3bb273e8eef0ccbf22d21400ac36949d7615a474' '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a' 'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e' '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678' - 'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52' - '3c4de02d6308a4d39693e6effa08894ae096397347e439b93b0b5328aba41a373f7f2eeb88c109970f69cca65aaa74ba14e384d6d033f6a913438f4f920854a6' - 'b6014af23688ea971d7af38d58829c8016a0af63770b7f5e8bc986c13ea2cafefe0935ff483b1b37c87ebe3e652b6e0c48ab43dd8ae752d0ed7fecc3751432f4' - 'd77c8f9c807f25aeeafa302858116f4adf903f46fe1db2035dbe998105d7206bbc6d3055119831ff7744eb721b05795866c80d99671c3a8f33d5386d80978248') + 'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52') prepare() { mkdir -p glibc-build lib32-glibc-build - [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc + [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc cd glibc # Disable clone3 syscall for now @@ -52,15 +44,6 @@ prepare() { # 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 - - # Fix Sefault introduced by new DFS algorithm - # https://bugs.archlinux.org/task/73938 - patch -Np1 -i "${srcdir}"/0001-elf-Fix-DFS-sorting-algorithm-for-LD_TRACE_LOADED_OB.patch } build() { @@ -199,19 +182,6 @@ package_glibc() { 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" @@ -240,14 +210,4 @@ package_lib32-glibc() { # 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/gmp/PKGBUILD b/gmp/PKGBUILD index 24db944..beecec1 100644 --- a/gmp/PKGBUILD +++ b/gmp/PKGBUILD @@ -1,15 +1,17 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gmp pkgver=6.2.1 -pkgrel=01 +pkgrel=02 pkgdesc='A free library for arbitrary precision arithmetic' arch=(x86_64) url='https://gmplib.org/' +#options=(debug) ## uncomment this line to have the debug pkg produced depends=(gcc-libs sh) source=(https://gmplib.org/download/gmp/gmp-$pkgver.tar.lz{,.sig}) @@ -44,3 +46,5 @@ md5sums=('03a31d8cbaf29d136252f8f38875ed82' sha256sums=(2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41 # gmp-6.2.1.tar.lz 1e01bee28a3ac6ccce3d7b91eaa62c07f43f572565729ed0e0c50948b81c2b14) # gmp-6.2.1.tar.lz.sig + + diff --git a/gmp/PKGBUILD-arch b/gmp/PKGBUILD-arch index 2c1c1a6..e66f32d 100644 --- a/gmp/PKGBUILD-arch +++ b/gmp/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgname=gmp pkgver=6.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='A free library for arbitrary precision arithmetic' arch=(x86_64) url='https://gmplib.org/' @@ -13,6 +13,7 @@ source=(https://gmplib.org/download/gmp/gmp-$pkgver.tar.lz{,.sig}) md5sums=('03a31d8cbaf29d136252f8f38875ed82' 'SKIP') validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298') # Niels Möller +options=(debug) build() { cd $pkgname-$pkgver diff --git a/gmp/deps b/gmp/deps index 8b13789..139597f 100644 --- a/gmp/deps +++ b/gmp/deps @@ -1 +1,2 @@ + diff --git a/gnutls/PKGBUILD b/gnutls/PKGBUILD index 151cf16..eecff08 100644 --- a/gnutls/PKGBUILD +++ b/gnutls/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gnutls -pkgver=3.7.4 -pkgrel=03 +pkgver=3.7.5 +pkgrel=01 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('x86_64') url="https://www.gnutls.org/" @@ -28,9 +28,15 @@ build() { --with-idn \ --enable-openssl-compatibility \ --enable-guile --with-guile-site-dir=no \ - --with-default-trust-store-pkcs11="pkcs11:" \ - --with-tpm2 + --with-brotli \ + --without-zstd \ + --with-tpm2 \ + --enable-openssl-compatibility \ + --enable-guile --with-guile-site-dir=no \ + --with-default-trust-store-pkcs11="pkcs11:" + # --enable-ktls \ # breaks testsuite + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } @@ -56,6 +62,5 @@ license=('GPL3' 'LGPL2.1') validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno " -sha256sums=(e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f # gnutls-3.7.4.tar.xz - efa67eff568e7606c299fa3261c918ea3cabd1465523f6b76393775aef2df252) # gnutls-3.7.4.tar.xz.sig - +sha256sums=(1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad # gnutls-3.7.5.tar.xz + 465049fb74a87df5528269ce2757f8a03b78bb028d87641c30f7243d12c3c634) # gnutls-3.7.5.tar.xz.sig diff --git a/gnutls/PKGBUILD-arch b/gnutls/PKGBUILD-arch index e42fbde..57d9ea2 100644 --- a/gnutls/PKGBUILD-arch +++ b/gnutls/PKGBUILD-arch @@ -2,8 +2,8 @@ # Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.7.4 -pkgrel=3 +pkgver=3.7.5 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('x86_64') license=('GPL3' 'LGPL2.1') @@ -14,9 +14,10 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit' 'libidn2' makedepends=('tpm2-tss') checkdepends=('net-tools' 'tpm2-tools') optdepends=('guile: for use with Guile bindings' - 'tpm2-tss: support for TPM2 wrapped keys') + 'tpm2-tss: support for TPM2 wrapped keys' + 'zstd: for compression support') source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz{,.sig}) -sha256sums=('e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f' +sha256sums=('1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad' 'SKIP') validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno " @@ -25,10 +26,12 @@ build() { ./configure --prefix=/usr \ --disable-static \ --with-idn \ + --with-brotli \ + --with-zstd \ + --with-tpm2 \ --enable-openssl-compatibility \ --enable-guile --with-guile-site-dir=no \ - --with-default-trust-store-pkcs11="pkcs11:" \ - --with-tpm2 + --with-default-trust-store-pkcs11="pkcs11:" # --enable-ktls \ # breaks testsuite sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make diff --git a/gnutls/deps b/gnutls/deps index 498d933..8f63e0b 100644 --- a/gnutls/deps +++ b/gnutls/deps @@ -1,4 +1,4 @@ net-tools - tpm2-tss tpm2-tools + diff --git a/iptables/PKGBUILD b/iptables/PKGBUILD index 82f02a7..a7e25fa 100644 --- a/iptables/PKGBUILD +++ b/iptables/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=iptables pkgname=(iptables iptables-nft) -pkgver=1.8.7 +pkgver=1.8.8 pkgrel=01 epoch=1 pkgdesc='Linux kernel packet control tool - w/o ipv6 & systemd' @@ -17,8 +17,9 @@ 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} - empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules ) -# iptables-{legacy,nft}-flush) + empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules + iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e) + prepare() { mkdir build @@ -26,6 +27,9 @@ prepare() { # use system one 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 } build() { @@ -89,12 +93,14 @@ license=(GPL2) validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4' '37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team -sha256sums=(c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0 # iptables-1.8.7.tar.bz2 - 438ef3feb2c0b5b05a71546382c11c2ff64c729dd864e1f4ac460959512e218f # iptables-1.8.7.tar.bz2.sig +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 + 91161a73f323016a9efc5eabd16243d20f8ca2467995cf0eabfb95f845090121 # empty-security.rules + 9d9e23d6452632e7944d942ccbf6c82deb327780a084611aa7444eb88c596a70) # iptables-format-security.patch + diff --git a/iptables/PKGBUILD-arch b/iptables/PKGBUILD-arch index 13bec2d..bfbcc86 100644 --- a/iptables/PKGBUILD-arch +++ b/iptables/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgbase=iptables pkgname=(iptables iptables-nft) -pkgver=1.8.7 +pkgver=1.8.8 pkgrel=1 epoch=1 pkgdesc='Linux kernel packet control tool' @@ -15,8 +15,9 @@ 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} empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules - {arp,eb,ip,ip6}tables.service iptables-{legacy,nft}-flush) -sha1sums=('05ef75415cb7cb7641f51d51e74f3ea29cc31ab1' + {arp,eb,ip,ip6}tables.service iptables-{legacy,nft}-flush + iptables-format-security.patch::https://git.netfilter.org/iptables/patch/?id=b72eb12e) +sha1sums=('98783621a5e58ff55f83b1350523f3de41af621d' 'SKIP' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' @@ -30,7 +31,8 @@ sha1sums=('05ef75415cb7cb7641f51d51e74f3ea29cc31ab1' '8d66d21fa4cbfe2a80478301af94ba54f65e4ea0' '9cec592787e32451f58fa608ea057870e07aa704' 'd10af7780d1634778d898c709e2d950aa1561856' - '15c1684f3e671f4d0ede639a7c9c08e1a841511c') + '15c1684f3e671f4d0ede639a7c9c08e1a841511c' + 'df4b0a31dfa01cff65926d439ab1475f246d4e74') validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4' '37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team @@ -40,6 +42,9 @@ prepare() { # use system one 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 } build() { diff --git a/iptables/deps b/iptables/deps index cd316f3..e5fc33d 100644 --- a/iptables/deps +++ b/iptables/deps @@ -1,2 +1,3 @@ nftables + diff --git a/iptables/iptables-format-security.patch b/iptables/iptables-format-security.patch new file mode 100644 index 0000000..7c05b00 --- /dev/null +++ b/iptables/iptables-format-security.patch @@ -0,0 +1,28 @@ +From b72eb12ea5a61df0655ad99d5048994e916be83a Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Fri, 13 May 2022 16:51:58 +0200 +Subject: xshared: Fix build for -Werror=format-security + +Gcc complains about the omitted format string. + +Signed-off-by: Phil Sutter +--- + iptables/xshared.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptables/xshared.c b/iptables/xshared.c +index fae5ddd5..a8512d38 100644 +--- a/iptables/xshared.c ++++ b/iptables/xshared.c +@@ -1307,7 +1307,7 @@ static void check_empty_interface(struct xtables_args *args, const char *arg) + return; + + if (args->family != NFPROTO_ARP) +- xtables_error(PARAMETER_PROBLEM, msg); ++ xtables_error(PARAMETER_PROBLEM, "%s", msg); + + fprintf(stderr, "%s", msg); + } +-- +cgit v1.2.3 + diff --git a/lvm2/PKGBUILD b/lvm2/PKGBUILD index a28a99f..7694b98 100644 --- a/lvm2/PKGBUILD +++ b/lvm2/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -_tag='890c0635554075e122ef5437b5dfb28ff6fcb128' # git rev-parse v${pkgver//./_} -pkgver=2.03.15 +#_tag='890c0635554075e122ef5437b5dfb28ff6fcb128' # git rev-parse v${pkgver//./_} +_tag='82b36d78165764dda7d44d104737a95054348a02' # git rev-parse v${pkgver//./_}pkgver=2.03.16 +pkgver=2.03.16 pkgrel=01 - arch=('x86_64') url='https://sourceware.org/lvm2/' makedepends=('git' 'thin-provisioning-tools') @@ -130,7 +130,7 @@ validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17' # Alasdair G Kergon sha256sums=(SKIP -# db540799e8810c0976b354792074b4956693df985564aa1ae37bc60414b22cf1 # 0001-udev-initcpio.patch e9ab9207b805cab702a666a2deb754583e6acd4c46973898ebb4170b563f0eec # 0001-udev-initcpio.patch 00228d69679d5db15860bdf6b92746a146d0952f0d1bd27c74886ce6f22bf216 # lvm2_install e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules + diff --git a/lvm2/PKGBUILD-arch b/lvm2/PKGBUILD-arch index ac43a30..b0c9d58 100644 --- a/lvm2/PKGBUILD-arch +++ b/lvm2/PKGBUILD-arch @@ -3,8 +3,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -_tag='890c0635554075e122ef5437b5dfb28ff6fcb128' # git rev-parse v${pkgver//./_} -pkgver=2.03.15 +_tag='82b36d78165764dda7d44d104737a95054348a02' # git rev-parse v${pkgver//./_} +pkgver=2.03.16 pkgrel=1 arch=('x86_64') url='https://sourceware.org/lvm2/' diff --git a/lvm2/deps b/lvm2/deps index 1fc9385..8a3a0c4 100644 --- a/lvm2/deps +++ b/lvm2/deps @@ -1,2 +1,4 @@ git thin-provisioning-tools + + diff --git a/python/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch b/python/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch new file mode 100644 index 0000000..f9770ad --- /dev/null +++ b/python/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch @@ -0,0 +1,49 @@ +From 178a238f25ab8aff7689d7a09d66dc1583ecd6cb Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Wed, 4 May 2022 03:23:29 -0700 +Subject: [PATCH] gh-92036: Fix gc_fini_untrack() (GH-92037) + +Fix a crash in subinterpreters related to the garbage collector. When +a subinterpreter is deleted, untrack all objects tracked by its GC. +To prevent a crash in deallocator functions expecting objects to be +tracked by the GC, leak a strong reference to these objects on +purpose, so they are never deleted and their deallocator functions +are not called. +(cherry picked from commit 14243369b5f80613628a565c224bba7fb3fcacd8) + +Co-authored-by: Victor Stinner +--- + .../2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst | 5 +++++ + Modules/gcmodule.c | 6 ++++++ + 2 files changed, 11 insertions(+) + create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst + +diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst b/Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst +new file mode 100644 +index 0000000000000..78094c5e4fea7 +--- /dev/null ++++ b/Misc/NEWS.d/next/Core and Builtins/2022-04-28-23-37-30.gh-issue-92036.GZJAC9.rst +@@ -0,0 +1,5 @@ ++Fix a crash in subinterpreters related to the garbage collector. When a ++subinterpreter is deleted, untrack all objects tracked by its GC. To prevent a ++crash in deallocator functions expecting objects to be tracked by the GC, leak ++a strong reference to these objects on purpose, so they are never deleted and ++their deallocator functions are not called. Patch by Victor Stinner. +diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c +index 805a159d53d60..43ae6fa98beb9 100644 +--- a/Modules/gcmodule.c ++++ b/Modules/gcmodule.c +@@ -2170,6 +2170,12 @@ gc_fini_untrack(PyGC_Head *list) + for (gc = GC_NEXT(list); gc != list; gc = GC_NEXT(list)) { + PyObject *op = FROM_GC(gc); + _PyObject_GC_UNTRACK(op); ++ // gh-92036: If a deallocator function expect the object to be tracked ++ // by the GC (ex: func_dealloc()), it can crash if called on an object ++ // which is no longer tracked by the GC. Leak one strong reference on ++ // purpose so the object is never deleted and its deallocator is not ++ // called. ++ Py_INCREF(op); + } + } + diff --git a/python/PKGBUILD b/python/PKGBUILD index 05eafe1..f4d9e25 100644 --- a/python/PKGBUILD +++ b/python/PKGBUILD @@ -5,22 +5,25 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- shopt -s extglob - pkgbase=python pkgname=(python python-tests) pkgver=3.10.4 -pkgrel=01 +pkgrel=02 _pybasever=${pkgver%.*} pkgdesc="Next generation of the python high-level scripting language - no ipv6 " arch=('x86_64') url="https://www.python.org/" depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib') makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font') -source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}) +source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc} + https://github.com/python/cpython/commit/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch) prepare() { cd Python-${pkgver} + # FS#73002 + patch -p1 -i ../178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch + # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py @@ -150,4 +153,5 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re 'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado sha256sums=(80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19 # Python-3.10.4.tar.xz - a4d5ff92a2743029a7bec2cb8cf07b799c52199d27493d453d38a37036c7d896) # Python-3.10.4.tar.xz.asc + a4d5ff92a2743029a7bec2cb8cf07b799c52199d27493d453d38a37036c7d896 # Python-3.10.4.tar.xz.asc + 7941c5985507e04cf55675be12d5f6784ac336cfdcd283945f8df525d13c6c82) # 178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch diff --git a/python/PKGBUILD-arch b/python/PKGBUILD-arch index b40c897..f5cbd6e 100644 --- a/python/PKGBUILD-arch +++ b/python/PKGBUILD-arch @@ -9,7 +9,7 @@ shopt -s extglob pkgbase=python pkgname=(python python-tests) pkgver=3.10.4 -pkgrel=1 +pkgrel=2 _pybasever=${pkgver%.*} pkgdesc="Next generation of the python high-level scripting language" arch=('x86_64') @@ -17,9 +17,11 @@ license=('custom') url="https://www.python.org/" depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib') makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font') -source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}) +source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc} + https://github.com/python/cpython/commit/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch) sha512sums=('6c9aeecddc55c7896b2e8527fca131c7b2b6127d56ce1a001ccedfebf590334e0c0bb7c517ed3cf1da3c1910e002552b56aa7e03eeb672f42ff0bd8150799113' - 'SKIP') + 'SKIP' + 'a76517ddfcbfa7363999016ba6b938677f07350c4c167c49e5837d8711bea1c0d49f3c77706e361b88fe915fba8b2de7dc6dc251afa2d0a93ea03287bbde475d') validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) 'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) 'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado @@ -27,6 +29,9 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re prepare() { cd Python-${pkgver} + # FS#73002 + patch -p1 -i ../178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch + # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py diff --git a/python/deps b/python/deps index 5803d20..c10b476 100644 --- a/python/deps +++ b/python/deps @@ -6,3 +6,4 @@ llvm gdb xorg-server-xvfb ttf-liberation + diff --git a/zsh/PKGBUILD b/zsh/PKGBUILD index 1fd646d..69a2ffb 100644 --- a/zsh/PKGBUILD +++ b/zsh/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=zsh pkgname=('zsh' 'zsh-doc') -pkgver=5.8.1 -pkgrel=02 +pkgver=5.9 +pkgrel=01 arch=('x86_64') url='https://www.zsh.org/' makedepends=(pcre libcap gdbm yodl) @@ -94,8 +94,8 @@ validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3' 'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444' '7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4') -sha256sums=(b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 # zsh-5.8.1.tar.xz - 2ab4308151f87733eafcd09c88974508156136c94d1c56a0ee7b3f649c994ec6 # zsh-5.8.1.tar.xz.asc - 8b9cb53d6432f13e9767a8680b642e8e8a52c7f1b8decd211756ca20c667f917 # zsh-5.8.1-doc.tar.xz - 2d0f2895c28fb9b4bb131b3b387ee50ee383ee27b20204231409b900cd7670ce # zsh-5.8.1-doc.tar.xz.asc +sha256sums=(9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 # zsh-5.9.tar.xz + 026e0e0bcaf389a60167694eec41fb7840bb4bf196af25b3365ba7eef51e763b # zsh-5.9.tar.xz.asc + 6f7c091249575e68c177c5e8d5c3e9705660d0d3ca1647aea365fd00a0bd3e8a # zsh-5.9-doc.tar.xz + 2fda22062a9dcbcb5e76a5b4b5a0f7b8d7e4cd08707b05f11d3b99e721a982b5 # zsh-5.9-doc.tar.xz.asc 230832038c3b8f67fdb1b284ac5f68d709cdb7f1bc752b0e60657b9b9d091045) # zprofile diff --git a/zsh/PKGBUILD-arch b/zsh/PKGBUILD-arch index 4e27b5a..9e05b7e 100644 --- a/zsh/PKGBUILD-arch +++ b/zsh/PKGBUILD-arch @@ -2,17 +2,17 @@ pkgbase=zsh pkgname=('zsh' 'zsh-doc') -pkgver=5.8.1 -pkgrel=2 +pkgver=5.9 +pkgrel=1 arch=('x86_64') url='https://www.zsh.org/' license=('custom') makedepends=('pcre' 'libcap' 'gdbm' 'yodl') source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} 'zprofile') -sha512sums=('f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d' +sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e' 'SKIP' - '0d8ca4c54c10e8a471ba7d53f1371ee057f7df4b710fc01194833f29a61b5465133432b891b0b891b6cc5235a928a783bf99f39c67314e29e3d161ca5abf3219' + '5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860' 'SKIP' 'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034') validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3' diff --git a/zsh/clean b/zsh/clean index 97548ba..fe67bad 100644 --- a/zsh/clean +++ b/zsh/clean @@ -1 +1 @@ -rm -rvf {src,pkg,zsh*5.8.1.tar.xz*,zsh*doc.tar.xz*} +rm -rvf {src,pkg,zsh*5.9*.tar.xz*,zsh*doc.tar.xz*}