[gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/

[Richard Farina]

commit:     42cb25eec1a7d9fd0efa27c0c40cf1659d1647f4
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 17:18:04 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 17:18:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42cb25ee

sys-fs/dmraid: bug #585886

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild                 |  3 ++-
 sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
index 2f5791521df..8c99b3b4831 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
@@ -37,7 +37,8 @@ pkg_setup() {
 src_prepare() {
 	epatch	"${FILESDIR}"/${P}-undo-p-rename.patch \
 		"${FILESDIR}"/${P}-return-all-sets.patch \
-		"${FILESDIR}"/${P}-static-build-fixes.patch
+		"${FILESDIR}"/${P}-static-build-fixes.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch
 	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
 	einfo "Appending pkg.m4 from system to aclocal.m4"
 	cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
new file mode 100644
index 00000000000..8c89374588f
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
@@ -0,0 +1,11 @@
+--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig	2016-09-20 12:54:09.416628404 +0200
++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in	2016-09-20 12:55:06.343698229 +0200
+@@ -79,7 +79,7 @@
+ 		-Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \
+ 		$(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS)
+ 
+-$(LIB_EVENTS_SHARED): $(OBJECTS2)
++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED)
+ 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
+ 		-shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \
+ 		$(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS)

[gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/

[Ian Stakenvicius]

commit:     07a74ec765ebc25d68f44c5aa8e91ae0f866c7ad
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 02:55:11 2020 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 02:55:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a74ec7

sys-fs/dmraid: ensure _PATH_MOUNTED is defined, bump to EAPI7

glibc's /usr/include/paths.h defines _PATH_MOUNTED as /etc/mtab
but if musl doesn't have that define it would explain this
failure.  This patch ensures its defined in the code.

Also bumped ebuild to EAPI7

Closes: https://bugs.gentoo.org/716156
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>

 sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild          | 102 +++++++++++++++++++++
 ...mraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch |  14 +++
 2 files changed, 116 insertions(+)

diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
new file mode 100644
index 00000000000..a4b58735f59
--- /dev/null
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info flag-o-matic
+
+MY_PV=${PV/_/.}-3
+
+DESCRIPTION="Device-mapper RAID tool and library"
+HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/"
+SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="intel_led led mini static"
+
+RDEPEND=">=sys-fs/lvm2-2.02.45"
+DEPEND="${RDEPEND}
+	static? ( sys-fs/lvm2[static-libs] )
+"
+BDEPEND="virtual/pkgconfig
+	app-arch/tar"
+
+S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
+
+pkg_setup() {
+	if kernel_is lt 2 6 ; then
+		ewarn "You are using a kernel < 2.6"
+		ewarn "DMraid uses recently introduced Device-Mapper features."
+		ewarn "These might be unavailable in the kernel you are running now."
+	fi
+}
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${P}-undo-p-rename.patch \
+		"${FILESDIR}"/${P}-return-all-sets.patch
+	eapply -p0 "${FILESDIR}"/${P}-static-build-fixes.patch
+	eapply -p3 "${FILESDIR}"/${P}-parallel-make.patch
+	eapply "${FILESDIR}"/${P}-fix-missing-PATH-MOUNTED.patch
+
+	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
+	einfo "Appending pkg.m4 from system to aclocal.m4"
+	cat "${BROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
+	eapply_user
+	eautoreconf
+
+	einfo "Creating prepatched source archive for use with Genkernel"
+	# archive the patched source for use with genkernel
+	cd "${WORKDIR}" || die
+	mkdir -p "tmp/${PN}" || die
+	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die
+	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die
+	cd tmp || die
+	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
+	mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die
+}
+
+src_configure() {
+	# disable klibc and dietlibc, bug #653392
+	econf --with-usrlibdir='${prefix}'/$(get_libdir) \
+		--disable-klibc \
+		--disable-dietlibc \
+		$(use_enable static static_link) \
+		$(use_enable mini) \
+		$(use_enable led) \
+		$(use_enable intel_led)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
+	insinto /usr/share/${PN}
+	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs."
+		elog
+		elog "Genkernel will generate the kernel and the initramfs with a statically "
+		elog "linked dmraid binary (its own version which may not be the same as this version):"
+		elog "\t emerge -av sys-kernel/genkernel"
+		elog "\t genkernel --dmraid all"
+	fi
+	# skip this message if this revision has already been emerged
+	if [[ " ${REPLACING_VERSIONS} " != *\ ${PVR}\ * ]]; then
+		elog
+		elog "A pre-patched distfile of this version of DMRAID has been installed at"
+		elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a"
+		elog "Genkernel initramfs."
+		elog
+	fi
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you would rather use this version of DMRAID with Genkernel, update the following"
+		elog "in /etc/genkernel.conf:"
+		elog "\t DMRAID_VER=\"${MY_PV}\""
+		elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
+		elog
+	fi
+}

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch
new file mode 100644
index 00000000000..3d773b5e15e
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-fix-missing-PATH-MOUNTED.patch
@@ -0,0 +1,14 @@
+--- a/lib/device/scan.c	2010-10-27 07:31:47.000000000 -0400
++++ b/lib/device/scan.c	2020-04-04 22:13:26.905977068 -0400
+@@ -32,6 +32,11 @@
+ #define	_PATH_MOUNTS	"/proc/mounts"
+ #endif
+ 
++/* Find mtab */
++#ifndef _PATH_MOUNTED
++#define _PATH_MOUNTED	"/etc/mtab"
++#endif
++
+ static char *
+ find_sysfs_mp(struct lib_context *lc)
+ {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/, sys-fs/dmraid/files/

[Sam James]

commit:     88f1074d0291e321e9765f358b4806dc9a8ad457
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 00:57:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 00:57:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f1074d

sys-fs/dmraid: add musl patch

Closes: https://bugs.gentoo.org/717430
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild        |  4 ++++
 sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index ac268a35d6c..e76bae706c5 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -41,12 +41,16 @@ src_prepare() {
 	eapply -p0 "${FILESDIR}"/${P}-static-build-fixes.patch
 	eapply -p3 "${FILESDIR}"/${P}-parallel-make.patch
 	eapply "${FILESDIR}"/${P}-fix-missing-PATH-MOUNTED.patch
+	eapply "${FILESDIR}"/${PN}-1.0.0_rc16-musl.patch
 
 	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
 	einfo "Appending pkg.m4 from system to aclocal.m4"
 	cat "${BROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
 
+	mv configure.{in,ac} || die
+
 	default
+
 	eautoreconf
 
 	einfo "Creating prepatched source archive for use with Genkernel"

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch
new file mode 100644
index 00000000000..d43ed635471
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-musl.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/717430
+https://git.alpinelinux.org/aports/plain/main/dmraid/006-musl-libc.patch
+--- a/include/dmraid/misc.h
++++ b/include/dmraid/misc.h
+@@ -10,6 +10,7 @@
+ 
+ #ifndef _MISC_H_
+ #define _MISC_H_
++#include <fcntl.h>
+ 
+ #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0);
+ 
+--- a/lib/device/scan.c
++++ b/lib/device/scan.c
+@@ -10,6 +10,7 @@
+ # include <dirent.h>
+ # include <paths.h>
+ #else
++# include <paths.h>
+ # include <dirent.h>
+ # include <mntent.h>
+ #endif