* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/
@ 2015-09-17 13:44 Alexys Jacob
0 siblings, 0 replies; 5+ messages in thread
From: Alexys Jacob @ 2015-09-17 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 080e72c050e57e0b7bdb29a68dec8bcb6d1fd9df
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 13:43:42 2015 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 13:44:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080e72c0
sys-cluster/drbd-utils: new ebuild fix #513928 thx to Benjamin Beier Jerry McDonald Mark (voidzero) Mike Williams Zentoo
Package-Manager: portage-2.2.20.1
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild | 95 +++++++++++++++
sys-cluster/drbd-utils/files/drbd-utils-8.0.rc | 159 +++++++++++++++++++++++++
sys-cluster/drbd-utils/files/run-lock.patch | 13 ++
sys-cluster/drbd-utils/metadata.xml | 14 +++
5 files changed, 282 insertions(+)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
new file mode 100644
index 0000000..a800c25
--- /dev/null
+++ b/sys-cluster/drbd-utils/Manifest
@@ -0,0 +1 @@
+DIST drbd-utils-8.9.3.tar.gz 768700 SHA256 011050578c153bf4fef86e03749304ff9f333b7af3512c5c395e0e870a0445bd SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2 WHIRLPOOL f21aec707f06d361ae336d0cf1e55fa546e5f250f869c80829f806eaef7d59c12ff30d1ded39e3624b162a9bff1ffe96cb3cb1acd85ca58ca29a4998740fba85
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
new file mode 100644
index 0000000..8a47847
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils multilib udev versionator
+
+LICENSE="GPL-2"
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="heartbeat pacemaker +udev xen"
+SLOT="0"
+
+DEPEND="heartbeat? ( sys-cluster/heartbeat )
+ pacemaker? ( sys-cluster/pacemaker )
+ udev? ( virtual/udev )
+ !!sys-cluster/drbd"
+RDEPEND="${DEPEND}"
+
+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
+
+ epatch "${FILESDIR}"/run-lock.patch
+
+ autoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ --without-rgmanager \
+ $(use_with udev) \
+ $(use_with xen) \
+ $(use_with pacemaker) \
+ $(use_with heartbeat) \
+ --with-bashcompletion \
+ --with-distro=gentoo
+}
+
+src_compile() {
+ # only compile the tools
+ emake OPTFLAGS="${CFLAGS}" tools
+}
+
+src_install() {
+ # only install the tools
+ emake DESTDIR="${D}" install-tools
+ dodoc README ChangeLog
+
+ # install our own init script
+ newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+ dodoc scripts/drbd.conf.example
+
+ dosym /usr/sbin/drbdadm /sbin/drbdadm
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Please copy and gunzip the configuration file:"
+ einfo "from /usr/share/doc/${PF}/${PN}.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-8.0.rc b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
new file mode 100644
index 0000000..2b90674
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
@@ -0,0 +1,159 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+extra_started_commands="reload"
+
+depend() {
+ use logger
+ need net
+ before heartbeat
+ after sshd
+}
+
+DEFAULTFILE="/etc/conf.d/drbd"
+DRBDADM="/sbin/drbdadm"
+PROC_DRBD="/proc/drbd"
+MODPROBE="/sbin/modprobe"
+RMMOD="/sbin/rmmod"
+UDEV_TIMEOUT=10
+ADD_MOD_PARAM=""
+PATH=${PATH}:/lib/drbd:/lib64/drbd
+
+if [ -f $DEFAULTFILE ]; then
+ . $DEFAULTFILE
+fi
+
+# Just in case drbdadm want to display any errors in the configuration
+# file, or we need to ask the user about registering this installation
+# at http://usage.drbd.org, we call drbdadm here without any IO
+# redirection.
+$DRBDADM sh-nop
+
+assure_module_is_loaded() {
+ [ -e "$PROC_DRBD" ] && return
+ ebegin "Loading drbd module"
+ ret=0
+
+ $MODPROBE -s drbd `$DRBDADM sh-mod-parms` $ADD_MOD_PARAM || ret=20
+ eend $ret
+ return $ret
+}
+
+adjust_with_progress() {
+ IFS_O=$IFS
+ NEWLINE='
+'
+ IFS=$NEWLINE
+ local D=0
+ local S=0
+ local N=0
+
+ einfon "Setting drbd parameters "
+ COMMANDS=`$DRBDADM -d adjust all` || {
+ eend 20 "Error executing drbdadm"
+ return 20
+ }
+ echo -n "[ "
+
+ for CMD in $COMMANDS; do
+ if echo $CMD | grep -q disk; then echo -n "d$D "; D=$(( D+1 ));
+ elif echo $CMD | grep -q syncer; then echo -n "s$S "; S=$(( S+1 ));
+ elif echo $CMD | grep -q net; then echo -n "n$N "; N=$(( N+1 ));
+ else echo -n ".. ";
+ fi
+ IFS=$IFS_O
+ $CMD || {
+ echo
+ eend 20 "cmd $CMD failed!"
+ return 20
+ }
+ IFS=$NEWLINE
+ done
+ echo "]"
+ eend 0
+
+ IFS=$IFS_O
+}
+
+start() {
+ einfo "Starting DRBD resources:"
+ eindent
+ assure_module_is_loaded || return $?
+ adjust_with_progress || return $?
+
+ # make sure udev has time to create the device files
+ ebegin "Waiting for udev device creation ..."
+ for RESOURCE in `$DRBDADM sh-resources`; do
+ for DEVICE in `$DRBDADM sh-dev $RESOURCE`; do
+ UDEV_TIMEOUT_LOCAL=$UDEV_TIMEOUT
+ while [ ! -e $DEVICE ] && [ $UDEV_TIMEOUT_LOCAL -gt 0 ] ; do
+ sleep 1
+ UDEV_TIMEOUT_LOCAL=$(( $UDEV_TIMEOUT_LOCAL-1 ))
+ done
+ done
+ done
+ eend 0
+
+ einfon "Waiting for connection "
+ $DRBDADM wait-con-int
+ ret=$?
+ echo
+
+ sleep 5
+
+ einfon "Become primary if configured "
+ $DRBDADM sh-b-pri all
+ echo
+
+ eend $ret
+ return $ret
+}
+
+stop() {
+ ebegin "Stopping all DRBD resources"
+
+ # Check for mounted drbd devices
+ if ! grep -q '^/dev/drbd' /proc/mounts &>/dev/null; then
+ if [ -e ${PROC_DRBD} ]; then
+ ${DRBDADM} down all
+ ret=$?
+ sleep 3
+ if [ -e /proc/modules ] && grep -q '^drbd' /proc/modules ; then
+ ${RMMOD} drbd
+ fi
+ fi
+ eend $ret
+ return $ret
+ else
+ einfo "drbd devices mounted, please umount them before trying to stop drbd!"
+ eend 1
+ return 1
+ fi
+}
+
+status() {
+ # NEEDS to be heartbeat friendly...
+ # so: put some "OK" in the output.
+
+ if [ -e $PROC_DRBD ]; then
+ ret=0
+ ebegin "drbd driver loaded OK; device status:"
+ eend $ret
+ cat $PROC_DRBD
+ else
+ ebegin "drbd not loaded"
+ ret=3
+ eend $ret
+ fi
+ return $ret
+}
+
+reload() {
+ ebegin "Reloading DRBD"
+ ${DRBDADM} adjust all
+ ret=$?
+ eend $ret
+ return $ret
+}
diff --git a/sys-cluster/drbd-utils/files/run-lock.patch b/sys-cluster/drbd-utils/files/run-lock.patch
new file mode 100644
index 0000000..5ff7ab2
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/run-lock.patch
@@ -0,0 +1,13 @@
+--- configure.ac.orig 2015-01-31 23:19:18.745021931 +0000
++++ configure.ac 2015-01-31 23:19:38.988027506 +0000
+@@ -353,8 +353,8 @@
+ AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
+
+ 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_DEFINE_UNQUOTED(DRBD_LIB_DIR, ["$DRBD_LIB_DIR"])
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
new file mode 100644
index 0000000..cbfbad5
--- /dev/null
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>cluster</herd>
+ <use>
+ <flag name='xen'>Enable Xen integration</flag>
+ <flag name='pacemaker'>Enable Pacemaker integration</flag>
+ <flag name='heartbeat'>Enable Heartbeat integration</flag>
+ </use>
+ <longdescription>
+ The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
+ that glues the DRBD system to cluster management software and other system components.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/
@ 2018-05-04 18:16 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2018-05-04 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 288250f32327260ed63a4b284bbf36599ae61c6d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 18:16:27 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 4 18:16:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288250f3
sys-cluster/drbd-utils: Add missing sys/sysmacros.h include, bug 616758
Closes: https://bugs.gentoo.org/616758
Package-Manager: Portage-2.3.31, Repoman-2.3.9
sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 3 ++
.../files/drbd-utils-8.9.6-sysmacros.patch | 44 ++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
index 2f4ad204b77..8295be34e7b 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
epatch "${FILESDIR}"/run-lock.patch
+ # bug 616758
+ epatch "${FILESDIR}/${P}"-sysmacros.patch
+
autoreconf
}
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
new file mode 100644
index 00000000000..135f7a8b3ff
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
@@ -0,0 +1,44 @@
+diff -ruN drbd-utils-8.9.6.orig/user/shared/shared_tool.c drbd-utils-8.9.6/user/shared/shared_tool.c
+--- drbd-utils-8.9.6.orig/user/shared/shared_tool.c 2018-05-04 20:13:51.959412972 +0200
++++ drbd-utils-8.9.6/user/shared/shared_tool.c 2018-05-04 20:14:12.979679788 +0200
+@@ -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>
+diff -ruN drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c drbd-utils-8.9.6/user/v83/drbdadm_adjust.c
+--- drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c 2015-02-11 17:33:00.000000000 +0100
++++ drbd-utils-8.9.6/user/v83/drbdadm_adjust.c 2018-05-04 20:15:08.060378940 +0200
+@@ -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>
+diff -ruN drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c drbd-utils-8.9.6/user/v84/drbdadm_adjust.c
+--- drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c 2015-05-08 15:16:31.000000000 +0200
++++ drbd-utils-8.9.6/user/v84/drbdadm_adjust.c 2018-05-04 20:14:42.192050588 +0200
+@@ -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>
+diff -ruN drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c drbd-utils-8.9.6/user/v9/drbdadm_adjust.c
+--- drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c 2018-05-04 20:13:51.960412985 +0200
++++ drbd-utils-8.9.6/user/v9/drbdadm_adjust.c 2018-05-04 20:14:12.980679801 +0200
+@@ -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>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/
@ 2021-12-03 0:12 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-12-03 0:12 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/
@ 2023-06-13 18:00 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-06-13 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 02512e1d120272ad4e035959fa4014a8df7a28fc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 17:42:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 17:59:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02512e1d
sys-cluster/drbd-utils: add 9.23.1
Bug: https://bugs.gentoo.org/863728
Closes: https://bugs.gentoo.org/828057
Closes: https://bugs.gentoo.org/828058
Closes: https://bugs.gentoo.org/832021
Closes: https://bugs.gentoo.org/880973
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild | 129 +++++++++++++++++++++
.../files/drbd-utils-9.23.1-respect-flags.patch | 21 ++++
3 files changed, 151 insertions(+)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index e6ad5260cac6..86c5b2f714f3 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,2 +1,3 @@
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
+DIST drbd-utils-9.23.1.tar.gz 1279916 BLAKE2B f631473d7ff2d569e2e5dc61940085f4d575baaa1e02eaba50f37b15e9b381afb9089d4e50fbd511dc7c73350a9e5552b16a1e80742151801e5068c12830a469 SHA512 8befaa20f4217fb83b127bad332a96be61ffd0cefca78b298dbede4c7f33424e8f27aeb251bb022bb4e1ade11307448cdf39d5750924fcf2711141a29e7a81f0
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
new file mode 100644
index 000000000000..1ca0cd8e56f3
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
@@ -0,0 +1,129 @@
+# 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
+)
+
+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.23.1-respect-flags.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.23.1-respect-flags.patch
new file mode 100644
index 000000000000..259f6aa35632
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-9.23.1-respect-flags.patch
@@ -0,0 +1,21 @@
+--- a/user/drbdmon/Makefile.in
++++ b/user/drbdmon/Makefile.in
+@@ -1,6 +1,6 @@
+-CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror -pedantic-errors -fPIC -O2 \
+--Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits \
+--Wmissing-declarations -Wshadow
++CPPFLAGS = -I. -I../shared -Icppdsaext/src
++CXXFLAGS ?= -Wall -Werror -pedantic-errors -fPIC -O2 -Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits -Wmissing-declarations -Wshadow
++CXXFLAGS += -std=c++11 -O2 -fPIC
+ CXX = @CXX@
+ LIBS = @LIBS@
+
+@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
+ $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
+
+ drbdmon: $(ls-obj)
+- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
+
+ # do not try to rebuild Makefile itself
+ Makefile: ;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/
@ 2024-01-01 1:14 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-01-01 1:14 UTC (permalink / raw
To: gentoo-commits
commit: bf4f20599e90d685b6deb74ab53279558cb504e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 01:13:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 01:13:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4f2059
sys-cluster/drbd-utils: drop 9.15.1-r2, 9.19.1, 9.23.1, 9.24.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 4 -
sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild | 109 -----------------
sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild | 131 ---------------------
sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild | 129 --------------------
sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild | 129 --------------------
.../files/drbd-utils-9.15.1-run-lock.patch | 13 --
.../files/drbd-utils-9.15.1-sysmacros.patch | 41 -------
.../files/drbd-utils-9.19.1-configure-posix.diff | 11 --
sys-cluster/drbd-utils/files/run-lock.patch | 13 --
9 files changed, 580 deletions(-)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index ff503360df7e..188e63acd4e9 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,5 +1 @@
-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
-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.15.1-r2.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
deleted file mode 100644
index d080591f8106..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 tmpfiles 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
- # 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
-
- # 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
-}
-
-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
- elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
deleted file mode 100644
index e68a3085c8a4..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 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/drbd-utils-9.23.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
deleted file mode 100644
index 1ca0cd8e56f3..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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
-)
-
-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/drbd-utils-9.24.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
deleted file mode 100644
index 1ca0cd8e56f3..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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
-)
-
-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.15.1-run-lock.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
deleted file mode 100644
index fa31a9b0cb11..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 961105f2b3ff..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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>
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
deleted file mode 100644
index bea7fd08f9d2..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/sys-cluster/drbd-utils/files/run-lock.patch b/sys-cluster/drbd-utils/files/run-lock.patch
deleted file mode 100644
index 5ff7ab21f7c3..000000000000
--- a/sys-cluster/drbd-utils/files/run-lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig 2015-01-31 23:19:18.745021931 +0000
-+++ configure.ac 2015-01-31 23:19:38.988027506 +0000
-@@ -353,8 +353,8 @@
- AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
-
- 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_DEFINE_UNQUOTED(DRBD_LIB_DIR, ["$DRBD_LIB_DIR"])
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-01 1:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-04 18:16 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-01-01 1:14 Sam James
2023-06-13 18:00 Sam James
2021-12-03 0:12 Sam James
2015-09-17 13:44 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox