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

13 files changed, 148 insertions, 61 deletions

diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 5a1918e74f..d15c12e9e2 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apache2
 pkgver=2.2.21
-pkgrel=0
+pkgrel=1
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
@@ -32,7 +32,8 @@ source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
 	httpd.conf
 	ssl.conf
 	ldap.conf
-	alpine.layout"
+	alpine.layout
+	CVE-2011-4317.patch"
 
 prepare() {
 	cd "$srcdir"/httpd-$pkgver
@@ -251,4 +252,5 @@ e322b5211e49511cac6e40c86af1b1da  apache2.confd
 749faf0b2916d85d1240bc34f700e5d9  httpd.conf
 5d0d024ca43571b863874ab871b2c109  ssl.conf
 b70fe826486043e3953cfe21f9e6fa16  ldap.conf
-c66ff5f70260d5266e6803a59b39bd7f  alpine.layout"
+c66ff5f70260d5266e6803a59b39bd7f  alpine.layout
+4c9b33458e4c8dea1be39f811da39be3  CVE-2011-4317.patch"
diff --git a/main/apache2/CVE-2011-4317.patch b/main/apache2/CVE-2011-4317.patch
new file mode 100644
index 0000000000..698b2eb7ab
--- /dev/null
+++ b/main/apache2/CVE-2011-4317.patch
@@ -0,0 +1,36 @@
+Index: modules/proxy/mod_proxy.c
+===================================================================
+--- httpd-2.2.21/modules/proxy/mod_proxy.c	(revision 1179633)
++++ httpd-2.2.21/modules/proxy/mod_proxy.c	(working copy)
+@@ -566,6 +566,13 @@
+         return OK;
+     }
+ 
++    /* Check that the URI is valid. */
++    if (!r->uri  || r->uri[0] != '/') {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                     "Invalid URI in request %s", r->the_request);
++        return HTTP_BAD_REQUEST;
++    }
++
+     /* XXX: since r->uri has been manipulated already we're not really
+      * compliant with RFC1945 at this point.  But this probably isn't
+      * an issue because this is a hybrid proxy/origin server.
+Index: modules/mappers/mod_rewrite.c
+===================================================================
+--- httpd-2.2.21/modules/mappers/mod_rewrite.c	(revision 1179633)
++++ httpd-2.2.21/modules/mappers/mod_rewrite.c	(working copy)
+@@ -4266,6 +4266,13 @@
+         return DECLINED;
+     }
+ 
++    /* Check that the URI is valid. */
++    if (!r->uri || r->uri[0] != '/') {
++        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                     "Invalid URI in request %s", r->the_request);
++        return HTTP_BAD_REQUEST;
++    }
++    
+     /*
+      *  add the SCRIPT_URL variable to the env. this is a bit complicated
+      *  due to the fact that apache uses subrequests and internal redirects
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index d807fe25c8..79d5f78306 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 
 _flavor=grsec
-_kver=3.0.10
+_kver=3.0.12
 _kpkgrel=0
 _mypkgrel=0
 
 # verify the kernel version before entering chroot
 if [ -f ../linux-${_flavor}/APKBUILD ]; then
 	. ../linux-${_flavor}/APKBUILD
-	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
+	[ "$_kver" != "$pkgver" ] && die "dahdi-linux-grsec: please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "dahdi-linuc-grsec: please update _kpkgrel to $pkgrel"
 fi
 
 _kpkgver="$_kver-r$_kpkgrel"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 15fd8b5f20..cd6766e69c 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.3.7
+pkgver=6.7.3.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="6dce502c11ff4a61ab08c4cd38a8ebe2  ImageMagick-6.7.3-7.tar.gz"
+md5sums="a71452f19ece3c36e2eee090c0d317ef  ImageMagick-6.7.3-9.tar.gz"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 7b0261f04a..c29fac6b62 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=3.0.10
+pkgver=3.0.12
 _kernver=3.0
 pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
@@ -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.10-unofficial.patch
+	grsecurity-2.2.2-$pkgver-unofficial.patch
 	grsec-timblogiw-noconst.patch
 	
 	0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
@@ -139,8 +139,8 @@ dev() {
 }
 
 md5sums="398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
-8e0391dd935d838ee3023ab9daa6b447  patch-3.0.10.bz2
-cb9aa7ec8c615a5c3ba730ac951da9d2  grsecurity-2.2.2-3.0.10-unofficial.patch
+b3030035fcc87c55ede362a47113af5d  patch-3.0.12.bz2
+a129184102c16a4ee39afe50cae43efd  grsecurity-2.2.2-3.0.12-unofficial.patch
 c41cf0ee9794f393423c6b2093072260  grsec-timblogiw-noconst.patch
 ebb99ef6ad8cd2d9fd8f49d5c5849057  0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
diff --git a/main/linux-grsec/grsecurity-2.2.2-3.0.10-unofficial.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.12-unofficial.patch
index ad5496b8f7..8fad8f4f85 100644
--- a/main/linux-grsec/grsecurity-2.2.2-3.0.10-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.2.2-3.0.12-unofficial.patch
@@ -158,7 +158,7 @@ index aa47be7..1fbd18f 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index 36036d1..167a8c6 100644
+index 993fe05..8ddd85b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -27302,7 +27302,7 @@ index 7eef6e1..f8b411e 100644
  	return can_switch;
  }
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index ce7914c..2e5f051 100644
+index e0d0e27..f48e37e 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
 @@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
@@ -27323,7 +27323,7 @@ index ce7914c..2e5f051 100644
  
  	/* protects the irq masks */
  	spinlock_t irq_lock;
