Merge git://git.alpinelinux.org/aports

24 files changed, 265 insertions, 263 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 3f2c2462d3..916f8dac1d 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=1.8.6.0
+pkgver=1.8.7.0
 pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
@@ -159,7 +159,7 @@ sound_en() {
 	_move_dir var/lib/asterisk/sounds/en
 }
 
-md5sums="58f1635d1f9b851717c3fec9e67b5da7  asterisk-1.8.6.0.tar.gz
+md5sums="5c6616a53fa3f300420ea17fd23abae9  asterisk-1.8.7.0.tar.gz
 b00c9d98ce2ad445501248a197c6e436  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
 79e9634b5054bceb3b8dc246654bb243  400-bug-227.patch
diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD
index dea9d8583c..25b7262ab4 100644
--- a/main/gdk-pixbuf/APKBUILD
+++ b/main/gdk-pixbuf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdk-pixbuf
-pkgver=2.22.1
-pkgrel=3
+pkgver=2.24.0
+pkgrel=0
 pkgdesc="GDK Pixbuf library"
 url="http://www.gtk.org/"
 arch="all"
@@ -12,8 +12,7 @@ makedepends="tiff-dev libpng-dev glib-dev jpeg-dev gobject-introspection-dev"
 install="$pkgname.pre-deinstall"
 triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.bz2
