rpms/mdadm/F-12 mdadm-2.5.2-static.patch,1.7,1.8

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8760

Modified Files:
	mdadm-2.5.2-static.patch 
Log Message:
* Thu Jul 22 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100722.1
- Change git date format to the correct format (YYYYMMDD)
- Update to latest upstream push (fixes bz604023, bz575164))


mdadm-2.5.2-static.patch:
 Makefile |   17 ++++++++---------
 mdadm    |binary
 2 files changed, 8 insertions(+), 9 deletions(-)

Index: mdadm-2.5.2-static.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm-2.5.2-static.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mdadm-2.5.2-static.patch	22 Jul 2010 15:15:05 -0000	1.7
+++ mdadm-2.5.2-static.patch	22 Jul 2010 15:22:50 -0000	1.8
@@ -1,6 +1,6 @@
---- mdadm-3.1.2/Makefile.static	2010-04-06 11:55:03.098505021 -0400
-+++ mdadm-3.1.2/Makefile	2010-04-06 11:55:44.120254408 -0400
-@@ -62,9 +62,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)
+--- mdadm-3.1.3-git20100722/Makefile.static	2010-07-22 10:16:31.000000000 -0400
++++ mdadm-3.1.3-git20100722/Makefile	2010-07-22 11:22:16.503067608 -0400
+@@ -68,9 +68,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)
  # pivotroot from early boot to late boot.
  # If you don't have /lib/init/rw you might want to use /dev/.something
  #  e.g. make MAP_DIR=/dev/.mdadm
@@ -13,7 +13,18 @@
  DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
  DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
  CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
-@@ -206,16 +206,16 @@ install : mdadm mdmon install-man instal
+@@ -165,9 +165,8 @@ mdadm.O2 : $(SRCS) mdadm.h mdmon.O2
+ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
+ 	$(CC) -o mdmon.O2 $(CFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(MON_SRCS)
+ 
+-# use '-z now' to guarantee no dynamic linker interactions with the monitor thread
+ mdmon : $(MON_OBJS)
+-	$(CC) $(LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
++	$(CC) $(LDFLAGS) -o mdmon $(MON_OBJS) $(LDLIBS)
+ msg.o: msg.c msg.h
+ 
+ test_stripe : restripe.c mdadm.h
+@@ -224,16 +223,16 @@ install : mdadm mdmon install-man instal
  	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
  
  install-static : mdadm.static install-man
@@ -34,3 +45,4 @@
  
  install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
  	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
+Binary files mdadm-3.1.3-git20100722/mdadm.static and mdadm-3.1.3-git20100722/mdadm differ