-@@ -874,7 +874,7 @@ struct drm_i915_gem_object {
+@@ -875,7 +875,7 @@ struct drm_i915_gem_object {
  	 * will be page flipped away on the next vblank.  When it
  	 * reaches 0, dev_priv->pending_flip_queue will be woken up.
  	 */
@@ -27332,7 +27332,7 @@ index ce7914c..2e5f051 100644
  };
  
  #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1247,7 +1247,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
+@@ -1248,7 +1248,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
  extern void intel_teardown_gmbus(struct drm_device *dev);
  extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
  extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
@@ -27404,7 +27404,7 @@ index 9b1d669..d88e72c 100644
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index cbf4c4c..76e1edc 100644
+index 853bddb..6afec46 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
@@ -27416,7 +27416,7 @@ index cbf4c4c..76e1edc 100644
  
  		/* Big Hammer, we also need to ensure that any pending
  		 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2548,7 +2548,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
+@@ -2550,7 +2550,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
  	obj = to_intel_framebuffer(crtc->fb)->obj;
  	dev_priv = crtc->dev->dev_private;
  	wait_event(dev_priv->pending_flip_queue,
@@ -27425,7 +27425,7 @@ index cbf4c4c..76e1edc 100644
  }
  
  static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -6225,7 +6225,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
+@@ -6257,7 +6257,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
  
  	atomic_clear_mask(1 << intel_crtc->plane,
  			  &obj->pending_flip.counter);
@@ -27434,7 +27434,7 @@ index cbf4c4c..76e1edc 100644
  		wake_up(&dev_priv->pending_flip_queue);
  
  	schedule_work(&work->work);
-@@ -6514,7 +6514,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+@@ -6546,7 +6546,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
  	/* Block clients from rendering to the new back buffer until
  	 * the flip occurs and the object is no longer visible.
  	 */
@@ -27443,7 +27443,7 @@ index cbf4c4c..76e1edc 100644
  
  	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
  	if (ret)
-@@ -6527,7 +6527,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+@@ -6559,7 +6559,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
  	return 0;
  
  cleanup_pending:
@@ -34486,10 +34486,10 @@ index 8a0b330..b4286de 100644
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
 diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 3382475..9c8d000 100644
+index c7b6fed..4db0569 100644
 --- a/drivers/scsi/aacraid/linit.c
 +++ b/drivers/scsi/aacraid/linit.c
-@@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
+@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
  #elif defined(__devinitconst)
  static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
  #else
@@ -34729,10 +34729,10 @@ index 351dc0b..951dc32 100644
  
  	/* These three are default values which can be overridden */
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 6689d5d..9cbea58 100644
+index 56a9f3f..a51d0fb 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -498,7 +498,7 @@ static inline u32 next_command(struct ctlr_info *h)
+@@ -499,7 +499,7 @@ static inline u32 next_command(struct ctlr_info *h)
  	u32 a;
  
  	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
@@ -34741,7 +34741,7 @@ index 6689d5d..9cbea58 100644
  
  	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
  		a = *(h->reply_pool_head); /* Next cmd in ring buffer */
-@@ -2955,7 +2955,7 @@ static void start_io(struct ctlr_info *h)
+@@ -2956,7 +2956,7 @@ static void start_io(struct ctlr_info *h)
  	while (!list_empty(&h->reqQ)) {
  		c = list_entry(h->reqQ.next, struct CommandList, list);
  		/* can't do anything if fifo is full */
@@ -34750,7 +34750,7 @@ index 6689d5d..9cbea58 100644
  			dev_warn(&h->pdev->dev, "fifo full\n");
  			break;
  		}
-@@ -2965,7 +2965,7 @@ static void start_io(struct ctlr_info *h)
+@@ -2966,7 +2966,7 @@ static void start_io(struct ctlr_info *h)
  		h->Qdepth--;
  
  		/* Tell the controller execute command */
@@ -34759,7 +34759,7 @@ index 6689d5d..9cbea58 100644
  
  		/* Put job onto the completed Q */
  		addQ(&h->cmpQ, c);
-@@ -2974,17 +2974,17 @@ static void start_io(struct ctlr_info *h)
+@@ -2975,17 +2975,17 @@ static void start_io(struct ctlr_info *h)
  
  static inline unsigned long get_next_completion(struct ctlr_info *h)
  {
@@ -34780,7 +34780,7 @@ index 6689d5d..9cbea58 100644
  		(h->interrupts_enabled == 0);
  }
  
-@@ -3881,7 +3881,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
+@@ -3882,7 +3882,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
  	if (prod_index < 0)
  		return -ENODEV;
  	h->product_name = products[prod_index].product_name;
@@ -34789,7 +34789,7 @@ index 6689d5d..9cbea58 100644
  
  	if (hpsa_board_disabled(h->pdev)) {
  		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -4158,7 +4158,7 @@ reinit_after_soft_reset:
+@@ -4163,7 +4163,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
@@ -34798,7 +34798,7 @@ index 6689d5d..9cbea58 100644
  
  	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
  		goto clean2;
-@@ -4192,7 +4192,7 @@ reinit_after_soft_reset:
+@@ -4197,7 +4197,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
@@ -34807,7 +34807,7 @@ index 6689d5d..9cbea58 100644
  		spin_unlock_irqrestore(&h->lock, flags);
  		free_irq(h->intr[h->intr_mode], h);
  		rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4211,9 +4211,9 @@ reinit_after_soft_reset:
+@@ -4216,9 +4216,9 @@ reinit_after_soft_reset:
  		dev_info(&h->pdev->dev, "Board READY.\n");
  		dev_info(&h->pdev->dev,
  			"Waiting for stale completions to drain.\n");
@@ -34819,7 +34819,7 @@ index 6689d5d..9cbea58 100644
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -4234,7 +4234,7 @@ reinit_after_soft_reset:
+@@ -4239,7 +4239,7 @@ reinit_after_soft_reset:
  	}
  
  	/* Turn the interrupts on so we can service requests */
@@ -34828,7 +34828,7 @@ index 6689d5d..9cbea58 100644
  
  	hpsa_hba_inquiry(h);
  	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
-@@ -4287,7 +4287,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -4292,7 +4292,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
  	 * To write all data in the battery backed cache to disks
  	 */
  	hpsa_flush_cache(h);
@@ -34837,7 +34837,7 @@ index 6689d5d..9cbea58 100644
  	free_irq(h->intr[h->intr_mode], h);
  #ifdef CONFIG_PCI_MSI
  	if (h->msix_vector)
-@@ -4450,7 +4450,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
+@@ -4455,7 +4455,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
  		return;
  	}
  	/* Change the access methods to the performant access methods */
