rpms/mdadm/devel mdadm-3.0-udev.patch, NONE, 1.1 mdadm-3.0-warn.patch, NONE, 1.1

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2401

Added Files:
	mdadm-3.0-udev.patch mdadm-3.0-warn.patch 
Log Message:
* Thu Feb 12 2009 Doug Ledford <dledford at redhat.com> - 3.0-0.devel2.1
- Update to latest upstream devel release
- Use the udev rules file included with mdadm instead of our own
- Drop all the no longer relevant patches
- Fix a build error in mdopen.c
- Fix the udev rules path in Makefile


mdadm-3.0-udev.patch:

--- NEW FILE mdadm-3.0-udev.patch ---
--- mdadm-3.0-devel2/Makefile.udev	2009-02-12 09:10:23.000000000 -0500
+++ mdadm-3.0-devel2/Makefile	2009-02-12 09:12:20.000000000 -0500
@@ -44,7 +44,7 @@ CC = $(CROSS_COMPILE)gcc
 CXFLAGS = -ggdb
 CWFLAGS = -Wall -Werror -Wstrict-prototypes
 ifdef WARN_UNUSED
-CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -Os
 endif
 
 ifdef DEBIAN
@@ -71,6 +71,7 @@ MANDIR  = /usr/share/man
 MAN4DIR = $(MANDIR)/man4
 MAN5DIR = $(MANDIR)/man5
 MAN8DIR = $(MANDIR)/man8
+UDEVDIR = /etc/udev/rules.d
 
 OBJS =  mdadm.o config.o mdstat.o  ReadMe.o util.o Manage.o Assemble.o Build.o \
 	Create.o Detail.o Examine.o Grow.o Monitor.o dlink.o Kill.o Query.o \
@@ -199,7 +200,7 @@ install-man: mdadm.8 md.4 mdadm.conf.5
 	$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
 
 install-udev: udev-md-raid.rules
-	$(INSTALL) -D -m 644 udev-md-raid.rules /lib/udev/rules.d/64-md-raid.rules
+	$(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)$(UDEVDIR)/64-md-raid.rules
 
 uninstall:
 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm

mdadm-3.0-warn.patch:

--- NEW FILE mdadm-3.0-warn.patch ---
--- mdadm-3.0-devel2/mdopen.c.warn	2009-02-12 09:13:54.000000000 -0500
+++ mdadm-3.0-devel2/mdopen.c	2009-02-12 09:34:15.000000000 -0500
@@ -88,8 +88,9 @@ void make_parts(char *dev, int cnt)
 			if (chmod(name, stb2.st_mode & 07777))
 				perror("chmod");
 		} else {
-			snprintf(sym, 10000, "%s%s%d", orig, odig?"p":"", i);
-			symlink(sym, name);
+			snprintf(sym, 1024, "%s%s%d", orig, odig?"p":"", i);
+			if (symlink(sym, name))
+				perror("symlink");
 		}
 		stat(name, &stb2);
 		add_dev(name, &stb2, 0, NULL);
@@ -357,7 +358,8 @@ int create_mddev(char *dev, char *name, 
 					strcpy(chosen, devname);
 				}
 			} else
-				symlink(devname, chosen);
+				if (symlink(devname, chosen))
+					perror("symlink");
 			if (use_mdp && strcmp(chosen, devname) != 0)
 				make_parts(chosen, parts);
 		}