[packages/lxd] - up to 5.21.3

[mis]

commit e38f60f8f4f5ae8e6e4ba705891fc7fb76960eed
Author: mis <mistoo at gmail.com>
Date:   Fri Feb 7 22:48:00 2025 +0100

    - up to 5.21.3

 glibc2_36.patch | 69 ---------------------------------------------------------
 lxd.spec        | 16 ++++++-------
 2 files changed, 7 insertions(+), 78 deletions(-)
---
diff --git a/lxd.spec b/lxd.spec
index 8ade43d..362e881 100644
--- a/lxd.spec
+++ b/lxd.spec
@@ -1,23 +1,22 @@
 Summary:	Fast, dense and secure container and virtual machine management
 Name:		lxd
-Version:	4.24
+Version:	5.21.3
 Release:	1
-License:	Apache v2.0
+License:	AGPL v3.0
 Group:		Applications/System
-Source0:	https://linuxcontainers.org/downloads/lxd/%{name}-%{version}.tar.gz
-# Source0-md5:	85313ed5ded11aad00e6376a8f140cc7
+Source0:	https://github.com/canonical/lxd/archive/refs/tags/%{name}-%{version}.tar.gz
+# Source0-md5:	7dab2698e4cfbb3f8aba388e97152f98
 Source1:	%{name}.service
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.sh
-Patch1:		glibc2_36.patch
 URL:		http://linuxcontainers.org/
 BuildRequires:	acl-devel
 %ifarch %{x8664} arm aarch64 ppc64
 BuildRequires:	criu-devel >= 1.7
 %endif
-BuildRequires:	dqlite-devel >= 1.10.0
-BuildRequires:	golang >= 1.18
+BuildRequires:	dqlite-devel >= 1.18.0
+BuildRequires:	golang >= 1.23
 BuildRequires:	libco-devel
 BuildRequires:	libuv-devel
 BuildRequires:	lxc-devel >= 3.0
@@ -100,8 +99,7 @@ bash-completion for %{name}
 Bashowe dopełnianie parametrów dla %{name}
 
 %prep
-%setup -q
-%patch1 -p1
+%setup -q -n %{name}-%{name}-%{version}
 
 %build
 export GOPATH=$(pwd)/_dist
diff --git a/glibc2_36.patch b/glibc2_36.patch
deleted file mode 100644
index cfef656..0000000
--- a/glibc2_36.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/shared/idmap/shift_linux.go	2022-03-11 04:52:20.000000000 +0100
-+++ b/shared/idmap/shift_linux.go	2022-11-22 09:18:23.513333279 +0100
-@@ -314,7 +314,7 @@
- static int create_detached_idmapped_mount(const char *path)
- {
- 	__do_close int fd_tree = -EBADF, fd_userns = -EBADF;
--	struct lxc_mount_attr attr = {
-+	struct mount_attr attr = {
- 	    .attr_set		= MOUNT_ATTR_IDMAP,
- 	    .propagation	= MS_SLAVE,
- 
---- a/lxd/include/syscall_wrappers.h	2022-11-22 09:10:03.053333289 +0100
-+++ b/lxd/include/syscall_wrappers.h	2022-11-22 09:20:55.586666611 +0100
-@@ -11,7 +11,7 @@
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <unistd.h>
--
-+#include <sys/mount.h>
- #include "syscall_numbers.h"
- 
- #ifndef CLOSE_RANGE_UNSHARE
-@@ -27,7 +27,7 @@
- 	return syscall(__NR_close_range, fd, max_fd, flags);
- }
- 
--static inline int open_tree(int dfd, const char *filename, unsigned int flags)
-+static inline int xopen_tree(int dfd, const char *filename, unsigned int flags)
- {
- 	return syscall(__NR_open_tree, dfd, filename, flags);
- }
-@@ -42,13 +42,13 @@
- 	__u64 userns_fd;
- };
- 
--static inline int mount_setattr(int dfd, const char *path, unsigned int flags,
-+static inline int xmount_setattr(int dfd, const char *path, unsigned int flags,
- 				struct lxc_mount_attr *attr, size_t size)
- {
- 	return syscall(__NR_mount_setattr, dfd, path, flags, attr, size);
- }
- 
--static inline int move_mount(int from_dfd, const char *from_pathname, int to_dfd,
-+static inline int xmove_mount(int from_dfd, const char *from_pathname, int to_dfd,
- 			     const char *to_pathname, unsigned int flags)
- {
- 	return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,
---- a/lxd/main_checkfeature.go	2022-03-11 04:52:20.000000000 +0100
-+++ b/lxd/main_checkfeature.go	2022-11-22 10:54:47.506666609 +0100
-@@ -563,7 +563,7 @@
- static bool kernel_supports_idmapped_mounts(void)
- {
- 	__do_close int fd_devnull = -EBADF, fd_tree = -EBADF;
--	struct lxc_mount_attr attr = {
-+	struct mount_attr attr = {
- 	    .attr_set		= MOUNT_ATTR_IDMAP,
- 
- 	};
---- a/lxd/main_nsexec.go	2022-03-11 04:52:20.000000000 +0100
-+++ b/lxd/main_nsexec.go	2022-11-22 10:59:03.776666604 +0100
-@@ -298,7 +298,7 @@
- int mount_detach_idmap(const char *path, int fd_userns)
- {
- 	__do_close int fd_tree = -EBADF;
--	struct lxc_mount_attr attr = {
-+	struct mount_attr attr = {
- 	    .attr_set		= MOUNT_ATTR_IDMAP,
- 
- 	};
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxd.git/commitdiff/e38f60f8f4f5ae8e6e4ba705891fc7fb76960eed