@@ -36913,10 +36913,10 @@ index b44aef0..c5ad11d 100644
  
  /*
 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index ef925d5..6ddb00e 100644
+index a76c808..ecbc743 100644
 --- a/drivers/tty/tty_ldisc.c
 +++ b/drivers/tty/tty_ldisc.c
-@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *ld)
+@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
  
@@ -36925,7 +36925,7 @@ index ef925d5..6ddb00e 100644
  		module_put(ldo->owner);
  		spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
-@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
+@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
  	tty_ldiscs[disc] = new_ldisc;
  	new_ldisc->num = disc;
@@ -36934,7 +36934,7 @@ index ef925d5..6ddb00e 100644
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
  	return ret;
-@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
+@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
  		return -EINVAL;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -36943,7 +36943,7 @@ index ef925d5..6ddb00e 100644
  		ret = -EBUSY;
  	else
  		tty_ldiscs[disc] = NULL;
-@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
+@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
  	if (ldops) {
  		ret = ERR_PTR(-EAGAIN);
  		if (try_module_get(ldops->owner)) {
@@ -36952,7 +36952,7 @@ index ef925d5..6ddb00e 100644
  			ret = ldops;
  		}
  	}
-@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
+@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
  	unsigned long flags;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -37318,10 +37318,10 @@ index 1fc8f12..20647c1 100644
  	return 0;
  }
 diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 104620b..af0338a 100644
+index ffeee57..22ca548 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags)
+@@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags)
  	unsigned int num_tests;
  	int i, ret;
  
@@ -45971,7 +45971,7 @@ index 202f370..9d4565e 100644
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 6f4850d..875435e 100644
+index c48f9f6..17c27ce 100644
 --- a/fs/nfs/inode.c
 +++ b/fs/nfs/inode.c
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
@@ -48414,10 +48414,10 @@ index 54e623b..5c3fd7a 100644
  	if (error)
  		return -error;
 diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
-index d44d92c..ef7ad2d 100644
+index f5b697b..a8de28d 100644
 --- a/fs/xfs/linux-2.6/xfs_iops.c
 +++ b/fs/xfs/linux-2.6/xfs_iops.c
-@@ -437,7 +437,7 @@ xfs_vn_put_link(
+@@ -445,7 +445,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
  {
@@ -75210,10 +75210,10 @@ index 4851e9e..d860e05 100644
  
  	return p;
 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index d3fe2d2..0affe0d 100644
+index 2124db8..8718fc2 100644
 --- a/net/mac80211/util.c
 +++ b/net/mac80211/util.c
-@@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1151,7 +1151,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
  #endif
  
  	/* restart hardware */
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index eb0458ca8f..41d4518acf 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=7.11.1
+pkgver=7.11.2
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
@@ -143,7 +143,7 @@ nouveau() {	_mv_dri nouveau_dri nouveau_vieux_dri; }
 swrast() {	_mv_dri swrast_dri swrastg_dri; }
 vmwgfx() {	_mv_dri vmwgfx_dri; }
 
