Revision: 8083
http://sourceforge.net/p/ipcop/svn/8083
Author: owes
Date: 2016-01-21 21:28:37 +0000 (Thu, 21 Jan 2016)
Log Message:
-----------
Update mdadm to 3.3.4
Modified Paths:
--------------
ipcop/trunk/lfs/mdadm
ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
ipcop/trunk/updates/2.2.0/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/mdadm-3.3.4_compiler-fix.patch
ipcop/trunk/src/patches/mdadm-3.3.4_udev-blkid.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch
Modified: ipcop/trunk/lfs/mdadm
===================================================================
--- ipcop/trunk/lfs/mdadm 2016-01-21 21:22:41 UTC (rev 8082)
+++ ipcop/trunk/lfs/mdadm 2016-01-21 21:28:37 UTC (rev 8083)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = mdadm
-VER = 3.3.2
+VER = 3.3.4
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 44698d351501cac6a89072dc877eb220
+$(DL_FILE)_MD5 = 7ca8b114710f98f53f20c5787b674a09
install : $(TARGET)
@@ -86,6 +86,8 @@
# use external blkid with udev option to get all /dev/disk/by* symlinks
cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_udev-blkid.patch
+ # Fix compiler warning
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_compiler-fix.patch
cd $(DIR_APP) && sed -i 's|sbin\/sendmail|bin/sendEmail|' Makefile
# CXFLAGS="$(CFLAGS)" is required to set the optimization level or -O0
is used and FORTIFY does not apply
Deleted: ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch 2016-01-21
21:22:41 UTC (rev 8082)
+++ ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch 2016-01-21
21:28:37 UTC (rev 8083)
@@ -1,11 +0,0 @@
---- mdadm-3.3/udev-md-raid-arrays.rules.orig 2014-01-11 17:11:31.000000000
+0100
-+++ mdadm-3.3/udev-md-raid-arrays.rules 2014-01-11 17:12:38.000000000
+0100
-@@ -26,7 +26,7 @@
- ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]",
SYMLINK+="md/$env{MD_DEVNAME}%n"
- ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]",
SYMLINK+="md/$env{MD_DEVNAME}p%n"
-
--IMPORT{builtin}="blkid"
-+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
- OPTIONS+="link_priority=100"
- OPTIONS+="watch"
- ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*",
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
Added: ipcop/trunk/src/patches/mdadm-3.3.4_compiler-fix.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.3.4_compiler-fix.patch
(rev 0)
+++ ipcop/trunk/src/patches/mdadm-3.3.4_compiler-fix.patch 2016-01-21
21:28:37 UTC (rev 8083)
@@ -0,0 +1,26 @@
+From 598f8904acf640fdf6866cd06d1e9a65bd32982a Mon Sep 17 00:00:00 2001
+From: NeilBrown <ne...@suse.com>
+Date: Wed, 5 Aug 2015 14:50:34 +1000
+Subject: [PATCH] raid6check: don't ignore return value from posix_memalign.
+
+Compilers don't like that.
+
+Signed-off-by: NeilBrown <ne...@suse.de>
+---
+ raid6check.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/raid6check.c b/raid6check.c
+index cb8522e..ad7ffe7 100644
+--- a/raid6check.c
++++ b/raid6check.c
+@@ -349,7 +349,8 @@ int check_stripes(struct mdinfo *info, int *source,
unsigned long long *offsets,
+ if (!tables_ready)
+ make_tables();
+
+- posix_memalign((void**)&stripe_buf, 4096, raid_disks * chunk_size);
++ if (posix_memalign((void**)&stripe_buf, 4096, raid_disks * chunk_size)
!= 0)
++ exit(4);
+ block_index_for_slot += 2;
+ blocks += 2;
+ blocks_page += 2;
Copied: ipcop/trunk/src/patches/mdadm-3.3.4_udev-blkid.patch (from rev 8079,
ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch)
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.3.4_udev-blkid.patch
(rev 0)
+++ ipcop/trunk/src/patches/mdadm-3.3.4_udev-blkid.patch 2016-01-21
21:28:37 UTC (rev 8083)
@@ -0,0 +1,11 @@
+--- mdadm-3.3/udev-md-raid-arrays.rules.orig 2014-01-11 17:11:31.000000000
+0100
++++ mdadm-3.3/udev-md-raid-arrays.rules 2014-01-11 17:12:38.000000000
+0100
+@@ -26,7 +26,7 @@
+ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]",
SYMLINK+="md/$env{MD_DEVNAME}%n"
+ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]",
SYMLINK+="md/$env{MD_DEVNAME}p%n"
+
+-IMPORT{builtin}="blkid"
++IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+ OPTIONS+="link_priority=100"
+ OPTIONS+="watch"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*",
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
Modified: ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
===================================================================
--- ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2016-01-21 21:22:41 UTC
(rev 8082)
+++ ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2016-01-21 21:28:37 UTC
(rev 8083)
@@ -285,6 +285,10 @@
/usr/lib/liblzo2.so.2
/usr/lib/liblzo2.so.2.0.0
##
+## mdadm-3.3.4
+/sbin/mdadm
+/sbin/mdmon
+##
## nano-2.4.3
/usr/bin/nano
##
Modified: ipcop/trunk/updates/2.2.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.2.0/information.xml 2016-01-21 21:22:41 UTC (rev
8082)
+++ ipcop/trunk/updates/2.2.0/information.xml 2016-01-21 21:28:37 UTC (rev
8083)
@@ -11,7 +11,8 @@
ethtool to 4.2, glib to 2.42.2, gmp to 6.0.0a, gnupg to 1.4.20,
hdparm to 9.48, iproute2 to 4.4.0, iw to 4.1, less to 481,
libffi to 3.2.1, libgcrypt to 1.6.4, libgpg-error to 1.19, libnl to
3.2.27, libpcap to 1.7.4,
- libpng to 1.6.21, libtool to 2.4.6, lzo to 2.09, nano to 2.4.3, ntp to
4.2.8p4,
+ libpng to 1.6.21, libtool to 2.4.6, lzo to 2.09,
+ mdadm to 3.3.4, nano to 2.4.3, ntp to 4.2.8p4,
openssh to 7.1p2, openssl to 1.0.2e, openvpn to 2.3.9,
patch to 2.7.5, pciutils to 3.4.1, perl to 5.20.2-2,
rp-pppoe to 3.12, rrdtool to 1.5.5, rsyslog to 8.11.0,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
