From 4206fcea0171793f27ffba347903437171556107 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 22 Apr 2023 13:22:10 +0300 Subject: [PATCH] upg cpreutils libxml2 lvm2 --- coreutils/PKGBUILD | 32 +++++------ coreutils/PKGBUILD-arch | 18 ++---- coreutils/deps | 1 + libxml2/0001-Fix-python3-unicode-errors.patch | 57 +++++++++++++++++++ .../0002-HACK-Don-t-run-fuzzing-tests.patch | 29 ++++++++++ libxml2/PKGBUILD | 40 ++++++------- libxml2/PKGBUILD-arch | 57 +++++++++++-------- libxml2/deps | 1 - lvm2/PKGBUILD | 13 +++-- lvm2/PKGBUILD-arch | 4 +- lvm2/deps | 1 + lvm2/time | 8 +-- 12 files changed, 174 insertions(+), 87 deletions(-) create mode 100644 libxml2/0001-Fix-python3-unicode-errors.patch create mode 100644 libxml2/0002-HACK-Don-t-run-fuzzing-tests.patch diff --git a/coreutils/PKGBUILD b/coreutils/PKGBUILD index 90eb145..08582ca 100644 --- a/coreutils/PKGBUILD +++ b/coreutils/PKGBUILD @@ -6,16 +6,16 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=coreutils -pkgver=9.2 -pkgrel=03 +pkgver=9.3 +pkgrel=01 pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system' url='https://www.gnu.org/software/coreutils/' depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl') -source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - '01-FS#77969.patch::https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=76f2fb627118a26c25003dbd98c22c153b7ee1d2' - 'copy-fix-reflink-auto-fallback.patch' - 'gnulib-backupfile-62607.patch' - 'coreutils-backup-62607.patch') +source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +# '01-FS#77969.patch::https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=76f2fb627118a26c25003dbd98c22c153b7ee1d2' +# 'copy-fix-reflink-auto-fallback.patch' +# 'gnulib-backupfile-62607.patch' +# 'coreutils-backup-62607.patch') prepare() { cd $pkgname-$pkgver @@ -59,13 +59,11 @@ license=('GPL3') validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady -sha256sums=(6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3 # coreutils-9.2.tar.xz - 7b20b632a8fb8862434af5ec8e2eb455c4044ca81664406b708b1c6a581f641e # coreutils-9.2.tar.xz.sig - a3cc5d1548bd6a26e1b8f4cff076862243af9faaffc4c257a0c766457fd028cc # 01-FS#77969.patch - 4b2ac873a9cb4a825bb90e964383ca0cb956ece347e9ded5387ddd8ff293855b # copy-fix-reflink-auto-fallback.patch - 5455ce8f736d5d8f5c7a5c8b70b4ec46a7e050125924f2135af4fbf685bddda6 # gnulib-backupfile-62607.patch - 10a8ea0b14c5254775c3817a31a07928c0609ca3eaec78fcecddeefe95101b9d) # coreutils-backup-62607.patch - -## 524733d9064e4f6f870e2d67039188d56941a76c0cc0d4a3535669db064de0a0 coreutils-9.2-03-x86_64.pkg.tar.lz - - +sha256sums=(adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa # coreutils-9.3.tar.xz + ba1c3836fd981e582739ebd55765b3616d23e653a20a95642f5a72b3dbd45ea7) # coreutils-9.3.tar.xz.sig +# a3cc5d1548bd6a26e1b8f4cff076862243af9faaffc4c257a0c766457fd028cc # 01-FS#77969.patch +# 4b2ac873a9cb4a825bb90e964383ca0cb956ece347e9ded5387ddd8ff293855b # copy-fix-reflink-auto-fallback.patch +# 5455ce8f736d5d8f5c7a5c8b70b4ec46a7e050125924f2135af4fbf685bddda6 # gnulib-backupfile-62607.patch +# 10a8ea0b14c5254775c3817a31a07928c0609ca3eaec78fcecddeefe95101b9d) # coreutils-backup-62607.patch +# +## 5f1fa71b3f9e3e17a2b049c6c102ae36e02cfa8328e4f60e55a3924287c1b89d coreutils-9.3-01-x86_64.pkg.tar.lz diff --git a/coreutils/PKGBUILD-arch b/coreutils/PKGBUILD-arch index 4db28f3..3a371b1 100644 --- a/coreutils/PKGBUILD-arch +++ b/coreutils/PKGBUILD-arch @@ -4,25 +4,17 @@ # Contributor: judd pkgname=coreutils -pkgver=9.2 -pkgrel=3 +pkgver=9.3 +pkgrel=1 pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system' arch=('x86_64') license=('GPL3') url='https://www.gnu.org/software/coreutils/' depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl') -source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - '01-FS#77969.patch::https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=76f2fb627118a26c25003dbd98c22c153b7ee1d2' - 'copy-fix-reflink-auto-fallback.patch' - 'gnulib-backupfile-62607.patch' - 'coreutils-backup-62607.patch') +source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady -sha256sums=('6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3' - 'SKIP' - 'a3cc5d1548bd6a26e1b8f4cff076862243af9faaffc4c257a0c766457fd028cc' - '4b2ac873a9cb4a825bb90e964383ca0cb956ece347e9ded5387ddd8ff293855b' - '5455ce8f736d5d8f5c7a5c8b70b4ec46a7e050125924f2135af4fbf685bddda6' - '10a8ea0b14c5254775c3817a31a07928c0609ca3eaec78fcecddeefe95101b9d') +sha256sums=('adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa' + 'SKIP') prepare() { cd $pkgname-$pkgver diff --git a/coreutils/deps b/coreutils/deps index 735aea7..2878865 100644 --- a/coreutils/deps +++ b/coreutils/deps @@ -2,3 +2,4 @@ automake autoconf + diff --git a/libxml2/0001-Fix-python3-unicode-errors.patch b/libxml2/0001-Fix-python3-unicode-errors.patch new file mode 100644 index 0000000..92a0c11 --- /dev/null +++ b/libxml2/0001-Fix-python3-unicode-errors.patch @@ -0,0 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 11 Apr 2023 21:55:36 +0000 +Subject: [PATCH] Fix python3 unicode errors + +Patch taken from Fedora at +https://src.fedoraproject.org/rpms/libxml2/raw/c1fa5c85e9d3a0b7340aaf34d2e5134cf47f5d66/f/libxml2-2.9.8-python3-unicode-errors.patch + +Works around https://bugzilla.gnome.org/show_bug.cgi?id=789714 +and https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 +--- + python/libxml.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/python/libxml.c b/python/libxml.c +index e071e824ca39..9d476f4fcd92 100644 +--- a/python/libxml.c ++++ b/python/libxml.c +@@ -1621,28 +1621,37 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg, + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); + #endif + + + if (libxml_xmlPythonErrorFuncHandler == NULL) { + va_start(ap, msg); + vfprintf(stderr, msg, ap); + va_end(ap); + } else { + va_start(ap, msg); + if (vsnprintf(str, 999, msg, ap) >= 998) + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } diff --git a/libxml2/0002-HACK-Don-t-run-fuzzing-tests.patch b/libxml2/0002-HACK-Don-t-run-fuzzing-tests.patch new file mode 100644 index 0000000..cb308a8 --- /dev/null +++ b/libxml2/0002-HACK-Don-t-run-fuzzing-tests.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 11 Apr 2023 21:59:24 +0000 +Subject: [PATCH] HACK: Don't run fuzzing tests + +They take way too long. +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 316109b16148..3ef672fe911f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,12 +2,12 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = include . doc example fuzz xstc ++SUBDIRS = include . doc example xstc + if WITH_PYTHON + SUBDIRS += python + endif + +-DIST_SUBDIRS = include . doc example fuzz python xstc ++DIST_SUBDIRS = include . doc example python xstc + + AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include -DSYSCONFDIR='"$(sysconfdir)"' + diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD index 7319671..be6b059 100644 --- a/libxml2/PKGBUILD +++ b/libxml2/PKGBUILD @@ -8,21 +8,20 @@ #pkgbase=libxml2 #pkgname=(libxml2 libxml2-docs) pkgname=libxml2 -pkgver=2.10.3 -pkgrel=02 +pkgver=2.10.4 +pkgrel=03 pkgdesc="XML C parser and toolkit" url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" -arch=(x86_64) -depends=(zlib xz icu readline ncurses) +depends=(xz icu ncurses readline zlib) makedepends=(python git) -optdepends=('python: Python bindings') -provides=(libxml2.so) + optdepends=('python: Python bindings') + provides=(libxml2.so) #options=(debug) ## uncomment this to have the debug pkg produced -_commit=f507d167f1755b7eaea09fb1a44d29aab828b6d1 # tags/v2.10.3^0 +_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0 source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" - libxml2-2.9.8-python3-unicode-errors.patch - no-fuzz.diff - https://www.w3.org/XML/Test/xmlts20130923.tar.gz) + 0001-Fix-python3-unicode-errors.patch + 0002-HACK-Don-t-run-fuzzing-tests.patch + https://www.w3.org/XML/Test/xmlts20130923.tar.gz) pkgver() { cd libxml2 @@ -35,11 +34,11 @@ prepare() { # Use xmlconf from conformance test suite ln -s ../xmlconf - # https://src.fedoraproject.org/rpms/libxml2/tree/rawhide - git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 + git apply -3 ../0001-Fix-python3-unicode-errors.patch # Do not run fuzzing tests - git apply -3 ../no-fuzz.diff + git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch NOCONFIGURE=1 ./autogen.sh } @@ -85,15 +84,18 @@ package() { # mv doc/* "$pkgdir" #} -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) # license=(MIT) ... 2.9.14 -license=(custom:MIT) # 2.10.1 +# license=(custom:MIT) # 2.10.1 +license=(custom:MIT) # 2.10.4 sha256sums=(SKIP - 3d07a50fc0963bda05fc5269dedc51f108260699e25e455bb31f6d80c2a9cada # libxml2-2.9.8-python3-unicode-errors.patch - 3908e7a53b20109bdfde143238f36e22a154dbb7d363b634e54c0a18328f4656 # no-fuzz.diff + 161208f5f3ca000438c8d55d2f977bbd187205d2e70ce72b3fdbd59df4837a39 # 0001-Fix-python3-unicode-errors.patch + 4c426ffa9c8f397929ff575748fbed9a2db036033a3738d95c1d5309e666de59 # 0002-HACK-Don-t-run-fuzzing-tests.patch 9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz + +## 13734fd70263e8e448c08f00e973c4649b31a2e9dca8f666f687f833528bba3b libxml2-2.10.4-03-x86_64.pkg.tar.lz - - diff --git a/libxml2/PKGBUILD-arch b/libxml2/PKGBUILD-arch index 0a47ba9..93629cc 100644 --- a/libxml2/PKGBUILD-arch +++ b/libxml2/PKGBUILD-arch @@ -5,9 +5,12 @@ # Contributor: John Proctor pkgbase=libxml2 -pkgname=(libxml2 libxml2-docs) -pkgver=2.10.3 -pkgrel=2 +pkgname=( + libxml2 + libxml2-docs +) +pkgver=2.10.4 +pkgrel=3 pkgdesc="XML C parser and toolkit" url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" arch=(x86_64) @@ -23,16 +26,17 @@ makedepends=( git python ) -options=(debug) -_commit=f507d167f1755b7eaea09fb1a44d29aab828b6d1 # tags/v2.10.3^0 -source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" - libxml2-2.9.8-python3-unicode-errors.patch - no-fuzz.diff - https://www.w3.org/XML/Test/xmlts20130923.tar.gz) -sha256sums=('SKIP' - '3d07a50fc0963bda05fc5269dedc51f108260699e25e455bb31f6d80c2a9cada' - '3908e7a53b20109bdfde143238f36e22a154dbb7d363b634e54c0a18328f4656' - '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f') +_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0 +source=( + "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" + 0001-Fix-python3-unicode-errors.patch + 0002-HACK-Don-t-run-fuzzing-tests.patch + https://www.w3.org/XML/Test/xmlts20130923.tar.gz +) +b2sums=('SKIP' + 'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13' + 'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d' + '63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be') pkgver() { cd libxml2 @@ -45,27 +49,30 @@ prepare() { # Use xmlconf from conformance test suite ln -s ../xmlconf - # https://src.fedoraproject.org/rpms/libxml2/tree/rawhide - git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 + git apply -3 ../0001-Fix-python3-unicode-errors.patch # Do not run fuzzing tests - git apply -3 ../no-fuzz.diff + git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch NOCONFIGURE=1 ./autogen.sh } build() { + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --localstatedir=/var + --with-history + --with-icu + --with-python=/usr/bin/python + --with-threads + --disable-static + ) + cd libxml2 - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-threads \ - --with-history \ - --with-python=/usr/bin/python \ - --with-icu \ - --disable-static + ./configure "${configure_options[@]}" sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/libxml2/deps b/libxml2/deps index 009142a..b2cde19 100644 --- a/libxml2/deps +++ b/libxml2/deps @@ -3,4 +3,3 @@ autoconf automake gettext - diff --git a/lvm2/PKGBUILD b/lvm2/PKGBUILD index 9dd74dc..468f1b9 100644 --- a/lvm2/PKGBUILD +++ b/lvm2/PKGBUILD @@ -7,10 +7,9 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -_tag='aba3b33d3778ad28b445130ebaa8efca4ddba844' # git rev-parse v${pkgver//./_} -pkgver=2.03.20 +_tag='a6c8d2429ce4d4a13750f271987702d3e2648904' # git rev-parse v${pkgver//./_} +pkgver=2.03.21 pkgrel=01 -arch=('x86_64') url='https://sourceware.org/lvm2/' makedepends=('git' 'libaio' 'thin-provisioning-tools') #options=('!makeflags') @@ -122,7 +121,9 @@ package_lvm2() { install -D -m0644 udev/69-dm-lvm-initcpio.rules "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm.rules" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL2' 'LGPL2.1') @@ -134,6 +135,6 @@ sha256sums=(SKIP def6e03aa1629bbc0ca1ee5e84e620366daf779f037eab2fda47487a8471729b # lvm2_install e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules -## 6dd05162e48c8559660a8b84d80b7579ea10501535f138f59530592505b01cc9 device-mapper-2.03.20-01-x86_64.pkg.tar.lz -## 83d77b7ffbadb25e269b21fe3ab1b9935f82dec92bd608b5f7d901a8d58511d9 lvm2-2.03.20-01-x86_64.pkg.tar.lz +## 44ffbc9511495664524066b7ead4944a1e2a608dd05bfc512b0748d481a3b0b1 lvm2-2.03.21-01-x86_64.pkg.tar.lz +## bb55469b14b6b4524e01cc4bb1c261f315de09ae425358a4d1e3c7861bc15081 device-mapper-2.03.21-01-x86_64.pkg.tar.lz diff --git a/lvm2/PKGBUILD-arch b/lvm2/PKGBUILD-arch index 762dfb6..93d97c1 100644 --- a/lvm2/PKGBUILD-arch +++ b/lvm2/PKGBUILD-arch @@ -3,8 +3,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -_tag='aba3b33d3778ad28b445130ebaa8efca4ddba844' # git rev-parse v${pkgver//./_} -pkgver=2.03.20 +_tag='a6c8d2429ce4d4a13750f271987702d3e2648904' # git rev-parse v${pkgver//./_} +pkgver=2.03.21 pkgrel=1 arch=('x86_64') url='https://sourceware.org/lvm2/' diff --git a/lvm2/deps b/lvm2/deps index 62e15cd..897c509 100644 --- a/lvm2/deps +++ b/lvm2/deps @@ -2,3 +2,4 @@ git thin-provisioning-tools libaio + diff --git a/lvm2/time b/lvm2/time index 54ecb93..4e0364a 100644 --- a/lvm2/time +++ b/lvm2/time @@ -1,6 +1,6 @@ -real 1m34.338s -user 1m26.076s -sys 0m8.075s - +real 2m44.254s +user 1m38.547s +sys 0m10.877s +