diff --git a/0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch b/0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch deleted file mode 100644 index 98afb9ac2dc55cfa7b22490511f5e43b1aa1d627..0000000000000000000000000000000000000000 --- a/0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1fa8d43007b31115342002ac675c905d9f18fbd9 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Thu, 3 Mar 2022 09:39:52 -0600 -Subject: [PATCH] sanlock: fix memory leak of lockspace renewal_history - -Leak was in original commit for "sanlock: renewal history" -6313c709722b3ba63234a75d1651a160bf1728ee. - -With the default renewal history size, each lockspace that -was created would leak about 4kb of memory. ---- - src/lockspace.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lockspace.c b/src/lockspace.c -index 2ebc247..d23dccd 100644 ---- a/src/lockspace.c -+++ b/src/lockspace.c -@@ -939,6 +939,8 @@ static void free_sp(struct space *sp) - { - if (sp->lease_status.renewal_read_buf) - free(sp->lease_status.renewal_read_buf); -+ if (sp->renewal_history) -+ free(sp->renewal_history); - free(sp); - } - --- -1.8.3.1 - diff --git a/sanlock-3.8.4.tar.gz b/sanlock-3.8.4.tar.gz deleted file mode 100644 index ccd3dfd4c752040366756306c2465b8cddd4b9ad..0000000000000000000000000000000000000000 Binary files a/sanlock-3.8.4.tar.gz and /dev/null differ diff --git a/sanlock-3.8.5.tar.gz b/sanlock-3.8.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..351e21aee22243a7459bf2686c3af4824474e4e8 Binary files /dev/null and b/sanlock-3.8.5.tar.gz differ diff --git a/sanlock.spec b/sanlock.spec index 3de791474169c957f993192fe5595cb5c845604d..5ec9954aabfac33fa5128b999c8f41cd1fa8c9be 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,13 +1,12 @@ Name: sanlock -Version: 3.8.4 -Release: 3 +Version: 3.8.5 +Release: 1 Summary: A shared storage lock manager License: GPLv2 and GPLv2+ and LGPLv2+ URL: https://pagure.io/sanlock/ Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz -Patch1: 0001-sanlock-fix-memory-leak-of-lockspace-renewal_history.patch -Patch2: Add-sanlk-reset-command-t-options.patch +Patch1: Add-sanlk-reset-command-t-options.patch BuildRequires: libblkid-devel libaio-devel python3 python3-devel systemd-units gcc Requires(pre): shadow @@ -153,6 +152,9 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \ %changelog +* Wed Apr 12 2023 wangjie5911 - 3.8.5-1 +- update to 3.8.5 and sync patch Add sanlk_reset command t options. + * Wed Mar 08 2023 xu_ping - 3.8.4-3 - fix sanlk-reset -t command error.