From 71c9a39c3fe8642646af9f741e1825d58e2514bf Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 07:01:59 +0100 Subject: [PATCH] automatic update by autodist [release 3.4-1mamba;Wed Feb 10 2016] --- mdadm-3.4-i586-gcc-5.3.0.patch | 44 ++++++++++++++++++++++++++++++++++ mdadm.spec | 7 +++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 mdadm-3.4-i586-gcc-5.3.0.patch diff --git a/mdadm-3.4-i586-gcc-5.3.0.patch b/mdadm-3.4-i586-gcc-5.3.0.patch new file mode 100644 index 0000000..a09c637 --- /dev/null +++ b/mdadm-3.4-i586-gcc-5.3.0.patch @@ -0,0 +1,44 @@ +From 1d13b599607e48446273913ce594931ba53df9fd Mon Sep 17 00:00:00 2001 +From: Xiao Ni +Date: Sat, 6 Feb 2016 09:18:41 +0800 +Subject: [PATCH] Fix some type comparison problems + +As 26714713cd2bad9e0bf7f4669f6cc4659ceaab6c said, 32 bit signed +timestamps will overflow in the year 2038. It already changed the +utime and ctime in struct mdu_array_info_s from int to unsigned +int. So we need to change the values that compared with them to +unsigned int too. + +Signed-off-by : Xiao Ni +Signed-off-by: Jes Sorensen +--- + Monitor.c | 2 +- + util.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Monitor.c b/Monitor.c +index f19c2e5..6df80f9 100644 +--- a/Monitor.c ++++ b/Monitor.c +@@ -33,7 +33,7 @@ + struct state { + char *devname; + char devnm[32]; /* to sync with mdstat info */ +- long utime; ++ unsigned int utime; + int err; + char *spare_group; + int active, working, failed, spare, raid; +diff --git a/util.c b/util.c +index 970d484..6e7d3fb 100644 +--- a/util.c ++++ b/util.c +@@ -1267,7 +1267,7 @@ struct supertype *guess_super_type(int fd, enum guess_types guess_type) + */ + struct superswitch *ss; + struct supertype *st; +- time_t besttime = 0; ++ unsigned int besttime = 0; + int bestsuper = -1; + int i; + diff --git a/mdadm.spec b/mdadm.spec index 9dae5bd..f232dd2 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,5 +1,5 @@ Name: mdadm -Version: 3.3.4 +Version: 3.4 Release: 1mamba Summary: A tool to manage MD devices aka Linux Software RAID Group: System/Kernel and Hardware @@ -9,6 +9,7 @@ Packager: Stefano Cotta Ramusino URL: http://neil.brown.name/blog/mdadm Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Patch0: mdadm-3.3.1-gcc-4.9.patch +Patch1: mdadm-3.4-i586-gcc-5.3.0.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -33,6 +34,7 @@ The particular differences to raidtools is that mdadm is a single program, and i %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %make @@ -77,6 +79,9 @@ install -D -m 644 %{name}.conf-example \ #%{_sbindir}/%{name}.static %changelog +* Wed Feb 10 2016 Automatic Build System 3.4-1mamba +- automatic update by autodist + * Sat Sep 05 2015 Automatic Build System 3.3.4-1mamba - automatic version update by autodist