Merge branch 'master' of git://git.alpinelinux.org/aports

7 files changed, 81 insertions, 20 deletions

diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index d3cb48c91b..b2a162630f 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=coreutils
-pkgver=8.2
+pkgver=8.4
 pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="http://www.gnu.org/software/coreutils/"
@@ -28,4 +28,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="dfb0d3dbc5f555386339f4f74621cda0  coreutils-8.2.tar.gz"
+md5sums="56f549854d723d9dcebb77919019df55  coreutils-8.4.tar.gz"
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index 3f81d32565..e49d990744 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,22 +1,41 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=expat
 pkgver=2.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="An XML Parser library written in C"
 url="http://www.libexpat.org/"
 license='AS IS'
-depends="uclibc"
-makedepends=""
-source="http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz"
+depends=
+makedepends=
+source="http://surfnet.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
+	CVE-2009-3560.patch
+	CVE-2009-3720.patch
+	"
 subpackages="$pkgname-dev $pkgname-doc"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	cd "$_builddir"
+	for i in "$srcdir"/*.patch; do
+		[ -f "$i" ] || continue
+		msg "Applying $i"
+		patch -p1 -i "$i" || return 1
+	done
+		
+}
 
+build() {
+	cd "$_builddir"
 	./configure --prefix=/usr \
 	--mandir=/usr/share/man
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir/" install
 }
 
-md5sums="ee8b492592568805593f81f8cdf2a04c  expat-2.0.1.tar.gz"
+md5sums="ee8b492592568805593f81f8cdf2a04c  expat-2.0.1.tar.gz
+50603cac0f03aabc7087415251f592be  CVE-2009-3560.patch
+f3eeb796f28945899216b815e5901996  CVE-2009-3720.patch"
diff --git a/main/expat/CVE-2009-3560.patch b/main/expat/CVE-2009-3560.patch
new file mode 100644
index 0000000000..5fe9c36c82
--- /dev/null
+++ b/main/expat/CVE-2009-3560.patch
@@ -0,0 +1,13 @@
+diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
+--- trunk~/lib/xmlparse.c	2007-05-08 04:25:35.000000000 +0200
++++ trunk/lib/xmlparse.c	2009-12-29 21:57:22.141732904 +0100
+@@ -3703,6 +3703,9 @@
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
++      case -XML_TOK_PROLOG_S:
++        tok = -tok;
++        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */
diff --git a/main/expat/CVE-2009-3720.patch b/main/expat/CVE-2009-3720.patch
new file mode 100644
index 0000000000..65d16431f4
--- /dev/null
+++ b/main/expat/CVE-2009-3720.patch
@@ -0,0 +1,12 @@
+diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
+--- trunk~/lib/xmltok_impl.c	2006-11-26 18:34:46.000000000 +0100
++++ trunk/lib/xmltok_impl.c	2009-10-22 21:42:41.000000000 +0200
+@@ -1744,7 +1744,7 @@
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index a96c43c965..1bf81305de 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=glib
-pkgver=2.22.2
+pkgver=2.22.4
 pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="http://www.gtk.org"
@@ -12,15 +12,23 @@ subpackages="$pkgname-doc $pkgname-dev"
 
 depends_dev="perl gettext-dev libiconv-dev pkgconfig"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
 
+prepare() {
+	cd "$_builddir"
 	# busybox env does not handle the -w after perl. we remove it for now
 	sed -i -e '1,1s/ -w//' gobject/glib-mkenums.in
+}
 
+build() {
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir/" install
 }
 
@@ -30,4 +38,4 @@ dev() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="846a86c74b74d5b16826aa5508940f9b  glib-2.22.2.tar.bz2"
+md5sums="d91bcbe27556430ddecce65086355708  glib-2.22.4.tar.bz2"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index c6055f8be7..f42cf5e174 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.4.3
-pkgrel=1
+pkgver=3.4.4
+pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
@@ -108,7 +108,7 @@ tdb() {
 		usr/bin/tdb*
 }
 
-md5sums="322379680c12057f57685652a35a6b05  samba-3.4.3.tar.gz
+md5sums="491a1bc9c94ad2f1e6d1c29da271b242  samba-3.4.4.tar.gz
 c8a7f6ac5df2f73dbf023e25ea39927b  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate"
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 4ebc9da381..83d31e03fd 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfsprogs
-pkgver=3.0.5
+pkgver=3.1.0
 pkgrel=0
 pkgdesc="XFS filesystem utilities"
 url="http://oss.sgi.com/projects/xfs/"
@@ -12,13 +12,18 @@ source="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-$pkgver.tar.gz
 	xfsprogs-3.0.0-gzip.patch
 	"
 
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
 	for i in ../*.patch; do
 		msg "Applying $i..."
 		patch -p1 < $i || return 1
 	done
+}
 	
+build() {
+	cd "$_builddir"
 	export DEBUG=-DNDEBUG
 	export OPTIMIZER="$CFLAGS"
 
@@ -29,7 +34,11 @@ build() {
 		--enable-gettext=no
 
 	make SHELL=/bin/bash || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make -j1 DIST_ROOT="$pkgdir" install install-dev
 }
-md5sums="d2f981b1ae9348405a331b4c33a08cab  xfsprogs-3.0.5.tar.gz
+md5sums="07c1ff6a4a44b58ee5ffdabca33a4493  xfsprogs-3.1.0.tar.gz
 c72865de30f55343e843dd4fd49a91c5  xfsprogs-3.0.0-gzip.patch"