diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-cluster/sanlock | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'sys-cluster/sanlock')
| -rw-r--r-- | sys-cluster/sanlock/Manifest | 5 | ||||
| -rw-r--r-- | sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch | 12 | ||||
| -rw-r--r-- | sys-cluster/sanlock/sanlock-3.8.2.ebuild (renamed from sys-cluster/sanlock/sanlock-3.8.0.ebuild) | 16 |
3 files changed, 23 insertions, 10 deletions
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest index b440b9b5a382..d8ed348f2180 100644 --- a/sys-cluster/sanlock/Manifest +++ b/sys-cluster/sanlock/Manifest @@ -1,7 +1,8 @@ +AUX sanlock-fence_sanlock-LDFLAGS.patch 504 BLAKE2B 11176057304ee5f841500921f1fa1ee4e97777547f7318d192f1b5bd94bfdb145db4bdc6eb6ecede2f7c5d0d9f29e85506283119d904a65735e5152a07167c97 SHA512 2c7d7204e369449c23f4641fae27ecbb35d0f1f670a580feab7982514a90e60eec3bcdaf01cbd1cf88e7a39050026474553eb10a48d57ab8b4e6549d574bcebf AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802fd180584becde8a5b9d919ac9ab887a4ebdfe8ea64e53f30b3785bc32875ccd2e25fa99a9278081 SHA512 5ed7b2d96cb875e2db0914ec7232fe8443c05de69e07d214ffc0adfafac5123694173373f831c5acf46d11aa4fca304b88e6e4c4ee2fbe5b033d173eea5aec36 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0 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 EBUILD sanlock-3.6.0.ebuild 2055 BLAKE2B ddf101be000bf9d0b081a50386bbd8947e025d8edb475457167cc460c4f3a44f9863d0a3db1720839d239da61b9b3925d8eb953a29029501281eb6e6873575c9 SHA512 1c651d40550f67858d4ff552f8cbeea125205396087cb2290e3b70d370a410fbdab29d7e2fc0da9d01593b59c29042080a463fff920601b37e5577a5cec125bb -EBUILD sanlock-3.8.0.ebuild 2071 BLAKE2B c67135662be618ea3b705d44f628f3411ff950c82f025567c9ee71f57ad147459872d867a771fd0fe40da668167dfbc045d03e3eca6bcbb1406681f575fdd4c5 SHA512 223b02756c854c0e37a289f0735b2f091295ba46b20f75b5d380fd2c0eb08f874181188ea4c8e31b7646db932555b487e0e341002723d597333e218b9a412562 +EBUILD sanlock-3.8.2.ebuild 2090 BLAKE2B d8eca28a2869f76a0817e27b26632517ba8634fbe97a41bd4b19978519a2560c4382869bf776f3995eda9e50e66ba027cbb1f2ac4887917cbe31bcb2fa54d8e2 SHA512 b5250d978145ce6fab960531b7945e1195d5d6cfc9b91d80726ebdc3ed07fe538aecc3751ca15d039c94ca331a23232168418dc7df7f2f50ff85baf988b75508 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086 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 000000000000..0fb00b364bad --- /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.0.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild index ae42ae240e21..449fd2f3274a 100644 --- a/sys-cluster/sanlock/sanlock-3.8.0.ebuild +++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild @@ -3,8 +3,8 @@ EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit linux-info python-r1 systemd user +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit linux-info python-r1 systemd DESCRIPTION="shared storage lock manager" HOMEPAGE="https://pagure.io/sanlock" @@ -18,12 +18,18 @@ 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 @@ -39,12 +45,6 @@ pkg_setup() { fi } -pkg_preinst() { - enewgroup sanlock - enewuser sanlock -1 -1 -1 sanlock,disk - -} - src_compile() { for d in wdmd src fence_sanlock reset; do cd $d; emake; cd .. |