diff --git a/.gitignore b/.gitignore index 4979997..53ea46f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /rpm-4.17.0.tar.bz2 /rpm-4.18.0-alpha1.tar.bz2 /rpm-4.18.0-alpha2.tar.bz2 +/rpm-4.18.0-beta1.tar.bz2 diff --git a/0001-Prevent-uncontrolled-sqlite-WAL-growth-during-large-.patch b/0001-Prevent-uncontrolled-sqlite-WAL-growth-during-large-.patch deleted file mode 100644 index b1a7b04..0000000 --- a/0001-Prevent-uncontrolled-sqlite-WAL-growth-during-large-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 33c8b214425c2860fdfe485d597e210b9723a792 Mon Sep 17 00:00:00 2001 -Message-Id: <33c8b214425c2860fdfe485d597e210b9723a792.1653292401.git.pmatilai@redhat.com> -From: Panu Matilainen -Date: Mon, 23 May 2022 10:42:13 +0300 -Subject: [PATCH] Prevent uncontrolled sqlite WAL growth during large - transactions - -Sqlite WAL threshold of 1000 pages is way too low for rpmdb as a single -header often exceeds that, but disabling the checkpointing entirely can -cause the WAL to grow to multiple gigabytes during large distro update -transactions, which isn't healty either. Bump the threshold to 10000 -pages which caps the WAL size to tens of megabytes, which hopefully -is a reasonable balance between performance on rotational disks (anybody -remember those?) and diskpace consumption. - -Also drop no longer meaningful link to %_flush_io configuration. ---- - lib/backend/sqlite.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c -index 31f77e845..d5389736b 100644 ---- a/lib/backend/sqlite.c -+++ b/lib/backend/sqlite.c -@@ -180,9 +180,8 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) - int one = 1; - /* Annoying but necessary to support non-privileged readers */ - sqlite3_file_control(sdb, NULL, SQLITE_FCNTL_PERSIST_WAL, &one); -- -- if (!rpmExpandNumeric("%{?_flush_io}")) -- sqlexec(sdb, "PRAGMA wal_autocheckpoint = 0"); -+ /* Sqlite default threshold is way too low for rpmdb */ -+ sqlexec(sdb, "PRAGMA wal_autocheckpoint = 10000"); - } - } - --- -2.35.3 - diff --git a/rpm.spec b/rpm.spec index 77ead79..b703859 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,8 +29,8 @@ %define rpmhome /usr/lib/rpm %global rpmver 4.18.0 -%global snapver alpha2 -%global baserelease 2 +%global snapver beta1 +%global baserelease 1 %global sover 9 %global srcver %{rpmver}%{?snapver:-%{snapver}} @@ -56,7 +56,6 @@ Patch1: rpm-4.17.x-siteconfig.patch Patch3: rpm-4.9.90-no-man-dirs.patch # Patches already upstream: -Patch100: 0001-Prevent-uncontrolled-sqlite-WAL-growth-during-large-.patch # These are not yet upstream Patch906: rpm-4.7.1-geode-i686.patch @@ -611,6 +610,9 @@ fi %doc docs/librpm/html/* %changelog +* Tue Jun 28 2022 Panu Matilainen - 4.18.0-0.beta1.1 +- Rebase to 4.18.0-beta1 (https://rpm.org/wiki/Releases/4.18.0) + * Mon Jun 13 2022 Python Maint - 4.18.0-0.alpha2.2 - Rebuilt for Python 3.11 diff --git a/sources b/sources index e897291..dff03e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-4.18.0-alpha2.tar.bz2) = 76282bbcdf7cfb3b6240ef2e2650cfbee784bddbfa85a09a92c02038e44b19cf8f20bf94b6d5464773d04ee838e136b788506ca28bdf36ed3a017c8e7172990e +SHA512 (rpm-4.18.0-beta1.tar.bz2) = 4476c9e679e0ac622323e80212404dc062884d1f38923ab824a64e1120bd7c1586379709feae824628425222567e4f338fcba0104e2ae285909df249adcf96c8