aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-02-06 21:07:10 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2017-02-06 21:11:07 +0100
commit52591c8b83b3b8861654896d2010933512673e8a (patch)
tree373d89045af9c5007b554ddbd34102f0eed8339d
parent27b45066dad182078cf78b15827e76d58f25ef1c (diff)
downloadaports-52591c8b83b3b8861654896d2010933512673e8a.tar.bz2
aports-52591c8b83b3b8861654896d2010933512673e8a.tar.xz
main/snappy: fix chrome crash
-rw-r--r--main/snappy/APKBUILD13
-rw-r--r--main/snappy/fix-UnalignedCopy64.patch13
2 files changed, 20 insertions, 6 deletions
diff --git a/main/snappy/APKBUILD b/main/snappy/APKBUILD
index 51bee11db1..733dcae2a0 100644
--- a/main/snappy/APKBUILD
+++ b/main/snappy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=snappy
pkgver=1.1.4
-pkgrel=0
+pkgrel=1
pkgdesc="Fast compression and decompression library"
url="http://code.google.com/p/snappy/"
arch="all"
@@ -11,8 +11,10 @@ depends=""
depends_dev=""
makedepends="$depends_dev"
install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/google/snappy/releases/download/$pkgver/snappy-$pkgver.tar.gz"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
+source="https://github.com/google/snappy/releases/download/$pkgver/snappy-$pkgver.tar.gz
+ fix-UnalignedCopy64.patch
+ "
_builddir="$srcdir"/snappy-$pkgver
prepare() {
@@ -38,6 +40,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="c328993b68afe3e5bd87c8ea9bdeb028 snappy-1.1.4.tar.gz"
-sha256sums="134bfe122fd25599bb807bb8130e7ba6d9bdb851e0b16efcb83ac4f5d0b70057 snappy-1.1.4.tar.gz"
-sha512sums="4f522f1d541e3f00d82ccaf6dda5c6ede28d4db19c53717003d8057261fe8630516ed6ff2a28615da032e0de9c6200b560ed5fce4f8714df9916d50d6a7c2178 snappy-1.1.4.tar.gz"
+sha512sums="4f522f1d541e3f00d82ccaf6dda5c6ede28d4db19c53717003d8057261fe8630516ed6ff2a28615da032e0de9c6200b560ed5fce4f8714df9916d50d6a7c2178 snappy-1.1.4.tar.gz
+a086dbdfe2cb21419b33c2f8a2739224a8e843f2c6a51715100c723b9fbd9aed14bcfa791c20dae785b33ac1d1cf4812ed2c5c5d4058c5b8e56a0e004e9a8c60 fix-UnalignedCopy64.patch"
diff --git a/main/snappy/fix-UnalignedCopy64.patch b/main/snappy/fix-UnalignedCopy64.patch
new file mode 100644
index 0000000000..ea64639a17
--- /dev/null
+++ b/main/snappy/fix-UnalignedCopy64.patch
@@ -0,0 +1,13 @@
+diff --git a/snappy.cc b/snappy.cc
+index 4bcea0b..2db94b7 100644
+--- a/snappy.cc
++++ b/snappy.cc
+@@ -89,7 +89,7 @@ size_t MaxCompressedLength(size_t source_len) {
+ namespace {
+
+ void UnalignedCopy64(const void* src, void* dst) {
+- memcpy(dst, src, 8);
++ memmove(dst, src, 8);
+ }
+
+ void UnalignedCopy128(const void* src, void* dst) {