From def26507e512d1eed494d1781e692fcd76df0c5d Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Fri, 28 Apr 2017 09:29:18 +0000
Subject: community/roundcubemail: security upgrade to 1.2.5 (CVE-2017-8114)

---
 community/roundcubemail/APKBUILD | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'community')

diff --git a/community/roundcubemail/APKBUILD b/community/roundcubemail/APKBUILD
index dc8a3ebee1..10d922918c 100644
--- a/community/roundcubemail/APKBUILD
+++ b/community/roundcubemail/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 _php=php7
 pkgname=roundcubemail
-pkgver=1.2.4
-pkgrel=1
+pkgver=1.2.5
+pkgrel=0
 pkgdesc="A PHP web-based mail client"
 url="http://www.roundcube.net"
 arch="noarch"
@@ -18,16 +18,15 @@ options="!check"
 subpackages="$pkgname-installer $pkgname-doc"
 source="https://github.com/roundcube/$pkgname/releases/download/$pkgver/${pkgname}-$pkgver.tar.gz
 	fix-dirs.patch"
+builddir="$srcdir"/roundcubemail-$pkgver
 
-_src="$srcdir"/roundcubemail-$pkgver
+# secfixes:
+#   1.2.5-r0:
+#   - CVE-2017-8114
 
 prepare() {
-	cd "$_src"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	cd "$builddir"
+	default_prepare
 
 	# fix permissions
 	find . -type f -print | xargs chmod a-x
@@ -53,7 +52,7 @@ package() {
 	_instdir="$pkgdir"/usr/share/webapps/roundcube
 	mkdir -p "${_instdir}"
 	cd "${_instdir}"
-	cp -rp "$srcdir"/roundcubemail-$pkgver/* .
+	cp -rp "$builddir"/* .
 	# install config in /etc/roundcube so config files are not overwritten
 	# on upgrades
 	mkdir -p "$pkgdir"/etc/
@@ -78,5 +77,5 @@ installer() {
 		"$subpkgdir"/usr/share/webapps/roundcube
 }
 
-sha512sums="299ab90d6dba9325efdea2e0498e4345e13c78fd8b85e0848827e5127e4cf210e66327ad264f5609373d9de2237cf396907dcb9cc2901c13e18899e4233a3c77  roundcubemail-1.2.4.tar.gz
+sha512sums="8f17c8222a59123e438a3683e5f2fbfef28c966899a271a2a11c25535e7188ff57846847108190a4d20ff53eccd10a2a7e88e8a5f958e9bc38c69e53824e7928  roundcubemail-1.2.5.tar.gz
 5c645ab7f130f8f3b17b7821e2cd0be88b6d7999da38876bde36c9b116bf7d34bcf52e2d8939d9359649e3fc5ddfb1cab7798ffb9e649be11bebd1d2c4ee006b  fix-dirs.patch"
-- 
cgit v1.2.3