[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/, sys-cluster/ploop/

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/, sys-cluster/ploop/

[Maxim Koltsov]

commit:     4ee814d2c1222272104e5ff4ca602a755ba4d173
Author:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 14:31:51 2015 +0000
Commit:     Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 14:33:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee814d2

sys-cluster/ploop: bump to 1.14.1

Package-Manager: portage-2.2.22

 sys-cluster/ploop/Manifest                         |  1 +
 .../ploop/files/disable_create_run_dir.patch       | 21 ++++++++
 sys-cluster/ploop/ploop-1.14.1.ebuild              | 61 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index 056d0d0..e48d97d 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1 +1,2 @@
 DIST ploop-1.13.2.tar.bz2 122821 SHA256 c1705c3bebd4f0f8860fecadf57cca457216b2abad880eb36098351244f9c1c3 SHA512 85a3314dc1114b692cd98290412fd2ea78c516964c712487dd72f8347fd583172d8836f997d63ccade89ee39be031669074d9bc957926b97175e659ec505ddfb WHIRLPOOL aea714ec18aa82cce2fcffa9aafdfe0e627ed83db9b8eaf0621b2dddb58fd300fdd9a3896e2e5192154cc5e0b6b11668128ed2e66fd04c1daae84e23d41c7a99
+DIST ploop-1.14.1.tar.bz2 123962 SHA256 841fde81c46632072ff8bcc29a4074a15b3c8359967254deeba51f0af34a6c0e SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484 WHIRLPOOL 8e80385233cbd5be0a26a20fb5442f82fa57adffe22f78a1207c73ece65822091c7fbbf90b59b97b8cf6ff760447a93c391e828af5402ecdc59285a74c114332

diff --git a/sys-cluster/ploop/files/disable_create_run_dir.patch b/sys-cluster/ploop/files/disable_create_run_dir.patch
new file mode 100644
index 0000000..7260949
--- /dev/null
+++ b/sys-cluster/ploop/files/disable_create_run_dir.patch
@@ -0,0 +1,21 @@
+--- lib/Makefile.old	2015-10-10 15:49:25.377235002 +0300
++++ lib/Makefile	2015-10-10 15:49:50.021464544 +0300
+@@ -76,17 +76,13 @@
+ .depend: $(filter-out $(GENERATED),$(SOURCES))
+ -include .depend
+ 
+-install-lockdir:
+-	$(Q) $(INSTALL) -d $(DESTDIR)$(LOCKDIR)
+-.PHONY: install-lockdir
+-
+ install-pc: $(PC)
+ 	$(E) "  INSTALL " $(PC)
+ 	$(Q) $(INSTALL) -d $(DESTDIR)$(PCDIR)
+ 	$(Q) $(INSTALL) $(PC) $(DESTDIR)$(PCDIR)
+ .PHONY: install-pc
+ 
+-install: all install-lockdir install-pc
++install: all  install-pc
+ 	$(Q) $(INSTALL) -d $(DESTDIR)$(LIBDIR)
+ 	$(E) "  INSTALL " $(LIBPLOOP)
+ 	$(Q) $(INSTALL) -m 644 $(LIBPLOOP) $(DESTDIR)$(LIBDIR)

diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
new file mode 100644
index 0000000..00858bd
--- /dev/null
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib systemd
+
+DESCRIPTION="openvz tool and a library to control ploop block devices"
+HOMEPAGE="http://wiki.openvz.org/Download/ploop"
+SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+DEPEND="
+	dev-libs/libxml2
+	virtual/pkgconfig
+	"
+
+RDEPEND="dev-libs/libxml2
+	!<sys-cluster/vzctl-4.8
+	sys-block/parted
+	sys-fs/e2fsprogs
+	sys-process/lsof
+	sys-apps/findutils
+	"
+
+DOCS=( tools/README )
+
+src_prepare() {
+	epatch "${FILESDIR}/disable_create_run_dir.patch"
+
+	# Respect CFLAGS and CC, do not add debug by default
+	sed -i \
+		-e 's|CFLAGS =|CFLAGS +=|' \
+		-e '/CFLAGS/s/-g -O0 //' \
+		-e '/CFLAGS/s/-O2//' \
+		-e 's|CC=|CC?=|' \
+		-e 's/-Werror//' \
+		-e '/DEBUG=yes/d' \
+		-e '/LOCKDIR/s/var/run/' \
+		Makefile.inc || die 'sed on Makefile.inc failed'
+	# Avoid striping of binaries
+	sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
+
+	# respect AR and RANLIB, bug #452092
+	tc-export AR RANLIB
+	sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '')
+}
+
+src_install() {
+	default
+	ldconfig -n "${D}/usr/$(get_libdir)/" || die
+}

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/, sys-cluster/ploop/

[Stephan Hartmann]

commit:     d2c74fe1c6bd290617186d2cd4992f005a288ca2
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 17:45:12 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 17:45:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c74fe1

sys-cluster/ploop: fix building on musl

Closes: https://bugs.gentoo.org/832965
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 sys-cluster/ploop/files/ploop-1.14-musl.patch | 78 +++++++++++++++++++++++++++
 sys-cluster/ploop/ploop-1.14.1-r1.ebuild      |  1 +
 2 files changed, 79 insertions(+)

diff --git a/sys-cluster/ploop/files/ploop-1.14-musl.patch b/sys-cluster/ploop/files/ploop-1.14-musl.patch
new file mode 100644
index 000000000000..693135123c55
--- /dev/null
+++ b/sys-cluster/ploop/files/ploop-1.14-musl.patch
@@ -0,0 +1,78 @@
+--- a/lib/balloon_util.c
++++ b/lib/balloon_util.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <linux/fs.h>
+ #include <linux/fiemap.h>
++#include <stddef.h>
+ 
+ #include "ploop.h"
+ 
+--- a/lib/delta_read.c
++++ b/lib/delta_read.c
+@@ -24,6 +24,7 @@
+ #include <malloc.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#include <stddef.h>
+ 
+ #include "ploop.h"
+ 
+--- a/lib/delta_sysfs.c
++++ b/lib/delta_sysfs.c
+@@ -29,6 +29,7 @@
+ #include <linux/fs.h>
+ #include <sys/ioctl.h>
+ #include <sys/utsname.h>
++#include <sys/sysmacros.h>
+ 
+ #include "ploop.h"
+ 
+@@ -238,7 +239,7 @@ static int get_dev_num(const char *path, dev_t *dev_num)
+ 		ploop_err(0, "Unexpected format of %s: %s", path, nbuf);
+ 		return -1;
+ 	}
+-	*dev_num = gnu_dev_makedev(maj, min);
++	*dev_num = makedev(maj, min);
+ 	return 0;
+ }
+ 
+--- a/lib/merge.c
++++ b/lib/merge.c
+@@ -29,6 +29,7 @@
+ #include <linux/types.h>
+ #include <string.h>
+ #include <assert.h>
++#include <stddef.h>
+ 
+ #include "ploop.h"
+ 
+--- a/lib/ploop.c
++++ b/lib/ploop.c
+@@ -1087,7 +1087,7 @@ static int get_mount_dir(const char *device, char *out, int size)
+ 
+ 	if (get_dev_by_name(device, &dev))
+ 		return -1;
+-	minor = gnu_dev_minor(dev);
++	minor = minor(dev);
+ 
+ 	fp = fopen("/proc/self/mountinfo", "r");
+ 	if (fp == NULL) {
+@@ -1719,7 +1719,7 @@ static int create_ploop_dev(int minor)
+ 	make_sysfs_dev_name(minor, device + 5, sizeof(device) - 5);
+ 	/* Create pair /dev/ploopN & /dev/ploopNp1 */
+ 	if (access(device, F_OK)) {
+-		if (mknod(device, S_IFBLK, gnu_dev_makedev(PLOOP_DEV_MAJOR, minor))) {
++		if (mknod(device, S_IFBLK, makedev(PLOOP_DEV_MAJOR, minor))) {
+ 			ploop_err(errno, "mknod %s", device);
+ 			return SYSEXIT_MKNOD;
+ 		}
+@@ -1730,7 +1730,7 @@ static int create_ploop_dev(int minor)
+ 	}
+ 	snprintf(devicep1, sizeof(devicep1), "%sp1", device);
+ 	if (access(devicep1, F_OK)) {
+-		if (mknod(devicep1, S_IFBLK, gnu_dev_makedev(PLOOP_DEV_MAJOR, minor+1))) {
++		if (mknod(devicep1, S_IFBLK, makedev(PLOOP_DEV_MAJOR, minor+1))) {
+ 			ploop_err(errno, "mknod %s", devicep1);
+ 			return SYSEXIT_MKNOD;
+ 		}

diff --git a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild
index b8086d22b8d8..1dfbcff162dc 100644
--- a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild
+++ b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/disable_create_run_dir.patch
+	"${FILESDIR}"/${PN}-1.14-musl.patch
 )
 
 DOCS=( tools/README )