[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/, sys-cluster/ploop/
commit: d2c74fe1c6bd290617186d2cd4992f005a288ca2
Author: Stephan Hartmann gentoo org>
AuthorDate: Sun Jun 19 17:45:12 2022 +
Commit: Stephan Hartmann gentoo org>
CommitDate: Sun Jun 19 17:45:23 2022 +
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 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 ..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
+ #include
+ #include
++#include
+
+ #include "ploop.h"
+
+--- a/lib/delta_read.c
b/lib/delta_read.c
+@@ -24,6 +24,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "ploop.h"
+
+--- a/lib/delta_sysfs.c
b/lib/delta_sysfs.c
+@@ -29,6 +29,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #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
+ #include
+ #include
++#include
+
+ #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, ))
+ 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 )
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/
commit: a35866ef41c29d0b69a9159114f25ff18b30487e Author: Marek Szuba gentoo org> AuthorDate: Fri Nov 26 23:36:45 2021 + Commit: Marek Szuba gentoo org> CommitDate: Fri Nov 26 23:37:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a35866ef sys-cluster/ploop: make the patch eapply-compliant Signed-off-by: Marek Szuba gentoo.org> sys-cluster/ploop/files/disable_create_run_dir.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/ploop/files/disable_create_run_dir.patch b/sys-cluster/ploop/files/disable_create_run_dir.patch index 726094903b51..597a6c1d160d 100644 --- a/sys-cluster/ploop/files/disable_create_run_dir.patch +++ b/sys-cluster/ploop/files/disable_create_run_dir.patch @@ -1,5 +1,5 @@ lib/Makefile.old 2015-10-10 15:49:25.377235002 +0300 -+++ lib/Makefile 2015-10-10 15:49:50.021464544 +0300 +--- a/lib/Makefile b/lib/Makefile @@ -76,17 +76,13 @@ .depend: $(filter-out $(GENERATED),$(SOURCES)) -include .depend
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/
commit: 020e86bd40ae781498e541f302d9dc5094808531
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Feb 9 19:46:53 2017 +
Commit: David Seifert gentoo org>
CommitDate: Thu Feb 9 22:35:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020e86bd
sys-cluster/ploop: remove unused patch/file
Closes: https://github.com/gentoo/gentoo/pull/3897
sys-cluster/ploop/files/ploop-1.2-soname.patch | 19 ---
sys-cluster/ploop/files/ploop.tmpfiles | 1 -
2 files changed, 20 deletions(-)
diff --git a/sys-cluster/ploop/files/ploop-1.2-soname.patch
b/sys-cluster/ploop/files/ploop-1.2-soname.patch
deleted file mode 100644
index 34cd56567c..00
--- a/sys-cluster/ploop/files/ploop-1.2-soname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
lib/Makefile 2012-05-03 21:11:04.0 +0400
-+++ lib/Makefile 2012-05-03 21:10:47.0 +0400
-@@ -2,6 +2,7 @@
-
- LIBPLOOP=libploop.a
- LIBPLOOP_DYN = libploop.so
-+SONAME = $(LIBPLOOP_DYN).0
- LIBOBJS=uuid.o \
- delta_read.o \
- delta_sysfs.o \
-@@ -36,7 +37,7 @@
-
- $(LIBPLOOP_DYN): $(LIBOBJS)
- $(E) " LINK" $@
-- $(Q) $(CC) $(CFLAGS) $(INC) $(LDFLAGS) -shared $^ ${LDLIBS} -o $@
-+ $(Q) $(CC) $(CFLAGS) $(INC) $(LDFLAGS) -shared $^ ${LDLIBS} -o $@
-Wl,-soname,$(SONAME)
-
- .depend: $(SOURCES)
- -include .depend
diff --git a/sys-cluster/ploop/files/ploop.tmpfiles
b/sys-cluster/ploop/files/ploop.tmpfiles
deleted file mode 100644
index 25feee63db..00
--- a/sys-cluster/ploop/files/ploop.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/lock/ploop 0755 root root - -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/files/, sys-cluster/ploop/
commit: 4ee814d2c172104e5ff4ca602a755ba4d173
Author: Maxim Koltsov gentoo org>
AuthorDate: Sat Oct 10 14:31:51 2015 +
Commit: Maxim Koltsov gentoo org>
CommitDate: Sat Oct 10 14:33:40 2015 +
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 000..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 000..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
+ !
