Wed Nov 30 23:15:09 UTC 2011

26 files changed, 278 insertions, 75 deletions

diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 5cdab4d99..037dabef7 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129453 2011-06-28 01:17:42Z stephane $
+# $Id: PKGBUILD 143806 2011-11-29 13:33:24Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.3.12
-pkgrel=2
+pkgrel=3
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index b298f17e3..1d5f9ccc9 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136347 2011-08-26 22:11:46Z allan $
+# $Id: PKGBUILD 143808 2011-11-29 13:33:28Z stephane $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=5
+pkgrel=6
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD
index 17488c5a5..6b846e191 100644
--- a/extra/f-spot/PKGBUILD
+++ b/extra/f-spot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 125874 2011-05-31 09:04:12Z ibiru $
+# $Id: PKGBUILD 143780 2011-11-29 08:49:53Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=f-spot
 pkgver=0.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A personal photo management program for GNOME"
 url="http://www.gnome.org/projects/f-spot/"
 arch=(i686 x86_64)
@@ -15,9 +15,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        mono-2.8.patch)
+        mono-2.8.patch
+        flickrnet-3.0.patch)
 sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
-            '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65')
+            '4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65'
+            'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
@@ -25,11 +27,17 @@ build() {
 
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/mono-2.8.patch"
+  # https://bugzilla.gnome.org/show_bug.cgi?id=665063
+  patch -Np1 -i "${srcdir}/flickrnet-3.0.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-scrollkeeper --disable-schemas-install --enable-release \
               --with-vendor-build-id=ArchLinux
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/f-spot/flickrnet-3.0.patch b/extra/f-spot/flickrnet-3.0.patch
new file mode 100644
index 000000000..c79e3c442
--- /dev/null
+++ b/extra/f-spot/flickrnet-3.0.patch
@@ -0,0 +1,114 @@
+diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
+--- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs	2010-12-19 14:34:42.000000000 +0100
++++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs	2011-11-28 14:23:08.000000000 +0100
+@@ -124,9 +124,9 @@
+ 					do_export_flickr.Sensitive = true;
+ 					auth_flickr.Sensitive = true;
+ 					auth_label.Text = System.String.Format (Catalog.GetString ("Welcome {0} you are connected to {1}"),
+-										auth.User.Username,
++										auth.User.UserName,
+ 										current_service.Name);
+-					auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.Username);
++					auth_flickr.Label = String.Format (Catalog.GetString ("Sign in as a different user"), auth.User.UserName);
+ 					used_bandwidth.Visible = !fr.Connection.PeopleGetUploadStatus().IsPro &&
+ 									fr.Connection.PeopleGetUploadStatus().BandwidthMax > 0;
+ 					if (used_bandwidth.Visible) {
+@@ -326,7 +326,7 @@
+ 				progress_dialog.ProgressText = String.Format (Catalog.GetString ("Waiting for response {0} of {1}"),
+ 									      photo_index, selection.Count);
+ 			}
+-			progress_dialog.Fraction = (photo_index - 1.0 + (args.Bytes / (double) info.Length)) / (double) selection.Count;
++			progress_dialog.Fraction = (photo_index - 1.0 + (args.BytesSent / (double) info.Length)) / (double) selection.Count;
+ 		}
+ 
+ 		private class DateComparer : IComparer
+@@ -370,7 +370,7 @@
+ 						App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id,
+ 									      (photo as FSpot.Photo).DefaultVersionId,
+ 									      ExportStore.FlickrExportType,
+-									      auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
++									      auth.User.UserId + ":" + auth.User.UserName + ":" + current_service.Name + ":" + id);
+ 
+ 				} catch (System.Exception e) {
+ 					progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"),
+@@ -393,7 +393,7 @@
+ 			if (open && ids.Count != 0) {
+ 				string view_url;
+ 				if (current_service.Name == "Zooomr.com")
+-					view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.Username);
++					view_url = string.Format ("http://www.{0}/photos/{1}/", current_service.Name, auth.User.UserName);
+ 				else {
+ 					view_url = string.Format ("http://www.{0}/tools/uploader_edit.gne?ids", current_service.Name);
+ 					bool first = true;
+diff -Naur f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
+--- f-spot-0.8.2.orig/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs	2010-12-19 14:34:42.000000000 +0100
++++ f-spot-0.8.2/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs	2011-11-28 15:42:01.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ namespace FSpot.Exporters.Flickr {
+ public class FlickrRemote {
+-	public static Licenses    licenses;
++	public static LicenseCollection    licenses;
+ 	private string            frob;
+ 	private string            token;
+ 	private Auth              auth;
+@@ -62,28 +62,30 @@
+ 		get { return flickr; }
+ 	}
+ 
+-	public License[] GetLicenses ()
++	public LicenseCollection GetLicenses ()
+ 	{
+ 		// Licenses won't change normally in a user session
+ 		if (licenses == null) {
+ 			try {
+ 				licenses = flickr.PhotosLicensesGetInfo();
+ 			} catch (FlickrNet.FlickrApiException e ) {
+-				Log.Error (e.Code + ": " + e.Verbose );
++				Log.Error (e.Code + ": " + e.OriginalMessage );
+ 				return null;
+ 			}
+ 		}
+-		return licenses.LicenseCollection;
++		return licenses;
+ 	}
+ 
+ 	public ArrayList Search (string[] tags, int licenseId)
+ 	{
+ 		ArrayList photos_url = new ArrayList ();
+ 		// Photos photos = flickr.PhotosSearchText (tags, licenseId);
+-		Photos photos = flickr.PhotosSearch (tags);
++		PhotoSearchOptions options = new PhotoSearchOptions ();
++		options.Tags = string.Join(",", tags);
++		PhotoCollection photos = flickr.PhotosSearch (options);
+ 
+ 		if (photos != null) {
+-			foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
++			foreach (FlickrNet.Photo photo in photos) {
+ 				photos_url.Add (photo.ThumbnailUrl);
+ 			}
+ 		}
+@@ -94,10 +96,12 @@
+ 	public ArrayList Search (string tags, int licenseId)
+ 	{
+ 		ArrayList photos_url = new ArrayList ();
+-		Photos photos = flickr.PhotosSearchText (tags, licenseId);
++		PhotoSearchOptions options = new PhotoSearchOptions ();
++		options.Tags = tags;
++		PhotoCollection photos = flickr.PhotosSearch (options);
+ 
+ 		if (photos != null) {
+-			foreach (FlickrNet.Photo photo in photos.PhotoCollection) {
++			foreach (FlickrNet.Photo photo in photos) {
+ 				photos_url.Add (photo.ThumbnailUrl);
+ 			}
+ 		}
+@@ -126,7 +130,7 @@
+ 
+ 				return auth;
+ 			} catch (FlickrNet.FlickrApiException ex) {
+-				Log.Error ("Problems logging in to Flickr - " + ex.Verbose);
++				Log.Error ("Problems logging in to Flickr - " + ex.OriginalMessage);
+ 				return null;
+ 			}
+ 		}
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index cdbe94d39..424492fe1 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143028 2011-11-21 05:59:12Z ibiru $
+# $Id: PKGBUILD 143841 2011-11-29 20:18:51Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -15,14 +15,14 @@ backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
         settings.ini
-        fix_crash_treeview.patch)
+        filechooserdefault_do_not_unref_value_twice.patch)
 sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            'eb187ef05f3735b24b58cd4c533dc3d4f616103cafba399c009ea3eb519be0b9')
+            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -R -i "$srcdir/fix_crash_treeview.patch"
+    patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch b/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch
new file mode 100644
index 000000000..3a0f8320e
--- /dev/null
+++ b/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch
@@ -0,0 +1,24 @@
+From aca43f43be3886f1a0befda0178ebb94ea2cf7b1 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Tue, 29 Nov 2011 19:39:21 +0000
+Subject: filechooserdefault: Don't unref value twice
+
+Double unref was introduced in eb02dacb370e8b4e6ef62328d0c09673b1234b32
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646461
+https://bugzilla.gnome.org/show_bug.cgi?id=664137
+---
+diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
+index e33b91e..a74aacc 100644
+--- a/gtk/gtkfilechooserdefault.c
++++ b/gtk/gtkfilechooserdefault.c
+@@ -10127,7 +10127,6 @@ list_row_activated (GtkTreeView           *tree_view,
+   if (is_folder && file)
+     {
+       change_folder_and_display_error (impl, file, FALSE);
+-      g_object_unref (file);
+       goto out;
+     }
+ 
+--
+cgit v0.9.0.2
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index 602d12bb4..fa41c86b2 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123069 2011-05-07 23:28:40Z stephane $
+# $Id: PKGBUILD 143830 2011-11-29 16:30:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
 pkgver=5.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,14 +14,16 @@ optdepends=('cups:		to use cups printer spooler(recommended)'
             'foomatic-db-engine:	to use foomatic spooler'
             'ghostscript:	adds postscript support for ijsgutenprint'
             'gimp:		adds gutenprint plugin to gimp')
-source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
+source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2 buildfix.patch)
 url="http://gimp-print.sourceforge.net/"
 replaces=('gimp-print')
 options=('!libtool' '!emptydirs')
-md5sums=('b19029972bf28f6efd693270daf8f5de')
+md5sums=('b19029972bf28f6efd693270daf8f5de'
+         '2354cdecf1fbab32eca84266c8c72e7d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/buildfix.patch
   ./configure --prefix=/usr --disable-samples --with-cups --with-gimp2 \
 	--disable-translated-cups-ppds --with-gimp2-as-gutenprint \
 	--disable-libgutenprintui  --enable-libgutenprintui2 --disable-gtktest \
diff --git a/extra/gutenprint/buildfix.patch b/extra/gutenprint/buildfix.patch
new file mode 100644
index 000000000..6b17a4029
--- /dev/null
+++ b/extra/gutenprint/buildfix.patch
@@ -0,0 +1,22 @@
+diff -up gutenprint-5.2.7/src/cups/commandtocanon.c.build gutenprint-5.2.7/src/cups/commandtocanon.c
+--- gutenprint-5.2.7/src/cups/commandtocanon.c.build	2011-06-07 13:32:37.372042304 +0100
++++ gutenprint-5.2.7/src/cups/commandtocanon.c	2011-06-07 13:32:41.270970750 +0100
+@@ -13,6 +13,7 @@
+ 
+ #include <cups/cups.h>
+ #include <ctype.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ 
+ 
+diff -up gutenprint-5.2.7/src/cups/commandtoepson.c.build gutenprint-5.2.7/src/cups/commandtoepson.c
+--- gutenprint-5.2.7/src/cups/commandtoepson.c.build	2007-12-24 17:19:20.000000000 +0000
++++ gutenprint-5.2.7/src/cups/commandtoepson.c	2011-06-07 13:32:35.656073794 +0100
+@@ -30,6 +30,7 @@
+ 
+ #include <cups/cups.h>
+ #include <ctype.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD
index e07fa4562..9cd6d49bd 100644
--- a/extra/iperf/PKGBUILD
+++ b/extra/iperf/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 132026 2011-07-19 09:15:09Z giovanni $
+# $Id: PKGBUILD 143786 2011-11-29 11:18:28Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=iperf
 pkgver=2.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool to measure maximum TCP bandwidth"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://iperf.sourceforge.net"
 depends=('gcc-libs')
-source=(http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz
-	license
-        client.cpp.patch)
+source=("http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz"
+        'license'
+        'client.cpp.patch')
 md5sums=('44b5536b67719f4250faed632a3cd016'
          'a2879f900b76668b28a1cc922909db18'
          '82ce63c87cc8bb2f0f94069857ac14a9')
diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD
index 57d810d9d..33e1cf1bc 100644
--- a/extra/ivtv-utils/PKGBUILD
+++ b/extra/ivtv-utils/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 89079 2010-08-29 10:28:03Z thomas $
+# $Id: PKGBUILD 143788 2011-11-29 11:25:59Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=ivtv-utils
 pkgver=1.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Userspace utilities for Hauppauge PVR cards"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://ivtvdriver.org"
-source=(http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz
-        http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz)
+source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz"
+        "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz")
 depends=('gcc-libs')
 md5sums=('3a4219d698262ca2b28e41f0f547b0a2'
          'b9a871f1c569025be9c48a77b3515faf')
diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD
index 2744d3bd1..fa036bb63 100644
--- a/extra/lbreakout2/PKGBUILD
+++ b/extra/lbreakout2/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 113510 2011-03-09 01:34:28Z giovanni $
+# $Id: PKGBUILD 143790 2011-11-29 11:41:15Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=lbreakout2
 pkgver=2.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A breakout game with nice effects, graphics, and sounds"
 arch=('i686' 'x86_64')
 url="http://lgames.sourceforge.net"
 license=('GPL')
 depends=('sdl_mixer' 'libpng')
 backup=('var/games/lbreakout2/lbreakout2.hscr')
-source=(http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz
-        lbreakout2.desktop
-	lbreakout2.png)
+source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz"
+        'lbreakout2.desktop'
+	'lbreakout2.png')
 md5sums=('43900187bc935475cd6489569cd2230a'
          '14cd34a72a8f4e3b8f385f9023625241'
          '94e2fa393eb2a7d4494641dec580573b')
diff --git a/extra/lcab/PKGBUILD b/extra/lcab/PKGBUILD
index bebea4c52..35252cdbb 100644
--- a/extra/lcab/PKGBUILD
+++ b/extra/lcab/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 68001 2010-02-10 12:31:34Z giovanni $
+# $Id: PKGBUILD 143792 2011-11-29 11:52:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lcab
 pkgver=1.0b12
-pkgrel=2
+pkgrel=3
 pkgdesc="A program to make Microsoft cabinet files"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://freshmeat.net/projects/lcab/"
 depends=('glibc')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.gz)
+source=("ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.gz")
 md5sums=('9403e08f53fcf262e25641a9b900d4de')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make || return 1
-  install -D -m755 lcab "${pkgdir}/usr/bin/lcab" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -D -m755 lcab "${pkgdir}/usr/bin/lcab"
 }
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index a8bc64db7..ce99e9c8a 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140250 2011-10-10 22:45:12Z giovanni $
+# $Id: PKGBUILD 143794 2011-11-29 11:56:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=libass
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/libass/"
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index 275dbc9c9..7302de3d0 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138665 2011-09-27 14:36:55Z giovanni $
+# $Id: PKGBUILD 143796 2011-11-29 12:02:45Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libebml/"
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index d6bc1f95d..1d9c20cb4 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134666 2011-08-07 10:50:50Z pierre $
+# $Id: PKGBUILD 143810 2011-11-29 13:33:30Z stephane $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.29
-pkgrel=2
+pkgrel=3
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -17,8 +17,10 @@ optdepends=('libxml2: mod_webdav'
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
+        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
 md5sums=('e6e67b09986cb504db630b5a86b2dd76'
+         'de2afb4ed6a088fd7fa5f13c387a08f0'
          '268386e71f5748dc1d887b9a0ab65589'
          '913e2157fa78d990c32146f387d44c2b'
          'acdaa94299e6299cb5085e6d88babeca')
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 9a940857c..9b97bf170 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 121107 2011-04-29 00:34:05Z stephane $
+# $Id: PKGBUILD 143812 2011-11-29 13:33:33Z stephane $
 # Contributor: tobias [tobias [at] archlinux.org]
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mutt
 pkgver=1.5.21
-pkgrel=5
+pkgrel=6
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
 backup=('etc/Muttrc')
 arch=('i686' 'x86_64')
+optdepends=('smtp-forwarder: to send mail')
 depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
 source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 97decbd24..7ba798ba7 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138196 2011-09-18 13:56:45Z tpowa $
+# $Id: PKGBUILD 143814 2011-11-29 13:33:35Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
 pkgname=('ocaml' 'ocaml-compiler-libs')
 pkgver=3.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
 license=('LGPL2' 'custom: QPL-1.0')
@@ -27,7 +27,7 @@ package_ocaml() {
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
   # Save >10MB with this one, makepkg only strips debug symbols.
-  #find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
+  #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
 
   # install license
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -50,4 +50,8 @@ optdepends=()
   cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils
   # duplicated by installation
   rm -f "$compiler_libs"/typing/outcometree.{cmi,mli}
+
+  # install license
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index bc1c8cbb1..81688e917 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139482 2011-10-02 02:49:43Z eric $
+# $Id: PKGBUILD 143816 2011-11-29 13:33:39Z stephane $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -23,7 +23,7 @@ pkgname=('php'
          'php-xsl')
 pkgver=5.3.8
 _suhosinver=5.3.7-0.9.10
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -33,10 +33,12 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
 md5sums=('704cd414a0565d905e1074ffdc1fadfb'
          '08582e502fed8221c6577042ca45ddb8'
+         '5bf4473f658404aa9a97bf026ecef8e9'
          '65606c606df97a0760dfe5aaf9893afc'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index f90d8576f..d96900b36 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 136999 2011-09-05 05:47:36Z allan $
+# $Id: PKGBUILD 143818 2011-11-29 13:33:44Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 _pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
@@ -17,8 +17,10 @@ optdepends=('tk: for tkinter' 'sqlite3')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
+        gdbm-magic-values.patch)
+sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769'
+          '43bfbe3e23360f412b95cb284ff29b2cbe338be9')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -26,6 +28,10 @@ build() {
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
 
+  # gdbm has new magic that whichdb does not recognize
+  # http://bugs.python.org/issue13007
+  patch -Np1 -i ../gdbm-magic-values.patch
+
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -40,6 +46,7 @@ build() {
               --with-valgrind \
               --with-wide-unicode \
               --with-system-expat \
+              --with-dbmliborder=gdbm:ndbm \
               --with-system-ffi
 
   make
@@ -48,7 +55,7 @@ build() {
 check() {
   cd "${srcdir}/Python-${pkgver}"
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid
 }
 
 package() {
diff --git a/extra/python/gdbm-magic-values.patch b/extra/python/gdbm-magic-values.patch
new file mode 100644
index 000000000..e8ce828cf
--- /dev/null
+++ b/extra/python/gdbm-magic-values.patch
@@ -0,0 +1,13 @@
+diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py
+--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic	2011-09-03 12:16:40.000000000 -0400
++++ Python-3.2.2/Lib/dbm/__init__.py	2011-09-30 15:47:27.488863694 -0400
+@@ -166,7 +166,7 @@ def whichdb(filename):
+         return ""
+ 
+     # Check for GNU dbm
+-    if magic == 0x13579ace:
++    if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+         return "dbm.gnu"
+ 
+     # Later versions of Berkeley db hash file have a 12-byte pad in
+diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index 54915dcd0..a57ce304e 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 133485 2011-07-28 15:04:33Z andrea $
+# $Id: PKGBUILD 143784 2011-11-29 10:37:04Z bluewind $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=qrencode
-pkgver=3.1.1
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
 arch=(i686 x86_64)
 depends=('libpng>=1.4.0')
@@ -12,13 +12,12 @@ makedepends=(sdl)
 url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
 options=(!libtool)
-source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng14.diff)
-md5sums=('e7feb2c2c65d0f2f4010a14da3ecdb89' '93e87b2751b0d422a08e96ccaae4d082')
+source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7e90615eb314abcd2eb2eab5c8155b97')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  patch -p1 < "$srcdir/libpng14.diff"
-  autoreconf
+#  autoreconf
   ./autogen.sh
   ./configure --prefix=/usr
   make
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 01bedf9e0..62a6a6e50 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142784 2011-11-15 06:17:05Z andrea $
+# $Id: PKGBUILD 143845 2011-11-30 01:41:45Z eric $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
-pkgver=2.0.5
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('curl>=7.22.0' 'libxslt>=1.1.26')
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
-md5sums=('ffa2aa82c83dbd5b1f77835348ed2c2a')
+md5sums=('1f07af81cbe3cf1bf0d1d250b18d9f93')
 
 build() {
   cd "${srcdir}"/raptor2-${pkgver}
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 63b9c7194..760386762 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142306 2011-11-08 07:15:40Z angvp $
+# $Id: PKGBUILD 143822 2011-11-29 13:33:50Z stephane $
 # Maintainer:
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
@@ -7,7 +7,7 @@
 pkgbase=ruby
 pkgname=('ruby' 'ruby-docs')
 pkgver=1.9.3_p0
-pkgrel=1
+pkgrel=2
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 url="http://www.ruby-lang.org/en/"
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 8f8e8adbe..2cd85eb0d 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $
+# $Id: PKGBUILD 143824 2011-11-29 13:33:54Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.6.17
-pkgrel=6
+pkgrel=7
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util' 'sqlite3')
 optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment'
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 598e8684b..a99ca0501 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 136459 2011-08-29 19:26:01Z bisson $
+# $Id: PKGBUILD 143826 2011-11-29 13:33:57Z stephane $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
 pkgver=2.26
-pkgrel=1
+pkgrel=3
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64')
 url='http://www.linux-nis.org/nis/ypserv/'
 license=('GPL2')
-depends=('gdbm' 'openslp')
+depends=('gdbm' 'openslp' 'inetutils')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
 source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \
         'yppasswd'
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 027b192d2..352881046 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127893 2011-06-19 11:12:41Z pierre $
+# $Id: PKGBUILD 143828 2011-11-29 13:33:59Z stephane $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=4.3.12
-pkgrel=2
+pkgrel=3
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'