Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/netsurf/PKGBUILD
	extra/python/PKGBUILD
	extra/python2/PKGBUILD

21 files changed, 270 insertions, 68 deletions

diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD
index fc087c24d..d06fce73b 100644
--- a/community/golangide/PKGBUILD
+++ b/community/golangide/PKGBUILD
@@ -1,15 +1,15 @@
-#$Id: PKGBUILD 80553 2012-11-25 02:17:39Z arodseth $
+#$Id: PKGBUILD 81231 2012-12-13 21:58:59Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 pkgname=golangide
 pkgver=14.0
-pkgrel=1
+pkgrel=2
 _hgrev=828
 pkgdesc='Simple IDE for Go to edit code and build projects'
 license=('LGPL')
 arch=('x86_64' 'i686')
-url='http://code.google.com/p/golangide/'
+url='https://github.com/visualfc/liteide'
 depends=('go' 'libpng12' 'glib2')
 makedepends=('gendesk')
 if [ "$CARCH" == "x86_64" ]; then
@@ -18,14 +18,14 @@ if [ "$CARCH" == "x86_64" ]; then
           'golangide.sh')
   sha256sums=('8f166ae5b97c4484bfa47932a716e28c78547944db4f2d0e222d21694c510e5b'
             '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
-            '8054157f7d1b61a9d97c045f271f935636feb4939249d1bf1ab1b39f18a15207')
+            '79eaede6c031e87a94627fb126a0aefab1feb971995d648436f142b3d684f1b2')
 else
   source=("http://$pkgname.googlecode.com/files/liteidex${pkgver}.linux-386.hg${_hgrev}.tar.bz2"
           'golangide.png'
           'golangide.sh')
   sha256sums=('3b2e565aecc141affc7d10d3aa3e2efe06866559091690b6fe13b9a664eb81c0'
             '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
-            '8054157f7d1b61a9d97c045f271f935636feb4939249d1bf1ab1b39f18a15207')
+            '79eaede6c031e87a94627fb126a0aefab1feb971995d648436f142b3d684f1b2')
 fi
 options=('!strip')
 _name=('Golang IDE')
diff --git a/community/golangide/golangide.sh b/community/golangide/golangide.sh
index 486c8590b..824126c45 100644
--- a/community/golangide/golangide.sh
+++ b/community/golangide/golangide.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ ! -z $GOROOT -a -e $GOROOT ]; then
-  /usr/bin/liteide
+  /usr/bin/liteide $@
 else
-  GOROOT=/usr/lib/go /usr/bin/liteide
+  GOROOT=/usr/lib/go /usr/bin/liteide $@
 fi
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index ff1c0eb63..7352a6e0b 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81120 2012-12-12 00:49:31Z eric $
+# $Id: PKGBUILD 81215 2012-12-13 11:26:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.1@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
@@ -6,7 +6,7 @@
 pkgbase=luasec
 pkgname=(lua-sec lua51-sec)
 pkgver=0.4.1
-pkgrel=1
+pkgrel=3
 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luasec.luaforge.net/'
@@ -14,16 +14,16 @@ license=('MIT')
 makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket')
 conflicts=('luasec')
 replaces=('luasec')
-source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgbase-$pkgver.tar.gz")
+source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-$pkgver.tar.gz")
 md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12')
 
 build() {
-    cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51
+    cp -a luasec-$pkgver luasec-$pkgver-51
     msg2 'Building with lua 5.2'
-    cd $pkgbase-$pkgver
+    cd luasec-$pkgver
     make linux
     msg2 'Building with lua 5.1'
-    cd ../$pkgbase-$pkgver-51
+    cd ../luasec-$pkgver-51
     make INCDIR=-I/usr/include/lua5.1 linux
 }
 
@@ -31,7 +31,7 @@ package_lua-sec() {
     depends=('openssl' 'lua' 'lua-socket')
 
     install -dm755 "$pkgdir/usr/lib/lua/5.2"
-    cd $pkgbase-$pkgver
+    cd luasec-$pkgver
     make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install
     install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -40,7 +40,7 @@ package_lua51-sec() {
     depends=('openssl' 'lua51' 'lua51-socket')
 
     install -dm755 "$pkgdir/usr/lib/lua/5.1"
-    cd $pkgbase-$pkgver-51
+    cd luasec-$pkgver-51
     make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install
     install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index e94694e5a..22f9d4b60 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81121 2012-12-12 00:49:32Z eric $
+# $Id: PKGBUILD 81217 2012-12-13 11:26:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgbase=luasocket
 pkgname=(lua-socket lua51-socket)
 pkgver=2.0.2
-pkgrel=1
+pkgrel=3
 pkgdesc='Networking support library for the Lua language'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.cs.princeton.edu/~diego/professional/luasocket/'
@@ -22,20 +22,20 @@ md5sums=('41445b138deb7bcfe97bff957503da8e'
 
 build() {
   msg2 'Building with lua 5.2'
-  cp -a $pkgbase-$pkgver $pkgbase-$pkgver-52
-  cd $pkgbase-$pkgver-52
+  cp -a luasocket-$pkgver luasocket-$pkgver-52
+  cd luasocket-$pkgver-52
   patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
   patch -Np1 -i "$srcdir/lua52.patch"
   make
   msg2 'Building with lua 5.1'
-  cd ../$pkgbase-$pkgver
+  cd ../luasocket-$pkgver
   patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
   make LUAINC=-I/usr/include/lua5.1
 }
 
 package_lua-socket() {
   depends=('lua')
-  cd $pkgbase-$pkgver
+  cd luasocket-$pkgver
   make DESTDIR="$pkgdir/" \
     INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.1' \
     INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.1' install
@@ -44,7 +44,7 @@ package_lua-socket() {
 
 package_lua51-socket() {
   depends=('lua51')
-  cd $pkgbase-$pkgver
+  cd luasocket-$pkgver
   make DESTDIR="$pkgdir/" \
     INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \
     INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index 82e70038a..0874ee86f 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75461 2012-08-24 22:05:13Z arodseth $
+# $Id: PKGBUILD 81235 2012-12-13 22:54:07Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -6,12 +6,12 @@
 
 pkgname=netsurf
 pkgver=2.9
-pkgrel=4
-pkgdesc="Lightweight and fast web browser"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.netsurf-browser.org/"
+pkgrel=5
+pkgdesc='Lightweight and fast web browser'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/'
 license=('GPL')
-depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss>=0.1.2' 'hubbub>=0.1.2' 'libwebp=0.2.0' 'gstreamer0.10')
+depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss>=0.1.2' 'hubbub>=0.1.2' 'libwebp>=0.2.0' 'gstreamer0.10')
 makedepends=('re2c' 'lcms' 'gendesk>=0.4.2')
 provides=('netsurf')
 conflicts=('netsurf')
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index a0f71f534..c074a400d 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 80430 2012-11-21 14:28:23Z spupykin $
+# $Id: PKGBUILD 81219 2012-12-13 11:58:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=7.2.3
+pkgver=7.2.4
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
@@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog'
 	'rsyslog.logrotate'
 	'rsyslog.conf.d')
-md5sums=('81fd0f6c38e2005a1d2a9e6afff338c1'
+md5sums=('7fb607313ec534a4352da7aa2e0084ec'
          'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
          '8065db4bef3061a4f000ba58779f6829'
          '18565f38a4445136446a31a3c95ffc3e')
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 965b82256..1242a98aa 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80605 2012-11-27 00:42:31Z bisson $
+# $Id: PKGBUILD 81233 2012-12-13 22:22:41Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.18
-pkgrel=3
+pkgver=1.4.19
+pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
@@ -19,7 +19,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.service'
         'unbound.conf'
         'rc.d')
-sha1sums=('b64b4c9f7981df4e7589ebb770a31352a09db3fb'
+sha1sums=('ccf0d465fc0045d59ceca11ecde688edebd28ec1'
           '5bc313cd978e4d6efe8c13600e838c70629be477'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 3b6ccc653..08309dc5e 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170239 2012-11-05 22:39:18Z bluewind $
+# $Id: PKGBUILD 173216 2012-12-13 12:43:19Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
@@ -6,21 +6,22 @@
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.16.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://www.perl.org"
 groups=('base')
 depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
+source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
+cgi-cr-escaping.diff
 perlbin.sh
 perlbin.csh
 provides.pl)
 install=perl.install
 options=('makeflags' '!purge')
 md5sums=('2818ab01672f005a4e552a713aa27b08'
+         '0486659c9eefe682364a3e364d814296'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
          '999c3eea6464860704abbb055a0f0896')
@@ -33,10 +34,12 @@ fi
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  patch -i "$srcdir/cgi-cr-escaping.diff" -p1
+
   if [ "${CARCH}" = "x86_64" ]; then
     # for x86_64
     arch_opts="-Dcccdlflags='-fPIC'"
-  else 
+  else
     # for i686
     arch_opts=""
   fi
@@ -95,7 +98,7 @@ package() {
   # Profile script to set paths to perl scripts.
   install -D -m755 ${srcdir}/perlbin.sh \
                    ${pkgdir}/etc/profile.d/perlbin.sh
-  # Profile script to set paths to perl scripts on csh. (FS#22441) 
+  # Profile script to set paths to perl scripts on csh. (FS#22441)
   install -D -m755 ${srcdir}/perlbin.csh \
                   ${pkgdir}/etc/profile.d/perlbin.csh
 
diff --git a/core/perl/cgi-cr-escaping.diff b/core/perl/cgi-cr-escaping.diff
new file mode 100644
index 000000000..51adf7231
--- /dev/null
+++ b/core/perl/cgi-cr-escaping.diff
@@ -0,0 +1,75 @@
+From 18b607e4544c0cffc85207a8f9901ba37ac917d9 Mon Sep 17 00:00:00 2001
+From: Ryo Anazawa <anazawa@cpan.org>
+Date: Wed, 14 Nov 2012 09:47:32 +0900
+Subject: CR escaping for P3P and Set-Cookie headers
+
+Bug: https://github.com/markstos/CGI.pm/pull/23
+Bug-Debian: http://bugs.debian.org/693420
+Origin: https://github.com/markstos/CGI.pm/commit/cb39938b45206093a363e36fd104e4a0f26deecb
+Patch-Name: fixes/cgi-cr-escaping.diff
+---
+ cpan/CGI/lib/CGI.pm  |   24 ++++++++++++------------
+ cpan/CGI/t/headers.t |    6 ++++++
+ 2 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/cpan/CGI/lib/CGI.pm b/cpan/CGI/lib/CGI.pm
+index 1a52c70..c70e9c1 100644
+--- a/cpan/CGI/lib/CGI.pm
++++ b/cpan/CGI/lib/CGI.pm
+@@ -1550,8 +1550,17 @@ sub header {
+                             'EXPIRES','NPH','CHARSET',
+                             'ATTACHMENT','P3P'],@p);
+ 
++    # Since $cookie and $p3p may be array references,
++    # we must stringify them before CR escaping is done.
++    my @cookie;
++    for (ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie) {
++        my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
++        push(@cookie,$cs) if defined $cs and $cs ne '';
++    }
++    $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY';
++
+     # CR escaping for values, per RFC 822
+-    for my $header ($type,$status,$cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) {
++    for my $header ($type,$status,@cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) {
+         if (defined $header) {
+             # From RFC 822:
+             # Unfolding  is  accomplished  by regarding   CRLF   immediately
+@@ -1595,18 +1604,9 @@ sub header {
+ 
+     push(@header,"Status: $status") if $status;
+     push(@header,"Window-Target: $target") if $target;
+-    if ($p3p) {
+-       $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY';
+-       push(@header,qq(P3P: policyref="/w3c/p3p.xml", CP="$p3p"));
+-    }
++    push(@header,"P3P: policyref=\"/w3c/p3p.xml\", CP=\"$p3p\"") if $p3p;
+     # push all the cookies -- there may be several
+-    if ($cookie) {
+-	my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie;
+-	for (@cookie) {
+-            my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
+-	    push(@header,"Set-Cookie: $cs") if $cs ne '';
+-	}
+-    }
++    push(@header,map {"Set-Cookie: $_"} @cookie);
+     # if the user indicates an expiration time, then we need
+     # both an Expires and a Date header (so that the browser is
+     # uses OUR clock)
+diff --git a/cpan/CGI/t/headers.t b/cpan/CGI/t/headers.t
+index 661b74b..4b4922c 100644
+--- a/cpan/CGI/t/headers.t
++++ b/cpan/CGI/t/headers.t
+@@ -22,6 +22,12 @@ like($@,qr/contains a newline/,'invalid header blows up');
+ like $cgi->header( -type => "text/html".$CGI::CRLF." evil: stuff " ),
+     qr#Content-Type: text/html evil: stuff#, 'known header, with leading and trailing whitespace on the continuation line';
+ 
++eval { $cgi->header( -p3p => ["foo".$CGI::CRLF."bar"] ) };
++like($@,qr/contains a newline/,'P3P header with CRLF embedded blows up');
++
++eval { $cgi->header( -cookie => ["foo".$CGI::CRLF."bar"] ) };
++like($@,qr/contains a newline/,'Set-Cookie header with CRLF embedded blows up');
++
+ eval { $cgi->header( -foobar => "text/html".$CGI::CRLF."evil: stuff" ) };
+ like($@,qr/contains a newline/,'unknown header with CRLF embedded blows up');
+ 
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index eb8be47cb..b23aea1fe 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172182 2012-12-01 09:02:32Z heftig $
+# $Id: PKGBUILD 173212 2012-12-13 09:39:25Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.29
-pkgrel=2
+pkgver=0.6.30
+pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/software/accountsservice/"
@@ -11,15 +11,13 @@ license=('GPL3')
 depends=('glib2' 'polkit' 'systemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
-source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch 32bit-crash.patch)
-md5sums=('396c16f39711e24bb7cc685a170befa3'
-         '1d5cf127e5aac407fe7c37b2f4fd503c'
-         '2d364b82e7bb1df4aaae70e9ac5be0ba')
+source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch)
+md5sums=('8955b53b0ac9036b3f6a91202ff954f1'
+         '1d5cf127e5aac407fe7c37b2f4fd503c')
 
 build() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../more-exclusions.patch
-  patch -Np1 -i ../32bit-crash.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/accountsservice \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 08a0e8859..a7ce33b7c 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 156372 2012-04-17 18:59:36Z eric $
+# $Id: PKGBUILD 173222 2012-12-14 01:35:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('e6267b5e0483cf9c29d01793d2f9433e73d62191')
+sha1sums=('f3cd76d5b4cc637d1a82398cdb9c1ac9518ce057')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 2f91724c0..3f19a9ca6 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164657 2012-08-02 00:26:06Z bisson $
+# $Id: PKGBUILD 173220 2012-12-13 22:30:06Z bisson $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.9.4
+pkgver=2.9.5
 pkgrel=1
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
@@ -17,9 +17,9 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p
         'aliases.patch'
         'service'
         'rc.d')
-sha1sums=('ac53c2c6e15b642d5d06eb0fc092d6a35ab7eec7'
+sha1sums=('8602cd54e63b1af02a8f994b5da69d01d73ec8cc'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
-          'af621cf064813d9ddb13ffd579fee33e6b82d4be'
+          '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
 
 provides=('smtp-server' 'smtp-forwarder')
diff --git a/extra/postfix/service b/extra/postfix/service
index 6ede53632..e7d4cd20c 100644
--- a/extra/postfix/service
+++ b/extra/postfix/service
@@ -1,12 +1,14 @@
 [Unit]
-Description=Postfix Mail Transport Daemon
+Description=Postfix Mail Transport Agent
 After=network.target
 
 [Service]
 Type=forking
+PIDFile=/var/spool/postfix/pid/master.pid
 ExecStart=/usr/sbin/postfix start
 ExecStop=/usr/sbin/postfix stop
 ExecReload=/usr/sbin/postfix reload
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 8aea684a2..67b8d3c49 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 169007 2012-10-17 10:19:56Z allan $
+# $Id: PKGBUILD 173215 2012-12-13 12:39:30Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 _pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite')
+makedepends=('tk' 'sqlite' 'bluez')
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('tk: for tkinter' 'sqlite')
 provides=('python3')
@@ -56,7 +56,7 @@ 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 \
-     test_urllib test_uuid test_pydoc
+     test_urllib test_uuid test_pydoc test_logging
 }
 
 package() {
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 31f598187..1c23d1d8a 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 157413 2012-04-28 09:27:14Z allan $
+# $Id: PKGBUILD 173214 2012-12-13 12:39:26Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
 pkgver=2.7.3
-pkgrel=2.1
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PSF')
 url="http://www.python.org/"
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
+makedepends=('tk' 'bluez')
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
new file mode 100644
index 000000000..24b667a67
--- /dev/null
+++ b/libre/django-countries/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=django-countries
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+pkgrel=1
+arch=(any)
+depends=('django')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=(6c65fcc3aa7de065a54cdb619397626d)
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
+  # fix python->python2, and a typo!
+  sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index e3d9444ce..4220394dc 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -6,12 +6,14 @@
 #  _get_depends_nover (no version requirements)
 
 pkgname=parabolaweb-utils
-pkgver=20121115.1554
-pkgrel=1
+pkgver=20120425.0657
 pkgdesc="Utils for the Parabola website"
-arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
 license=('GPL2')
+
+pkgrel=1
+epoch=1
+arch=('any')
 depends=(
     'python2'      # duh
     'python2-flup' # for fcgi
@@ -19,6 +21,7 @@ depends=(
     'git'          # used in parabolaweb-download
     'libretools'   # used in parabolaweb-{download,update} (libremessages)
     `_get_depends`)
+conflicts=('django>=1.5') # hold it at 1.4
 makedepends=(makepkg-git)
 backup=('etc/conf.d/parabolaweb')
 
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
index 5212571a8..ce8638e7e 100644
--- a/libre/parabolaweb-utils/helper.sh
+++ b/libre/parabolaweb-utils/helper.sh
@@ -13,7 +13,7 @@ _get_depends() {
 	if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
 		pushd "${srcdir:-src}" >/dev/null
 		< parabolaweb/requirements_prod.txt sed -r \
-			-e 's/.*/\L&/' -e 's/==/=/' \
+			-e 's/.*/\L&/' -e 's/==/>=/' \
 			-e 's/^(python2?-)?/python2-/' \
 			-e 's/python2-django/django/'
 		popd >/dev/null
diff --git a/pcr/emacs-mailcrypt/PKGBUILD b/pcr/emacs-mailcrypt/PKGBUILD
new file mode 100644
index 000000000..8dad422c0
--- /dev/null
+++ b/pcr/emacs-mailcrypt/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>
+
+_pkgname=mailcrypt
+pkgname=emacs-$_pkgname
+pkgver=3.5.9
+pkgdesc="Emacs interface to PGP and GnuPG"
+url="http://mailcrypt.sourceforge.net/"
+license=('GPL')
+
+pkgrel=2.1
+arch=(any)
+depends=(emacs)
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz
+        destdir.patch)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/destdir.patch"
+  autoreconf
+  ./configure --prefix=/usr --infodir=/usr/share/info
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('18c0dea5dde0fc73168f4815df0d9db0'
+         '805f2c6bf624c946df2eefaf0edabcb3')
diff --git a/pcr/emacs-mailcrypt/destdir.patch b/pcr/emacs-mailcrypt/destdir.patch
new file mode 100644
index 000000000..a0159cd02
--- /dev/null
+++ b/pcr/emacs-mailcrypt/destdir.patch
@@ -0,0 +1,41 @@
+diff -ruN mailcrypt-3.5.9.orig/Makefile.in mailcrypt-3.5.9/Makefile.in
+--- mailcrypt-3.5.9.orig/Makefile.in	2010-03-11 08:38:05.000000000 -0500
++++ mailcrypt-3.5.9/Makefile.in	2012-12-13 18:38:59.000000000 -0500
+@@ -77,16 +77,16 @@
+ 
+ install: all installdirs install-info
+ 	for f in $(SOURCES); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(lispdir); \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(lispdir); \
+ 	done;
+ 	for f in $(OBJECTS); do \
+-	  $(INSTALL_DATA) $$f $(lispdir); \
++	  $(INSTALL_DATA) $$f $(DESTDIR)$(lispdir); \
+ 	done;
+ 
+ # Make sure all installation directories actually exist
+ # by making them if necessary.
+ installdirs: mkinstalldirs
+-	$(srcdir)/mkinstalldirs $(lispdir) $(infodir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(lispdir) $(DESTDIR)$(infodir)
+ 
+ # If your install-info doesn't know how to look inside the .info file for the
+ # menu entry to add, try adding
+@@ -95,14 +95,12 @@
+ 
+ install-info: info
+ 	cd $(srcdir) && for file in $(INFOFILES); do\
+-	  $(INSTALL_DATA) $$file $(infodir)/$$file; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
+ 	done
+-	-$(INSTALL_INFO) --info-dir=$(infodir) mailcrypt.info
+ 
+ uninstall:
+-	-cd $(lispdir) && rm -f $(SOURCES) $(OBJECTS)
+-	-cd $(infodir) && rm -f $(INFOFILES)
+-	$(INSTALL_INFO) --remove --info-dir=$(infodir) mailcrypt.info
++	-cd $(DESTDIR)$(lispdir) && rm -f $(SOURCES) $(OBJECTS)
++	-cd $(DESTDIR)$(infodir) && rm -f $(INFOFILES)
+ 
+ info: $(INFOFILES)
+ 
diff --git a/pcr/emacs-mailcrypt/mailcrypt.install b/pcr/emacs-mailcrypt/mailcrypt.install
new file mode 100644
index 000000000..3257b7338
--- /dev/null
+++ b/pcr/emacs-mailcrypt/mailcrypt.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(mailcrypt.info)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: