* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/sanlock/, sys-cluster/sanlock/files/
@ 2017-01-02 0:17 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2017-01-02 0:17 UTC (permalink / raw
To: gentoo-commits
commit: 54c9e81337a454689d400a290d416f4590d32c97
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 2 00:16:38 2017 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 00:17:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c9e813
sys-cluster/sanlock: added new package
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-cluster/sanlock/Manifest | 1 +
sys-cluster/sanlock/files/sanlock.initd | 9 ++++
sys-cluster/sanlock/files/wdmd.initd | 12 +++++
sys-cluster/sanlock/metadata.xml | 12 +++++
sys-cluster/sanlock/sanlock-3.4.0.ebuild | 83 ++++++++++++++++++++++++++++++++
5 files changed, 117 insertions(+)
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
new file mode 100644
index 00000000..7a3cd9c
--- /dev/null
+++ b/sys-cluster/sanlock/Manifest
@@ -0,0 +1 @@
+DIST sanlock-3.4.0.tar.xz 157016 SHA256 b4b18eb0af1bfc730a037f9da7dd84777c9a4ceb1a1ac2e577705124c4c9e891 SHA512 8a10faaa5b9ce9f0506ca16620ad482804c9ca860b84a60a6f0b525a256059229a202163d366a57fb59169c0f4f822ced570b42562e412747f6f716509341f19 WHIRLPOOL 500ccc9ab323bed28fc6b65dbdc04588deae03d3bb500ab623b9b922c436db896b793965bf4e780800138cd780d4fb659a952dc064bb01065e629c69062c330e
diff --git a/sys-cluster/sanlock/files/sanlock.initd b/sys-cluster/sanlock/files/sanlock.initd
new file mode 100644
index 00000000..30a5c1e
--- /dev/null
+++ b/sys-cluster/sanlock/files/sanlock.initd
@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+pidfile="/var/run/snlock.pid"
+command="/usr/sbin/snlock"
+command_args="daemon ${SANLOCKOPTS:-"-U sanlock -G sanlock"}"
+
diff --git a/sys-cluster/sanlock/files/wdmd.initd b/sys-cluster/sanlock/files/wdmd.initd
new file mode 100644
index 00000000..70140f0
--- /dev/null
+++ b/sys-cluster/sanlock/files/wdmd.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+pidfile="/var/run/wdmd.pid"
+command="/usr/sbin/wdmd"
+command_args="${WDMDOPTS:-"-G sanlock"}"
+
+start_pre() {
+ $command -p || exit 1
+}
diff --git a/sys-cluster/sanlock/metadata.xml b/sys-cluster/sanlock/metadata.xml
new file mode 100644
index 00000000..f854e20
--- /dev/null
+++ b/sys-cluster/sanlock/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>cluster@gentoo.org</email>
+ <name>Gentoo Cluster Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sys-cluster/sanlock/sanlock-3.4.0.ebuild b/sys-cluster/sanlock/sanlock-3.4.0.ebuild
new file mode 100644
index 00000000..9e0358e
--- /dev/null
+++ b/sys-cluster/sanlock/sanlock-3.4.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit linux-info python-r1 systemd user
+
+DESCRIPTION="shared storage lock manager"
+HOMEPAGE="https://fedorahosted.org/sanlock/"
+SRC_URI="https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${P}.tar.xz"
+
+LICENSE="LGPL-2+ GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ sys-apps/util-linux
+ python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ local warning="You need to have CONFIG_SOFT_WATCHDOG enabled in your kernel for wdmd"
+ if linux_config_exists; then
+ if ! linux_chkconfig_present SOFT_WATCHDOG; then
+ ewarn ""
+ ewarn "$warning"
+ ewarn ""
+ fi
+ else
+ ewarn ""
+ ewarn "Could not be checked automatically: $warning"
+ ewarn ""
+ fi
+}
+
+pkg_preinst() {
+ enewuser sanlock
+ enewgroup sanlock
+}
+
+src_compile() {
+ for d in wdmd src fence_sanlock reset; do
+ cd $d; emake; cd ..
+ done
+ if use python; then
+ cd python; python_foreach_impl emake; cd ..
+ fi
+}
+
+src_install() {
+ for d in wdmd src fence_sanlock reset; do
+ cd $d; emake DESTDIR="${D}" LIBDIR="${EROOT}usr/$(get_libdir)" install; cd ..
+ done
+ if use python; then
+ cd python; python_foreach_impl emake DESTDIR="${D}" install; cd ..
+ fi
+
+ # config
+ dodir /etc/wdmd.d
+ dodir /etc/sanlock
+ insinto /etc/sanlock
+ doins src/sanlock.conf
+
+ # init
+ newconfd init.d/sanlock.sysconfig sanlock
+ newconfd init.d/wdmd.sysconfig wdmd
+ newinitd "${FILESDIR}"/sanlock.initd sanlock
+ newinitd "${FILESDIR}"/wdmd.initd wdmd
+ #doinitd ${FILESDIR}/sanlk-resetd.initd
+ #doinitd ${FILESDIR}/fence_sanlockd.initd
+
+ # systemd
+ systemd_newunit init.d/sanlock.service.native sanlock.service
+ systemd_newunit init.d/wdmd.service.native wdmd.service
+ systemd_dounit init.d/sanlk-resetd.service
+ #systemd_dounit ${FILESDIR}/fence_sanlockd.service
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/sanlock/, sys-cluster/sanlock/files/
@ 2020-08-21 18:06 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2020-08-21 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 05b4374649b60e5aed18180481f35c7b2095aeca
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 17:57:36 2020 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 18:05:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b43746
sys-cluster/sanlock: add new version
Bug: https://bugs.gentoo.org/718532
Closes: https://bugs.gentoo.org/721594
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
sys-cluster/sanlock/Manifest | 1 +
.../files/sanlock-fence_sanlock-LDFLAGS.patch | 12 +++
sys-cluster/sanlock/sanlock-3.8.2.ebuild | 85 ++++++++++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index d3a63ecac01..517da432a43 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -1,2 +1,3 @@
DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
DIST sanlock-3.8.0.tar.gz 262077 BLAKE2B c5638dc405cb22098f551d2c267fb13ef8b59422d5d5fb64ade5273d27d6ef772178c1283860a180d3da053da46387e3687c69369c5447d90d7b04a61da80b92 SHA512 ec4e40066c8f5f25287265247509bcb9d8ae24e5bafdd563cb090e94df3fa65881c4814edeb81c50188e71990774d29e330b1dda864c22052fc936a9e2a0892a
+DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
diff --git a/sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch b/sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch
new file mode 100644
index 00000000000..0fb00b364ba
--- /dev/null
+++ b/sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch
@@ -0,0 +1,12 @@
+diff -ur sanlock-3.8.2.orig/fence_sanlock/Makefile sanlock-3.8.2/fence_sanlock/Makefile
+--- sanlock-3.8.2.orig/fence_sanlock/Makefile 2020-08-21 19:48:12.695801870 +0200
++++ sanlock-3.8.2/fence_sanlock/Makefile 2020-08-21 19:47:50.477402437 +0200
+@@ -34,7 +34,7 @@
+ CFLAGS += -DVERSION=\"$(VER)\" -I../src -I../wdmd
+ CFLAGS += -fPIE -DPIE
+
+-LDFLAGS = -Wl,-z,now -Wl,-z,relro -pie
++LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
+ LDADD = -lrt -laio -lblkid -lsanlock -lwdmd
+
+ all: $(TARGET1) $(TARGET2)
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
new file mode 100644
index 00000000000..449fd2f3274
--- /dev/null
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit linux-info python-r1 systemd
+
+DESCRIPTION="shared storage lock manager"
+HOMEPAGE="https://pagure.io/sanlock"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+ GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ acct-user/${PN}
+ acct-group/${PN}
+ dev-libs/libaio
+ sys-apps/util-linux
+ python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ ${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch
+)
+
+pkg_setup() {
+ local warning="You need to have CONFIG_SOFT_WATCHDOG enabled in your kernel for wdmd"
+ if linux_config_exists; then
+ if ! linux_chkconfig_present SOFT_WATCHDOG; then
+ ewarn ""
+ ewarn "$warning"
+ ewarn ""
+ fi
+ else
+ ewarn ""
+ ewarn "Could not be checked automatically: $warning"
+ ewarn ""
+ fi
+}
+
+src_compile() {
+ for d in wdmd src fence_sanlock reset; do
+ cd $d; emake; cd ..
+ done
+ if use python; then
+ cd python; python_foreach_impl emake; cd ..
+ fi
+}
+
+src_install() {
+ for d in wdmd src fence_sanlock reset; do
+ cd $d; emake DESTDIR="${D}" LIBDIR="${EROOT}usr/$(get_libdir)" install; cd ..
+ done
+ if use python; then
+ cd python; python_foreach_impl emake DESTDIR="${D}" install; cd ..
+ fi
+
+ # config
+ dodir /etc/wdmd.d
+ dodir /etc/sanlock
+ insinto /etc/sanlock
+ doins src/sanlock.conf
+
+ # init
+ newconfd init.d/sanlock.sysconfig sanlock
+ newconfd init.d/wdmd.sysconfig wdmd
+ newinitd "${FILESDIR}"/sanlock.initd sanlock
+ newinitd "${FILESDIR}"/wdmd.initd wdmd
+ #doinitd ${FILESDIR}/sanlk-resetd.initd
+ #doinitd ${FILESDIR}/fence_sanlockd.initd
+
+ # systemd
+ systemd_newunit init.d/sanlock.service.native sanlock.service
+ sed -i 's,^ExecStartPre=,#ExecStartPre=,' init.d/wdmd.service.native
+ systemd_newunit init.d/wdmd.service.native wdmd.service
+ systemd_dounit init.d/sanlk-resetd.service
+ #systemd_dounit ${FILESDIR}/fence_sanlockd.service
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/sanlock/, sys-cluster/sanlock/files/
@ 2022-09-07 4:58 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-09-07 4:58 UTC (permalink / raw
To: gentoo-commits
commit: 2c1e76900f3ab6b0a34f14372970325d6518340a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 7 04:52:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 04:52:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1e7690
sys-cluster/sanlock: fix implicit function declarations
Unlike normal missing includes, implicit function declaration
fixes require a revbump as they can affect code generation.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/sanlock-3.8.4-implicit-func-decls.patch | 34 ++++++++++++++++++++++
...anlock-3.8.4.ebuild => sanlock-3.8.4-r1.ebuild} | 2 ++
2 files changed, 36 insertions(+)
diff --git a/sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch b/sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch
new file mode 100644
index 000000000000..7e99d9b1f939
--- /dev/null
+++ b/sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch
@@ -0,0 +1,34 @@
+https://pagure.io/sanlock/issue/8
+
+From 272f9838f3495f5e419f77e000762c420754c96d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sep 02 2022 22:58:56 +0000
+Subject: add missing system header string.h
+
+
+This is needed for mem* function prototypes used in these sources
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/src/sanlock_sock.c
++++ b/src/sanlock_sock.c
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stddef.h>
++#include <string.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+
+--- a/wdmd/wdmd_sock.c
++++ b/wdmd/wdmd_sock.c
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stddef.h>
++#include <string.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+
+
+
diff --git a/sys-cluster/sanlock/sanlock-3.8.4.ebuild b/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild
similarity index 95%
rename from sys-cluster/sanlock/sanlock-3.8.4.ebuild
rename to sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild
index 638cec0ffefb..d48b048e3ead 100644
--- a/sys-cluster/sanlock/sanlock-3.8.4.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild
@@ -25,9 +25,11 @@ DEPEND="
python? ( ${PYTHON_DEPS} )
"
RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/which"
PATCHES=(
"${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch"
+ "${FILESDIR}/sanlock-3.8.4-implicit-func-decls.patch"
)
CONFIG_CHECK="~SOFT_WATCHDOG"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-07 4:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-07 4:58 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/sanlock/, sys-cluster/sanlock/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-08-21 18:06 Marc Schiffbauer
2017-01-02 0:17 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox