Wed Feb 1 23:14:54 UTC 2012

40 files changed, 1163 insertions, 176 deletions

diff --git a/community-staging/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD
index 82f6480bd..d20095a97 100644
--- a/community-staging/mtpaint/PKGBUILD
+++ b/community-staging/mtpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62300 2012-01-19 07:19:24Z arodseth $
+# $Id: PKGBUILD 63383 2012-01-31 23:43:55Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
diff --git a/community-testing/amsn/PKGBUILD b/community-testing/amsn/PKGBUILD
new file mode 100644
index 000000000..7a617d3d5
--- /dev/null
+++ b/community-testing/amsn/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 63376 2012-01-31 17:40:02Z jelle $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Jeff Mickey <j@codemac.net>
+
+pkgname=amsn
+pkgver=0.98.4
+pkgrel=2
+pkgdesc="MSN client written in Tcl/Tk"
+arch=('i686' 'x86_64')
+url="http://amsn.sourceforge.net/"
+license=('GPL2')
+depends=('tk' 'tls')
+makedepends=('libjpeg' 'libpng' 'farsight2' 'libv4l')
+optdepends=('farsight2: for video conferencing')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch)
+md5sums=('96fd20e8709ced4443432d125a5e0a5a'
+         '182eef321e78632499c24b3009c085ad'
+         '02d4ec8faed521387d6e44481f43c91a')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # patch for libpng15
+  patch -Np0 -i $srcdir/amsn-0.98.4-libpng15.patch
+
+  # patch for linux kernel header changes
+  patch -Np0 -i $srcdir/amsn-0.98.4-v4l2.patch
+  # python2 fix
+  for file in lang/missing.py plugins/music/infosongbird; do
+      sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
+  done
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-testing/amsn/amsn-0.98.4-libpng15.patch b/community-testing/amsn/amsn-0.98.4-libpng15.patch
new file mode 100644
index 000000000..24f875d02
--- /dev/null
+++ b/community-testing/amsn/amsn-0.98.4-libpng15.patch
@@ -0,0 +1,471 @@
+--- utils/TkCximage/src/CxImage/ximapng.cpp
++++ utils/TkCximage/src/CxImage/ximapng.cpp
+@@ -15,7 +15,7 @@
+ void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
+ {
+ 	strcpy(info.szLastError,message);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ #if CXIMAGE_SUPPORT_DECODE
+@@ -62,7 +62,7 @@
+     /* Set error handling if you are using the setjmp/longjmp method (this is
+     * the normal method of doing things with libpng).  REQUIRED unless you
+     * set up your own error handlers in the png_create_read_struct() earlier. */
+-	if (setjmp(png_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		delete [] row_pointers;
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -77,15 +77,15 @@
+ 	png_read_info(png_ptr, info_ptr);
+ 
+ 	if (info.nEscape == -1){
+-		head.biWidth = info_ptr->width;
+-		head.biHeight= info_ptr->height;
++		head.biWidth = png_get_image_width(png_ptr, info_ptr);
++		head.biHeight= png_get_image_height(png_ptr, info_ptr);
+ 		info.dwType = CXIMAGE_FORMAT_PNG;
+-		longjmp(png_ptr->jmpbuf, 1);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	/* calculate new number of channels */
+ 	int channels=0;
+-	switch(info_ptr->color_type){
++	switch(png_get_color_type(png_ptr, info_ptr)){
+ 	case PNG_COLOR_TYPE_GRAY:
+ 	case PNG_COLOR_TYPE_PALETTE:
+ 		channels = 1;
+@@ -101,71 +101,76 @@
+ 		break;
+ 	default:
+ 		strcpy(info.szLastError,"unknown PNG color type");
+-		longjmp(png_ptr->jmpbuf, 1);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	//find the right pixel depth used for cximage
+-	int pixel_depth = info_ptr->pixel_depth;
++#if MIGHT_BE_BUGGY
++	int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr);
+ 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
++#endif
++	int pixel_depth;
++	if (channels == 1) pixel_depth=8;
+ 	if (channels == 2) pixel_depth=8;
+ 	if (channels >= 3) pixel_depth=24;
+ 
+-	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+-		longjmp(png_ptr->jmpbuf, 1);
++	if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	/* get metrics */
+-	switch (info_ptr->phys_unit_type)
++	png_uint_32 res_x, res_y;
++	int unit_type;
++	png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type);
++	switch (unit_type)
+ 	{
+ 	case PNG_RESOLUTION_UNKNOWN:
+-		SetXDPI(info_ptr->x_pixels_per_unit);
+-		SetYDPI(info_ptr->y_pixels_per_unit);
++		SetXDPI(res_x);
++		SetYDPI(res_y);
+ 		break;
+ 	case PNG_RESOLUTION_METER:
+-		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
+-		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
++		SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5));
++		SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5));
+ 		break;
+ 	}
+ 
+-	if (info_ptr->num_palette>0){
+-		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
+-		SetClrImportant(info_ptr->num_palette);
+-	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
++	if (num_palette>0){
++		SetPalette((rgb_color*)palette,num_palette);
++		SetClrImportant(num_palette);
++	} else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs
+ 		SetPaletteColor(0,0,0,0);
+ 		SetPaletteColor(1,85,85,85);
+ 		SetPaletteColor(2,170,170,170);
+ 		SetPaletteColor(3,255,255,255);
+ 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
+ 	
+-	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
++	int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3;
+ 
+-	if (info_ptr->num_trans!=0){ //palette transparency
+-		if (info_ptr->num_trans==1){
+-			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-				info.nBkgndIndex = info_ptr->trans_color.index;
+-#else
+-				info.nBkgndIndex = info_ptr->trans_values.index;
+-#endif
++png_uint_32    png_get_tRNS   (png_const_structp   png_ptr,   png_infop
++info_ptr,  png_bytep  *trans_alpha,   int   *num_trans,   png_color_16p
++*trans_color);
++	png_bytep trans_alpha;
++	int num_trans;
++	png_color_16p trans_color;
++	png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
++	if (num_trans!=0){ //palette transparency
++		if (num_trans==1){
++			if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){
++				info.nBkgndIndex = trans_color->index;
+ 			} else{
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+-#else
+-				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
+-#endif
++				info.nBkgndIndex = trans_color->gray>>nshift;
+ 			}
+ 		}
+-		if (info_ptr->num_trans>1){
++		if (num_trans>1){
+ 			RGBQUAD* pal=GetPalette();
+ 			if (pal){
+ 				DWORD ip;
+-				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+-#else
+-					pal[ip].rgbReserved=info_ptr->trans[ip];
+-#endif
+-				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
++				for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++)
++					pal[ip].rgbReserved=trans_alpha[ip];
++				for (ip=num_trans;ip<head.biClrUsed;ip++){
+ 					pal[ip].rgbReserved=255;
+ 				}
+ 				info.bAlphaPaletteEnabled=true;
+@@ -178,15 +183,9 @@
+ 		int num_trans;
+ 		png_color_16 *image_background;
+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
+-#else
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
+-#endif
++			info.nBkgndColor.rgbRed   = (BYTE)(trans_color->red>>nshift);
++			info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift);
++			info.nBkgndColor.rgbBlue  = (BYTE)(trans_color->blue>>nshift);
+ 			info.nBkgndColor.rgbReserved = 0;
+ 			info.nBkgndIndex = 0;
+ 		}
+@@ -202,15 +201,15 @@
+ 	}
+ 
+ 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
+-	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
++	if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){
+ 		png_set_bgr(png_ptr);
+ 	}
+ 
+ 	// <vho> - handle cancel
+-	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+ 
+ 	// row_bytes is the width x number of channels x (bit-depth / 8)
+-	row_pointers = new BYTE[info_ptr->rowbytes + 8];
++	row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8];
+ 
+ 	// turn on interlace handling
+ 	int number_passes = png_set_interlace_handling(png_ptr);
+@@ -221,8 +220,10 @@
+ 		SetCodecOption(0);
+ 	}
+ 
+-	int chan_offset = info_ptr->bit_depth >> 3;
+-	int pixel_offset = info_ptr->pixel_depth >> 3;
++	int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
++	int chan_offset = bit_depth >> 3;
++	//int pixel_offset = info_ptr->pixel_depth >> 3;
++	int pixel_offset = (bit_depth * channels) >> 3;
+ 
+ 	for (int pass=0; pass < number_passes; pass++) {
+ 		iter.Upset();
+@@ -230,7 +231,7 @@
+ 		do	{
+ 
+ 			// <vho> - handle cancel
+-			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			if (AlphaIsValid()) {
+@@ -241,7 +242,7 @@
+ 				BYTE* prow= iter.GetRow(ay);
+ 
+ 				//recover data from previous scan
+-				if (info_ptr->interlace_type && pass>0 && pass!=7){
++				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0 && pass!=7){
+ 					for(ax=0;ax<head.biWidth;ax++){
+ 						long px = ax * pixel_offset;
+ 						if (channels == 2){
+@@ -278,10 +279,10 @@
+ #endif // CXIMAGE_SUPPORT_ALPHA		// vho
+ 			{
+ 				//recover data from previous scan
+-				if (info_ptr->interlace_type && pass>0){
+-					iter.GetRow(row_pointers, info_ptr->rowbytes);
++				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0){
++					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
+ 					//re-expand buffer for images with bit depth > 8
+-					if (info_ptr->bit_depth > 8){
++					if (png_get_bit_depth(png_ptr, info_ptr) > 8){
+ 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
+ 							row_pointers[ax*chan_offset] = row_pointers[ax];
+ 					}
+@@ -291,15 +292,15 @@
+ 				png_read_row(png_ptr, row_pointers, NULL);
+ 
+ 				//shrink 16 bit depth images down to 8 bits
+-				if (info_ptr->bit_depth > 8){
++				if (png_get_bit_depth(png_ptr, info_ptr) > 8){
+ 					for(long ax=0;ax<(head.biWidth*channels);ax++)
+ 						row_pointers[ax] = row_pointers[ax*chan_offset];
+ 				}
+ 
+ 				//copy the pixels
+-				iter.SetRow(row_pointers, info_ptr->rowbytes);
++				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
+ 				//<DP> expand 2 bpp images only in the last pass
+-				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
++				if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1))
+ 					expand2to4bpp(iter.GetRow());
+ 
+ 				//go on
+@@ -340,6 +341,11 @@
+ 	BYTE trans[256];	//for transparency (don't move)
+ 	png_struct *png_ptr;
+ 	png_info *info_ptr;
++	png_uint_32 width, height;
++	png_byte bit_depth;
++	png_byte color_type;
++	png_byte interlace_type;
++	BYTE channels;
+ 
+   cx_try
+   {
+@@ -362,9 +368,8 @@
+    /* Set error handling.  REQUIRED if you aren't supplying your own
+     * error hadnling functions in the png_create_write_struct() call.
+     */
+-	if (setjmp(png_ptr->jmpbuf)){
++	if (setjmp(png_jmpbuf(png_ptr))){
+ 		/* If we get here, we had a problem reading the file */
+-		if (info_ptr->palette) free(info_ptr->palette);
+ 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
+ 		cx_throw("Error saving PNG file");
+ 	}
+@@ -376,20 +381,18 @@
+     png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
+ 
+ 	/* set the file information here */
+-	info_ptr->width = GetWidth();
+-	info_ptr->height = GetHeight();
+-	info_ptr->pixel_depth = (BYTE)GetBpp();
+-	info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
+-	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
+-	info_ptr->compression_type = info_ptr->filter_type = 0;
+-	info_ptr->valid = 0;
++	width = GetWidth();
++	height = GetHeight();
++	//pixel_depth = (BYTE)GetBpp();
++	channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
++	bit_depth = (BYTE)(GetBpp()/channels);
+ 
+ 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
+ 	case 1:
+-		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
++		interlace_type = PNG_INTERLACE_ADAM7;
+ 		break;
+ 	default:
+-		info_ptr->interlace_type = PNG_INTERLACE_NONE;
++		interlace_type = PNG_INTERLACE_NONE;
+ 	}
+ 
+ 	/* set compression level */
+@@ -399,19 +402,19 @@
+ 
+ 	if (GetNumColors()){
+ 		if (bGrayScale){
+-			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++			color_type = PNG_COLOR_TYPE_GRAY;
+ 		} else {
+-			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++			color_type = PNG_COLOR_TYPE_PALETTE;
+ 		}
+ 	} else {
+-		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++		color_type = PNG_COLOR_TYPE_RGB;
+ 	}
+ #if CXIMAGE_SUPPORT_ALPHA
+ 	if (AlphaIsValid()){
+-		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+-		info_ptr->channels++;
+-		info_ptr->bit_depth = 8;
+-		info_ptr->pixel_depth += 8;
++		color_type |= PNG_COLOR_MASK_ALPHA;
++		channels++;
++		bit_depth = 8;
++		//pixel_depth += 8;
+ 	}
+ #endif
+ 
+@@ -428,29 +431,21 @@
+ 	/* set metrics */
+ 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
+ 
+-	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
+-				info_ptr->color_type, info_ptr->interlace_type,
++	png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
++				color_type, interlace_type,
+ 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	//<DP> simple transparency
+ 	if (info.nBkgndIndex >= 0){
+-		info_ptr->num_trans = 1;
+-		info_ptr->valid |= PNG_INFO_tRNS;
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-		info_ptr->trans_alpha = trans;
+-		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
+-		info_ptr->trans_color.red   = tc.rgbRed;
+-		info_ptr->trans_color.green = tc.rgbGreen;
+-		info_ptr->trans_color.blue  = tc.rgbBlue;
+-		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
+-#else
+-		info_ptr->trans = trans;
+-		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
+-		info_ptr->trans_values.red   = tc.rgbRed;
+-		info_ptr->trans_values.green = tc.rgbGreen;
+-		info_ptr->trans_values.blue  = tc.rgbBlue;
+-		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
+-#endif
++		png_color_16 trans_color;
++
++		trans_color.index = (BYTE)info.nBkgndIndex;
++		trans_color.red   = tc.rgbRed;
++		trans_color.green = tc.rgbGreen;
++		trans_color.blue  = tc.rgbBlue;
++		trans_color.gray  = (BYTE)info.nBkgndIndex;
++
++		png_set_tRNS(png_ptr, info_ptr, trans, 1, &trans_color);
+ 
+ 		// the transparency indexes start from 0 for non grayscale palette
+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
+@@ -459,30 +454,27 @@
+ 
+ 	/* set the palette if there is one */
+ 	if (GetPalette()){
+-		if (!bGrayScale){
+-			info_ptr->valid |= PNG_INFO_PLTE;
+-		}
+-
+ 		int nc = GetClrImportant();
+ 		if (nc==0) nc = GetNumColors();
+ 
+ 		if (info.bAlphaPaletteEnabled){
+ 			for(WORD ip=0; ip<nc;ip++)
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
+-			info_ptr->num_trans = (WORD)nc;
+-			info_ptr->valid |= PNG_INFO_tRNS;
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-			info_ptr->trans_alpha = trans;
+-#else
+-			info_ptr->trans = trans;
+-#endif
++			png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL);
+ 		}
+ 
+ 		// copy the palette colors
+-		info_ptr->palette = new png_color[nc];
+-		info_ptr->num_palette = (png_uint_16) nc;
+-		for (int i=0; i<nc; i++)
+-			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
++		if (!bGrayScale) {
++			png_color *palette;
++
++			palette = (png_color *)png_malloc(png_ptr, nc*sizeof(palette[0]));
++			for (int i=0; i<nc; i++)
++				GetPaletteColor(i, &palette[i].red, &palette[i].green, &palette[i].blue);
++			png_set_PLTE(png_ptr, info_ptr, palette, nc);
++			png_data_freer(png_ptr, info_ptr,
++				       PNG_DESTROY_WILL_FREE_DATA,
++				       PNG_FREE_PLTE);
++		}
+ 	}  
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+@@ -496,8 +488,8 @@
+ 	}	}	}
+ #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 
+-	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
+-	info_ptr->rowbytes = row_size;
++	int row_size = max(info.dwEffWidth, png_get_rowbytes(png_ptr, info_ptr));
++	//info_ptr->rowbytes = row_size;
+ 	BYTE *row_pointers = new BYTE[row_size];
+ 
+ 	/* write the file information */
+@@ -515,7 +507,7 @@
+ 			if (AlphaIsValid()){
+ 				for (long ax=head.biWidth-1; ax>=0;ax--){
+ 					c = BlindGetPixelColor(ax,ay);
+-					int px = ax * info_ptr->channels;
++					int px = ax * png_get_channels(png_ptr, info_ptr);
+ 					if (!bGrayScale){
+ 						row_pointers[px++]=c.rgbRed;
+ 						row_pointers[px++]=c.rgbGreen;
+@@ -530,7 +522,7 @@
+ #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			{
+ 				iter.GetRow(row_pointers, row_size);
+-				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
++				if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP
+ 					RGBtoBGR(row_pointers, row_size);
+ 				png_write_row(png_ptr, row_pointers);
+ 			}
+@@ -547,12 +539,6 @@
+ 	/* It is REQUIRED to call this to finish writing the rest of the file */
+ 	png_write_end(png_ptr, info_ptr);
+ 
+-	/* if you malloced the palette, free it here */
+-	if (info_ptr->palette){
+-		delete [] (info_ptr->palette);
+-		info_ptr->palette = NULL;
+-	}
+-
+ 	/* clean up after the write, and free any memory allocated */
+ 	png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
+ 
+--- utils/TkCximage/src/CxImage/ximapng.h
++++ utils/TkCximage/src/CxImage/ximapng.h
+@@ -64,8 +64,8 @@
+ 
+     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ 	{
+-		strncpy((char*)png_ptr->error_ptr,error_msg,255);
+-		longjmp(png_ptr->jmpbuf, 1);
++		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ };
+ 
diff --git a/community-testing/amsn/amsn-0.98.4-v4l2.patch b/community-testing/amsn/amsn-0.98.4-v4l2.patch
new file mode 100644
index 000000000..815a6ad19
--- /dev/null
+++ b/community-testing/amsn/amsn-0.98.4-v4l2.patch
@@ -0,0 +1,33 @@
+Add support for v4l2 on Linux so it can compile against modern
+kernel headers. #363201
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -382,6 +382,10 @@
+ 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
+ fi
+ 
++if test "$FOUND_OS" = "linux"; then
++    AC_CHECK_HEADERS(linux/videodev2.h)
++fi
++
+ #---------------------------------------------------------------------------------------------
+ 
+ dnl ---------------------------------------------------------------------
+--- utils/linux/capture/capture.h
++++ utils/linux/capture/capture.h
+@@ -33,7 +33,11 @@
+ #ifdef HAVE_SYS_VIDEODEV2_H
+ #   include <sys/videodev2.h>
+ #else
+-#   include <linux/videodev.h>
++	#ifdef HAVE_LINUX_VIDEODEV2_H
++		#include <linux/videodev2.h>
++	#else
++		#include <linux/videodev.h>
++	#endif
+ #endif
+ 
+ #include "grab-ng.h"
diff --git a/community-testing/amsn/amsn-jpeg7.patch b/community-testing/amsn/amsn-jpeg7.patch
new file mode 100644
index 000000000..d9c9f103d
--- /dev/null
+++ b/community-testing/amsn/amsn-jpeg7.patch
@@ -0,0 +1,10 @@
+--- utils/TkCximage/src/CxImage/ximajpg.cpp.orig	2009-07-18 05:29:43.000000000 -0300
++++ utils/TkCximage/src/CxImage/ximajpg.cpp	2009-07-18 05:30:31.000000000 -0300
+@@ -142,6 +142,7 @@
+  */ //</DP>
+ 
+ 	// Set the scale <ignacio>
++        SetJpegScale(8); // Set an initial value (FIX for jpeg-7)
+ 	cinfo.scale_denom = GetJpegScale();
+ 
+ 	// Borrowed the idea from GIF implementation <ignacio>
diff --git a/community-testing/amsn/amsn-libpng14.patch b/community-testing/amsn/amsn-libpng14.patch
new file mode 100644
index 000000000..8b6e8a05d
--- /dev/null
+++ b/community-testing/amsn/amsn-libpng14.patch
@@ -0,0 +1,64 @@
+--- utils/TkCximage/src/CxImage/ximapng.cpp	2008-03-07 20:14:37.000000000 +0100
++++ utils/TkCximage/src/CxImage/ximapng.cpp_fixed	2010-01-28 23:08:13.000000000 +0100
+@@ -142,9 +142,9 @@
+ 	if (info_ptr->num_trans!=0){ //palette transparency
+ 		if (info_ptr->num_trans==1){
+ 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+-				info.nBkgndIndex = info_ptr->trans_values.index;
++				info.nBkgndIndex = info_ptr->trans_color.index;
+ 			} else{
+-				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
++				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+ 			}
+ 		}
+ 		if (info_ptr->num_trans>1){
+@@ -152,7 +152,7 @@
+ 			if (pal){
+ 				DWORD ip;
+ 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+-					pal[ip].rgbReserved=info_ptr->trans[ip];
++					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+ 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
+ 					pal[ip].rgbReserved=255;
+ 				}
+@@ -166,9 +166,9 @@
+ 		int num_trans;
+ 		png_color_16 *image_background;
+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
++			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
++			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
++			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
+ 			info.nBkgndColor.rgbReserved = 0;
+ 			info.nBkgndIndex = 0;
+ 		}
+@@ -417,12 +417,12 @@
+ 	if (info.nBkgndIndex >= 0){
+ 		info_ptr->num_trans = 1;
+ 		info_ptr->valid |= PNG_INFO_tRNS;
+-		info_ptr->trans = trans;
+-		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
+-		info_ptr->trans_values.red   = tc.rgbRed;
+-		info_ptr->trans_values.green = tc.rgbGreen;
+-		info_ptr->trans_values.blue  = tc.rgbBlue;
+-		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
++		info_ptr->trans_alpha = trans;
++		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
++		info_ptr->trans_color.red   = tc.rgbRed;
++		info_ptr->trans_color.green = tc.rgbGreen;
++		info_ptr->trans_color.blue  = tc.rgbBlue;
++		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
+ 
+ 		// the transparency indexes start from 0 for non grayscale palette
+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
+@@ -443,7 +443,7 @@
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
+ 			info_ptr->num_trans = (WORD)nc;
+ 			info_ptr->valid |= PNG_INFO_tRNS;
+-			info_ptr->trans = trans;
++			info_ptr->trans_alpha = trans;
+ 		}
+ 
+ 		// copy the palette colors
diff --git a/community-testing/amsn/amsn.changelog b/community-testing/amsn/amsn.changelog
new file mode 100644
index 000000000..8dab097ad
--- /dev/null
+++ b/community-testing/amsn/amsn.changelog
@@ -0,0 +1,8 @@
+2010-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.98.4
+
+2010-03-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to major release 0.98.3
+
+2009-07-26  Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* FS#15542 fixed in 0.97.2-14
diff --git a/community-testing/mtpaint/PKGBUILD b/community-testing/mtpaint/PKGBUILD
index 60112debb..de75fbc17 100644
--- a/community-testing/mtpaint/PKGBUILD
+++ b/community-testing/mtpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63206 2012-01-30 19:02:55Z ibiru $
+# $Id: PKGBUILD 63382 2012-01-31 23:18:34Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
diff --git a/community-testing/rawtherapee/PKGBUILD b/community-testing/rawtherapee/PKGBUILD
index 9ecd715fb..c189b5d62 100644
--- a/community-testing/rawtherapee/PKGBUILD
+++ b/community-testing/rawtherapee/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 63266 2012-01-30 19:06:52Z ibiru $
+# $Id: PKGBUILD 63357 2012-01-31 10:21:09Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.6
-pkgrel=2
+pkgver=4.0.7
+pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
 url="http://www.rawtherapee.com/"
-license=('GPL')
-depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
+license=('GPL3')
+depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
 source=()
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index be3e3c257..e1dfd351c 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62171 2012-01-17 08:26:12Z giovanni $
+# $Id: PKGBUILD 63386 2012-02-01 00:49:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.4.8
+pkgver=0.4.9
 pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('65cdb89445a3063b9c8362b411d3e3ef')
+md5sums=('81e6a717a020266f161d33980110a4f1')
 
 build() {
   cd "${srcdir}"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 967663b78..480f9a3f0 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 57063 2011-10-20 05:50:26Z ibiru $
-#Maintainer:  Ionut Biru <ibiru@archlinux.org>
-#Contributor: Hugo Doria <hugo@archlinux.org>
-#Contributor: Sergej Chodarev <sergejx@centrum.sk>
-#Contributor: zhuqin <zhuqin83@gmail.com>
+# $Id: PKGBUILD 63362 2012-01-31 11:48:17Z arodseth $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: Sergej Chodarev <sergejx@centrum.sk>
+# Contributor: zhuqin <zhuqin83@gmail.com>
 
 pkgname=gedit-plugins
 pkgver=3.2.1
-pkgrel=1
-pkgdesc="Set of plugins for gedit"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc="Plugins for gedit"
+arch=('x86_64' 'i686')
 license=('GPL')
 url="http://live.gnome.org/GeditPlugins"
 depends=('gedit' 'dbus-python')
-optdepends=('gucharmap: for charmap plugin')
+optdepends=('gucharmap: for charmap plugin'
+            'vte3: for embedded terminal')
 makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!emptydirs')
 install=gedit-plugins.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz)
+source=("ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz")
 sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \
       --disable-schemas-compile
-
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR=$pkgdir install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD
index 9b37571a5..127c4256a 100644
--- a/community/par2cmdline/PKGBUILD
+++ b/community/par2cmdline/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 62520 2012-01-20 16:52:42Z seblu $
+# $Id: PKGBUILD 63354 2012-01-31 06:44:37Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgname=par2cmdline
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc='A PAR 2.0 compatible file verification and repair tool'
 url='https://github.com/BlackIkeEagle/par2cmdline'
 license=('GPL2')
 arch=('i686' 'x86_64')
 source=("https://github.com/downloads/BlackIkeEagle/$pkgname/$pkgname-$pkgver.tar.xz")
-md5sums=('708db095eac3d83f21ce27b8be123c54')
+md5sums=('96b4fb91859c0214d2c562636abea3af')
 
 build() {
 	cd ${pkgname}-${pkgver}
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 8da7cbee6..b065622ff 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142199 2011-11-06 05:47:47Z bisson $
+# $Id: PKGBUILD 148436 2012-01-31 20:35:00Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
-pkgver=1.4.12.1
-pkgrel=2
+pkgver=1.4.12.2
+pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -24,7 +24,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta
         empty-raw.rules
         empty-security.rules)
 backup=(etc/conf.d/iptables)
-sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728'
+sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c'
           '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
           '2db68906b603e5268736f48c8e251f3a49da1d75'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
@@ -49,13 +49,19 @@ build() {
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
      --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel --enable-libipq
+     --enable-devel --enable-libipq \
+     --enable-shared --enable-static 
+# build fails when not enabling static, see if we can remove it on next build
 
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  unset CFLAGS
+  unset LDFLAGS
+
   make DESTDIR="${pkgdir}" install
 
   cd "${srcdir}"
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 9a160f365..024c5d1a4 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141376 2011-10-30 06:48:48Z allan $
+# $Id: PKGBUILD 148401 2012-01-31 11:16:55Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sudo
-_ver=1.8.3p1
+_ver=1.8.3p2
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
+pkgrel=2
 pkgdesc="Give certain users the ability to run some commands as root"
 arch=('i686' 'x86_64')
 url="http://www.sudo.ws/sudo/"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
 options=('!libtool' '!makeflags')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
         sudo.pam)
-md5sums=('7becc572fa97f94cf721a2ee8299c45b'
-         'b0726a25694fb2cdd5e1c146eb024e9c'
+md5sums=('6d4282a1530c541f7900fa8dfcf2a882'
+         '07e3c5c79d78db50674d5ad17963d631'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
@@ -32,6 +32,8 @@ package() {
   install -dm755 "$pkgdir/var/lib"
 
   make DESTDIR="$pkgdir" install
+  chmod 755 $pkgdir/var/db
+
   install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
 
   install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 85be39214..7b3d060c2 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147273 2012-01-25 16:27:42Z tomegun $
+# $Id: PKGBUILD 148430 2012-01-31 19:55:52Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
-pkgver=179
+pkgver=180
 pkgrel=1
 arch=(i686 x86_64)
 url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
@@ -99,4 +99,4 @@ package_udev-compat() {
   mknod cpu/microcode c 10 184
   
 }
-md5sums=('7d2880f66ea39146aae928f19ff3ca09')
+md5sums=('1cf124ab5a124ea35d4748ea414926ec')
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index d1f16c1b2..615e9911e 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -1,26 +1,19 @@
-# $Id: PKGBUILD 135916 2011-08-20 07:14:14Z allan $
+# $Id: PKGBUILD 148444 2012-01-31 23:47:55Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.5
-pkgrel=4
+pkgver=1.2.6
+pkgrel=1
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.zlib.net/"
 depends=('glibc')
-options=('!makeflags')
-source=("http://zlib.net/zlib-${pkgver}.tar.gz"
-        'zlib-1.2.5-lfs-decls.patch')
-md5sums=('c735eab2d659a96e5a594c9e8541ad63'
-         '4cb279ea3beab621f3526bf7b7ab99e5')
+source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
+md5sums=('618e944d7c7cd6521551e30b32322f4a')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver
-	# see http://bugs.archlinux.org/task/19280
-	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
-	# work around gcc bug; see https://bugs.archlinux.org/task/20647
-	export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
 	./configure --prefix=/usr
 	make
 
@@ -29,7 +22,7 @@ build() {
 
 check() {
 	cd ${srcdir}/zlib-$pkgver
-	make check
+	make test
 }
 
 package() {
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index c8d527923..94a693017 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 142273 2011-11-07 19:57:07Z ibiru $
+# $Id: PKGBUILD 148405 2012-01-31 12:11:47Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.8.2
-pkgrel=2
+pkgver=1.8.4
+pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
-depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi')
+depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
 makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fallback.patch::http://git.gnome.org/browse/clutter/patch/?id=f05432d57e5e980d0841fd6c13a7f886a46107fe)
-sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f'
-            '30c3c1dfdf1c74e8a7dc2cc6eac305127b7441504cb7040b7cf8d46a4b67fdd9')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/fallback.patch
   ./configure --prefix=/usr --enable-introspection
   make
 }
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
index ddaf0d307..b891651d3 100644
--- a/extra/gnome-games/PKGBUILD
+++ b/extra/gnome-games/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140893 2011-10-20 05:42:40Z ibiru $
+# $Id: PKGBUILD 148440 2012-01-31 22:33:21Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-games
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,11 +13,14 @@ options=('!emptydirs' '!libtool')
 install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gnome-sudoku-fix.patch)
+sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b'
+            '00daafd11078355e16f384fe98dab69ee7e03037c8c311e7180f8f896965a715')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/gnome-sudoku-fix.patch"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper \
       --disable-static \
@@ -27,15 +30,15 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
   # Remove all scores, we generate them from postinstall
-  rm -rf "${pkgdir}/var"
+  rm -rf "$pkgdir/var"
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-games "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku
+  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
 }
diff --git a/extra/gnome-games/gnome-sudoku-fix.patch b/extra/gnome-games/gnome-sudoku-fix.patch
new file mode 100644
index 000000000..ec29f34ab
--- /dev/null
+++ b/extra/gnome-games/gnome-sudoku-fix.patch
@@ -0,0 +1,29 @@
+From 8ab5a3a28281e6b1b649d9ef93628b3433ddd887 Mon Sep 17 00:00:00 2001
+From: John (J5) Palmieri <johnp@redhat.com>
+Date: Mon, 02 Jan 2012 18:39:05 +0000
+Subject: fix type check so gnome-sudoku works with pygobject >= 3.0.3
+
+gnome-sudoku was using if type(grid) == str to check if it needed
+to convert the game board to a list.  Unicode fixes in the latest
+pygobject returns unicode strings for any string stored in a
+TreeStore. The fix was to correctly check for any string using
+isinstance(grid, basestring)
+
+Note this will not work in python3 so needs to be looked at when
+porting
+---
+diff --git a/gnome-sudoku/src/lib/sudoku.py b/gnome-sudoku/src/lib/sudoku.py
+index a345593..7d28608 100644
+--- a/gnome-sudoku/src/lib/sudoku.py
++++ b/gnome-sudoku/src/lib/sudoku.py
+@@ -130,7 +130,7 @@ class SudokuGrid(object):
+         for n, col in enumerate([[(x, y) for y in range(self.group_size)] for x in range(self.group_size)]):
+             self.col_coords[n] = col
+         if grid:
+-            if type(grid) == str:
++            if isinstance(grid, basestring):
+                 g = re.split("\s+", grid)
+                 side = int(math.sqrt(len(g)))
+                 grid = []
+--
+cgit v0.9.0.2
diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD
index b4cdf8f55..89ff4ecaa 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143091 2011-11-22 18:13:16Z ibiru $
+# $Id: PKGBUILD 148403 2012-01-31 11:38:44Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libepc
-pkgver=0.4.3
+pkgver=0.4.4
 pkgrel=1
 pkgdesc="Easy Publish and Consume Library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3' 'avahi' 'libsoup')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('57303bc180ef1447e060a64590fd359365390e14a90dddc8b8af8d3a6551e454')
+sha256sums=('4f98fc306c0f9d361e1381484744246efd084053732924741078270c49afc33b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index c44222970..242f0a1e3 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146502 2012-01-12 07:42:48Z giovanni $
+# $Id: PKGBUILD 148407 2012-01-31 13:31:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.01.07
+pkgver=2012.01.26
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('416375892db282da88fdc7f7a3f2385f')
+md5sums=('db7f0658583b590fb3d4044935f48b8e')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 5b148762b..ec7178126 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 147967 2012-01-29 09:41:58Z ronald $
+# $Id: PKGBUILD 148432 2012-01-31 20:05:46Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
-pkgver=4.0.5
+pkgver=4.0.6
 pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ makedepends=('pkg-config')
 install=miro.install
 options=('!makeflags')
 source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1921357026df1092284a572ffe9c75ae32ec313f')
+sha1sums=('5c3d632d8cf30516b321f79b22d4468b61ff9e6c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index ab2ffd7bc..2a21d88ce 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 146479 2012-01-11 15:22:30Z stephane $
+# $Id: PKGBUILD 148446 2012-02-01 03:47:09Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.8.7
-pkgrel=2
+pkgver=2.9.0
+pkgrel=1
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
@@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
         'aliases.patch' \
         'rc.d')
-sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0'
+sha1sums=('a04a72a8b9436279a30b7d1b62197be63124a132'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
@@ -58,7 +58,6 @@ package() {
 
 	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	cd "${pkgdir}"
-	patch -p0 -i "${srcdir}"/aliases.patch
+	sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
+	cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
 }
diff --git a/extra/postfix/install b/extra/postfix/install
index c276e0919..cb97e2e6c 100644
--- a/extra/postfix/install
+++ b/extra/postfix/install
@@ -18,10 +18,9 @@ post_install() {
 post_upgrade() {
 	post_install
 
-	if [ `vercmp $2 2.8.3` = -1 ]; then cat <<EOF
+	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
 
-==> You must now execute "/etc/rc.d/postfix reload" (or restart).
-==> This is needed because of an inter-daemon protocol change.
+==> You must now run "postfix reload" due to inter-daemon protocol change.
 
 EOF
 	fi
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 0b203d599..c4b30f982 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 142774 2011-11-15 00:48:27Z eric $
+# $Id: PKGBUILD 148448 2012-02-01 04:14:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
 pkgver=5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64')
 url="http://racket-lang.org/"
 license=('LGPL')
 depends=('gtk2' 'desktop-file-utils')
 makedepends=('gsfonts')
-options=('!strip')
+options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
@@ -19,7 +19,8 @@ sha1sums=('f88007c12d7e5f2773b122d3652c8cd1d15da8c3'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
-  ./configure --prefix=/usr
+  [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC"
+  ./configure --prefix=/usr --enable-shared
   make
 }
 
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
index 187d12948..0b113c93a 100644
--- a/extra/ristretto/PKGBUILD
+++ b/extra/ristretto/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146669 2012-01-16 05:44:36Z eric $
+# $Id: PKGBUILD 148434 2012-01-31 20:33:48Z ronald $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ristretto
-pkgver=0.3.2
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="A fast and lightweight picture-viewer for Xfce"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 groups=('xfce4-goodies')
 install=ristretto.install
 source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha1sums=('3ca49cd2ffa21d5a7ce3bd5dad87ff78c4898add')
+sha1sums=('7da6c287c45949193fd6046e82a099fd0469278c')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 3187681ea..89c7b8b28 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145719 2011-12-28 18:26:36Z ibiru $
+# $Id: PKGBUILD 148399 2012-01-31 11:14:02Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.6.10
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64')
@@ -13,13 +13,17 @@ url="http://smplayer.sourceforge.net/"
 license=('GPL')
 depends=('qt' 'mplayer')
 install=smplayer.install
-source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9f5ee3319bebc0ed5efe636cf7f0efad')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('e39ba5b54e6218d411ecd296002d77bb')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
   make PREFIX=/usr
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make PREFIX=${pkgdir}/usr install
 }
 
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index a8bc6ad19..5fbf6a990 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143889 2011-11-30 17:59:28Z heftig $
+# $Id: PKGBUILD 148412 2012-01-31 15:56:29Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.14.1
+pkgver=0.14.2
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64')
@@ -12,16 +12,16 @@ license=('LGPL')
 depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bef8c803e6e84d6dd2c6e771b72245ae268f49f554f3d00b2c4a0b7a28f4a439')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.14/$pkgname-$pkgver.tar.xz)
+sha256sums=('807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0')
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "$srcdir/$pkgname-$pkgver"
     ./configure --prefix=/usr --enable-vapigen
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index a074d16fd..af2fc76ef 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141039 2011-10-22 08:26:43Z andyrtr $
+# $Id: PKGBUILD 148450 2012-02-01 04:56:04Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.2
+pkgver=0.5.4.3
 pkgrel=1
-pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
+pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
@@ -13,11 +13,11 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b79f7c65f8155cb77d99dcf9716bb38b')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 57ff8cae3..767b5e1d1 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -9,7 +9,7 @@ license=('GPL3')
 groups=('base')
 install=${pkgname}.install
 source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt)
-md5sums=('707ba4c6ba76fb3fed35c70103f269cb')
+md5sums=('bfb788afe8386c24116d44827329f3d4')
 
 build() {
     cd ${srcdir}
diff --git a/multilib/lib32-zlib/PKGBUILD b/multilib/lib32-zlib/PKGBUILD
index a72223ae3..4d7d57011 100644
--- a/multilib/lib32-zlib/PKGBUILD
+++ b/multilib/lib32-zlib/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 35298 2010-12-18 01:45:49Z heftig $
+# $Id: PKGBUILD 63384 2012-01-31 23:48:40Z pschmitz $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 _pkgbasename=zlib
 pkgname=lib32-$_pkgbasename
-pkgver=1.2.5
-pkgrel=6
+pkgver=1.2.6
+pkgrel=1
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
 arch=('x86_64')
 license=('custom')
 url="http://www.zlib.net/"
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!makeflags')
-source=("http://zlib.net/zlib-${pkgver}.tar.gz"
-        'zlib-1.2.5-lfs-decls.patch')
-md5sums=('c735eab2d659a96e5a594c9e8541ad63'
-         '4cb279ea3beab621f3526bf7b7ab99e5')
+depends=('lib32-glibc' "$_pkgbasename")
+makedepends=('gcc-multilib')
+source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
+md5sums=('618e944d7c7cd6521551e30b32322f4a')
 
 build() {
 	export CC="gcc -m32"
@@ -24,14 +21,14 @@ build() {
 	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
 	cd ${srcdir}/zlib-$pkgver
-	# see http://bugs.archlinux.org/task/19280
-	patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
-	# work around gcc bug; see https://bugs.archlinux.org/task/20647
-	export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
 	./configure --prefix=/usr \
-          --libdir=/usr/lib32
+		--libdir=/usr/lib32
 	make
-	make check
+}
+
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make test -j 1
 }
 
 package() {
diff --git a/staging/mtpaint/PKGBUILD b/staging/mtpaint/PKGBUILD
index 71ed9d9f9..50049b123 100644
--- a/staging/mtpaint/PKGBUILD
+++ b/staging/mtpaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62290 2012-01-19 00:25:09Z arodseth $
+# $Id: PKGBUILD 63381 2012-01-31 21:35:06Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
diff --git a/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch b/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
new file mode 100644
index 000000000..b69d095d3
--- /dev/null
+++ b/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
@@ -0,0 +1,34 @@
+From cdaf4b2f3ef60365c6b8006a63410368a7b38f39 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 31 Jan 2012 00:12:32 -0500
+Subject: [PATCH 1/4] partially fix parsing of alias with dots
+
+---
+ libkmod/libkmod-util.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
+index 7c2611b..6a9f697 100644
+--- a/libkmod/libkmod-util.c
++++ b/libkmod/libkmod-util.c
+@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
+ 		case ']':
+ 			return -EINVAL;
+ 		case '[':
+-			while (alias[s] != ']' &&
+-					alias[s] != '.' && alias[s] != '\0')
++			while (alias[s] != ']' && alias[s] != '\0')
+ 				s++;
+ 
+ 			if (alias[s] != ']')
+@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
+ 			s++;
+ 			break;
+ 		case '\0':
+-		case '.':
+ 			goto finish;
+ 		default:
+ 			buf[s] = c;
+-- 
+1.7.9
+
diff --git a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
new file mode 100644
index 000000000..76cc35049
--- /dev/null
+++ b/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
@@ -0,0 +1,196 @@
+From 1d2f64689b2456ade81d6d489c4f5bfb5fdb92fd Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 31 Jan 2012 00:13:43 -0500
+Subject: [PATCH 2/4] libkmod-module: used shared code in module creation
+
+---
+ libkmod/libkmod-module.c |  135 ++++++++++++++++++++++++++-------------------
+ 1 files changed, 78 insertions(+), 57 deletions(-)
+
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 47b1709..48e4aa1 100644
+--- a/libkmod/libkmod-module.c
++++ b/libkmod/libkmod-module.c
+@@ -162,6 +162,76 @@ fail:
+ 	return err;
+ }
+ 
++/*
++ * Memory layout with alias:
++ *
++ * struct kmod_module {
++ *        hashkey -----.
++ *        alias -----. |
++ *        name ----. | |
++ * }               | | |
++ * name <----------' | |
++ * alias <-----------' |
++ * name\alias <--------'
++ *
++ * Memory layout without alias:
++ *
++ * struct kmod_module {
++ *        hashkey ---.
++ *        alias -----|----> NULL
++ *        name ----. |
++ * }               | |
++ * name <----------'-'
++ *
++ * @key is "name\alias" or "name" (in which case alias == NULL)
++ */
++static int kmod_module_new(struct kmod_ctx *ctx, const char *key,
++				const char *name, size_t namelen,
++				const char *alias, size_t aliaslen,
++				struct kmod_module **mod)
++{
++	struct kmod_module *m;
++	size_t keylen;
++
++	m = kmod_pool_get_module(ctx, key);
++	if (m != NULL) {
++		*mod = kmod_module_ref(m);
++		return 0;
++	}
++
++	if (alias == NULL)
++		keylen = namelen;
++	else
++		keylen = namelen + aliaslen + 1;
++
++	m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1));
++	if (m == NULL) {
++		free(m);
++		return -ENOMEM;
++	}
++
++	memset(m, 0, sizeof(*m));
++
++	m->ctx = kmod_ref(ctx);
++	m->name = (char *)m + sizeof(*m);
++	memcpy(m->name, key, keylen + 1);
++	if (alias == NULL) {
++		m->hashkey = m->name;
++		m->alias = NULL;
++	} else {
++		m->name[namelen] = '\0';
++		m->alias = m->name + namelen + 1;
++		m->hashkey = m->name + keylen + 1;
++		memcpy(m->hashkey, key, keylen + 1);
++	}
++
++	m->refcount = 1;
++	kmod_pool_add_module(ctx, m, m->hashkey);
++	*mod = m;
++
++	return 0;
++}
++
+ /**
+  * kmod_module_new_from_name:
+  * @ctx: kmod library context
+@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
+ 						const char *name,
+ 						struct kmod_module **mod)
+ {
+-	struct kmod_module *m;
+ 	size_t namelen;
+ 	char name_norm[PATH_MAX];
+-	char *namesep;
+ 
+ 	if (ctx == NULL || name == NULL || mod == NULL)
+ 		return -ENOENT;
+ 
+-	if (alias_normalize(name, name_norm, &namelen) < 0) {
+-		DBG(ctx, "invalid alias: %s\n", name);
+-		return -EINVAL;
+-	}
++	modname_normalize(name, name_norm, &namelen);
+ 
+-	m = kmod_pool_get_module(ctx, name_norm);
+-	if (m != NULL) {
+-		*mod = kmod_module_ref(m);
+-		return 0;
+-	}
+-
+-	namesep = strchr(name_norm, '/');
+-	m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2);
+-	if (m == NULL) {
+-		free(m);
+-		return -ENOMEM;
+-	}
+-
+-	memset(m, 0, sizeof(*m));
+-
+-	m->ctx = kmod_ref(ctx);
+-	m->name = (char *)m + sizeof(*m);
+-	memcpy(m->name, name_norm, namelen + 1);
+-
+-	if (namesep) {
+-		size_t len = namesep - name_norm;
+-
+-		m->name[len] = '\0';
+-		m->alias = m->name + len + 1;
+-		m->hashkey = m->name + namelen + 1;
+-		memcpy(m->hashkey, name_norm, namelen + 1);
+-	} else {
+-		m->hashkey = m->name;
+-	}
+-
+-	m->refcount = 1;
+-	kmod_pool_add_module(ctx, m, m->hashkey);
+-	*mod = m;
+-
+-	return 0;
++	return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod);
+ }
+ 
+ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
+@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
+ 
+ 	memcpy(key, name, namelen);
+ 	memcpy(key + namelen + 1, alias, aliaslen + 1);
+-	key[namelen] = '/';
++	key[namelen] = '\\';
+ 
+-	err = kmod_module_new_from_name(ctx, key, mod);
++	err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod);
+ 	if (err < 0)
+ 		return err;
+ 
+@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
+ 			free(abspath);
+ 		else {
+ 			ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n",
+-									name, abspath, m->path);
++							name, abspath, m->path);
+ 			free(abspath);
+ 			return -EEXIST;
+ 		}
+@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
+ 		return 0;
+ 	}
+ 
+-	m = malloc(sizeof(*m) + namelen + 1);
+-	if (m == NULL)
+-		return -errno;
+-
+-	memset(m, 0, sizeof(*m));
++	err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
++	if (err < 0)
++		return err;
+ 
+-	m->ctx = kmod_ref(ctx);
+-	m->name = (char *)m + sizeof(*m);
+-	memcpy(m->name, name, namelen + 1);
+ 	m->path = abspath;
+-	m->hashkey = m->name;
+-	m->refcount = 1;
+-
+-	kmod_pool_add_module(ctx, m, m->hashkey);
+-
+ 	*mod = m;
+ 
+ 	return 0;
+-- 
+1.7.9
+
diff --git a/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch b/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
new file mode 100644
index 000000000..5bbc93a90
--- /dev/null
+++ b/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
@@ -0,0 +1,34 @@
+From fdf78d80d298353c29e1fe8c00602669dd9662bb Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 30 Jan 2012 23:05:26 -0500
+Subject: [PATCH 3/4] modprobe: handle all error returns from init_module
+
+---
+ tools/kmod-modprobe.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 3e51506..c882856 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -551,6 +551,8 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
+ 
+ 	err = kmod_module_insert_module(mod, flags, opts);
+ 	switch (err) {
++	case 0:
++		break;
+ 	case -EEXIST:
+ 		/*
+ 		 * We checked for EEXIST with an earlier call to
+@@ -564,7 +566,7 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
+ 			ERR("Module %s already in kernel.\n",
+ 					kmod_module_get_name(mod));
+ 		break;
+-	case -EPERM:
++	default:
+ 		ERR("could not insert '%s': %s\n", kmod_module_get_name(mod),
+ 				strerror(-err));
+ 		break;
+-- 
+1.7.9
+
diff --git a/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch b/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch
new file mode 100644
index 000000000..80cc73130
--- /dev/null
+++ b/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch
@@ -0,0 +1,52 @@
+From 4e3dd21aff55b5bbaa08b037fc2a5625bfffc0a5 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 30 Jan 2012 23:39:30 -0500
+Subject: [PATCH 4/4] modprobe: remove 0 refcnt deps
+
+---
+ tools/kmod-modprobe.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index c882856..bd991a5 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -381,7 +381,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
+ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
+ {
+ 	const char *modname = kmod_module_get_name(mod);
+-	struct kmod_list *pre = NULL, *post = NULL;
++	struct kmod_list *pre = NULL, *post = NULL, *deps, *itr;
+ 	const char *cmd = NULL;
+ 	int err;
+ 
+@@ -422,7 +422,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
+ 	rmmod_do_deps_list(post, false);
+ 
+ 	if (do_dependencies && remove_dependencies) {
+-		struct kmod_list *deps = kmod_module_get_dependencies(mod);
++		deps = kmod_module_get_dependencies(mod);
+ 
+ 		err = rmmod_do_deps_list(deps, true);
+ 		if (err < 0)
+@@ -451,6 +451,17 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
+ 
+ 	rmmod_do_deps_list(pre, false);
+ 
++	deps = kmod_module_get_dependencies(mod);
++	if (deps != NULL) {
++		kmod_list_foreach_reverse(itr, deps) {
++			struct kmod_module *dep = kmod_module_get_module(itr);
++			if (kmod_module_get_refcnt(dep) == 0)
++				rmmod_do_remove_module(dep);
++			kmod_module_unref(dep);
++		}
++		kmod_module_unref_list(deps);
++	}
++
+ error:
+ 	kmod_module_unref_list(pre);
+ 	kmod_module_unref_list(post);
+-- 
+1.7.9
+
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
index 34983beaf..b1566507b 100644
--- a/testing/kmod/PKGBUILD
+++ b/testing/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146697 2012-01-16 19:19:27Z dreisner $
+# $Id: PKGBUILD 148396 2012-01-31 05:23:46Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
 pkgver=4
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url="http://git.profusion.mobi/cgit.cgi/kmod.git"
@@ -15,13 +15,26 @@ provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
+        0001-partially-fix-parsing-of-alias-with-dots.patch
+        0002-libkmod-module-used-shared-code-in-module-creation.patch
+        0003-modprobe-handle-all-error-returns-from-init_module.patch
+        0004-modprobe-remove-0-refcnt-deps.patch
         "depmod-search.conf")
 md5sums=('e14450a066a48accd0af1995b3c0232d'
+         '5f497ab3466ee1a616b6e6c97b330706'
+         '23a9257a152862753ce4c4ee7287761a'
+         '3a57671b0f37b1203b207f35a4442ae3'
+         '1fe88eee9302104b179124ce6bfc55d2'
          '4b8cbcbc54b9029c99fd730e257d4436')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  patch -Np1 <"$srcdir/0001-partially-fix-parsing-of-alias-with-dots.patch"
+  patch -Np1 <"$srcdir/0002-libkmod-module-used-shared-code-in-module-creation.patch"
+  patch -Np1 <"$srcdir/0003-modprobe-handle-all-error-returns-from-init_module.patch"
+  patch -Np1 <"$srcdir/0004-modprobe-remove-0-refcnt-deps.patch"
+
   ./configure \
     --sysconfdir=/etc \
     --with-rootprefix= \
diff --git a/testing/openjdk6/PKGBUILD b/testing/openjdk6/PKGBUILD
index 0bb30bbbd..2df623d78 100644
--- a/testing/openjdk6/PKGBUILD
+++ b/testing/openjdk6/PKGBUILD
@@ -1,50 +1,48 @@
-# $Id: PKGBUILD 148249 2012-01-30 18:49:15Z ibiru $
+# $Id: PKGBUILD 148420 2012-01-31 18:28:42Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 _javaver=6
-_icedteaver=1.10.5
-_openjdk_version=b22
-_openjdk_date=28_feb_2011
+_icedteaver=1.11
+_openjdk_version=b24
+_openjdk_date=14_nov_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
 makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'libxt' 'nss'
+	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' 
 	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6')
 options=('!emptydirs') # 'force') # force needed for hg shots
 source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_01.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+	http://icedtea.classpath.org/download/drops/jaxp144_03.zip
+	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
 	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
 	openjdk6.profile
-	openjdk6.profile.csh
-    glibc2_15.diff)
+	openjdk6.profile.csh)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_01.zip
-	jdk6-jaxws-b20.zip
+	jaxp144_03.zip
+	jdk6-jaxws2_1_6-2011_06_13.zip
 	jdk6-jaf-b20.zip)
-md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
-         '2d2bbbb0f9b81f1fec41ec730da8a933'
-         'ef7a8b3624ea904bf584bc46d79b5e75'
-         '91adfd41e6f001add4f92ae31216b1e3'
+md5sums=('10c1cea1d24c064572abfe9687567948'
+         '0eabdd360169144336e50081b8d01001'
+         '9eea471ad474040265c688858fcf09aa'
+         '8fd91b09b643a19a912b8a75e7a7a9d5'
          'bc95c133620bd68c161cac9891592901'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
          'ee1afda124d5927345014ab382ef581e'
          '9b4d368f5ee08de248eaf029303a446c'
          '74c4a7adc782edd087802bf92ae3d6d0'
-         'fdf295e2f186dfa4d308691a3d7ac8c5'
-         '0c8f0a398c88f85e0db44b4417562cf3')
+         'fdf295e2f186dfa4d308691a3d7ac8c5')
 
 build() {
 
@@ -64,18 +62,17 @@ build() {
 
   autoreconf -i
 
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/glibc2_15.diff"
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
   unset MAKEFLAGS
 
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+	--with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
+  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
 	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
 	--disable-bootstrap
   LD_PRELOAD="" make 
diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD
index ca0d40d38..a42ce8523 100644
--- a/testing/run-parts/PKGBUILD
+++ b/testing/run-parts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 148045 2012-01-30 14:42:46Z pierre $
+# $Id: PKGBUILD 148442 2012-01-31 23:41:09Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=run-parts
-pkgver=4.2
+pkgver=4.2.1
 pkgrel=1
 pkgdesc='run scripts or programs in a directory'
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url='http://packages.qa.debian.org/d/debianutils.html'
 license=('GPL')
 depends=('glibc')
 source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz")
-sha256sums=('14f76d82d413d3b5d302b3a06e132dea5bb834bf3d699c1f79cfb5c1af49a95d')
+sha256sums=('6359b273bee9b959d243d1490caa8f0f5ff8dc294690b1bdb5df755d6364be0f')
 
 build() {
 	cd $srcdir/debianutils-$pkgver
diff --git a/testing/xulrunner/PKGBUILD b/testing/xulrunner/PKGBUILD
index 646cfa715..bac8ddd72 100644
--- a/testing/xulrunner/PKGBUILD
+++ b/testing/xulrunner/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 148367 2012-01-30 18:52:22Z ibiru $
+# $Id: PKGBUILD 148425 2012-01-31 19:04:34Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=9.0.1
-pkgrel=2
+pkgver=10.0
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
 makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig
-        mozilla-pkgconfig.patch
-        5007_fix_libpr0n_nsPNGDecoder.patch)
+        mozilla-pkgconfig.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('7cf2bd379792a9b232267c6a79680566'
+md5sums=('13c61203ccfa583e5a54b4dc22f41233'
          '8dfb78c5bd0581c8cf4753813132bf0b'
-         '27271ce647a83906ef7a24605e840d61'
-         '6f3be4f4ac0217d0782b1a0770d80f28')
+         '27271ce647a83906ef7a24605e840d61')
 
 build() {
   cd "$srcdir/mozilla-release"
@@ -28,7 +26,6 @@ build() {
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
 
-  patch -Np1 -i "$srcdir/5007_fix_libpr0n_nsPNGDecoder.patch"
 
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
   export PYTHON="/usr/bin/python2"