gentoo resync : 17.02.2021

4 files changed, 162 insertions, 0 deletions

diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index b9cc7442c122..7b4006c5b6e8 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,6 +1,10 @@
 AUX drbd-utils-8.0.rc 3073 BLAKE2B 982d8e20bba38259cc9cb37c922a2653e65471cd7fc9a66ace58cfaaee7989b035076dac523484e0b9ba74a89e1a90f06844234aeb703556beaff66fc6564680 SHA512 9cd9de6d41552f080f3d590630ecd1686ea32b9e9db3b78a132e7fb55318a338331c09af5d80ba885d48a001ee3f7a6f791ddd806e834d2a7c72f01a00ec2f6c
 AUX drbd-utils-8.9.6-sysmacros.patch 1749 BLAKE2B 8d086d294c99f21c369821750b5772319f6cfe687251843cf741ac8c87f958986b2d464558b0dbe275e7a280eec9bc5ab6ce72a781d5c6b9f8d5dc25fac36855 SHA512 574c759a2125f2dbf240ab310cc57425773d75ec5e508693d09f506df704329c8a6e367f5621df5bb43fc1af22e65da1bd7631cb26715147b70c8704ab797d24
+AUX drbd-utils-9.15.1-run-lock.patch 564 BLAKE2B f09107b53ee522976c40a91a4d6e267f1effb2bf3afadf77b2138af2031c59a88debc40ed06e1fe0d6fafe6773f3bf5358c315081eca3182853bf132632c617f SHA512 62faedab4668d31d86cfb634bde68aaeb7d9329d0e6948d46e2c0a90cf1988b68438ef1b71f9d84a4dd2230f0cef5179be80cf4a5aef22c30f59a0ab2906523c
+AUX drbd-utils-9.15.1-sysmacros.patch 950 BLAKE2B d5a81c0e13715c595ec25ae8e78a8176b46b437e01efa8d3a44d3ad6b143ac6ae723fa7f563b5d930d6b9dd82107ed02b5d67406732e2ff2675e1fe180cba657 SHA512 471877458ac9f8fbfe6c223f35ec51e487dfe0e8448ccbc17aabcfec002e9eeb1a3ab6d3477cce7e9791cab9b9db506519c409eee91bf45069fd35bb8bc81d58
 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
+DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
 EBUILD drbd-utils-8.9.6-r1.ebuild 2478 BLAKE2B 5155f241126f545397c0ee4aead4dbfb2d291615f1d3e73ae81feacb9c806e25e02a8afbbf93b892c0488ed17801f43d548d671d2d66bbc69c04e758c2752fd3 SHA512 f4dbeeff4969083a531ccc164b14daa682b2f5cf5e375153c29ae1e5e698f15bcf70bf3b8584d5517820fc632bc984324ef74180e1cbb3aae5f67643bb29acef
+EBUILD drbd-utils-9.15.1.ebuild 2621 BLAKE2B 75ba6cb6e8534addbfa3bf762c85cde070c285bececd65ff0b90d0fdfa0c4f3c1c2fd1e3baa1fd0b84af4422e02f6253338606927b565fc99c9215c65f7e7b42 SHA512 780dae9aa2ade0ced6db290ada69aa069593ea718c2a736e1f3065113cee13e2390b99fa7fe75f08c9deb01262325a596f3788e6e232b1996cc9a610ab26c3a7
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
new file mode 100644
index 000000000000..4b30e2174303
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+HOMEPAGE="https://www.linbit.com/drbd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker +udev xen"
+
+DEPEND="
+	pacemaker? ( sys-cluster/pacemaker )
+	udev? ( virtual/udev )"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-run-lock.patch
+	"${FILESDIR}"/${P}-sysmacros.patch
+)
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+	# respect LDFLAGS, #453442
+	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+		-i user/*/Makefile.in || die
+
+	# respect multilib
+	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
+		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+		-i user/*/Makefile.in || die
+
+	# correct install paths (really correct this time)
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
+		scripts/Makefile.in || die
+
+	# don't participate in user survey bug 360483
+	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-bashcompletion \
+		--with-distro=gentoo \
+		--with-prebuiltman \
+		--without-rgmanager \
+		$(use_with pacemaker) \
+		$(use_with udev) \
+		$(use_with xen)
+}
+
+src_compile() {
+	# only compile the tools
+	emake OPTFLAGS="${CFLAGS}" tools doc
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools install-doc
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+	dodoc scripts/drbd.conf.example
+
+	keepdir /var/lib/drbd
+	rm -r "${ED}"/var/run || die
+
+	# https://bugs.gentoo.org/698304
+	dodir lib/drbd
+	local i
+	for i in drbd drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+		dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
+	done
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please copy and gunzip the configuration file:"
+	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo "man 8 drbddisk"
+	einfo "man 8 drbdmeta"
+	einfo
+	elog "Remember to enable drbd support in kernel."
+}
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
new file mode 100644
index 000000000000..fa31a9b0cb11
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -457,8 +457,8 @@ AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
+ AH_TEMPLATE(WINDRBD, [Include support for windrbd (do not use this under Linux)])
+ 
+ AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])
+-AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])
+-AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])
++AC_SUBST(DRBD_RUN_DIR, [/run/$PACKAGE_TARNAME])
++AC_SUBST(DRBD_LOCK_DIR, [/run/lock])
+ AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])
+ AC_SUBST(DRBD_BIN_DIR, [$exec_prefix/bin])
+ 
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
new file mode 100644
index 000000000000..961105f2b3ff
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/616758
+--- a/user/shared/shared_tool.c
++++ b/user/shared/shared_tool.c
+@@ -8,6 +8,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+--- a/user/v83/drbdadm_adjust.c
++++ b/user/v83/drbdadm_adjust.c
+@@ -25,6 +25,7 @@
+ #define _GNU_SOURCE
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+--- a/user/v84/drbdadm_adjust.c
++++ b/user/v84/drbdadm_adjust.c
+@@ -27,6 +27,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+--- a/user/v9/drbdadm_adjust.c
++++ b/user/v9/drbdadm_adjust.c
+@@ -27,6 +27,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>