-	gdk-pixbuf-libpng15.patch"
+source="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.bz2"
 replaces="gtk+"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -39,7 +38,8 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/*.la \
+		"$pkgdir"/usr/lib/gdk-pixbuf-*/*/loaders/*.la
 }
 
 doc() {
@@ -52,5 +52,4 @@ dev() {
 	default_dev
 }
 
-md5sums="716c4593ead3f9c8cca63b8b1907a561  gdk-pixbuf-2.22.1.tar.bz2
-7153731aba3204b4e7173581360ddf37  gdk-pixbuf-libpng15.patch"
+md5sums="d8ece3a4ade4a91c768328620e473ab8  gdk-pixbuf-2.24.0.tar.bz2"
diff --git a/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch b/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch
deleted file mode 100644
index 424938e815..0000000000
--- a/main/gdk-pixbuf/gdk-pixbuf-libpng15.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From e6a5b2472a4a5d554b587dfcb798b95035caa6fd Mon Sep 17 00:00:00 2001
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 24 Jan 2011 10:39:22 +0000
-Subject: Use png_jmpbuf macro
-
-This makes the png loader compatible with libpng 1.5
----
-diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
-index 79c81fd..76f3304 100644
---- a/gdk-pixbuf/io-png.c
-+++ b/gdk-pixbuf/io-png.c
-@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_save_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf(png_save_ptr), 1);
- }
- 
- static void
-@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 	    	g_free (rows);
- 
- 		if (pixbuf)
-@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-                 return NULL;
-         }
-         
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context,
-         lc->error = error;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
-                 lc->error = NULL;
- 		return FALSE;
- 	} else {
-@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_read_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf(png_read_ptr), 1);
- }
- 
- static void
-@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
- 	       success = FALSE;
- 	       goto cleanup;
-        }
--       if (setjmp (png_ptr->jmpbuf)) {
-+       if (setjmp (png_jmpbuf(png_ptr))) {
- 	       success = FALSE;
- 	       goto cleanup;
-        }
---
-cgit v0.9
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 8c625e20ca..af88723634 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glib
-pkgver=2.28.8
+pkgver=2.30.0
 pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="http://www.gtk.org"
@@ -8,11 +8,11 @@ arch="all"
 license='GPL'
 depends=
 triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules"
-makedepends="gettext-dev libiconv-dev zlib-dev bzip2-dev pkgconfig"
+depends_dev="perl gettext-dev libiconv-dev zlib-dev bzip2-dev libffi-dev"
+makedepends="$depends_dev"
 source="http://ftp.gnome.org/pub/gnome/sources/glib/${pkgver%.*}/glib-$pkgver.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev"
 
-depends_dev="perl gettext-dev libiconv-dev zlib-dev bzip2-dev pkgconfig"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
@@ -45,4 +45,4 @@ dev() {
 		"$subpkgdir"/usr/bin/
 }
 
-md5sums="789e7520f71c6a4bf08bc683ec764d24  glib-2.28.8.tar.bz2"
+md5sums="fee101d9d7daa8ddfbae00325f307f3b  glib-2.30.0.tar.bz2"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 2c4df9f366..7936980623 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
-pkgver=6.7.2.7
+pkgver=6.7.2.9
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="A collection of tools and libraries for many image formats"
@@ -57,4 +57,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="8c7ff0941fde6d27363c3414fec306d7  ImageMagick-6.7.2-7.tar.gz"
+md5sums="ffe750155f7f583bf76a6d9fb10e54b6  ImageMagick-6.7.2-9.tar.gz"
diff --git a/main/libmowgli/APKBUILD b/main/libmowgli/APKBUILD
index a05a22a4cb..544d98254a 100644
--- a/main/libmowgli/APKBUILD
+++ b/main/libmowgli/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=libmowgli
-pkgver=0.9.50
+pkgver=0.9.95
 pkgrel=0
 pkgdesc="mowgli is a framework designed to reduce writing of boilerplate code"
 url="http://atheme.org/project/mowgli"
@@ -11,8 +11,7 @@ depends=
 makedepends=
 install=
 subpackages="$pkgname-dev"
-source="http://nenolod.net/~nenolod/$pkgname-$pkgver.tar.bz2"
-#source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz"
+source="http://distfiles.atheme.org/$pkgname-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -37,4 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="104cafd29fe874377169cb7e81c7b50f  libmowgli-0.9.50.tar.bz2"
+md5sums="9833b5845e60fe965924be4a15a30374  libmowgli-0.9.95.tar.bz2"
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD
index 0c66523b87..3fc9f96825 100644
--- a/main/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpng
-pkgver=1.5.4
+pkgver=1.5.5
 pkgrel=0
 pkgdesc="Portable Network Graphics library"
 url="http://www.libpng.org/"
@@ -29,4 +29,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="dea4d1fd671160424923e92ff0cdda78  libpng-1.5.4.tar.gz"
+md5sums="003bcac022125029bae4818d74c42a94  libpng-1.5.5.tar.gz"
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 7a460f5772..f66ba5b412 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=libvirt
-pkgver=0.9.4
-pkgrel=1
+pkgver=0.9.6
+pkgrel=0
 pkgdesc="A virtualization API for several hypervisor and container systems"
 url="http://libvirt.org/"
 arch="all"
@@ -44,6 +44,6 @@ package() {
 	install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
 }
 
-md5sums="86b411b11bd23d4af20611699f372af7  libvirt-0.9.4.tar.gz
+md5sums="b74df374b524d00a22a6c89cfc23099f  libvirt-0.9.6.tar.gz
 1c84a7baeafe0a7f4e9d7ae5180311b7  libvirt.confd
 3d32c12642cb9a84baf019c7b0971755  libvirt.initd"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 77438b0742..b4f4cd5ef7 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=3.0.4
 _kernver=3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2
-	grsecurity-2.2.2-3.0.4-201109190917.patch
+	grsecurity-2.2.2-3.0.4-201109261052.patch
 	
 	0004-arp-flush-arp-cache-on-device-change.patch
 
@@ -138,7 +138,7 @@ dev() {
 
 md5sums="398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
 62ca5f3caed233617127b2b3b7a87d15  patch-3.0.4.bz2
-475c1129df5aca0d82587640b878109d  grsecurity-2.2.2-3.0.4-201109190917.patch
+a7729608516e45657d47a0a458117ca1  grsecurity-2.2.2-3.0.4-201109261052.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
 9a2c88b20d296158cdcd01f843898415  kernelconfig.x86
 6957efc9f017c59b05aa0a2e4167255e  kernelconfig.x86_64"
diff --git a/main/linux-grsec/grsecurity-2.2.2-3.0.4-201109190917.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.4-201109261052.patch
index ec88fda16b..cce98cf9ed 100644
--- a/main/linux-grsec/grsecurity-2.2.2-3.0.4-201109190917.patch
+++ b/main/linux-grsec/grsecurity-2.2.2-3.0.4-201109261052.patch
@@ -50694,8 +50694,8 @@ diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_ch
 +}
 diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_disabled.c
 --- linux-3.0.4/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_disabled.c	2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,447 @@
++++ linux-3.0.4/grsecurity/grsec_disabled.c	2011-09-24 08:13:01.000000000 -0400
+@@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -50863,18 +50863,6 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +	return 0;
 +}
 +
-+int
-+gr_is_capable(const int cap)
-+{
-+	return 1;
-+}
-+
-+int
-+gr_is_capable_nolog(const int cap)
-+{
-+	return 1;
-+}
-+
 +void
 +gr_handle_alertkill(struct task_struct *task)
 +{
@@ -51135,8 +51123,6 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +	return dentry->d_inode->i_sb->s_dev;
 +}
 +
-+EXPORT_SYMBOL(gr_is_capable);
-+EXPORT_SYMBOL(gr_is_capable_nolog);
 +EXPORT_SYMBOL(gr_learn_resource);
 +EXPORT_SYMBOL(gr_set_kernel_label);
 +#ifdef CONFIG_SECURITY
@@ -51669,8 +51655,8 @@ diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link
 +}
 diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
 --- linux-3.0.4/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_log.c	2011-09-14 23:17:55.000000000 -0400
-@@ -0,0 +1,313 @@
++++ linux-3.0.4/grsecurity/grsec_log.c	2011-09-26 10:46:21.000000000 -0400
+@@ -0,0 +1,315 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -51723,6 +51709,7 @@ diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
 +	char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
 +	char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
 +	char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
++#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
 +	unsigned long curr_secs = get_seconds();
 +
 +	if (audit == GR_DO_AUDIT)
@@ -51731,18 +51718,19 @@ diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
 +	if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
 +		grsec_alert_wtime = curr_secs;
 +		grsec_alert_fyet = 0;
-+	} else if (time_before(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
-+		if (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST) {
-+			grsec_alert_fyet++;
-+		} else if (grsec_alert_fyet && grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
-+			grsec_alert_wtime = curr_secs;
-+			grsec_alert_fyet++;
-+			printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
-+			return FLOODING;
-+		}
-+	} else return FLOODING;
++	} else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
++		    && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
++		grsec_alert_fyet++;
++	} else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
++		grsec_alert_wtime = curr_secs;
++		grsec_alert_fyet++;
++		printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
++		return FLOODING;
++	}
++	else return FLOODING;
 +
 +set_fmt:
++#endif
 +	memset(buf, 0, PAGE_SIZE);
 +	if (current->signal->curr_ip && gr_acl_is_enabled()) {
 +		sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
@@ -55798,7 +55786,7 @@ diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
 +#endif
 diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grinternal.h
 --- linux-3.0.4/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grinternal.h	2011-08-23 21:48:14.000000000 -0400
++++ linux-3.0.4/include/linux/grinternal.h	2011-09-24 08:43:45.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -55924,7 +55912,7 @@ diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grin
 +	CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
 +	CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
 +	CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
-+	CAP_TO_MASK(CAP_IPC_OWNER) , 0 }}
++	CAP_TO_MASK(CAP_IPC_OWNER) , CAP_TO_MASK(CAP_SYSLOG) }}
 +
 +#define security_learn(normal_msg,args...) \
 +({ \
@@ -67520,7 +67508,16 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  
 diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
 --- linux-3.0.4/mm/slub.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slub.c	2011-08-23 21:48:14.000000000 -0400
++++ linux-3.0.4/mm/slub.c	2011-09-25 22:15:40.000000000 -0400
+@@ -200,7 +200,7 @@ struct track {
+ 
+ enum track_item { TRACK_ALLOC, TRACK_FREE };
+ 
+-#ifdef CONFIG_SYSFS
++#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ static int sysfs_slab_add(struct kmem_cache *);
+ static int sysfs_slab_alias(struct kmem_cache *, const char *);
+ static void sysfs_slab_remove(struct kmem_cache *);
 @@ -442,7 +442,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
@@ -67671,6 +67668,30 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  			goto err;
  		}
  		up_write(&slub_lock);
+@@ -3545,7 +3586,7 @@ void *__kmalloc_node_track_caller(size_t
+ }
+ #endif
+ 
+-#ifdef CONFIG_SYSFS
++#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ static int count_inuse(struct page *page)
+ {
+ 	return page->inuse;
+@@ -3935,12 +3976,12 @@ static void resiliency_test(void)
+ 	validate_slab_cache(kmalloc_caches[9]);
+ }
+ #else
+-#ifdef CONFIG_SYSFS
++#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ static void resiliency_test(void) {};
+ #endif
+ #endif
+ 
+-#ifdef CONFIG_SYSFS
++#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ enum slab_stat_type {
+ 	SL_ALL,			/* All slabs */
+ 	SL_PARTIAL,		/* Only partially allocated slabs */
 @@ -4150,7 +4191,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