-md5sums="a77307102cee844ff6544ffa8fafeac1  MesaLib-7.11.1.tar.bz2
+md5sums="0837c52698fe3252369c3fdb5195afcc  MesaLib-7.11.2.tar.bz2
 9c8c161f954f0d08895cd9d45e63f498  mesa-7.10-uclibc.patch
 03e9685b0d714e915c35fd0fb5fde810  mesa-7.10-uclibc-glsl.patch
 90a2ea438ff328443a0436a91a74d518  mesa-7.10-uclibc-gallium.patch"
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD
index ebb6607f54..db1d412887 100644
--- a/main/mpd/APKBUILD
+++ b/main/mpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpd
 pkgver=0.16.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 url="http://musicpd.org"
 pkgusers="mpd"
@@ -12,7 +12,7 @@ license="GPL2"
 depends=
 makedepends="pkgconfig lame-dev glib-dev curl-dev libao-dev libmad-dev flac-dev
 	libogg-dev faad2-dev libid3tag-dev libvorbis-dev alsa-lib-dev
-	libsamplerate-dev libshout-dev"
+	libsamplerate-dev libshout-dev libmodplug-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/project/musicpd/mpd/${pkgver}/mpd-${pkgver}.tar.bz2
@@ -27,6 +27,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-shout \
+		--enable-modplug \
 		|| return 1
 	make || return 1
 }
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index f9bfce0814..f4b0d31a9d 100644
--- a/main/open-iscsi-grsec/APKBUILD
+++ b/main/open-iscsi-grsec/APKBUILD
@@ -3,14 +3,14 @@
 _flavor=grsec
 _realname=open-iscsi
 _realver=2.0-872
-_kver=3.0.10
+_kver=3.0.12
 _kpkgrel=0
 
 # verify the kernel version before entering chroot
 if [ -f ../linux-${_flavor}/APKBUILD ]; then
 	. ../linux-${_flavor}/APKBUILD
-	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
+	[ "$_kver" != "$pkgver" ] && die "open-iscsi-$_flavor: please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "open-iscsi-$_flavor: please update _kpkgrel to $pkgrel"
 fi
 
 _kernelver="$_kver-r$_kpkgrel"
@@ -56,4 +56,4 @@ package() {
 }
 
 md5sums="b4df94f08c241352bb964043b3e44779  open-iscsi-2.0-872.tar.gz
-c28dfb108cec0399634d348132cee79a  Makefile-Alpine-kernels-support.patch"
+7fc6493815ac899da83db3197e25d0b9  Makefile-Alpine-kernels-support.patch"
diff --git a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
index 95e9c95733..8308ba5907 100644
--- a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
+++ b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch
@@ -26,7 +26,7 @@
  
  linux_2_6_35: $(unpatch_code)
 +
-+linux_3_0_10: $(unpatch_code)
++linux_3_0_12: $(unpatch_code)
  
  do_unpatch_code:
  	echo "Un-patching source code for use with linux-2.6.14 and up ..."
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index 133b3b7837..d5d85c939e 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -6,15 +6,15 @@ _mypkgrel=0
 _realver=2011.09.23
 _realsubver=491607
 
-_kver=3.0.10
+_kver=3.0.12
 _kpkgrel=0
 
 # source open-vm-tools version
 if [ -f ../main/$_realname/APKBUILD ]; then
 	. ../main/$_realname/APKBUILD
-	[ "$_realver" != "$pkgver" ] && die "please set _realver to $pkgver"
+	[ "$_realver" != "$pkgver" ] && die "$_realname-$_flavor: please set _realver to $pkgver"
 	[ "$_realsubver" != "$_pkgsubver" ] \
-		&& die "please set _realsubver to $_pkgsubver"
+		&& die "$_realname-$_flavor: please set _realsubver to $_pkgsubver"
 fi
 
 # source the kernel version
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index 20738ab030..eec3eeff5f 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -3,7 +3,7 @@ _flavor=${FLAVOR:-grsec}
 _realname=xtables-addons
 _name=$_realname-$_flavor
 
-_kver=3.0.10
+_kver=3.0.12
 _kpkgrel=0
 
 # source the kernel version
diff --git a/testing/audacity/APKBUILD b/testing/audacity/APKBUILD
new file mode 100644
index 0000000000..7b96153490
--- /dev/null
+++ b/testing/audacity/APKBUILD
@@ -0,0 +1,48 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=audacity
+pkgver=1.3.13
+pkgrel=0
+pkgdesc="Multitrack audio editor"
+url="http://audacity.sourceforge.net"
+arch="all"
+license="GPLv2"
+depends=""
+depends_dev=""
+makedepends="$depends_dev wxgtk-dev alsa-lib-dev libsndfile-dev flac-dev
+	libogg-dev libvorbis-dev libsamplerate-dev expat-dev libmad-dev
+	libid3tag-dev taglib-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-$pkgver-beta.tar.bz2"
+
+_builddir="$srcdir"/audacity-src-$pkgver-beta
+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 \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--with-libsndfile=system \
+		--with-libsamplerate=system \
+		--without-libresample \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="57be7fadb8c8dd17b8462c7ac1561d03  audacity-minsrc-1.3.13-beta.tar.bz2"