From 434d17b6889333db8cc4411dc1a7f9590fa3c0c2 Mon Sep 17 00:00:00 2001 From: joborun Date: Wed, 6 Dec 2023 17:27:08 +0200 Subject: [PATCH] upg curl glib2 libgssglue libxml2 thin-provisioning-tools --- curl/PKGBUILD | 14 +++++++------- curl/PKGBUILD-arch | 7 +++---- glib2/PKGBUILD | 8 ++++++-- glib2/PKGBUILD-arch | 6 +++++- libgssglue/PKGBUILD | 18 ++++++++++-------- libgssglue/PKGBUILD-arch | 11 +++++------ libxml2/PKGBUILD | 9 ++++----- libxml2/PKGBUILD-arch | 4 ++-- thin-provisioning-tools/PKGBUILD | 9 ++++----- thin-provisioning-tools/PKGBUILD-arch | 4 ++-- thin-provisioning-tools/time | 6 +++--- 11 files changed, 51 insertions(+), 45 deletions(-) diff --git a/curl/PKGBUILD b/curl/PKGBUILD index e523095..cfbcb8c 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -_tag='817204c6e41f66dafbaa704d67f828a4288b3577' # git rev-parse v${_tag_name} -_tag_name='8_4_0' +_tag='55b5fafb094ebe07ca8a5d4f79813c8b40670795' # git rev-parse v${_tag_name} +_tag_name='8_5_0' pkgver="${_tag_name//_/.}" -pkgrel=02 +pkgrel=01 pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd' url='https://curl.se' #options=(debug) # uncomment this to produce debug package @@ -24,7 +24,7 @@ provides=('libcurl.so') source=("git+https://github.com/bagder/curl.git#tag=${_tag}?signed") _backports=( - "1f7d8cd478f024bc16cad204a9b62feb6e92a0c5" # make package reproducible +# "1f7d8cd478f024bc16cad204a9b62feb6e92a0c5" # make package reproducible ) _reverts=( @@ -175,7 +175,7 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg sha256sums=(SKIP) -## 74683b0f87d672e42d28ada989682a8e7939640e04a2fe2591d760b6ddcc6cfd curl-8.4.0-02-x86_64.pkg.tar.lz -## de20d2dfad212644229e9743264bbd8fed080b01f097dfd7dbaa03b46ec548bd libcurl-compat-8.4.0-02-x86_64.pkg.tar.lz -## 8e5cbe4e880dee8c8377de4fd310e50a9cb977d49bc5ef47e0361d625594e4d5 libcurl-gnutls-8.4.0-02-x86_64.pkg.tar.lz +## 9f099f16009f2c7d412290a8b134d83055e35796189b3881f3b0b3b7bd61257d curl-8.5.0-01-x86_64.pkg.tar.lz +## d7f4cf687ec3bca5408fd86fa53e1a9e0546926484e04c30967afdf7692b4d37 libcurl-compat-8.5.0-01-x86_64.pkg.tar.lz +## fc904c2ae259193ba16ac44898ac31319cb772f89f43fceca289ed9a9e5d6018 libcurl-gnutls-8.5.0-01-x86_64.pkg.tar.lz diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch index 95cae44..381544e 100644 --- a/curl/PKGBUILD-arch +++ b/curl/PKGBUILD-arch @@ -6,10 +6,10 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -_tag='817204c6e41f66dafbaa704d67f828a4288b3577' # git rev-parse v${_tag_name} -_tag_name='8_4_0' +_tag='55b5fafb094ebe07ca8a5d4f79813c8b40670795' # git rev-parse v${_tag_name} +_tag_name='8_5_0' pkgver="${_tag_name//_/.}" -pkgrel=2 +pkgrel=1 pkgdesc='command line tool and library for transferring data with URLs' arch=('x86_64') url='https://curl.se/' @@ -24,7 +24,6 @@ source=("git+https://github.com/bagder/curl.git#tag=${_tag}?signed") sha512sums=('SKIP') _backports=( - "1f7d8cd478f024bc16cad204a9b62feb6e92a0c5" # make package reproducible ) _reverts=( diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD index 404c27f..eedd95f 100644 --- a/glib2/PKGBUILD +++ b/glib2/PKGBUILD @@ -9,7 +9,7 @@ #pkgname=(glib2 glib2-docs) pkgname=glib2 pkgver=2.78.2 -pkgrel=01 +pkgrel=03 pkgdesc="Low level core library" #url="https://wiki.gnome.org/Projects/GLib" url="https://gitlab.gnome.org/GNOME/glib" @@ -37,6 +37,10 @@ prepare() { # Suppress noise from glib-compile-schemas.hook git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + # Unbreak Firefox + # https://gitlab.gnome.org/GNOME/glib/-/issues/3196 + git cherry-pick -n b097adf18aedbb13b3d0e4cf260c3fede8d8995e + git submodule init git submodule set-url subprojects/gvdb "$srcdir/gvdb" git -c protocol.file.allow=always submodule update @@ -115,5 +119,5 @@ sha256sums=(SKIP 557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8 # gio-querymodules.hook 64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook -## 85d50ac1bfacad63d99288e060bc43405bbe4324ac0f633a892cc0623b837032 glib2-2.78.2-01-x86_64.pkg.tar.lz +## 5ab41ee0b66c5171a72a3f53aabf7ac980419dbc8798cb6a4831f27b1d6ef9b5 glib2-2.78.2-03-x86_64.pkg.tar.lz diff --git a/glib2/PKGBUILD-arch b/glib2/PKGBUILD-arch index 7b39ce9..c7d6303 100644 --- a/glib2/PKGBUILD-arch +++ b/glib2/PKGBUILD-arch @@ -7,7 +7,7 @@ pkgname=( glib2-docs ) pkgver=2.78.2 -pkgrel=1 +pkgrel=3 pkgdesc="Low level core library" url="https://gitlab.gnome.org/GNOME/glib" license=(LGPL) @@ -64,6 +64,10 @@ prepare() { # Suppress noise from glib-compile-schemas.hook git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + # Unbreak Firefox + # https://gitlab.gnome.org/GNOME/glib/-/issues/3196 + git cherry-pick -n b097adf18aedbb13b3d0e4cf260c3fede8d8995e + git submodule init git submodule set-url subprojects/gvdb "$srcdir/gvdb" git -c protocol.file.allow=always submodule update diff --git a/libgssglue/PKGBUILD b/libgssglue/PKGBUILD index c6a4e57..ff31388 100644 --- a/libgssglue/PKGBUILD +++ b/libgssglue/PKGBUILD @@ -6,19 +6,16 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libgssglue -pkgver=0.7 +pkgver=0.8 pkgrel=01 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries" -arch=('x86_64') #url="https://www.citi.umich.edu/projects/nfsv4/linux/" url="https://gitlab.com/gsasl/libgssglue/" #options=(debug) ## uncomment this to have the debug pkg produced depends=('glibc') makedepends=('pkgconfig' 'autoconf') backup=(etc/gssapi_mech.conf) -#source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz -# gssapi_mech.conf) -source=(https://gitlab.com/gsasl/$pkgname/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz) +source=($url/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz) prepare() { cd $pkgname-$pkgname-$pkgver @@ -39,8 +36,13 @@ package() { install -vDm 644 $pkgname-$pkgname-$pkgver/{AUTHORS,README,NEWS} -t "$pkgdir/usr/share/doc/$pkgname/" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- -license=('BSD') +arch=(x86_64) + +license=(BSD-3-Clause) + +sha256sums=(d5cb52a1c485cd1782ddef212787505c0e72904e486f6d03e0dde28fd6012ec7) # libgssglue-libgssglue-0.8.tar.gz + +## 8b517e9d3fd267d6a2fbd8b971dc775dc89ecb1924c71dc67637cef9bd8f8a9b libgssglue-0.8-01-x86_64.pkg.tar.lz -sha256sums=(e741fec9c41d78f9d215f8b6aaaa5a0bd1f64f6e2715f09c1d2b0293e093eedb) # libgssglue-libgssglue-0.7.tar.gz diff --git a/libgssglue/PKGBUILD-arch b/libgssglue/PKGBUILD-arch index ed90f5d..0c3deda 100644 --- a/libgssglue/PKGBUILD-arch +++ b/libgssglue/PKGBUILD-arch @@ -3,19 +3,18 @@ # Contributor: Tobias Powalowski pkgname=libgssglue -pkgver=0.7 +pkgver=0.8 pkgrel=1 pkgdesc="Library exporting a gssapi interface to call gssapi routines in other libraries" arch=(x86_64) url="https://gitlab.com/gsasl/libgssglue/" -license=(BSD) +license=(BSD-3-Clause) depends=(glibc) provides=(libgssglue.so) backup=(etc/gssapi_mech.conf) -options=(debug) -source=(https://gitlab.com/gsasl/$pkgname/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz) -sha512sums=('6f3b2bec37fec376fcdbf804593c01d6ba35541e482956f454583e6cd9e623f4d0f85ee75302621c38abe67c7675a39312bc25522985253482aa7012b8b6688e') -b2sums=('ade4c5eaf642e79090d84688f4c4e2abd07b1cdc955fafaf439c1453dc64e25fd2a7433b5330dd70e8a1559b1270af5f2029ab3027f53b1d01c05e6a7532489c') +source=($url/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.gz) +sha512sums=('bcab214da41789cfb9a4a42d6fa381aba209423273b64b00cca8b6e0c8c92ced3bff095544bcc67bb4bdd36bbbfaf49190ccb6d58652c1c70b2f5c64502a7bbc') +b2sums=('d6cab8babb57d49df7b1edab204011c9c9e8f97061ee7db2817a7bbc828898b24b64868f8dda19fef6e495f7b29fd0b69df804962fdaca03ef6997253e01e436') prepare() { cd $pkgname-$pkgname-$pkgver diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD index dcf3c9c..fe4ac59 100644 --- a/libxml2/PKGBUILD +++ b/libxml2/PKGBUILD @@ -8,7 +8,7 @@ #pkgbase=libxml2 #pkgname=(libxml2 libxml2-docs) pkgname=libxml2 -pkgver=2.12.1 +pkgver=2.12.2 pkgrel=01 # mixup between jobcore and staging 4/22 rebuild on jobcore used staging PKGBUILD-arch # so staging pkgrel is bumped up one to distinguish from jobcore's build @@ -19,7 +19,7 @@ makedepends=(python git) optdepends=('python: Python bindings') provides=(libxml2.so) #options=(debug) ## uncomment this to have the debug pkg produced -_commit=f4ac9926a463ecb628f73049e4fd7ecced8fb7cf # tags/v2.12.1^0 +_commit=4d8fa5b292fc902268217fa0f7031e77e5437b5a # tags/v2.12.2^0 source=( "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" 0001-HACK-Don-t-run-fuzzing-tests.patch @@ -89,12 +89,11 @@ package() { arch=(x86_64) -# license=(MIT) ... 2.9.14 -license=(custom:MIT) # 2.10.1 +license=(custom:MIT) sha256sums=(SKIP 60921b7894753a079659369b49b718c83d09edd49de76503850e5560af778c3a # 0001-HACK-Don-t-run-fuzzing-tests.patch 9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz -## 403b0210f848f52a4805b94129b4210a98f7ad74d4e7f0a17b7ba6f517130e0e libxml2-2.12.1-01-x86_64.pkg.tar.lz +## e2221b3ea02ae3fe66982874ec5a51eb3f2b99b1c638bc03790e4e5df88dcf62 libxml2-2.12.2-01-x86_64.pkg.tar.lz diff --git a/libxml2/PKGBUILD-arch b/libxml2/PKGBUILD-arch index 15aefe3..d2e0be3 100644 --- a/libxml2/PKGBUILD-arch +++ b/libxml2/PKGBUILD-arch @@ -9,7 +9,7 @@ pkgname=( libxml2 libxml2-docs ) -pkgver=2.12.1 +pkgver=2.12.2 pkgrel=1 pkgdesc="XML C parser and toolkit" url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" @@ -26,7 +26,7 @@ makedepends=( git python ) -_commit=f4ac9926a463ecb628f73049e4fd7ecced8fb7cf # tags/v2.12.1^0 +_commit=4d8fa5b292fc902268217fa0f7031e77e5437b5a # tags/v2.12.2^0 source=( "git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" 0001-HACK-Don-t-run-fuzzing-tests.patch diff --git a/thin-provisioning-tools/PKGBUILD b/thin-provisioning-tools/PKGBUILD index c019991..d7a850a 100644 --- a/thin-provisioning-tools/PKGBUILD +++ b/thin-provisioning-tools/PKGBUILD @@ -6,12 +6,10 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=thin-provisioning-tools -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=01 pkgdesc='Suite of tools for manipulating the metadata of the dm-thin device-mapper target' url="https://github.com/jthornber/thin-provisioning-tools" -#depends=('expat' 'gcc-libs' 'libaio') # 0.9.0 -#makedepends=('boost') # 0.9.0 depends=('gcc-libs') makedepends=('cargo') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jthornber/${pkgname}/archive/v${pkgver}.tar.gz") @@ -39,6 +37,7 @@ arch=(x86_64) license=(GPL3) -sha256sums=(6fd53f6c9aa70dc43b808858f3bd5b1c49279b8773bcd5c750ae21903559e629) # v1.0.7.tar.gz +sha256sums=(1afa8cf5c8b30c2c2e7bf45ca2af2c94b524ca63ef049322aa0dea6abe7e36fa) # v1.0.8.tar.gz + +## de0b2cdbed9a326e34a83748fb36b8f0c9ba87209337fbc9f032b1341ae56068 thin-provisioning-tools-1.0.8-01-x86_64.pkg.tar.lz -## dbf8775d9d76c8b0644c69782edbc2e6a1658f1757fa315dd452551286cb6bdd thin-provisioning-tools-1.0.7-01-x86_64.pkg.tar.lz diff --git a/thin-provisioning-tools/PKGBUILD-arch b/thin-provisioning-tools/PKGBUILD-arch index 6ecad0c..a1d9cca 100644 --- a/thin-provisioning-tools/PKGBUILD-arch +++ b/thin-provisioning-tools/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Jason Hall pkgname=thin-provisioning-tools -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc='Suite of tools for manipulating the metadata of the dm-thin device-mapper target' arch=('x86_64') @@ -11,7 +11,7 @@ license=('GPL3') depends=('gcc-libs') makedepends=('cargo') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jthornber/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('6fd53f6c9aa70dc43b808858f3bd5b1c49279b8773bcd5c750ae21903559e629') +sha256sums=('1afa8cf5c8b30c2c2e7bf45ca2af2c94b524ca63ef049322aa0dea6abe7e36fa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/thin-provisioning-tools/time b/thin-provisioning-tools/time index aa72ec5..d6a1a48 100644 --- a/thin-provisioning-tools/time +++ b/thin-provisioning-tools/time @@ -1,6 +1,6 @@ -real 7m27.654s -user 7m48.466s -sys 0m16.418s +real 1m19.893s +user 4m44.420s +sys 0m6.686s