[packages/dmraid] Rel 6

[arekm]

commit 1ea8baaaa7b6db6bbd8ebe3ae22f118d0742b8dd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Mar 9 19:14:58 2026 +0100

    Rel 6

 dmraid-types.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 dmraid.spec        |  6 ++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/dmraid.spec b/dmraid.spec
index aa95cb7..a7b1533 100644
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -4,7 +4,7 @@
 %bcond_with	dietlibc	# build initrd version with static glibc instead of dietlibc
 %bcond_without	selinux		# build without SELinux support (needs selinux-disabled device-mapper)
 
-%define		rel	5
+%define		rel	6
 %define		subver	rc16.3
 Summary:	Device-mapper RAID tool
 Summary(pl.UTF-8):	Narzędzie do RAID-u opartego o device-mapper
@@ -22,6 +22,7 @@ Patch1:		%{name}-optflags.patch
 Patch2:		%{name}-unsigned.patch
 Patch3:		%{name}-diet.patch
 Patch4:		%{name}-format.patch
+Patch5:		%{name}-types.patch
 URL:		http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -105,11 +106,12 @@ Statycznie skonsolidowana wersja programu narzędziowego dmraid.
 %prep
 %setup -q -n %{name}
 mv %{version}.*/dmraid/* .
-%{?with_selinux:%patch0 -p2}
+%{?with_selinux:%patch -P 0 -p2}
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
 %patch -P4 -p1
+%patch -P5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
diff --git a/dmraid-types.patch b/dmraid-types.patch
new file mode 100644
index 0000000..5779c19
--- /dev/null
+++ b/dmraid-types.patch
@@ -0,0 +1,40 @@
+--- dmraid/lib/activate/activate.c	2010-10-27 13:31:47.000000000 +0200
++++ dmraid/lib/activate/activate.c	2026-03-09 19:13:09.993023306 +0100
+@@ -861,7 +861,7 @@
+ 
+ #define LIB_NAME_LENGTH 255
+ static int
+-do_device(struct lib_context *lc, struct raid_set *rs, int (*f) ())
++do_device(struct lib_context *lc, struct raid_set *rs, int (*f) (char *, char *))
+ {
+ 	int ret = 0;
+ 	char lib_name[LIB_NAME_LENGTH];
+--- dmraid/lib/misc/file.c	2026-03-09 19:13:07.304470713 +0100
++++ dmraid/lib/misc/file.c	2026-03-09 19:13:15.746356638 +0100
+@@ -58,11 +58,14 @@
+ 	int fd, ret = 0;
+ 	loff_t o;
+ 	struct {
+-		ssize_t(*func) ();
++		union {
++			ssize_t (*r)(int, void *, size_t);
++			ssize_t (*w)(int, const void *, size_t);
++		} func;
+ 		const char *what;
+ 	} rw_spec[] = {
+-		{ read, "read"},
+-		{ write, "writ"},
++		{ { .r = read }, "read"},
++		{ { .w = write }, "writ"},
+ 	}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
+ 
+ 	if ((fd = open(path, flags, lc->mode)) == -1)
+@@ -76,7 +79,7 @@
+ 	if (offset && (o = DMRAID_LSEEK(fd, offset, SEEK_SET)) == (loff_t) - 1)
+ 		log_err(lc, "%s: seeking device \"%s\" to %" PRIu64,
+ 			who, path, offset);
+-	else if (rw->func(fd, buffer, size) != size)
++	else if (((flags & O_WRONLY) ? rw->func.w(fd, buffer, size) : rw->func.r(fd, buffer, size)) != size)
+ 		log_err(lc, "%s: %sing %s[%s]", who, rw->what,
+ 			path, strerror(errno));
+ 	else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dmraid.git/commitdiff/1ea8baaaa7b6db6bbd8ebe3ae22f118d0742b8dd