rediff patches

diff --git a/dmraid-optflags.patch b/dmraid-optflags.patch
index b105fac8128b34e79a43a02aa0272bd2a9fa0b55..7200287a22cf963beeabe5e2a2a93100e148f846 100644 (file)
--- 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 e8caa8d5e59bc77b51629b6cec22b06028bf7463..f7f490e9fa0ba91684365e25151e7a5294799884 100644 (file)
--- 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 09019dc77cb1b16268cbc76111601c1ee8c99ef6..727c6387e98ccd09bbf1e1ac178a06527ebacda1 100644 (file)
--- 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)