* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/, sys-cluster/ploop/files/
@ 2022-06-19 16:03 Stephan Hartmann
0 siblings, 0 replies; 2+ messages in thread
From: Stephan Hartmann @ 2022-06-19 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 71c068be98a510b39a8fda11bfaecaa36fe8f7d3
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 16:03:49 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 16:03:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c068be
sys-cluster/ploop: add 1.15
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
sys-cluster/ploop/Manifest | 1 +
.../ploop/files/ploop-1.15-makedev-include.patch | 12 ++++
sys-cluster/ploop/ploop-1.15.ebuild | 64 ++++++++++++++++++++++
3 files changed, 77 insertions(+)
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index dee8217c2c4e..adfb985c05c0 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1 +1,2 @@
DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
+DIST ploop-1.15.tar.bz2 125618 BLAKE2B ad7d06865606c20bdd9601ce343817a332653f3f7544dd27f08d3fb5ff2ee8112ef1ae0217546c28fde3dba076b0703b5881e8a019eec663964dd39885c5524c SHA512 07a691aeed949971534dcf9bb5138defacf25d7c437336df84a5ec3759cba0c20f6724660b7c8a204b3f455d15a892e20b060b0e0ea27280eeba738c36f280cb
diff --git a/sys-cluster/ploop/files/ploop-1.15-makedev-include.patch b/sys-cluster/ploop/files/ploop-1.15-makedev-include.patch
new file mode 100644
index 000000000000..81ebf2ac9ea4
--- /dev/null
+++ b/sys-cluster/ploop/files/ploop-1.15-makedev-include.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/delta_sysfs.c b/lib/delta_sysfs.c
+index 98e7254..e44fb3b 100644
+--- 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"
+
diff --git a/sys-cluster/ploop/ploop-1.15.ebuild b/sys-cluster/ploop/ploop-1.15.ebuild
new file mode 100644
index 000000000000..c554d97126d1
--- /dev/null
+++ b/sys-cluster/ploop/ploop-1.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit tmpfiles toolchain-funcs
+
+DESCRIPTION="openvz tool and a library to control ploop block devices"
+HOMEPAGE="https://wiki.openvz.org/Download/ploop"
+SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/libxml2"
+RDEPEND="${DEPEND}
+ sys-block/parted
+ sys-fs/e2fsprogs
+ sys-process/lsof
+ sys-apps/findutils"
+
+PATCHES=(
+ "${FILESDIR}"/disable_create_run_dir.patch
+ "${FILESDIR}"/${PN}-1.15-makedev-include.patch
+)
+
+DOCS=( tools/README )
+
+src_prepare() {
+ default
+
+ # 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() {
+ emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install
+ rm "${ED}"/usr/$(get_libdir)/*.a || die
+}
+
+pkg_postinst() {
+ tmpfiles_process ploop.conf
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/, sys-cluster/ploop/files/
@ 2022-08-21 7:38 Stephan Hartmann
0 siblings, 0 replies; 2+ messages in thread
From: Stephan Hartmann @ 2022-08-21 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 1ab8ef8505e1670b110d20ae6ed62ce593ec2d0e
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 07:37:57 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 07:37:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab8ef85
sys-cluster/ploop: drop 1.14.1-r1
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
sys-cluster/ploop/Manifest | 1 -
sys-cluster/ploop/files/ploop-1.14-musl.patch | 78 ---------------------------
sys-cluster/ploop/ploop-1.14.1-r1.ebuild | 64 ----------------------
3 files changed, 143 deletions(-)
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index adfb985c05c0..f469a1e30aa8 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1,2 +1 @@
-DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484
DIST ploop-1.15.tar.bz2 125618 BLAKE2B ad7d06865606c20bdd9601ce343817a332653f3f7544dd27f08d3fb5ff2ee8112ef1ae0217546c28fde3dba076b0703b5881e8a019eec663964dd39885c5524c SHA512 07a691aeed949971534dcf9bb5138defacf25d7c437336df84a5ec3759cba0c20f6724660b7c8a204b3f455d15a892e20b060b0e0ea27280eeba738c36f280cb
diff --git a/sys-cluster/ploop/files/ploop-1.14-musl.patch b/sys-cluster/ploop/files/ploop-1.14-musl.patch
deleted file mode 100644
index 693135123c55..000000000000
--- a/sys-cluster/ploop/files/ploop-1.14-musl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- 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
deleted file mode 100644
index 1dfbcff162dc..000000000000
--- a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit tmpfiles toolchain-funcs
-
-DESCRIPTION="openvz tool and a library to control ploop block devices"
-HOMEPAGE="https://wiki.openvz.org/Download/ploop"
-SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/libxml2"
-RDEPEND="${DEPEND}
- sys-block/parted
- sys-fs/e2fsprogs
- sys-process/lsof
- sys-apps/findutils"
-
-PATCHES=(
- "${FILESDIR}"/disable_create_run_dir.patch
- "${FILESDIR}"/${PN}-1.14-musl.patch
-)
-
-DOCS=( tools/README )
-
-src_prepare() {
- default
-
- # 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() {
- emake DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install
- rm "${ED}"/usr/$(get_libdir)/*.a || die
-}
-
-pkg_postinst() {
- tmpfiles_process ploop.conf
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-21 7:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-19 16:03 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ploop/, sys-cluster/ploop/files/ Stephan Hartmann
-- strict thread matches above, loose matches on Subject: below --
2022-08-21 7:38 Stephan Hartmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox