Attachment 1766 Details for Bug 10357 – mdadm-2.6-alt2.1.src.rpm.diff

[patch] mdadm-2.6-alt2.1.src.rpm.diff

mdadm-2.6-alt2.1.src.rpm.diff (text/plain), 1.57 KB, created by Sergey Vlasov on 2007-01-28 18:24:51 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Vlasov

Created: 2007-01-28 18:24:51 MSK

Size: 1.57 KB

patch

obsolete

>--- mdadm-2.6-alt2/mdadm.spec	2007-01-24 06:35:53 +0000
>+++ mdadm-2.6-alt2.1/mdadm.spec	2007-01-28 15:10:40 +0000
>@@ -2,7 +2,7 @@
> 
> Name: mdadm
> Version: 2.6
>-Release: alt2
>+Release: alt2.1
> 
> Summary: A tool for managing Soft RAID under Linux
> License: GPL
>@@ -24,15 +24,13 @@ Patch3: %name-2.6-alt-nowarn.patch
> 
> %if_without dietlibc
> %define mdassemble_binary mdassemble.static
>+%define mdassemble_cflags %nil
> 
> %else
> %define mdassemble_binary mdassemble
>+%define mdassemble_cflags -fno-stack-protector
> 
>-%ifarch x86_64
>-BuildPreReq: dietlibc >= 0.30-alt1.1
>-%else
>-BuildPreReq: dietlibc
>-%endif
>+BuildPreReq: dietlibc >= 0.30-alt2
> 
> %endif
> 
>@@ -78,7 +76,8 @@ of failed, but restored devices.
> %__cp -au %SOURCE2 %SOURCE3 .
> 
> %build
>-%make_build %mdassemble_binary CXFLAGS="%optflags" MDASSEMBLE_AUTO=1 SYSCONFDIR="%_sysconfdir"
>+%make_build %mdassemble_binary CXFLAGS="%optflags %mdassemble_cflags" \
>+	MDASSEMBLE_AUTO=1 SYSCONFDIR="%_sysconfdir"
> %make_build CXFLAGS="%optflags" SYSCONFDIR="%_sysconfdir"
> bzip2 -9fk ChangeLog
> 
>@@ -132,6 +131,12 @@ IMPORTANT NOTE: udev service changes nam
> %doc TODO ChangeLog.bz2 %name.conf-example ANNOUNCE-%version
> 
> %changelog
>+* Sun Jan 28 2007 Sergey Vlasov <vsu@altlinux.ru> 2.6-alt2.1
>+- Compile mdassemble with -fno-stack-protector when using dietlibc (current
>+  dietlibc release does not support -fstack-protector).  Fixes #10357.
>+- Require dietlibc >= 0.30-alt2 for build (previous versions were broken due
>+  to the -fstack-protector issue)
>+
> * Wed Jan 24 2007 Ilya Evseev <evseev@altlinux.ru> 2.6-alt2
> - fixed x86_64 problems
> 
>End of diff
>

Actions: View | Diff

Attachments on bug 10357: 1695 | 1766 | 1767