rpms/mdadm/devel .cvsignore, 1.18, 1.19 mdadm-2.6.1-build.patch, 1.1, 1.2 mdadm.spec, 1.48, 1.49 mdmonitor.init, 1.7, 1.8 sources, 1.18, 1.19 mdadm-2.6.2-assemble-ver1-superblock.patch, 1.2, NONE mdadm-2.6.2-create.patch, 1.1, NONE mdadm-2.6.2-file-leak.patch, 1.2, NONE mdadm-2.6.2-manage.patch, 1.1, NONE mdadm-2.6.2-raid4.patch, 1.1, NONE
Doug Ledford (dledford)
fedora-extras-commits at redhat.com
Fri Oct 19 16:38:43 UTC 2007
Author: dledford
Update of /cvs/extras/rpms/mdadm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1798
Modified Files:
.cvsignore mdadm-2.6.1-build.patch mdadm.spec mdmonitor.init
sources
Removed Files:
mdadm-2.6.2-assemble-ver1-superblock.patch
mdadm-2.6.2-create.patch mdadm-2.6.2-file-leak.patch
mdadm-2.6.2-manage.patch mdadm-2.6.2-raid4.patch
Log Message:
* Fri Oct 19 2007 Doug Ledford <dledford at redhat.com> - 2.6.4-1
- Update to latest upstream and remove patches upstream has taken
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 2 Jul 2007 15:43:07 -0000 1.18
+++ .cvsignore 19 Oct 2007 16:38:10 -0000 1.19
@@ -7,3 +7,4 @@
mdadm-2.6.tgz
mdadm-2.6.1.tgz
mdadm-2.6.2.tgz
+mdadm-2.6.4.tgz
mdadm-2.6.1-build.patch:
Index: mdadm-2.6.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm-2.6.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdadm-2.6.1-build.patch 11 Apr 2007 15:34:23 -0000 1.1
+++ mdadm-2.6.1-build.patch 19 Oct 2007 16:38:10 -0000 1.2
@@ -1,18 +1,23 @@
---- mdadm-2.6.1/Makefile.build 2007-04-11 11:12:46.000000000 -0400
-+++ mdadm-2.6.1/Makefile 2007-04-11 11:18:54.000000000 -0400
-@@ -100,9 +100,11 @@ mdadm.static : $(OBJS) $(STATICOBJS)
+--- mdadm-2.6.4/Makefile.build 2007-10-19 12:32:03.000000000 -0400
++++ mdadm-2.6.4/Makefile 2007-10-19 12:32:17.000000000 -0400
+@@ -102,13 +102,15 @@ mdadm.static : $(OBJS) $(STATICOBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
mdadm.tcc : $(SRCS) mdadm.h
-+ rm -f $(OBJS)
++ rm -f $(OBJS) $(STATICOBJS)
$(TCC) -o mdadm.tcc $(SRCS)
- mdadm.uclibc : $(SRCS) mdadm.h
+ dadm.uclibc : $(SRCS) mdadm.h
+ rm -f $(OBJS) $(STATICOBJS)
$(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) $(STATICSRC)
mdadm.klibc : $(SRCS) mdadm.h
-@@ -113,15 +115,15 @@ test_stripe : restripe.c mdadm.h
+- rm -f $(OBJS)
++ rm -f $(OBJS) $(STATICOBJS)
+ gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS)
+
+ mdadm.Os : $(SRCS) mdadm.h
+@@ -121,15 +123,15 @@ test_stripe : restripe.c mdadm.h
$(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
mdassemble : $(ASSEMBLE_SRCS) mdadm.h
@@ -34,7 +39,7 @@
$(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)
# This doesn't work
-@@ -164,10 +166,10 @@ install-klibc : mdadm.klibc install-man
+@@ -172,10 +174,10 @@ install-klibc : mdadm.klibc install-man
$(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5
Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mdadm.spec 29 Aug 2007 04:00:04 -0000 1.48
+++ mdadm.spec 19 Oct 2007 16:38:10 -0000 1.49
@@ -1,7 +1,7 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
-Version: 2.6.2
-Release: 5%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
Source1: mdmonitor.init
Patch1: mdadm-2.5.2-s390-build.patch
@@ -9,11 +9,6 @@
Patch3: mdadm-2.2-nodiet.patch
Patch4: mdadm-2.5.2-cflags.patch
Patch5: mdadm-2.6.1-build.patch
-Patch6: mdadm-2.6.2-file-leak.patch
-Patch7: mdadm-2.6.2-assemble-ver1-superblock.patch
-Patch8: mdadm-2.6.2-create.patch
-Patch9: mdadm-2.6.2-raid4.patch
-Patch10: mdadm-2.6.2-manage.patch
URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/
License: GPL
Group: System Environment/Base
@@ -37,11 +32,6 @@
%patch3 -p1 -b .nodiet
%patch4 -p1 -b .cflags
%patch5 -p1 -b .build
-%patch6 -p1 -b .leak
-%patch7 -p1 -b .ver1
-%patch8 -p1 -b .create
-%patch9 -p1 -b .raid4
-%patch10 -p1 -b .manage
%build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
@@ -89,6 +79,9 @@
%attr(0700,root,root) %dir /var/run/mdadm
%changelog
+* Fri Oct 19 2007 Doug Ledford <dledford at redhat.com> - 2.6.4-1
+- Update to latest upstream and remove patches upstream has taken
+
* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.6.2-5
- Rebuild for selinux ppc32 issue.
Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdmonitor.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mdmonitor.init 6 Jul 2007 16:39:50 -0000 1.7
+++ mdmonitor.init 19 Oct 2007 16:38:10 -0000 1.8
@@ -48,6 +48,7 @@
checkpid `cat $PIDFILE` && return 0
fi
echo -n $"Starting $prog: "
+ cd /
daemon --user=root mdadm ${OPTIONS}
ret=$?
[ $ret -eq "0" ] && touch /var/lock/subsys/$prog
@@ -82,9 +83,7 @@
status) status mdadm; RETVAL=$? ;;
restart) restart; RETVAL=$? ;;
reload) RETVAL=3 ;;
- condrestart) condrestart; RETVAL=$? ;;
- try-restart) condrestart; RETVAL=$? ;;
- force-reload) condrestart; RETVAL=$? ;;
+ condrestart|try-restart|force-reload) condrestart; RETVAL=$? ;;
*) usage ; RETVAL=2 ;;
esac
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 2 Jul 2007 15:43:07 -0000 1.18
+++ sources 19 Oct 2007 16:38:10 -0000 1.19
@@ -1 +1 @@
-e34d2590523d679895966c4111670450 mdadm-2.6.2.tgz
+4235fc330c9d51e6e613a6eee7ebca76 mdadm-2.6.4.tgz
--- mdadm-2.6.2-assemble-ver1-superblock.patch DELETED ---
--- mdadm-2.6.2-create.patch DELETED ---
--- mdadm-2.6.2-file-leak.patch DELETED ---
--- mdadm-2.6.2-manage.patch DELETED ---
--- mdadm-2.6.2-raid4.patch DELETED ---
More information about the fedora-extras-commits
mailing list