Subject: [alpine-aports] [PATCH] main/expat: security upgrade to 2.2.1 (CVE-2017-9233)

From: Daniel Sabogal <[email-masked]>
Date: Wed, 21 Jun 2017 22:22:49 -0400

ref #7448
add check()
---
 main/expat/APKBUILD | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index 62023e4afe..b1107a93a8 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,35 +1,38 @@
 # Maintainer: Carlo Landmeter <[email-masked]>
 pkgname=expat
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=0
 pkgdesc="An XML Parser library written in C"
 url="http://www.libexpat.org/"
 arch="all"
 license='MIT'
-depends=
-makedepends=
-source="http://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2
-	"
+depends=""
+source="http://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2"
 subpackages="$pkgname-dev $pkgname-doc"
-
 builddir="$srcdir/$pkgname-$pkgver"
 
+# secfixes:
+#   2.2.1-r0:
+#     - CVE-2017-9233
+
 build() {
 	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir/" install || return 1
+	make DESTDIR="$pkgdir/" install
 }
 
-md5sums="2f47841c829facb346eb6e3fab5212e2  expat-2.2.0.tar.bz2"
-sha256sums="d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff  expat-2.2.0.tar.bz2"
-sha512sums="2be1a6eea87b439374bfacb1fbb8e814fd8a085d5dfd3ca3be69d1af29b5dc93d36cbdec5f6843ca6d5910843c7ffbc498adc2a561b9dcece488edf3c6f8c7c8  expat-2.2.0.tar.bz2"
+sha512sums="74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea  expat-2.2.1.tar.bz2"
-- 
2.13.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Daniel Sabogal <[email-masked]>
Date: Wed, 21 Jun 2017 22:22:50 -0400

---
 main/i3lock/APKBUILD | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/main/i3lock/APKBUILD b/main/i3lock/APKBUILD
index 22c9e9f4d8..8352034cbd 100644
--- a/main/i3lock/APKBUILD
+++ b/main/i3lock/APKBUILD
@@ -1,22 +1,20 @@
 # Contributor: Johannes Matheis <[email-masked]>
 # Maintainer: Johannes Matheis <[email-masked]>
 pkgname=i3lock
-pkgver=2.8
+pkgver=2.9.1
 pkgrel=0
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 url="http://i3wm.org/i3lock/"
 arch="all"
 license="MIT"
 depends="xkeyboard-config"
-depends_dev="libev-dev cairo-dev linux-pam-dev libxkbcommon-dev xcb-util-image-dev"
-makedepends="$depends_dev"
-install=""
+makedepends="libev-dev cairo-dev linux-pam-dev libxkbcommon-dev xcb-util-image-dev"
 subpackages="$pkgname-doc"
 source="$url/$pkgname-$pkgver.tar.bz2"
-
 builddir="$srcdir/$pkgname-$pkgver"
+
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 
@@ -26,16 +24,19 @@ prepare() {
 
 build() {
 	cd "$builddir"
-	make || return 1
+	make
+}
+
+check() {
+	cd "$builddir"
+	./i3lock -v
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -m755 -d "${pkgdir}/usr/share/man/man1/"
-	install -m644 ${pkgname}.1 "${pkgdir}/usr/share/man/man1/"
+	make DESTDIR="$pkgdir" install
+	install -m755 -d "$pkgdir/usr/share/man/man1/"
+	install -m644 $pkgname.1 "$pkgdir/usr/share/man/man1/"
 }
 
-md5sums="89de7b7d46fdb05638122cf3c2512093  i3lock-2.8.tar.bz2"
-sha256sums="028fc0f74df10826514d5a4ed38f6895935d1f5d47ca9fcffc64b076aaf6e2f4  i3lock-2.8.tar.bz2"
-sha512sums="b0f2f2837e275ffb2874aec75cd5d7c69864f8861de5e3e6090a2bf9254a14f8bc141256b0faac3e30111f9612e97cc087efde0da939854fac975a87deb06e3f  i3lock-2.8.tar.bz2"
+sha512sums="9b1bfac67a97880e61f8655a9256662ceec51850005298f13247ab570c03715718db84b1afefa979fb9a53a011fa20958f38d05f5378becf7803ece3e804faaf  i3lock-2.9.1.tar.bz2"
-- 
2.13.1

---