From 1713d94d4a14e74f34a5ca6e9946f1886b6b3815 Mon Sep 17 00:00:00 2001 From: joborun Date: Thu, 8 Feb 2024 02:21:52 +0200 Subject: [PATCH] upg apparmor ell libgit2 libwacom mariadb webkit2gtk valgrind --- apparmor/PKGBUILD | 12 +- apparmor/PKGBUILD-arch | 14 +- ell/PKGBUILD | 15 +- ell/PKGBUILD-arch | 6 +- libgit2/PKGBUILD | 16 +- libgit2/PKGBUILD-arch | 9 +- libwacom/PKGBUILD | 10 +- libwacom/PKGBUILD-arch | 6 +- mariadb/PKGBUILD | 14 +- mariadb/PKGBUILD-arch | 4 +- valgrind/PKGBUILD | 39 +++- valgrind/PKGBUILD-arch | 41 ++-- valgrind/time | 8 +- .../valgrind_3_22_0_fchmodat2_syscall.patch | 204 ++++++++++++++++++ ...rind_3_22_0_s390x-linux_memfd_secret.patch | 25 +++ webkit2gtk/PKGBUILD | 5 +- webkit2gtk/PKGBUILD-arch | 12 +- webkit2gtk/time | 7 +- 18 files changed, 356 insertions(+), 91 deletions(-) create mode 100644 valgrind/valgrind_3_22_0_fchmodat2_syscall.patch create mode 100644 valgrind/valgrind_3_22_0_s390x-linux_memfd_secret.patch diff --git a/apparmor/PKGBUILD b/apparmor/PKGBUILD index 652dcaa..3d48c2e 100644 --- a/apparmor/PKGBUILD +++ b/apparmor/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=apparmor -pkgver=3.1.6 -pkgrel=03 +pkgver=3.1.7 +pkgrel=01 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM) w/o systemd" url="https://gitlab.com/apparmor/apparmor" depends=(audit bash gcc-libs glibc pam python) @@ -146,11 +146,11 @@ package() { arch=(x86_64) -license=(GPL2 LGPL2.1) +license=(GPL-2.0-only LGPL-2.0-only LGPL-2.1-only) validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) -sha256sums=(d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd # apparmor-3.1.6.tar.gz - fd68b2a19c3fbbbbe8607fed08521d7ad7b5b84389f7926e6a2e6356a1408c0a) # apparmor-3.1.6.tar.gz.asc +sha256sums=(c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64 # apparmor-3.1.7.tar.gz + 8ccc5f43737b759b9e5fc55067596e949753a40fae3846d1239cd2e4ecc3725e) # apparmor-3.1.7.tar.gz.asc -## 419699b1500c2edd0cbd26f84b4558af15b34c3eb239bf930b6540118ba8fe95 apparmor-3.1.6-03-x86_64.pkg.tar.lz +## 547c914bd2afbf60ec7bbc5c9d226ae3990d29dd0e469c310f5a8fce6d773f38 apparmor-3.1.7-01-x86_64.pkg.tar.lz diff --git a/apparmor/PKGBUILD-arch b/apparmor/PKGBUILD-arch index 987e026..75c2712 100644 --- a/apparmor/PKGBUILD-arch +++ b/apparmor/PKGBUILD-arch @@ -1,12 +1,16 @@ # Maintainer: David Runge pkgname=apparmor -pkgver=3.1.6 -pkgrel=2 +pkgver=3.1.7 +pkgrel=1 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)" arch=(x86_64) url="https://gitlab.com/apparmor/apparmor" -license=(GPL2 LGPL2.1) +license=( + GPL-2.0-only + LGPL-2.0-only + LGPL-2.1-only +) depends=( audit bash @@ -43,9 +47,9 @@ backup=( etc/apparmor/severity.db ) source=(https://launchpad.net/$pkgname/${pkgver%.[0-9]}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}) -sha512sums=('b89a547a8eda6f16d2f0543fdff693e79fdd5530f5e48ce78cdc42b9dc99b2fa8e95ba01753a0cc2ee7e3c03fe47917cb19e044bab4c4aa1a85ec5d87ef64281' +sha512sums=('7984a3cfd251f82c08604eb3c584ea5a84600c5fbe3a25834ba550c7a1bebb8b1b0216092a9a497eac2ba32a3f880495d024acf641212bce0041698ac5ff8552' 'SKIP') -b2sums=('5dab02218ad55e24d6b0f01cbebedabeb4042fac7c56659a2072504049d9c8d7411a4ecee5bb764abcc0619f7b5b22a290014803626e9adb74a4205ba2d4b797' +b2sums=('81e22d1e8b6432329e818d22f337704ad145e4a0c2d256e61a2918f864208dc1f1d9e94bf0db530829ba232a742e9430c2c104cefdb4d54cfb8bcdd677767837' 'SKIP') validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') # AppArmor Development Team (AppArmor signing key) _core_perl="/usr/bin/core_perl" diff --git a/ell/PKGBUILD b/ell/PKGBUILD index 0e42e16..d4e68b6 100644 --- a/ell/PKGBUILD +++ b/ell/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=ell -pkgver=0.61 +pkgver=0.62 pkgrel=01 pkgdesc="Embedded Linux library" url="https://01.org/ell" @@ -19,7 +19,9 @@ source=(https://mirrors.edge.kernel.org/pub/linux/libs/$pkgname/$pkgname-$pkgver build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure \ + --prefix=/usr \ + --disable-dbus make } @@ -37,12 +39,11 @@ package() { arch=(x86_64) -license=('LGPL2.1') +license=('LGPL-2.1-or-later') validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann " -sha256sums=(c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0 # ell-0.61.tar.xz - cbdc6801fa13c578163ebe0307e0eb4b51fc572ddb9b31d8aabf714aae7c4c6a) # ell-0.61.tar.sign - -## 40a106abf86e073351cb50cbd0ad7f0c531931f760a08ddd51e814759982dc14 ell-0.61-01-x86_64.pkg.tar.lz +sha256sums=(f1efae12085610049714dc509c6fab3478925801609ad4232ce873b7daf1e03d # ell-0.62.tar.xz + 274ba3ce18d94e9e9ea5c8e0545e1f4b0d6e2c8c6f405bc61b22e02d81afae0d) # ell-0.62.tar.sign +## b9ed27377284234668bce9a8f830b2b7787e48bd1bee241f223f68080fbd474c ell-0.62-01-x86_64.pkg.tar.lz diff --git a/ell/PKGBUILD-arch b/ell/PKGBUILD-arch index 8543fcc..c3e78c0 100644 --- a/ell/PKGBUILD-arch +++ b/ell/PKGBUILD-arch @@ -2,18 +2,18 @@ # Contributor: Jameson Pugh pkgname=ell -pkgver=0.61 +pkgver=0.62 pkgrel=1 pkgdesc="Embedded Linux library" arch=(x86_64) url="https://01.org/ell" #url="https://git.kernel.org/pub/scm/libs/ell/ell.git/" -license=('LGPL2.1') +license=('LGPL-2.1-or-later') depends=('gcc-libs' 'glibc') checkdepends=('dbus' 'procps-ng') # https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc source=(https://mirrors.edge.kernel.org/pub/linux/libs/$pkgname/$pkgname-$pkgver.tar.{xz,sign}) -sha256sums=('c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0' +sha256sums=('f1efae12085610049714dc509c6fab3478925801609ad4232ce873b7daf1e03d' 'SKIP') validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # "Marcel Holtmann " diff --git a/libgit2/PKGBUILD b/libgit2/PKGBUILD index 6e25ea3..2878688 100644 --- a/libgit2/PKGBUILD +++ b/libgit2/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libgit2 -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=01 epoch=1 pkgdesc="A linkable library for Git" @@ -69,22 +69,16 @@ package() { DESTDIR="$pkgdir" cmake --install build install -vDm 644 $pkgname-$pkgver/{AUTHORS,README.md} -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } #---- arch license gpg-key & sha256sums ---- arch=(x86_64) -license=(GPL2) +license=(LicenseRef-GPL-2.0-only-with-linking-exception) -sha256sums=(17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327) # libgit2-v1.7.1.tar.gz +sha256sums=(de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f) # libgit2-v1.7.2.tar.gz -## c06759538a08e93c065956b17c8659e8d8a557c627fd0b9e2a673742e2b0464a libgit2-1_1.7.1-01-x86_64.pkg.tar.lz - - - -# Note to packager: -#ls -l *pkg.tar.lz -#echo "you must rename this package to meet SF naming before you move to the repo" -#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log +## 3da3397fa99dd263de07d279cf64bd8d6ebe467e2bde8d14824022ebdb73448a libgit2-1_1.7.2-01-x86_64.pkg.tar.lz diff --git a/libgit2/PKGBUILD-arch b/libgit2/PKGBUILD-arch index a33431a..ccf2b26 100644 --- a/libgit2/PKGBUILD-arch +++ b/libgit2/PKGBUILD-arch @@ -6,13 +6,13 @@ pkgname=libgit2 # NOTE: add the following packages to rebuild TODOs on soname change (although they do not link against libgit2.so): # julia -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 epoch=1 pkgdesc="A linkable library for Git" arch=(x86_64) url="https://github.com/libgit2/libgit2" -license=(GPL2) +license=(LicenseRef-GPL-2.0-only-with-linking-exception) depends=( gcc-libs glibc @@ -28,8 +28,8 @@ makedepends=( ) provides=(libgit2.so) source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) -sha512sums=('08e60dde0cdf57006cf0c5f27a82220aba8d701bf7d6d709ffe312975ffa5dbef009ccb1e7cbe570b9502f4361d06ace44dbfd9a5f5f8ad08e9b0ca05bef765e') -b2sums=('9c50d3c25d1cc58e5fab60b4c438c91479dd57138a14a48a8b692bb6b43733f59759172043c94198df63fa1e4eb40c548bb78c94bc57fb99682059be57a5c3e2') +sha512sums=('825737e4a1991fba50ea535f15b0e560ebe76ead752e04aeba36925b944d0da77fe9826a70980a1aa3d0bf9afbedfab79dd92e799c9252931384c89ebec9b012') +b2sums=('c27870124c7e63a37794014a802a6fce46c577313f3b6081580f920fa842a65305b5bc56aa6ab02cf87c533d6052afdc37317f96aa1fd67387b07f52415ccbe3') build() { local cmake_options=( @@ -77,4 +77,5 @@ package() { DESTDIR="$pkgdir" cmake --install build install -vDm 644 $pkgname-$pkgver/{AUTHORS,README.md} -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } diff --git a/libwacom/PKGBUILD b/libwacom/PKGBUILD index eb919fb..c77bf07 100644 --- a/libwacom/PKGBUILD +++ b/libwacom/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libwacom -pkgver=2.9.0 -pkgrel=02 +pkgver=2.10.0 +pkgrel=01 pkgdesc="Library to identify Wacom tablets and their features w/o systemd" url="https://github.com/linuxwacom/libwacom/wiki" depends=('glib2' 'libevdev' 'libgudev') @@ -45,8 +45,8 @@ validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # "Peter Hutterer (Who # https://github.com/linuxwacom/libwacom/releases -sha256sums=(6f678156797becc4f1537a19aadcc48ed7a54e1ff3cbf591d1233f8a2d82e242 # libwacom-2.9.0.tar.xz - 8740508db77a7a9d97771b749a02748431df97fb7e55d96150900203b3950843) # libwacom-2.9.0.tar.xz.sig +sha256sums=(3f8ef37de78ac3d08af1bdcb5d5828ec8284dcb7154bbec4995238728914aa0e # libwacom-2.10.0.tar.xz + d03094ae0be864abb8f480e20a175c86fd53de61be84a3ec6d9d8d6bcec18d7d) # libwacom-2.10.0.tar.xz.sig -## ed91b36611c8092c2f008780c1c8ab49b24da8ba8508db514498e3f1ac1b312b libwacom-2.9.0-02-x86_64.pkg.tar.lz +## f6ec299fc61cd8f44212bf26e896b4f8a8a2ca18522f9212902eebf6be7c0911 libwacom-2.10.0-01-x86_64.pkg.tar.lz diff --git a/libwacom/PKGBUILD-arch b/libwacom/PKGBUILD-arch index 20e6966..577ba52 100644 --- a/libwacom/PKGBUILD-arch +++ b/libwacom/PKGBUILD-arch @@ -1,8 +1,8 @@ # Maintainer: Andreas Radke pkgname=libwacom -pkgver=2.9.0 -pkgrel=2 +pkgver=2.10.0 +pkgrel=1 pkgdesc="Library to identify Wacom tablets and their features" arch=('x86_64') url="https://github.com/linuxwacom/libwacom/wiki" @@ -14,7 +14,7 @@ optdepends=('python-libevdev: for libwacom-show-stylus' 'python-pyudev: for libwacom-show-stylus') source=(https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}) # https://github.com/linuxwacom/libwacom/releases -sha256sums=('6f678156797becc4f1537a19aadcc48ed7a54e1ff3cbf591d1233f8a2d82e242' +sha256sums=('3f8ef37de78ac3d08af1bdcb5d5828ec8284dcb7154bbec4995238728914aa0e' 'SKIP') validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # "Peter Hutterer (Who-T) " #validpgpkeys=('594ABBA066118C7A02D10A80A8AF906D9307FBAD') # "Joshua Dickens " diff --git a/mariadb/PKGBUILD b/mariadb/PKGBUILD index 027ddbc..da893fe 100644 --- a/mariadb/PKGBUILD +++ b/mariadb/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=mariadb pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop') pkgdesc='Fast SQL database server, derived from MySQL w/o systemd and zstd' -pkgver=11.2.2 +pkgver=11.2.3 pkgrel=01 url='https://mariadb.org/' makedepends=('boost' 'bzip2' 'cmake' 'cracklib' 'curl' 'jemalloc' 'judy' 'krb5' 'libaio' @@ -249,13 +249,13 @@ license=('GPL') #validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key validpgpkeys=('177F4010FE56CA3336300305F1656F24C74CD1D8') # MariaDB Signing Key -sha256sums=(faedbd8790c7ee65b348c0169706b4bae91eb6ce7335a76b27dbd8813c42e21b # mariadb-11.2.2.tar.gz - 3eb3d0e6354f2a7d49d536d4b1c18ad414a2d94555bdbee8858b051b3910f63d # mariadb-11.2.2.tar.gz.asc +sha256sums=(14a0bba0c2847eb3f69a4637f55798f8abe10904cd1dd22899c9b0a39c43e35f # mariadb-11.2.3.tar.gz + 352fd00a362318e22e1ddffe817c4c50b6197d9d616ae6585ad9edbdfca806a8 # mariadb-11.2.3.tar.gz.asc 711b4e7cf40e2b1ab132655a8d64f5a721027296f7a5731ffa70b504b3d805cd # mariadb.sysusers.conf 5ff8916c32c87ac45f05171669ff94e5a1a81c6bd7e6516b63fd9db8723916fc) # mariadb.tmpfile.conf -## 25e6fcc56ea54eb4bf0ead5d0c88f8a8da9f4cdd6eb8cd7d380a44d950360e56 mariadb-11.2.2-01-x86_64.pkg.tar.lz -## 283628f0cda7d46ae0ce15692bf4d7203f664fff449476d906eee31c7260a4b0 mariadb-clients-11.2.2-01-x86_64.pkg.tar.lz -## 077632f23baeaf797da13afd089c625080d43afefa9eb5a985ab259f2ba26e7c mariadb-libs-11.2.2-01-x86_64.pkg.tar.lz -## 4638c679b2cb99e8b9e4671b50b9700cb4b397fc3e4ce57d92755ab0b0a866f6 mytop-11.2.2-01-x86_64.pkg.tar.lz +## 114186990260555ca78a150eb5b0df397d7b41054f953677db1fdfdf4f8b45fe mariadb-11.2.3-01-x86_64.pkg.tar.lz +## e32d1b096fd1cec00dee274b4024a81df508da0e0c6ac561e278d9bac818e4d1 mariadb-clients-11.2.3-01-x86_64.pkg.tar.lz +## 75f6e1052af667a4f92cee67b4750c53d29a6366632d521685ddde04a0426181 mariadb-libs-11.2.3-01-x86_64.pkg.tar.lz +## f22b25013dc40a0358415deebd11dc697e0352e9c4d8e15513c1a79d24b83928 mytop-11.2.3-01-x86_64.pkg.tar.lz diff --git a/mariadb/PKGBUILD-arch b/mariadb/PKGBUILD-arch index 57014d3..9ce14f2 100644 --- a/mariadb/PKGBUILD-arch +++ b/mariadb/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgbase=mariadb pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop') pkgdesc='Fast SQL database server, derived from MySQL' -pkgver=11.2.2 +pkgver=11.2.3 pkgrel=1 arch=('x86_64') license=('GPL') @@ -18,7 +18,7 @@ validpgpkeys=('177F4010FE56CA3336300305F1656F24C74CD1D8') # MariaDB Signing Key # https://mariadb.com/kb/en/library/mirror-sites-for-mariadb/ source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc} '0001-arch-specific.patch') -sha256sums=('faedbd8790c7ee65b348c0169706b4bae91eb6ce7335a76b27dbd8813c42e21b' +sha256sums=('14a0bba0c2847eb3f69a4637f55798f8abe10904cd1dd22899c9b0a39c43e35f' 'SKIP' '3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460') diff --git a/valgrind/PKGBUILD b/valgrind/PKGBUILD index 97e2b01..1748495 100644 --- a/valgrind/PKGBUILD +++ b/valgrind/PKGBUILD @@ -11,25 +11,29 @@ # whenever the tests shall run # # For a fresh build: -# $repo-x86_64-build -- -I ../../glibc/trunk/glibc-debug*.pkg.tar.zst -# $repo-x86_64-build -# ${repo}pkg +# pkgctl build -I ../../glibc/trunk/glibc-debug*.pkg.tar.zst +# pkgctl build pkgname=valgrind pkgver=3.22.0 -pkgrel=02 +pkgrel=03 pkgdesc='Tool to help find memory-management problems in programs' url='https://valgrind.org/' depends=('glibc' 'perl' 'debuginfod') makedepends=('gdb' 'lib32-glibc' 'lib32-gcc-libs' 'docbook-xml' 'docbook-xsl' 'docbook-sgml') checkdepends=('procps-ng') -optdepends=('lib32-glibc: 32-bit ABI support') +optdepends=('lib32-glibc: 32-bit ABI support' + 'python: cg_* scripts') provides=('valgrind-multilib') replaces=('valgrind-multilib') options=('!emptydirs' '!strip') source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc} - valgrind-3.7.0-respect-flags.patch) + valgrind-3.7.0-respect-flags.patch + # https://sourceware.org/git/?p=valgrind.git;a=commit;h=372d09fd9a8d76847c81092ebff71c80fd6c145d + # dropped changes to NEWS as that did not apply + valgrind_3_22_0_s390x-linux_memfd_secret.patch + valgrind_3_22_0_fchmodat2_syscall.patch) options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252 prepare() { @@ -37,6 +41,11 @@ prepare() { patch -Np1 < ../valgrind-3.7.0-respect-flags.patch sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am + # can be dropped with the next release, see + # https://gitlab.archlinux.org/archlinux/packaging/packages/valgrind/-/issues/2 + patch -Np1 < ../valgrind_3_22_0_s390x-linux_memfd_secret.patch + patch -Np1 < ../valgrind_3_22_0_fchmodat2_syscall.patch + autoreconf -ifv } @@ -52,7 +61,8 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --enable-lto=yes make make -C docs man-pages } @@ -112,14 +122,21 @@ package() { arch=(x86_64) -license=('GPL') +license=('GPL-2.0-or-later') validpgpkeys=(0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A) # Mark Wielaard +b2sums=('80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514' + 'SKIP' + 'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a' + '5af1f467c8d22334e14e6c2878120550ce5f1e36b61f8180601b8673493a85cca8a0c3a804c281ab51fb04fe5e3706edeb897bbd5486f87d9143f472cd4c46b5' + '305234e118eeb389c95ca8afa45239b0386199dee6f5058a3ddca06a91b2069e1b9831ac5e31badf6d8bd0d43eef3f260d95b976a509d73284149a64d9ea0563') + sha256sums=(c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c # valgrind-3.22.0.tar.bz2 b41c4d660811d7b9d57579cbbaa1bf63a5ce2fff1dce5651985eab32d70348ca # valgrind-3.22.0.tar.bz2.asc - 4e6be3a1799c17a6e843ab1966a3a68ac0ffa83d4b2230ce1b607518c42a31a2) # valgrind-3.7.0-respect-flags.patch - -## 91f26c2787ea3b03fa7a8718cf9fc75ead653555f443d5996ad60757f3ef09de valgrind-3.22.0-02-x86_64.pkg.tar.lz + 4e6be3a1799c17a6e843ab1966a3a68ac0ffa83d4b2230ce1b607518c42a31a2 # valgrind-3.7.0-respect-flags.patch + 083cab680d79842ab36407dac9d728583cb1f0b69ec38cc14d69292701f2eece # valgrind_3_22_0_s390x-linux_memfd_secret.patch + 4361ea14580638a056edc04da9eebde9c471575b70161eca7cf79643a9955e3b) # valgrind_3_22_0_fchmodat2_syscall.patch +## 0106da9eef9bf34807cea976e15ba3edd11cf06a5c72578e500031b2cdb10f36 valgrind-3.22.0-03-x86_64.pkg.tar.lz diff --git a/valgrind/PKGBUILD-arch b/valgrind/PKGBUILD-arch index 778af42..d67fa7b 100644 --- a/valgrind/PKGBUILD-arch +++ b/valgrind/PKGBUILD-arch @@ -9,37 +9,47 @@ # whenever the tests shall run # # For a fresh build: -# $repo-x86_64-build -- -I ../../glibc/trunk/glibc-debug*.pkg.tar.zst -# $repo-x86_64-build -# ${repo}pkg +# pkgctl build -I ../../glibc/trunk/glibc-debug*.pkg.tar.zst +# pkgctl build pkgname=valgrind pkgver=3.22.0 -pkgrel=2 +pkgrel=3 pkgdesc='Tool to help find memory-management problems in programs' arch=('x86_64') -license=('GPL') +license=('GPL-2.0-or-later') url='https://valgrind.org/' depends=('glibc' 'perl' 'debuginfod') makedepends=('gdb' 'lib32-glibc' 'lib32-gcc-libs' 'docbook-xml' 'docbook-xsl' 'docbook-sgml') checkdepends=('procps-ng') -optdepends=('lib32-glibc: 32-bit ABI support') +optdepends=( + 'lib32-glibc: 32-bit ABI support' + 'python: cg_* scripts' +) provides=('valgrind-multilib') replaces=('valgrind-multilib') options=('!emptydirs' '!strip') source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc} - valgrind-3.7.0-respect-flags.patch) + valgrind-3.7.0-respect-flags.patch + # https://sourceware.org/git/?p=valgrind.git;a=commit;h=372d09fd9a8d76847c81092ebff71c80fd6c145d + # dropped changes to NEWS as that did not apply + valgrind_3_22_0_s390x-linux_memfd_secret.patch + valgrind_3_22_0_fchmodat2_syscall.patch) validpgpkeys=( 0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard ) sha512sums=('2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777' 'SKIP' - 'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c') + 'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c' + '6393ddf84eec93cc9b3e20f9c43a8f3ef37436980c9d91350ebd27d5c41057fe982308ba5d194feddaea4a75a4a9ef14fb404388cc9f4628edbe9ef58787afba' + '1e22b75b95252583774916dab9dcbc8663495107e15dd1ddf397744b288265fcffd1f456d306bc610989a1f650ae66a8ebeb84d253be312db2ab9fdc9fe1407f') b2sums=('80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514' 'SKIP' - 'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a') + 'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a' + '5af1f467c8d22334e14e6c2878120550ce5f1e36b61f8180601b8673493a85cca8a0c3a804c281ab51fb04fe5e3706edeb897bbd5486f87d9143f472cd4c46b5' + '305234e118eeb389c95ca8afa45239b0386199dee6f5058a3ddca06a91b2069e1b9831ac5e31badf6d8bd0d43eef3f260d95b976a509d73284149a64d9ea0563') options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252 prepare() { @@ -47,22 +57,23 @@ prepare() { patch -Np1 < ../valgrind-3.7.0-respect-flags.patch sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am + # can be dropped with the next release, see + # https://gitlab.archlinux.org/archlinux/packaging/packages/valgrind/-/issues/2 + patch -Np1 < ../valgrind_3_22_0_s390x-linux_memfd_secret.patch + patch -Np1 < ../valgrind_3_22_0_fchmodat2_syscall.patch + autoreconf -ifv } build() { - # valgrind does not like some of our flags - CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} - CFLAGS=${CFLAGS/-fno-plt/} - CXXFLAGS=${CXXFLAGS/-fno-plt/} - cd valgrind-${pkgver} ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --enable-lto=yes make make -C docs man-pages } diff --git a/valgrind/time b/valgrind/time index a68c73b..76f4796 100644 --- a/valgrind/time +++ b/valgrind/time @@ -1,6 +1,6 @@ - -real 8m28.579s -user 8m20.951s -sys 0m21.557s +3.22.0-03 +real 0m2.793s +user 0m2.540s +sys 0m0.481s diff --git a/valgrind/valgrind_3_22_0_fchmodat2_syscall.patch b/valgrind/valgrind_3_22_0_fchmodat2_syscall.patch new file mode 100644 index 0000000..e2e99d6 --- /dev/null +++ b/valgrind/valgrind_3_22_0_fchmodat2_syscall.patch @@ -0,0 +1,204 @@ +From 372d09fd9a8d76847c81092ebff71c80fd6c145d Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Sat, 18 Nov 2023 21:17:02 +0100 +Subject: [PATCH 1/1] Add fchmodat2 syscall on linux + +fchmodat2 is a new syscall on linux 6.6. It is a variant of fchmodat +that takes an extra flags argument. + +https://bugs.kde.org/show_bug.cgi?id=477198 +--- + NEWS | 1 + + coregrind/m_syswrap/priv_syswrap-linux.h | 3 +++ + coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-arm-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-arm64-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-linux.c | 11 +++++++++++ + coregrind/m_syswrap/syswrap-mips32-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-mips64-linux.c | 1 + + coregrind/m_syswrap/syswrap-nanomips-linux.c | 1 + + coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ + coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ + include/vki/vki-scnums-shared-linux.h | 2 ++ + 14 files changed, 35 insertions(+) + +diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h +index f13726bc0d..d50cdcc981 100644 +--- a/coregrind/m_syswrap/priv_syswrap-linux.h ++++ b/coregrind/m_syswrap/priv_syswrap-linux.h +@@ -334,6 +334,9 @@ DECL_TEMPLATE(linux, sys_memfd_secret); + // Linux-specific (since Linux 5.6) + DECL_TEMPLATE(linux, sys_pidfd_getfd); + ++// Since Linux 6.6 ++DECL_TEMPLATE(linux, sys_fchmodat2); ++ + /* --------------------------------------------------------------------- + Wrappers for sockets and ipc-ery. These are split into standalone + procedures because x86-linux hides them inside multiplexors +diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c +index 8de4371e20..d93d937211 100644 +--- a/coregrind/m_syswrap/syswrap-amd64-linux.c ++++ b/coregrind/m_syswrap/syswrap-amd64-linux.c +@@ -886,6 +886,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 + + LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 ++ ++ LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) +diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c +index 5a16ca124e..21fc066d6d 100644 +--- a/coregrind/m_syswrap/syswrap-arm-linux.c ++++ b/coregrind/m_syswrap/syswrap-arm-linux.c +@@ -1060,6 +1060,8 @@ static SyscallTableEntry syscall_main_table[] = { + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 ++ ++ LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + +diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c +index f80890bd0c..5a24dcaf39 100644 +--- a/coregrind/m_syswrap/syswrap-arm64-linux.c ++++ b/coregrind/m_syswrap/syswrap-arm64-linux.c +@@ -841,6 +841,8 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 + + LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 ++ ++ LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + +diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c +index 0cc6221976..01bbba0a6d 100644 +--- a/coregrind/m_syswrap/syswrap-linux.c ++++ b/coregrind/m_syswrap/syswrap-linux.c +@@ -6077,6 +6077,17 @@ PRE(sys_fchmodat) + PRE_MEM_RASCIIZ( "fchmodat(path)", ARG2 ); + } + ++PRE(sys_fchmodat2) ++{ ++ PRINT("sys_fchmodat2 ( %ld, %#" FMT_REGWORD "x(%s), %" FMT_REGWORD "u, %" ++ FMT_REGWORD "u )", ++ SARG1, ARG2, (HChar*)(Addr)ARG2, ARG3, ARG4); ++ PRE_REG_READ4(long, "fchmodat2", ++ int, dfd, const char *, path, vki_mode_t, mode, ++ unsigned int, flags); ++ PRE_MEM_RASCIIZ( "fchmodat2(pathname)", ARG2 ); ++} ++ + PRE(sys_faccessat) + { + PRINT("sys_faccessat ( %ld, %#" FMT_REGWORD "x(%s), %ld )", +diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c +index e90809602c..ba0a453879 100644 +--- a/coregrind/m_syswrap/syswrap-mips32-linux.c ++++ b/coregrind/m_syswrap/syswrap-mips32-linux.c +@@ -1145,6 +1145,8 @@ static SyscallTableEntry syscall_main_table[] = { + LINX_ (__NR_faccessat2, sys_faccessat2), // 439 + + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 ++ ++ LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) +diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c +index 1452e6b74f..ead350719d 100644 +--- a/coregrind/m_syswrap/syswrap-mips64-linux.c ++++ b/coregrind/m_syswrap/syswrap-mips64-linux.c +@@ -823,6 +823,7 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY (__NR_pidfd_getfd, sys_pidfd_getfd), + LINX_ (__NR_faccessat2, sys_faccessat2), + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), ++ LINX_ (__NR_fchmodat2, sys_fchmodat2), + }; + + SyscallTableEntry * ML_(get_linux_syscall_entry) ( UInt sysno ) +diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c +index fad05702d2..b7eaa24ebc 100644 +--- a/coregrind/m_syswrap/syswrap-nanomips-linux.c ++++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c +@@ -831,6 +831,7 @@ static SyscallTableEntry syscall_main_table[] = { + LINXY(__NR_pidfd_getfd, sys_pidfd_getfd), + LINX_ (__NR_faccessat2, sys_faccessat2), + LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), ++ LINX_ (__NR_fchmodat2, sys_fchmodat2), + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) +diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c +index 53722fbf7f..7cb0221314 100644 +--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c ++++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c +@@ -1067,6 +1067,8 @@ static SyscallTableEntry syscall_table[] = { + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + + LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 ++ ++ LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) +diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c +index 6a99673251..bd7fbb2c5a 100644 +--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c ++++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c +@@ -1033,6 +1033,8 @@ static SyscallTableEntry syscall_table[] = { + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + + LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 ++ ++ LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) +diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c +index 3238eef3ff..4f03f218eb 100644 +--- a/coregrind/m_syswrap/syswrap-s390x-linux.c ++++ b/coregrind/m_syswrap/syswrap-s390x-linux.c +@@ -876,6 +876,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 + + LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 ++ ++ LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) +diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c +index c7eff0585c..f57b5395ca 100644 +--- a/coregrind/m_syswrap/syswrap-x86-linux.c ++++ b/coregrind/m_syswrap/syswrap-x86-linux.c +@@ -1657,6 +1657,8 @@ static SyscallTableEntry syscall_table[] = { + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 + + LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 ++ ++ LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) +diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h +index 1bd4066703..068a2cd12b 100644 +--- a/include/vki/vki-scnums-shared-linux.h ++++ b/include/vki/vki-scnums-shared-linux.h +@@ -50,4 +50,6 @@ + + #define __NR_memfd_secret 447 + ++#define __NR_fchmodat2 452 ++ + #endif +-- +2.39.3 + diff --git a/valgrind/valgrind_3_22_0_s390x-linux_memfd_secret.patch b/valgrind/valgrind_3_22_0_s390x-linux_memfd_secret.patch new file mode 100644 index 0000000..b68fb00 --- /dev/null +++ b/valgrind/valgrind_3_22_0_s390x-linux_memfd_secret.patch @@ -0,0 +1,25 @@ +From ca88e1c63178186a1f6a0d0b1a4ba4ee895af323 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Sat, 18 Nov 2023 02:23:10 +0100 +Subject: [PATCH] s390x-linux also has memfd_secret, syswrap it + +--- + coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c +index 7740bd61f6..3238eef3ff 100644 +--- a/coregrind/m_syswrap/syswrap-s390x-linux.c ++++ b/coregrind/m_syswrap/syswrap-s390x-linux.c +@@ -874,6 +874,8 @@ static SyscallTableEntry syscall_table[] = { + LINX_(__NR_faccessat2, sys_faccessat2), // 439 + + LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 ++ ++ LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 + }; + + SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) +-- +2.39.3 + diff --git a/webkit2gtk/PKGBUILD b/webkit2gtk/PKGBUILD index faa30b4..23084cf 100644 --- a/webkit2gtk/PKGBUILD +++ b/webkit2gtk/PKGBUILD @@ -129,7 +129,10 @@ b2sums=('4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3 'daa782d4d40cc12a05c02b2494e879333f66f32820f1a1b89b7ab68f62fd53043b116ecb5ef476004095a7c7b924b12695b7e87e21dd547f66e72fa02a972f0d') sha256sums=(b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 # webkitgtk-2.42.5.tar.xz - 4c81a8b90fbdd689bba48c88ee5dcab23ae53931d48e1c69199e71870a5f3185 # webkitgtk-2.42.4.tar.xz.asc + 1495d1346e65696f25995efebceec0672e374c8740e49f623b6dd89a30280cd4 # webkitgtk-2.42.5.tar.xz.asc a921d6be1303e9f23474971f381886fd291ec5bb1a7ff1e85acede8cfb88bef2 # GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch 655f3b2c96355ac83c4fa1fc6048e3256bbfdbfb9727e1e18c5af12613536206) # GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch + +## bdbf0979800b92aa19a384a6562ca763ac7889d53e8aef905f9c1aab3392759d webkit2gtk-2.42.5-01-x86_64.pkg.tar.lz + diff --git a/webkit2gtk/PKGBUILD-arch b/webkit2gtk/PKGBUILD-arch index b1f82d9..c1b3486 100644 --- a/webkit2gtk/PKGBUILD-arch +++ b/webkit2gtk/PKGBUILD-arch @@ -6,8 +6,8 @@ pkgname=( webkit2gtk webkit2gtk-docs ) -pkgver=2.42.4 -pkgrel=2 +pkgver=2.42.5 +pkgrel=1 pkgdesc="Web content engine for GTK" url="https://webkitgtk.org" arch=(x86_64) @@ -81,11 +81,11 @@ source=( GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch ) -sha256sums=('52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86' +sha256sums=('b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749' 'SKIP' 'a921d6be1303e9f23474971f381886fd291ec5bb1a7ff1e85acede8cfb88bef2' '655f3b2c96355ac83c4fa1fc6048e3256bbfdbfb9727e1e18c5af12613536206') -b2sums=('3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401' +b2sums=('4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516' 'SKIP' 'd440d82c769f1b35caf5464dc850cdf1c896224205c90c17d8b0a44aee62e4b1383e11306936aaca067fde8836770d346d5122d7b05c91a5c7c1741c89c65e2f' 'daa782d4d40cc12a05c02b2494e879333f66f32820f1a1b89b7ab68f62fd53043b116ecb5ef476004095a7c7b924b12695b7e87e21dd547f66e72fa02a972f0d') @@ -129,6 +129,10 @@ build() { export CC=clang CXX=clang++ LDFLAGS+=" -fuse-ld=lld" + # JITted code crashes when CET is used + CFLAGS+=' -fcf-protection=none' + CXXFLAGS+=' -fcf-protection=none' + # Produce minimal debug info: 4.3 GB of debug data makes the # build too slow and is too much to package for debuginfod CFLAGS+=' -g1' diff --git a/webkit2gtk/time b/webkit2gtk/time index 23f7c88..e6ab6e6 100644 --- a/webkit2gtk/time +++ b/webkit2gtk/time @@ -1,5 +1,6 @@ -real 151m44.535s -user 572m5.360s -sys 25m49.142s + +real 254m40.350s +user 479m56.842s +sys 25m54.922s