* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/files/, sys-cluster/drbd-utils/
@ 2016-07-13 19:01 Robin H. Johnson
0 siblings, 0 replies; 4+ messages in thread
From: Robin H. Johnson @ 2016-07-13 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 8911d4e381715f088ddd2a760f039d089c74bdf6
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:56:39 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 19:01:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8911d4e3
sys-cluster/drbd-utils: bug #548800, support IPv6 addresses in init.
Package-Manager: portage-2.2.28
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 95 +++++++++++++++++++++++
sys-cluster/drbd-utils/files/drbd-utils-8.0.rc | 2 +-
2 files changed, 96 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..c81e9c1
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 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 install-doc
+ 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/-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-8.0.rc b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
index 8944c1d..6f2f74c 100644
--- a/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
+++ b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
@@ -64,7 +64,7 @@ adjust_with_progress() {
else echo -n ".. ";
fi
IFS=$IFS_O
- $CMD || {
+ eval $CMD || {
echo
eend 20 "cmd $CMD failed!"
return 20
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/files/, sys-cluster/drbd-utils/
@ 2021-02-17 9:37 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2021-02-17 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 64bd02f1d3e9dbb8300cfb01af795b5ed374ca95
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Feb 17 09:36:34 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 09:36:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bd02f1
sys-cluster/drbd-utils: Bump to 9.15.1
Closes: https://bugs.gentoo.org/690298
Closes: https://bugs.gentoo.org/698304
Closes: https://bugs.gentoo.org/705614
Closes: https://bugs.gentoo.org/715616
Closes: https://bugs.gentoo.org/716810
Closes: https://bugs.gentoo.org/718818
Closes: https://bugs.gentoo.org/721110
Closes: https://bugs.gentoo.org/725750
Closes: https://bugs.gentoo.org/728166
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild | 104 +++++++++++++++++++++
.../files/drbd-utils-9.15.1-run-lock.patch | 13 +++
.../files/drbd-utils-9.15.1-sysmacros.patch | 41 ++++++++
4 files changed, 159 insertions(+)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 051e205dae9..6e60b8b11db 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1 +1,2 @@
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
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 00000000000..4b30e217430
--- /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 00000000000..fa31a9b0cb1
--- /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 00000000000..961105f2b3f
--- /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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/files/, sys-cluster/drbd-utils/
@ 2021-03-26 10:53 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2021-03-26 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 3a4b745ffd4b29ec546f45d3e271795c2cd5fd38
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Mar 26 10:52:58 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 10:52:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4b745f
sys-cluster/drbd-utils: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 -
sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 97 ----------------------
.../files/drbd-utils-8.9.6-sysmacros.patch | 44 ----------
sys-cluster/drbd-utils/metadata.xml | 1 -
4 files changed, 143 deletions(-)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 6e60b8b11db..fbc8025e2dd 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,2 +1 @@
-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
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
deleted file mode 100644
index 8295be34e7b..00000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
- # bug 616758
- epatch "${FILESDIR}/${P}"-sysmacros.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 install-doc
- 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/-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-8.9.6-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
deleted file mode 100644
index 135f7a8b3ff..00000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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>
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index 82f50565f99..7e160adde1c 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -8,7 +8,6 @@
<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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/files/, sys-cluster/drbd-utils/
@ 2023-07-27 5:58 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-07-27 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 621649c943897391ce2cf0d4a73443462ad3071e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 05:33:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 05:57:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621649c9
sys-cluster/drbd-utils: add 9.25.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild | 130 +++++++++++++++++++++
.../files/drbd-utils-9.25.0-missing-stdint.patch | 35 ++++++
3 files changed, 166 insertions(+)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-27 5:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-26 10:53 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/files/, sys-cluster/drbd-utils/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-07-27 5:58 Sam James
2021-02-17 9:37 David Seifert
2016-07-13 19:01 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox