From: Jan Palus <atler@pld-linux.org>
Date: Thu, 15 Sep 2022 09:36:10 +0000 (+0200)
Subject: rediff patches
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=46a44db022fe59e3de14d1fe078db1f012c33704;p=packages%2Fdmraid.git

rediff patches
---

diff --git a/dmraid-optflags.patch b/dmraid-optflags.patch
index b105fac..7200287 100644
--- a/dmraid-optflags.patch
+++ b/dmraid-optflags.patch
@@ -12,7 +12,7 @@
 +++ dmraid/make.tmpl.in	2006-05-23 00:38:24.990584000 +0200
 @@ -52,7 +52,7 @@
  
- SUFFIXES=.c .o .so .a
+ SUFFIXES=.c .d .o .so .a
  
 -CFLAGS+=-fPIC -Wall -Wundef -Wcast-align -Wwrite-strings -Winline
 +CFLAGS+=-Wall -Wundef -Wcast-align -Wwrite-strings -Winline
@@ -21,7 +21,7 @@
    # These ones make klibc compiles very loud
 @@ -66,9 +66,7 @@
  ifeq ("@DEBUG@", "yes")
-   CFLAGS+=-g -fno-omit-frame-pointer -DDEBUG
+   CFLAGS+=-g -fno-omit-frame-pointer
  else
 -  ifeq ("@KLIBC@", "no")
 -    CFLAGS+=-O2
diff --git a/dmraid-selinux-static.patch b/dmraid-selinux-static.patch
index e8caa8d..f7f490e 100644
--- a/dmraid-selinux-static.patch
+++ b/dmraid-selinux-static.patch
@@ -2,7 +2,7 @@ diff -ur dmraid/1.0.0.rc7/tools/Makefile.in dmraid.new/1.0.0.rc7/tools/Makefile.
 --- dmraid/1.0.0.rc7/tools/Makefile.in	2005-03-11 12:47:28.000000000 +0000
 +++ dmraid.new/1.0.0.rc7/tools/Makefile.in	2005-04-17 12:35:13.262390032 +0000
 @@ -40,6 +40,13 @@
- 		DMRAIDLIBS += -rdynamic
+ 		LDFLAGS += -rdynamic
  	else
  		LDFLAGS += -static
 +		ifeq ("@LIBSELINUX@", "yes")
diff --git a/dmraid-unsigned.patch b/dmraid-unsigned.patch
index 09019dc..727c638 100644
--- a/dmraid-unsigned.patch
+++ b/dmraid-unsigned.patch
@@ -14,7 +14,7 @@ diff -ur dmraid/lib/metadata/reconfig.c dmraid-diet/lib/metadata/reconfig.c
 +++ dmraid-diet/lib/metadata/reconfig.c	2009-03-18 13:06:33.000000000 +0100
 @@ -260,7 +260,7 @@
  
- int
+ static int
  add_dev_to_array(struct lib_context *lc, struct raid_set *rs,
 -		 uint build_metadata, struct raid_dev *hot_spare_rd)
 +		 unsigned int build_metadata, struct raid_dev *hot_spare_rd)