@@ -67680,7 +67701,39 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4894,7 +4935,13 @@ static const struct file_operations proc
+@@ -4662,6 +4703,7 @@ static char *create_unique_id(struct kme
+ 	return name;
+ }
+ 
++#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ static int sysfs_slab_add(struct kmem_cache *s)
+ {
+ 	int err;
+@@ -4724,6 +4766,7 @@ static void sysfs_slab_remove(struct kme
+ 	kobject_del(&s->kobj);
+ 	kobject_put(&s->kobj);
+ }
++#endif
+ 
+ /*
+  * Need to buffer aliases during bootup until sysfs becomes
+@@ -4737,6 +4780,7 @@ struct saved_alias {
+ 
+ static struct saved_alias *alias_list;
+ 
++#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
+ {
+ 	struct saved_alias *al;
+@@ -4759,6 +4803,7 @@ static int sysfs_slab_alias(struct kmem_
+ 	alias_list = al;
+ 	return 0;
+ }
++#endif
+ 
+ static int __init slab_sysfs_init(void)
+ {
+@@ -4894,7 +4939,13 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD
index 14a99af687..88928ba522 100644
--- a/main/lua-posix/APKBUILD
+++ b/main/lua-posix/APKBUILD
@@ -1,26 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-posix
 _name=luaposix
-pkgver=5.1.11
+pkgver=5.1.14
 pkgrel=0
 pkgdesc="POSIX library for Lua"
 url="http://luaforge.net/projects/luaposix/"
 arch="all"
 license="MIT"
 depends="lua"
-makedepends="lua-dev"
-source="http://luaforge.net/frs/download.php/4813/luaposix-$pkgver.tar.gz"
+makedepends="lua-dev perl ncurses-dev"
+source="http://luaforge.net/frs/download.php/4848/luaposix-$pkgver.tar.gz"
 replaces="luaposix"
+subpackages="curses"
+
+_builddir="$srcdir"/$_name-$pkgver
+_lualib=/usr/lib/lua/5.1
+_luashare=/usr/share/lua/5.1
 
-_builddir="$srcdir"/$_name
 build() {
 	cd "$_builddir"
-	make PREFIX=/usr || return 1
+	./configure --prefix=/usr \
+		--libdir=$_lualib \
+		--datadir=$_luashare \
+		|| return 1
+	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make PREFIX=/usr DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/$_lualib/*.la || return 1
 }
 
-md5sums="edb76911dbdabe98dec49e3d8a126227  luaposix-5.1.11.tar.gz"
+curses() {
+	pkgdesc="ncurses binding for Lua"
+	mkdir -p "$subpkgdir"/$_lualib "$subpkgdir"/$_luashare
+	mv "$pkgdir"/$_lualib/curses* "$subpkgdir"/$_lualib/ || return 1
+	mv "$pkgdir"/$_luashare/curses* "$subpkgdir"/$_luashare/ || return 1
+}
+md5sums="a06af926a87e8d5e7c5b99304e0371f1  luaposix-5.1.14.tar.gz"
diff --git a/main/lxdm/APKBUILD b/main/lxdm/APKBUILD
index 05f9931dc1..4b93c4ac9a 100644
--- a/main/lxdm/APKBUILD
+++ b/main/lxdm/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=lxdm
-pkgver=0.3.0
-pkgrel=2
+pkgver=0.4.1
+pkgrel=0
 pkgdesc="LXDE desktop login manager"
 url="http://wiki.lxde.org/en/LXDM"
 license="GPL"
@@ -10,9 +10,8 @@ depends="bash"
 makedepends="autoconf automake gtk+-dev consolekit-dev"
 install=
 source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-	lxdm.initd
-	lxdm-execinfo.patch
-	lxdm-nopam.patch"
+	background.png
+	lxdm.initd"
 arch="all"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -29,11 +28,15 @@ prepare() {
 		esac
 	done
 
+	# Replace the default background with the Alpine default one
+	sed -i 's/file="wave.svg"/file="background.png"/' "$_builddir"/data/themes/Industrial/gtkrc
+
 	autoreconf
 }
 
 build() {
 	cd "$_builddir"
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -47,9 +50,10 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	# Install the custom Alpine background
+	install -m644 -D "$srcdir"/background.png "$pkgdir"/usr/share/lxdm/themes/Industrial/background.png
 }
 
-md5sums="1d0688e088edab7c3c563263eb2f9654  lxdm-0.3.0.tar.gz
-d6455d172d5d897f6bfcefe9a1a632c7  lxdm.initd
-045da38f5bb183ccacc489ea7e50e927  lxdm-execinfo.patch
-0d44e8cd97894fd680e3f09e680c3481  lxdm-nopam.patch"
+md5sums="8da1cfc2be6dc9217c85a7cf51e1e821  lxdm-0.4.1.tar.gz
+a510afe725112947d16f6c1f0602effe  background.png
+d6455d172d5d897f6bfcefe9a1a632c7  lxdm.initd"
diff --git a/main/lxdm/background.png b/main/lxdm/background.png
new file mode 100644
index 0000000000..751998ef2e
--- /dev/null
+++ b/main/lxdm/background.png
diff --git a/main/lxdm/lxdm-execinfo.patch b/main/lxdm/lxdm-execinfo.patch
deleted file mode 100644
index b81ef2fc84..0000000000
--- a/main/lxdm/lxdm-execinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- lxdm-0.3.0/configure.ac
-+++ lxdm-0.3.0.mod/configure.ac
-@@ -23,7 +23,7 @@
- 
- # Checks for header files.
- AC_PATH_X
--AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h])
-+AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h execinfo.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_TYPE_PID_T
-Only in lxdm-0.3.0: data/LoginReady
-Only in lxdm-0.3.0: data/PostLogin
-Only in lxdm-0.3.0: data/PostLogout
-Only in lxdm-0.3.0: data/PreLogin
-Only in lxdm-0.3.0: data/PreReboot
-Only in lxdm-0.3.0: data/PreShutdown
---- lxdm-0.3.0/src/lxdm.c
-+++ lxdm-0.3.0.mod/src/lxdm.c
-@@ -51,7 +51,9 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- 
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- 
- #include <utmp.h>
- 
-@@ -1480,6 +1482,7 @@
- 
- static void log_sigsegv(void)
- {
-+#ifdef HAVE_EXECINFO_H
- 	void *array[40];
- 	size_t size;
- 	char **bt_strs;
-@@ -1492,6 +1495,9 @@
- 	    fprintf(stderr, "%s\n", bt_strs[i]);
- 
- 	free(bt_strs);
-+#else
-+	fprintf(stderr, "backtrace is unavailable\n");
-+#endif
- }
- 
- static void sigsegv_handler(int sig)
diff --git a/main/lxdm/lxdm-nopam.patch b/main/lxdm/lxdm-nopam.patch
deleted file mode 100644
index 86c808fcb6..0000000000
--- a/main/lxdm/lxdm-nopam.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lxdm-0.3.0/src/lxdm.c
-+++ lxdm-0.3.0.mod/src/lxdm.c
-@@ -152,6 +152,7 @@
-     while( waitpid(-1, 0, WNOHANG) > 0 ) ;
- }
- 
-+#if HAVE_LIBPAM
- static void close_pam_session(pam_handle_t *pamh)
- {
-     int err;
-@@ -161,6 +162,7 @@
-     pam_end(pamh, err);
-     pamh = NULL;
- }
-+#endif
- 
- static LXSession *lxsession_find_greeter(void)
- {
diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD
index 01453de718..fe66bcecd0 100644
--- a/main/perl/APKBUILD
+++ b/main/perl/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl
-pkgver=5.14.1
+pkgver=5.14.2
 pkgrel=0
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url=http://www.perl.org
 arch="all"
 license="Artistic GPL-2"
-source="http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/perl-$pkgver.tar.gz"
+source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz"
 depends=
 subpackages="$pkgname-dev $pkgname-doc miniperl"
 
@@ -65,4 +65,4 @@ miniperl() {
 	cp "$srcdir/perl-$pkgver"/miniperl "$subpkgdir/usr/bin"
 }
 
-md5sums="0b74cffa3a10aee08442f950aecbaeec  perl-5.14.1.tar.gz"
+md5sums="3306fbaf976dcebdcd49b2ac0be00eb9  perl-5.14.2.tar.gz"
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index 5bb39415e1..d5d1c5c254 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postgresql
-pkgver=9.1.0
-pkgrel=1
+pkgver=9.1.1
+pkgrel=0
 pkgdesc="A sophisticated object-relational DBMS"
 url="http://www.postgresql.org/"
 arch="all"
@@ -57,7 +57,7 @@ client() {
 }
 
 
-md5sums="0497b9da1d7c380c340a9a87ba5500fe  postgresql-9.1.0.tar.bz2
+md5sums="061a9f17323117c9358ed60f33ecff78  postgresql-9.1.1.tar.bz2
 66c197b8186a6df0752fe2aed40c90c4  postgresql.initd
 c56a4db0c3757f5dc7f9d59132b428ba  postgresql.confd
 5f6d10a6a3d71dcee856fa6671954ab4  pg-restore.initd
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 05e1acedcf..2ae3376184 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsync
-pkgver=3.0.8
+pkgver=3.0.9
 pkgrel=0
 pkgdesc="A file transfer program to keep remote files in sync"
 url="http://samba.anu.edu.au/rsync/"
@@ -35,7 +35,7 @@ package() {
 	install -D -m 644 ../rsyncd.logrotate ${pkgdir}/etc/logrotate.d/rsyncd
 }
 
-md5sums="0ee8346ce16bdfe4c88a236e94c752b4  rsync-3.0.8.tar.gz
+md5sums="5ee72266fe2c1822333c407e1761b92b  rsync-3.0.9.tar.gz
 8c525f7c4222f90b3f01bb7f6a2684ab  rsyncd.initd
 e5e62e8cef29e09c22e8ba8152ec1751  rsyncd.confd
 a99211a14af1766ba849035241cd5bb2  rsyncd.conf
diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index eb8060c31e..899fad3aeb 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tzdata
-pkgver=2011h
+pkgver=2011k
 _tzcodever=2011g
 _ptzver=0.3
 pkgrel=0
@@ -48,7 +48,7 @@ package() {
 }
 
 md5sums="ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+9da1c2d4d1a01f9f504b73ccd371830f  tzdata2011k.tar.gz
 99efce32b3f870e1b071ce47f3a98a18  posixtz-0.3.tar.bz2
 a64ed97d1fc03c66ee8612c0d9f40507  Makefile.patch
 0b4d86d855f7daa3f79c9f28f04a48f9  0001-posixtz-fix-up-lseek.patch"
diff --git a/main/wine/0001-d3dx9_36-avoid-using-fabsf-fmaxf.patch b/main/wine/0001-d3dx9_36-avoid-using-fabsf-fmaxf.patch
new file mode 100644
index 0000000000..e046af735d
--- /dev/null
+++ b/main/wine/0001-d3dx9_36-avoid-using-fabsf-fmaxf.patch
@@ -0,0 +1,62 @@
+From b630b7aa0a086affabfb9533b5c64ef8505768dd Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 28 Sep 2011 06:03:59 +0000
+Subject: [PATCH] d3dx9_36: avoid using fabsf/fmaxf
+Reply-To: wine-devel <wine-devel@winehq.org>
+
+This fixes compiling on Alpine Linux and other uClibc based distros.
+
+This is related bug 28247 and commit 4cddd5ffdf0c568445365c6c62e7788d7dbbca7d
+---
+ dlls/d3dx9_36/tests/mesh.c |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
+index 6a78e64..c09607f 100644
+--- a/dlls/d3dx9_36/tests/mesh.c
++++ b/dlls/d3dx9_36/tests/mesh.c
+@@ -6160,7 +6160,7 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number
+             {
+                 FLOAT *got = (FLOAT*)(got_ptr + decl_ptr->Offset);
+                 FLOAT *exp = (FLOAT*)(exp_ptr + decl_ptr->Offset);
+-                FLOAT diff = fabsf(*got - *exp);
++                FLOAT diff = abs(*got - *exp);
+                 ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got %f for vertex %d %s, expected %f.\n",
+                     mesh_number, *got, vertex_number, usage_strings[decl_ptr->Usage], *exp);
+                 break;
+@@ -6169,7 +6169,7 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number
+             {
+                 D3DXVECTOR2 *got = (D3DXVECTOR2*)(got_ptr + decl_ptr->Offset);
+                 D3DXVECTOR2 *exp = (D3DXVECTOR2*)(exp_ptr + decl_ptr->Offset);
+-                FLOAT diff = fmaxf(fabsf(got->x - exp->x), fabsf(got->y - exp->y));
++                FLOAT diff = max(abs(got->x - exp->x), abs(got->y - exp->y));
+                 ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got (%f, %f) for vertex %d %s, expected (%f, %f).\n",
+                     mesh_number, got->x, got->y, vertex_number, usage_strings[decl_ptr->Usage], exp->x, exp->y);
+                 break;
+@@ -6178,8 +6178,8 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number
+             {
+                 D3DXVECTOR3 *got = (D3DXVECTOR3*)(got_ptr + decl_ptr->Offset);
+                 D3DXVECTOR3 *exp = (D3DXVECTOR3*)(exp_ptr + decl_ptr->Offset);
+-                FLOAT diff = fmaxf(fabsf(got->x - exp->x), fabsf(got->y - exp->y));
+-                diff = fmaxf(diff, fabsf(got->z - exp->z));
++                FLOAT diff = max(abs(got->x - exp->x), abs(got->y - exp->y));
++                diff = max(diff, abs(got->z - exp->z));
+                 ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got (%f, %f, %f) for vertex %d %s, expected (%f, %f, %f).\n",
+                     mesh_number, got->x, got->y, got->z, vertex_number, usage_strings[decl_ptr->Usage], exp->x, exp->y, exp->z);
+                 break;
+@@ -6188,9 +6188,9 @@ static void check_vertex_components(int line, int mesh_number, int vertex_number
+             {
+                 D3DXVECTOR4 *got = (D3DXVECTOR4*)(got_ptr + decl_ptr->Offset);
+                 D3DXVECTOR4 *exp = (D3DXVECTOR4*)(exp_ptr + decl_ptr->Offset);
+-                FLOAT diff = fmaxf(fabsf(got->x - exp->x), fabsf(got->y - exp->y));
+-                diff = fmaxf(diff, fabsf(got->z - exp->z));
+-                diff = fmaxf(diff, fabsf(got->w - exp->w));
++                FLOAT diff = max(abs(got->x - exp->x), abs(got->y - exp->y));
++                diff = max(diff, abs(got->z - exp->z));
++                diff = max(diff, abs(got->w - exp->w));
+                 ok_(__FILE__,line)(diff <= FLT_EPSILON, "Mesh %d: Got (%f, %f, %f, %f) for vertex %d %s, expected (%f, %f, %f, %f).\n",
+                     mesh_number, got->x, got->y, got->z, got->w, vertex_number, usage_strings[decl_ptr->Usage], exp->x, exp->y, exp->z, got->w);
+                 break;
+-- 
+1.7.6.1
+
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index e74ae5f376..3f9c2c3e23 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
-pkgver=1.3.28
-pkgrel=1
+pkgver=1.3.29
+pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 arch="x86"
@@ -15,6 +15,7 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
 	gstreamer-dev gst-plugins-base-dev paxctl
 	autoconf automake"
 source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2
+	0001-d3dx9_36-avoid-using-fabsf-fmaxf.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -46,4 +47,5 @@ package() {
 		"$pkgdir"/usr/bin/wine
 }
 
-md5sums="70574d609161cec8523804cd9364bcd2  wine-1.3.28.tar.bz2"
+md5sums="6c4159ef53c81faf5e52f29211ac50de  wine-1.3.29.tar.bz2
+65325cfcef7bffc954b9253f8d1dd2c5  0001-d3dx9_36-avoid-using-fabsf-fmaxf.patch"
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 2614714f52..67ee0e1d0b 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.11.0
+pkgver=1.11.1
 pkgrel=0
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
@@ -149,5 +149,5 @@ xephyr() {
 	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
 }
 
-md5sums="948e665bddc31c34be79b59db67c986e  xorg-server-1.11.0.tar.bz2
+md5sums="4cdf54dc569b6a5548257c93a45dcd3d  xorg-server-1.11.1.tar.bz2
 222de594206d1148a90eddfda4f7a11a  xorg-redhat-die-ugly-pattern-die-die-die.patch"
diff --git a/testing/lua-curses/APKBUILD b/testing/lua-curses/APKBUILD
deleted file mode 100644
index 32173a214c..0000000000
--- a/testing/lua-curses/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-curses
-pkgver=7
-pkgrel=0
-pkgdesc="ncurses binding for Lua"
-url="http://luaforge.net/projects/lcurses"
-arch="all"
-license="BSD"
-depends=""
-makedepends="lua-dev ncurses-dev"
-install=""
-subpackages=
-source="http://luaforge.net/frs/download.php/4843/lcurses-$pkgver.tar.gz"
-
-_builddir="$srcdir"/lcurses-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--disable-static \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/lua/*/*.*a
-}
-
-md5sums="5268b69548f113fa8205fd9dd86b89b3  lcurses-7.tar.gz"
diff --git a/testing/lua-ldoc/APKBUILD b/testing/lua-ldoc/APKBUILD
new file mode 100644
index 0000000000..3aa4b63d2f
--- /dev/null
+++ b/testing/lua-ldoc/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=lua-ldoc
+pkgver=1.0
+pkgrel=0
+pkgdesc="Documentation tool for Lua"
+url="http://github.com/stevedonovan/LDoc"
+arch="noarch"
+license="MIT"
+depends="lua-penlight"
+makedepends="lua-dev"
+install=""
+subpackages=
+source="http://stevedonovan.github.com/files/ldoc-$pkgver.zip"
+
+_luashare=/usr/share/lua/5.1
+_builddir="$srcdir"/LDoc
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	sed -i '1i \
+#!/usr/bin/env lua' ldoc.lua
+}
+
+build() {
+	cd "$_builddir"
+}
+
+package() {
+	cd "$_builddir"
+	install -Dm755 ldoc.lua "$pkgdir"/usr/bin/ldoc || return 1
+	install -d "$pkgdir"/$_luashare || return 1
+	cp -a ldoc "$pkgdir"/$_luashare/
+}
+
+md5sums="fcfb9afadd49c672f0cb553f490b2455  ldoc-1.0.zip"