commit 2ac2d785538052d37293fba2c675f78a8eb9fc73
Author: Jakub Bogusz <[email protected]>
Date: Sat Oct 26 21:04:30 2024 +0200
- updated to 8.0.99, fix build with glibc 2.36+
ploop-glibc.patch | 20 ++++++++++++++++++++
ploop-python.patch | 14 --------------
ploop.spec | 11 +++++++----
3 files changed, 27 insertions(+), 18 deletions(-)
---
diff --git a/ploop.spec b/ploop.spec
index a5e41e1..4809dc2 100644
--- a/ploop.spec
+++ b/ploop.spec
@@ -1,16 +1,18 @@
Summary: Tools for ploop devices and images
Summary(pl.UTF-8): Narzędzia do urządzeń i obrazów ploop
Name: ploop
-Version: 8.0.55
-Release: 2
+Version: 8.0.99
+Release: 1
License: GPL v2+
Group: Applications/System
#Source0Download: https://github.com/OpenVZ/ploop/releases
Source0:
https://github.com/OpenVZ/ploop/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 02b49c7cc117d3181e1cd109a34d3afc
+# Source0-md5: 1b6b86193ee29931572583b5912585a8
Patch0: %{name}-python.patch
Patch1: no-Werror.patch
+Patch2: %{name}-glibc.patch
URL: https://wiki.openvz.org/Ploop
+BuildRequires: glibc-devel >= 6:2.36
BuildRequires: libxml2-devel >= 2.0
BuildRequires: python3-devel >= 1:3.2
BuildRequires: rpmbuild(macros) >= 1.673
@@ -46,7 +48,7 @@ Bashowe dopełnianie składni poleceń ploop.
Summary: ploop library
Summary(pl.UTF-8): Biblioteka ploop
Group: Libraries
-Obsoletes: ploop-lib
+Obsoletes: ploop-lib < 1.4
%description libs
Parallels loopback (ploop) block device API library.
@@ -94,6 +96,7 @@ Interfejs Pythona 3 do biblioteki ploop.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# honour %{_libexecdir} whatever it's set to
%{__sed} -i -e '/exe = / s,/usr/libexec,%{_libexecdir},' scripts/crypthelper
diff --git a/ploop-glibc.patch b/ploop-glibc.patch
new file mode 100644
index 0000000..db574c4
--- /dev/null
+++ b/ploop-glibc.patch
@@ -0,0 +1,20 @@
+--- ploop-8.0.99/lib/ploop.c.orig 2022-11-02 09:00:30.000000000 +0100
++++ ploop-8.0.99/lib/ploop.c 2024-10-26 20:53:01.318185786 +0200
+@@ -2333,17 +2333,6 @@ static int do_mount(const char *part, co
+ }
+
+
+-static int open_tree(int dirfd, const char *pathname, unsigned int flags)
+-{
+- return syscall(428, dirfd, pathname, flags);
+-}
+-
+-static int move_mount(int from_dirfd, const char *from_pathname, int to_dirfd,
+- const char *to_pathname, unsigned int flags)
+-{
+- return syscall(429, from_dirfd, from_pathname, to_dirfd, to_pathname,
flags);
+-}
+-
+ static int do_mount_ns(const char *src_mnt, const char *dst_mnt, int pid)
+ {
+ char path[PATH_MAX];
diff --git a/ploop-python.patch b/ploop-python.patch
index aeb648e..96e0669 100644
--- a/ploop-python.patch
+++ b/ploop-python.patch
@@ -8,17 +8,3 @@
+ $(Q) CFLAGS= python3 setup.py install --prefix=/usr --optimize=2 \
$(if $(DESTDIR), --root $(DESTDIR))
.PHONY: install
---- ploop-8.0.14/python/libploop/__init__.py.orig 2020-06-19
13:24:40.000000000 +0200
-+++ ploop-8.0.14/python/libploop/__init__.py 2020-06-27 18:12:33.487985985
+0200
-@@ -2,9 +2,9 @@
- import threading
-
- class ploopcopy():
-- def __init__(self, ddxml, fd, async = 0):
-+ def __init__(self, ddxml, fd, _async = 0):
- self.di = libploopapi.open_dd(ddxml)
-- self.h = libploopapi.copy_init(self.di, fd, async)
-+ self.h = libploopapi.copy_init(self.di, fd, _async)
-
- def __del__(self):
- if self.h:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ploop.git/commitdiff/2ac2d785538052d37293fba2c675f78a8eb9fc73
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
