aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-09-01 14:56:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-09-01 14:57:05 +0000
commitcec8ddec2e8e239027f8dd8d381cc9cda8efd167 (patch)
treeb0d85f7959c534dfa2dc662899295f56f882a303 /main
parent9db6b342c21bd2e24f529ef07ffd4d4c109a87ed (diff)
downloadaports-cec8ddec2e8e239027f8dd8d381cc9cda8efd167.tar.bz2
aports-cec8ddec2e8e239027f8dd8d381cc9cda8efd167.tar.xz
main/mdadm: upgrade to 3.1.3
Diffstat (limited to 'main')
-rw-r--r--main/mdadm/APKBUILD13
-rw-r--r--main/mdadm/uclibc-bswap.patch18
2 files changed, 26 insertions, 5 deletions
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index c85f9bae9c..7fc136af05 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter at gmail>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mdadm
-pkgver=3.1.2
-pkgrel=1
+pkgver=3.1.3
+pkgrel=0
pkgdesc="a tool for managing Linux Software RAID arrays"
url="http://neil.brown.name/blog/mdadm"
license="GPL-2"
@@ -14,11 +14,13 @@ source="http://www.kernel.org/pub/linux/utils/raid/${pkgname}/${pkgname}-${pkgve
${pkgname}.confd
mdadm-raid.initd
mdadm-uclibc.patch
+ uclibc-bswap.patch
"
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i ../mdadm-uclibc.patch || return 1
+ patch -p1 -i "$srcdir"/mdadm-uclibc.patch || return 1
+ patch -p1 -i "$srcdir"/uclibc-bswap.patch || return 1
}
build() {
@@ -36,8 +38,9 @@ package() {
install -m644 -D mdadm.conf-example "$pkgdir"/etc/mdadm.conf
}
-md5sums="15c0112467df486b5805b18c7e51401f mdadm-3.1.2.tar.gz
+md5sums="6f48eea4042af51ad38a50e7bf33a760 mdadm-3.1.3.tar.gz
ce57e798431f7ab89f9b07a7daaa4852 mdadm.initd
16d2b8eb2e17184357db503470fdd8eb mdadm.confd
af5bb6e1479bf1d27cf50521af82dae1 mdadm-raid.initd
-bca76ff25366bd1b70654b0cf4814236 mdadm-uclibc.patch"
+bca76ff25366bd1b70654b0cf4814236 mdadm-uclibc.patch
+e6dde992d7da016f25161d6637474d26 uclibc-bswap.patch"
diff --git a/main/mdadm/uclibc-bswap.patch b/main/mdadm/uclibc-bswap.patch
new file mode 100644
index 0000000000..b1d0428dc8
--- /dev/null
+++ b/main/mdadm/uclibc-bswap.patch
@@ -0,0 +1,18 @@
+--- ./mdadm.h.orig
++++ ./mdadm.h
+@@ -104,12 +104,15 @@
+ * and there is no standard conversion function so... */
+ /* And dietlibc doesn't think byteswap is ok, so.. */
+ /* #include <byteswap.h> */
++#undef bswap_16
+ #define bswap_16(x) (((x) & 0x00ffU) << 8 | \
+ ((x) & 0xff00U) >> 8)
++#undef bswap_32
+ #define bswap_32(x) (((x) & 0x000000ffU) << 24 | \
+ ((x) & 0xff000000U) >> 24 | \
+ ((x) & 0x0000ff00U) << 8 | \
+ ((x) & 0x00ff0000U) >> 8)
++#undef bswap_64
+ #define bswap_64(x) (((x) & 0x00000000000000ffULL) << 56 | \
+ ((x) & 0xff00000000000000ULL) >> 56 | \
+ ((x) & 0x000000000000ff00ULL) << 40 | \