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"])
