summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-05-12 21:38:56 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-05-16 06:10:06 +0300
commit30897c60a4bb54936c228daf46e26377306da280 (patch)
tree19fff8c4ec569ae18fc25b5de7325aa950742309 /gnu
parente9eb24b1b25101439dbbafce3aa9ec0ce2e67c1a (diff)
gnu: mdadm: Update to 3.4.
* gnu/packages/linux.scm (mdadm): Update to 3.4. [source]: Remove patch. * gnu/packages/patches/mdadm-gcc-4.9-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/linux.scm5
-rw-r--r--gnu/packages/patches/mdadm-gcc-4.9-fix.patch38
3 files changed, 2 insertions, 42 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 229785b2db..f366be40b4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -620,7 +620,6 @@ dist_patch_DATA = \
gnu/packages/patches/matplotlib-setupext-tk.patch \
gnu/packages/patches/maxima-defsystem-mkdir.patch \
gnu/packages/patches/mcron-install.patch \
- gnu/packages/patches/mdadm-gcc-4.9-fix.patch \
gnu/packages/patches/mhash-keygen-test-segfault.patch \
gnu/packages/patches/mit-krb5-CVE-2015-8629.patch \
gnu/packages/patches/mit-krb5-CVE-2015-8630.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3462d287b5..48f7499453 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2318,7 +2318,7 @@ MPEG-2 and audio over Linux IEEE 1394.")
(define-public mdadm
(package
(name "mdadm")
- (version "3.3.2")
+ (version "3.4")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2326,8 +2326,7 @@ MPEG-2 and audio over Linux IEEE 1394.")
version ".tar.xz"))
(sha256
(base32
- "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg"))
- (patches (search-patches "mdadm-gcc-4.9-fix.patch"))))
+ "0248v9f28mrbwabl94ck22gfim29sqhkf70wrpfi52nk4x3bxl17"))))
(build-system gnu-build-system)
(inputs
`(("udev" ,eudev)))
diff --git a/gnu/packages/patches/mdadm-gcc-4.9-fix.patch b/gnu/packages/patches/mdadm-gcc-4.9-fix.patch
deleted file mode 100644
index 222fd0ea32..0000000000
--- a/gnu/packages/patches/mdadm-gcc-4.9-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 68641cdb646eaa15099c1d6cfff1eaa5dd2ac841 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 24 Feb 2015 16:00:40 -0500
-Subject: [PATCH] write_super_imsm_spares(): C statements are terminated by ;
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
----
- super-intel.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/super-intel.c b/super-intel.c
-index 819e0da..7f75b53 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -5115,13 +5115,13 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose)
- __u32 sum;
- struct dl *d;
-
-- spare->mpb_size = __cpu_to_le32(sizeof(struct imsm_super)),
-- spare->generation_num = __cpu_to_le32(1UL),
-+ spare->mpb_size = __cpu_to_le32(sizeof(struct imsm_super));
-+ spare->generation_num = __cpu_to_le32(1UL);
- spare->attributes = MPB_ATTRIB_CHECKSUM_VERIFY;
-- spare->num_disks = 1,
-- spare->num_raid_devs = 0,
-- spare->cache_size = mpb->cache_size,
-- spare->pwr_cycle_count = __cpu_to_le32(1),
-+ spare->num_disks = 1;
-+ spare->num_raid_devs = 0;
-+ spare->cache_size = mpb->cache_size;
-+ spare->pwr_cycle_count = __cpu_to_le32(1);
-
- snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH,
- MPB_SIGNATURE MPB_VERSION_RAID0);
---
-2.4.3
-