From d76329247ae6721efc632cd542c37cb807fc8470 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 22 Apr 2024 17:15:45 +0800 Subject: sanlock: upgrade 3.9.1 -> 3.9.2 0001-include-libgen.h-for-basename.patch removed since it's included in 3.9.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-include-libgen.h-for-basename.patch | 32 -------------- meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb | 49 ---------------------- meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb | 48 +++++++++++++++++++++ 3 files changed, 48 insertions(+), 81 deletions(-) delete mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch delete mode 100644 meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb create mode 100644 meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch deleted file mode 100644 index 439ffc6473..0000000000 --- a/meta-oe/recipes-extended/sanlock/sanlock/0001-include-libgen.h-for-basename.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c955ac2a4d57f21351e53a5209346fdc2325a747 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 25 Mar 2024 15:12:02 -0700 -Subject: [PATCH] include libgen.h for basename - -basename prototype has been removed from string.h from latest musl [1] -compilers e.g. clang-18 flags the absense of prototype as error. therefore -include libgen.h for providing it. - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - wdmd/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/wdmd/main.c b/wdmd/main.c -index 38a99f3..7014462 100644 ---- a/wdmd/main.c -+++ b/wdmd/main.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.44.0 - diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb deleted file mode 100644 index 1d0f8b0103..0000000000 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb +++ /dev/null @@ -1,49 +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" - -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 \ - file://0001-include-libgen.h-for-basename.patch \ - " -SRCREV = "ecf30a1ccf756776dfea440e4cf9b0b54581075f" - -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.2.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb new file mode 100644 index 0000000000..d369af1c6a --- /dev/null +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.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" + +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 = "e005fbec2324aa8de7e2f302e5a17483c525b1d1" + +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