sys-cluster/drbd-utils: add 9.25.0

Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 166 insertions, 0 deletions

diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 5ccb9584d266..ff503360df7e 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -2,3 +2,4 @@ DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d
 DIST drbd-utils-9.19.1.tar.gz 1265184 BLAKE2B b26fd9abd6408df4ccaa46c4713ece1743386bb4727ad8206498c30189d6c119ced57ec2d528c0575c5192cf366998b5f7db99aaecf1a2ba6af028b87c4ae082 SHA512 65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22
 DIST drbd-utils-9.23.1.tar.gz 1279916 BLAKE2B f631473d7ff2d569e2e5dc61940085f4d575baaa1e02eaba50f37b15e9b381afb9089d4e50fbd511dc7c73350a9e5552b16a1e80742151801e5068c12830a469 SHA512 8befaa20f4217fb83b127bad332a96be61ffd0cefca78b298dbede4c7f33424e8f27aeb251bb022bb4e1ade11307448cdf39d5750924fcf2711141a29e7a81f0
 DIST drbd-utils-9.24.0.tar.gz 1296591 BLAKE2B ece4773bc2e63739ae656987166423303ad32a50e27983d4e8b173d997221e5c45389aa6306b3219d5a648d2d3401720b73e9a67880225c46b9e2f28d5605b62 SHA512 20f85f3dcdb0a1a1dcf5029e4737799081bcb0c69a60e8fe077016899ef37efb5ee585a92cf30a0475970a12c1da90aaebc0fd9e33452690838a56bc75b49ec4
+DIST drbd-utils-9.25.0.tar.gz 1406804 BLAKE2B 6617d2a2a947926d894c184c0c6f79262c32010b7982c85b30f1e02fec66d611f9389c1de0e8435f6ea4999626cf2763bc332f8c619b9201bb29308338f1d355 SHA512 43ed52c59ab0272a389c647240ad4e8e04cdca4c4530da9645d9fc22fda45d7c6d9bea6781a433f3993f9f717e1c1a9ea10af12b18a49ad2d22f78f458ef46f3
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
new file mode 100644
index 000000000000..9a0fe756f308
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 linux-info tmpfiles udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+HOMEPAGE="https://www.linbit.com/drbd"
+SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker split-usr +udev xen"
+
+DEPEND="
+	pacemaker? ( sys-cluster/pacemaker )
+	udev? ( virtual/udev )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+	#"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
+	"${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
+	"${FILESDIR}"/${PN}-9.25.0-missing-stdint.patch
+)
+
+pkg_setup() {
+	# verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or
+	# warn otherwise
+	linux-info_pkg_setup
+	elog "Checking for suitable kernel configuration options..."
+	if linux_config_exists; then
+		if ! linux_chkconfig_present BLK_DEV_DRBD; then
+			ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should be."
+			elog "Please check to make sure these options are set correctly."
+		fi
+	else
+		ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in your kernel."
+		elog "Please check to make sure these options are set correctly."
+	fi
+}
+
+src_prepare() {
+	# Respect LDFLAGS, bug #453442
+	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+		-i user/*/Makefile.in || die
+
+	# Respect multilib, bug #698304
+	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
+	sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || 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() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--with-bashcompletion
+		--with-distro=gentoo
+		--with-prebuiltman
+		--without-rgmanager
+		$(use_with pacemaker)
+		$(use_with udev)
+		$(use_with xen)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Only compile the tools
+	emake CXXFLAGS="${CXXFLAGS}" 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
+
+	newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf
+
+	# bug #698304
+	dodir /lib/drbd
+	local i
+	for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+		dosym -r /$(get_libdir)/drbd/"${i}" /lib/drbd/"${i}"
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	tmpfiles_process drbd.conf
+
+	einfo
+	einfo "Please copy and gunzip the configuration file:"
+	einfo "from ${EROOT}/usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to ${EROOT}/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
+}
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.25.0-missing-stdint.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.25.0-missing-stdint.patch
new file mode 100644
index 000000000000..3f44567ffbd0
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-9.25.0-missing-stdint.patch
@@ -0,0 +1,35 @@
+https://github.com/LINBIT/drbd-utils/pull/30
+
+From 907145b7a9ae800cc66574097badf78f5e1f397d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 27 Jul 2023 06:30:25 +0100
+Subject: [PATCH] user: drbrdmon: add missing <stdint.h> includes
+
+GCC 13 drops some transitive includes within libstdc++.
+
+Explicitly include <stdint.h> for uint32_t etc.
+
+Note that using <stdint.h> deliberately because we're not using std::-prefixed
+types.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/user/drbdmon/DrbdMonConsts.h
++++ b/user/drbdmon/DrbdMonConsts.h
+@@ -1,6 +1,7 @@
+ #ifndef DRBDMONCONSTS_H
+ #define DRBDMONCONSTS_H
+ 
++#include <stdint.h>
+ #include <string>
+ 
+ class DrbdMonConsts
+--- a/user/drbdmon/terminal/DisplayId.h
++++ b/user/drbdmon/terminal/DisplayId.h
+@@ -1,6 +1,7 @@
+ #ifndef DISPLAYID_H
+ #define DISPLAYID_H
+ 
++#include <stdint.h>
+ #include <string>
+ 
+ class DisplayId