From 12441b57393aeb9ec0ceb58486792f80a2dae36f Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Tue, 23 Jan 2024 09:25:54 +0800
Subject: sanlock: upgrade 3.8.5 -> 3.9.0

Changelog:
============
-sanlock: replace strncat for creating debug output
-sanlock: reduce warnings
-sanlock: fix direct_next_free missing init
-sanlock: use product_uuid for host name
-sanlock: add comment with timeout example
-sanlock: skip short delay in delta lease reacquire
-README.dev: update userstorage doc
-userstorage: replace by PyPI userstorage
-tox.ini: add py310 to environments
-README.dev: update prerequisites
-wdmd: close watchdog when not used
-watchdog timeout configuration
-Add python3-setuptools build requirement

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb | 48 -----------------------
 meta-oe/recipes-extended/sanlock/sanlock_3.9.0.bb | 48 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb
 create mode 100644 meta-oe/recipes-extended/sanlock/sanlock_3.9.0.bb

diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb
deleted file mode 100644
index 962d19574c..0000000000
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY = "A shared storage lock manager"
-DESCRIPTION = "sanlock  is  a lock manager built on shared storage.  Hosts with access \
-to the storage can perform locking.   An  application  running  on  the \
-hosts  is  given  a small amount of space on the shared block device or \
-file, and uses sanlock for its  own  application-specific  synchronization. \
-Internally,  the  sanlock  daemon manages locks using two disk-based \
-lease algorithms: delta leases and paxos leases."
-HOMEPAGE = "https://pagure.io/sanlock"
-SECTION = "utils"
-
-LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22"
-
-PV .= "+git${SRCPV}"
-
-SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
-           file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
-           file://0001-add-missing-system-header-string.h.patch \
-          "
-SRCREV = "b820c63093c4ae85d7da4f719cf3026d7fca5d09"
-
-S = "${WORKDIR}/git"
-
-CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
-
-DEPENDS = "libaio util-linux"
-
-inherit setuptools3 useradd
-
-SETUPTOOLS_SETUP_PATH = "${S}/python"
-
-do_compile:prepend () {
-    oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}"
-    oe_runmake -C ${S}/src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}"
-}
-
-do_install:prepend () {
-    oe_runmake -C ${S}/wdmd DESTDIR=${D} LIBDIR=${libdir} install
-    oe_runmake -C ${S}/src DESTDIR=${D} LIBDIR=${libdir} install
-}
-
-SANLOCKGROUP ?= "sanlock"
-SANLOCKUSER ?= "sanlock"
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM:${PN} = "--system ${SANLOCKGROUP}"
-USERADD_PARAM:${PN} = "--system -g ${SANLOCKGROUP} -G disk \
-                       --home-dir /run/${SANLOCKUSER} --no-create-home \
-                       --shell /sbin/nologin ${SANLOCKUSER}"
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.0.bb
new file mode 100644
index 0000000000..fa1c6c7ecd
--- /dev/null
+++ b/meta-oe/recipes-extended/sanlock/sanlock_3.9.0.bb
@@ -0,0 +1,48 @@
+SUMMARY = "A shared storage lock manager"
+DESCRIPTION = "sanlock  is  a lock manager built on shared storage.  Hosts with access \
+to the storage can perform locking.   An  application  running  on  the \
+hosts  is  given  a small amount of space on the shared block device or \
+file, and uses sanlock for its  own  application-specific  synchronization. \
+Internally,  the  sanlock  daemon manages locks using two disk-based \
+lease algorithms: delta leases and paxos leases."
+HOMEPAGE = "https://pagure.io/sanlock"
+SECTION = "utils"
+
+LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22"
+
+PV .= "+git${SRCPV}"
+
+SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
+           file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
+           file://0001-add-missing-system-header-string.h.patch \
+          "
+SRCREV = "23766f9119b7c06b463110aeb9b969a742f0fe23"
+
+S = "${WORKDIR}/git"
+
+CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
+
+DEPENDS = "libaio util-linux"
+
+inherit setuptools3 useradd
+
+SETUPTOOLS_SETUP_PATH = "${S}/python"
+
+do_compile:prepend () {
+    oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}"
+    oe_runmake -C ${S}/src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}"
+}
+
+do_install:prepend () {
+    oe_runmake -C ${S}/wdmd DESTDIR=${D} LIBDIR=${libdir} install
+    oe_runmake -C ${S}/src DESTDIR=${D} LIBDIR=${libdir} install
+}
+
+SANLOCKGROUP ?= "sanlock"
+SANLOCKUSER ?= "sanlock"
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM:${PN} = "--system ${SANLOCKGROUP}"
+USERADD_PARAM:${PN} = "--system -g ${SANLOCKGROUP} -G disk \
+                       --home-dir /run/${SANLOCKUSER} --no-create-home \
+                       --shell /sbin/nologin ${SANLOCKUSER}"
-- 
cgit v1.2.3-54-g00ecf