commit: 85d6acdce7c5e60c5dfe768d1b3514e2c962c2ea Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> AuthorDate: Wed Dec 1 15:41:41 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 3 00:01:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d6acdc
sys-cluster/drbd-utils: Version updated to 9.19.1, with changes: * Use linux-info to determine if DRBD module is enabled. * Added configure-posix patch for POSIX compliance. * Added DOCS for upstream files. * Unconditionally install tmpfiles file as upstream only installs it for systemd. Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/20086 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-cluster/drbd-utils/Manifest | 1 + sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild | 131 +++++++++++++++++++++ .../files/drbd-utils-9.19.1-configure-posix.diff | 11 ++ 3 files changed, 143 insertions(+) diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest index fbc8025e2dd3..e6ad5260cac6 100644 --- a/sys-cluster/drbd-utils/Manifest +++ b/sys-cluster/drbd-utils/Manifest @@ -1 +1,2 @@ DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de +DIST drbd-utils-9.19.1.tar.gz 1265184 BLAKE2B b26fd9abd6408df4ccaa46c4713ece1743386bb4727ad8206498c30189d6c119ced57ec2d528c0575c5192cf366998b5f7db99aaecf1a2ba6af028b87c4ae082 SHA512 65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22 diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild new file mode 100644 index 000000000000..c54edf54fc3b --- /dev/null +++ b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 linux-info tmpfiles udev + +DESCRIPTION="mirror/replicate block-devices across a network-connection" +SRC_URI="https://pkg.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" + +DOCS=( ChangeLog README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-9.15.1-run-lock.patch + "${FILESDIR}"/${PN}-9.15.1-sysmacros.patch + "${FILESDIR}"/${PN}-9.19.1-configure-posix.diff +) + +S="${WORKDIR}/${P/_/}" + +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, #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() { + 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 + + newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf + + # https://bugs.gentoo.org/698304 + dodir lib/drbd + local i + for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do + dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}" + done + + einstalldocs +} + +pkg_postinst() { + tmpfiles_process drbd.conf + + 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 +} diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff b/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff new file mode 100644 index 000000000000..bea7fd08f9d2 --- /dev/null +++ b/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff @@ -0,0 +1,11 @@ +--- a/configure.ac 2021-12-02 12:37:16.175586192 +0000 ++++ b/configure.ac 2021-12-02 12:39:37.346871340 +0000 +@@ -248,7 +248,7 @@ if test -z $FLEX; then + AC_MSG_ERROR([Cannot build utils without flex.]) + fi + +-if [[ $WITH_DRBDMON == "yes" ]] ; then ++if test x"$WITH_DRBDMON" = x"yes"; then + AC_PROG_CXX + AX_CXX_COMPILE_STDCXX_11(, optional) + if test "$HAVE_CXX11" = "0"; then
