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

Conflicts:
	community/virtualbox/PKGBUILD

44 files changed, 610 insertions, 118 deletions

diff --git a/community/aide/PKGBUILD b/community/aide/PKGBUILD
index bec57db22..d7961b649 100644
--- a/community/aide/PKGBUILD
+++ b/community/aide/PKGBUILD
@@ -1,15 +1,18 @@
-# Maintainer: Thomas S Hatch <thatch45@gmail.copm>
+# $Id: PKGBUILD 60050 2011-12-03 20:33:18Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: Thomas S Hatch <thatch45@gmail.copm>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> 
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=aide
 pkgver=0.15.1
-pkgrel=1
+pkgrel=3
 pkgdesc='A file integrity checker and intrusion detection program.'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.tut.fi/~rammer/aide.html"
 license=('GPL')
-makedepends=('mhash')
+makedepends=('mhash' 'elfutils')
+backup=('etc/aide.conf')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \
         aide.conf)
 md5sums=('d0b72535ff68b93a648e4d08b0ed7f07'
diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD
index 2e5b07de4..669385f72 100644
--- a/community/bacula/PKGBUILD
+++ b/community/bacula/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Matias Hernandez <msdark@archlinux.cl>
 
 pkgname=bacula
-pkgver=5.2.1
-pkgrel=2
+pkgver=5.2.2
+pkgrel=1
 pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)"
 arch=(mips64el)
 url="http://www.${pkgname}.org"
@@ -26,7 +26,7 @@ source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgna
         ${pkgname}-sd.rc.d
         ${pkgname}-fd.rc.d
         ${pkgname}-dir.rc.d)
-md5sums=('793da9f89fc5e024b6b95eb16a3120e5'
+md5sums=('227b88f56ae085da8f48823b220d4c87'
          'e7be4c9fb3c7ce334f9ee24d71652d3e'
          'a9a070a862e9cf39ae4bc374409c721d'
          '55619ae3094c698541a3bfedc87bdb48')
@@ -64,9 +64,5 @@ package() {
 	# Logs
 	install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
 	sed -i "s|/var/cache/${pkgname}/working/log|/var/log/${pkgname}.log|g" ${pkgdir}/etc/{${pkgname}/${pkgname}-dir.conf,logrotate.d/${pkgname}}
-
-    # Temporary fix for 5.2.1 symlink mishap
-    cd ${pkgdir}/usr/lib
-    ln -sf libbaccats-mysql-5.2.1.so libbaccats-5.2.1.so
 }
 
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 95c6821cc..4fdea4990 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -15,8 +15,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.service'
         'bird6.service')
 md5sums=('20f5aa9d3f853d2c922438dc9d922ecc'
-         'e5ef4a753623e15e9daacb0874747bfb'
-         'fbd56e7ce085107e6b6c5600f4f1a4b8'
+         '1a4b98756d64f52333a83eff2e95d233'
+         '25241a4d7ef639506e0080431b2c1690'
          'e82a0519dca0b289685fda44787f5911'
          'c32e7f6cf1be6ed6f9aa98feea25176d')
 
diff --git a/community/bird/bird.conf b/community/bird/bird.conf
index 1730475a7..88276d8cf 100644
--- a/community/bird/bird.conf
+++ b/community/bird/bird.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAMEON_OPTIONS='-u noboby -g nobody'
+DAEMON_OPTS='-u nobody -g nobody'
diff --git a/community/bird/bird.rc b/community/bird/bird.rc
index 85b816e3e..95fe65217 100644
--- a/community/bird/bird.rc
+++ b/community/bird/bird.rc
@@ -11,7 +11,7 @@ PID=$(pidof -o %PPID $DAEMON)
 case "$1" in
 	start)
 		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon $NAME && stat_done && exit 0
+		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
 		stat_fail
 	;;
   stop)
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 6a850f19c..ae06f501d 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60002 2011-12-03 04:09:30Z seblu $
+# $Id: PKGBUILD 60046 2011-12-03 18:18:50Z seblu $
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
@@ -6,22 +6,23 @@
 
 pkgname=conntrack-tools
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
 depends=('libnetfilter_conntrack')
+backup=('etc/conntrackd/conntrackd.conf')
 source=("http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.bz2"
         'conntrackd.rc'
         'conntrackd.conf')
 md5sums=('5add24d4761baf17af630d5627a71752'
          '619ab1e15837436b47cbdc739d69ee78'
-         '728570bd7a13263606d97f6cc7f2d095')
+         '92a7fc6ab5cba5e48cde4cac0ac403b1')
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
@@ -30,8 +31,8 @@ package() {
   install -D -m 755 conntrackd.rc "$pkgdir/etc/rc.d/conntrackd"
   install -D -m 644 conntrackd.conf "$pkgdir/etc/conf.d/conntrackd"
 
-  # install configuration directories
-  install -d "${pkgdir}/etc/conntrackd"
+  # install empty configuration files
+  install -D -m 644 /dev/null "${pkgdir}/etc/conntrackd/conntrackd.conf"
 
   # install binaries
   cd ${pkgname}-${pkgver}
diff --git a/community/conntrack-tools/conntrackd.conf b/community/conntrack-tools/conntrackd.conf
index 910bb6eda..b90427a49 100644
--- a/community/conntrack-tools/conntrackd.conf
+++ b/community/conntrack-tools/conntrackd.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAMEON_OPTIONS='-d'
+DAEMON_OPTIONS='-d'
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index d5eab3b8d..c992d7f55 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 59840 2011-12-01 01:26:04Z ebelanger $
+# $Id: PKGBUILD 60004 2011-12-03 05:50:16Z ebelanger $
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=fotoxx
-pkgver=11.12
+pkgver=11.12.1
 pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
@@ -12,7 +12,7 @@ depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils')
 optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
 install=fotoxx.install
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('3734fc182c9002f45c664f7b0e42314d')
+sha1sums=('e9f6d58a56020e0548163c4b42687d8a23591c18')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 924719f14..c3184d90e 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 33632 2010-11-27 09:39:46Z spupykin $
+# $Id: PKGBUILD 60014 2011-12-03 08:20:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: nut543 <kfs1@online.no>
 
 #pkgbase=freedroidrpg
 #pkgname=('freedroidrpg' 'freedroidrpg-data')
 pkgname='freedroidrpg'
-pkgver=0.14.1
+pkgver=0.15rc1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
-depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl')
+depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl')
 optdepends=('python2' 'espeak')
 pkgdesc="a mature science fiction role playing game set in the future"
 url="http://freedroid.sourceforge.net"
 license=("GPL")
-source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.14/freedroidrpg-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.bz2
 	freedroidrpg.jpg
 	freedroidrpg.desktop)
-md5sums=('a71c36c0f0c8ce316852d2826357bc01'
+md5sums=('2309a9e7087d384a6a66e6985cc06bd7'
          'b73d9dac44c7e83a6c80fbe4eb96ba79'
          '9a10c2a2064439cdcff5b945dfb1c3ac')
 
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 9aaff5cf5..1c0843521 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 55128 2011-09-03 06:53:25Z stativ $
+# $Id: PKGBUILD 60020 2011-12-03 09:02:29Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=10.5.2
-_pkgver=107.587
+pkgver=10.5.3
+_pkgver=107.764
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('fe1bbc5c9a2f1e8be8682aff05d89be4')
+md5sums=('56d1fec8f420cb964f086f5685694b86')
 
 build() {
   cd "$srcdir"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 456b1e692..b31cd57d6 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59898 2011-12-02 09:11:25Z spupykin $
+# $Id: PKGBUILD 60010 2011-12-03 08:06:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
@@ -19,7 +19,8 @@ optdepends=('bridge-utils: for briged networking (default)'
 	    'kvm'
 	    'openbsd-netcat: for remote management over ssh'
 	    'qemu'
-	    'radvd')
+	    'radvd'
+	    'dmidecode')
 options=('emptydirs' '!libtool')
 backup=('etc/conf.d/libvirtd'
 	'etc/conf.d/libvirtd-guests'
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 92b897bd2..a01cf7932 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,9 +1,11 @@
-#$Id: PKGBUILD 56899 2011-10-16 07:36:44Z bpiotrowski $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
+#$Id: PKGBUILD 60017 2011-12-03 08:38:35Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
 pkgname=lxappearance
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -11,17 +13,22 @@ url="http://lxde.org/"
 groups=('lxde')
 depends=('gtk2' 'intltool')
 makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
+        gtk-3.0.patch)
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
+
+    patch -Np0 -i ../gtk-3.0.patch
     ./configure --sysconfdir=/etc --prefix=/usr 
     make 
 }
 
 package() {
     cd "$srcdir/$pkgname-$pkgver"
+
     make DESTDIR="$pkgdir" install 
 }
 
-md5sums=('34d157a7fe97ef0b93db8fab3f251e07')
+md5sums=('34d157a7fe97ef0b93db8fab3f251e07'
+         '58fd450329972be03181c98e7287f3ae')
diff --git a/community/lxappearance/gtk-3.0.patch b/community/lxappearance/gtk-3.0.patch
new file mode 100644
index 000000000..a65615cd7
--- /dev/null
+++ b/community/lxappearance/gtk-3.0.patch
@@ -0,0 +1,111 @@
+--- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
++++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
+@@ -153,21 +153,33 @@
+ 
+     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
+     GString* content = g_string_sized_new(512);
++    GString* content3 = g_string_sized_new(512);
+     g_string_append(content,
+         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
+         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
++    g_string_append(content3, "[Settings]\n"
++        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
++    
+     if(app.widget_theme)
+         g_string_append_printf(content,
+             "gtk-theme-name=\"%s\"\n", app.widget_theme);
++        g_string_append_printf(content3,
++            "gtk-theme-name = %s\n", app.widget_theme);
+     if(app.icon_theme)
+         g_string_append_printf(content,
+-            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
++            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
++        g_string_append_printf(content3,
++            "gtk-icon-theme-name = %s\n", app.icon_theme);
+     if(app.default_font)
+         g_string_append_printf(content,
+             "gtk-font-name=\"%s\"\n", app.default_font);
++        g_string_append_printf(content3,
++            "gtk-font-name = %s\n", app.default_font);
+     if(app.cursor_theme)
+         g_string_append_printf(content,
+             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
++        g_string_append_printf(content3,
++            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
+     save_cursor_theme_name();
+ 
+     g_string_append_printf(content,
+@@ -196,20 +208,46 @@
+         app.enable_hinting ? 1 : 0
+         );
+ 
++   g_string_append_printf(content3,
++        "gtk-cursor-theme-size = %d\n"
++        "gtk-toolbar-style = %s\n"
++        "gtk-toolbar-icon-size = %s\n"
++        "gtk-button-images = %d\n"
++        "gtk-menu-images = %d\n"
++        "gtk-enable-event-sounds = %d\n"
++        "gtk-enable-input-feedback-sounds = %d\n"
++        "gtk-xft-antialias = %d\n"
++        "gtk-xft-hinting = %d\n",
++        app.cursor_theme_size,
++        tb_styles[app.toolbar_style],
++        tb_icon_sizes[app.toolbar_icon_size],
++        app.button_images ? 1 : 0,
++        app.menu_images ? 1 : 0,
++        app.enable_event_sound ? 1 : 0,
++        app.enable_input_feedback ? 1 : 0,
++        app.enable_antialising ? 1 : 0,
++        app.enable_hinting ? 1 : 0
++        );
++
+     if(app.hinting_style)
+         g_string_append_printf(content,
+             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
++        g_string_append_printf(content3,
++            "gtk-xft-hintstyle = %s\n", app.hinting_style);
+ 
+     if(app.font_rgba)
+         g_string_append_printf(content,
+             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
++        g_string_append_printf(content3,
++            "gtk-xft-rgba = %s\n", app.font_rgba);
+ 
+     if(app.color_scheme)
+     {
+         char* escaped = g_strescape(app.color_scheme, NULL);
+         g_string_append_printf(content,
+-            "gtk-color-scheme=\"%s\"\n",
+-            escaped);
++            "gtk-color-scheme=\"%s\"\n", escaped);
++        g_string_append_printf(content3,
++            "gtk-color-scheme = %s\n", escaped);
+         g_free(escaped);
+     }
+ 
+@@ -218,20 +256,20 @@
+         g_get_home_dir());
+ 
+     g_file_set_contents(file_path, content->str, content->len, NULL);
++    g_string_free(content, TRUE);
+ 
+     /* Save also for GTK3 */
+-    g_string_prepend(content, "[Settings] \n");
+-    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
+-    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
++    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
++    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
+ 
+     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
+     {
+         g_mkdir_with_parents(file_path_gtk3, 0755);
+     }
+ 
+-    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
++    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
+ 
+-    g_string_free(content, TRUE);
++    g_string_free(content3, TRUE);
+     g_free(file_path);
+ }
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 786686d64..373ca457b 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58107 2011-11-06 17:20:02Z bpiotrowski $
+# $Id: PKGBUILD 60015 2011-12-03 08:31:47Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Lightweight Display Manager (part of LXDE)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
@@ -18,11 +18,12 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
 source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz"
-        lxdm.patch lxdm-conf.patch lxdm-pam.patch lxdm-daemon)
+        lxdm.patch lxdm-conf.patch lxdm-pam.patch Xsession.patch lxdm-daemon)
 md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
          'baed9055e8825a5511712bc095197519'
          'c50dd01b715b0a236407d48066191601'
          'b20fe3c8487a039050986d60e45233a9'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
          '705f394052fdd0dec22e95321d170de0')
 
 build() {
@@ -32,6 +33,7 @@ build() {
   	
 	patch -Np0 < ../lxdm.patch
     patch -Np0 < ../lxdm-conf.patch
+    patch -Np0 < ../Xsession.patch
 }
 
 
diff --git a/community/lxdm/Xsession.patch b/community/lxdm/Xsession.patch
new file mode 100644
index 000000000..035ff0383
--- /dev/null
+++ b/community/lxdm/Xsession.patch
@@ -0,0 +1,11 @@
+--- data/Xsession.orig	2011-07-29 15:42:33.000000000 +0200
++++ data/Xsession	2011-12-03 09:09:14.592876087 +0100
+@@ -9,6 +9,8 @@
+ 	LXSESSION=/usr/bin/startlxde
+ fi
+ 
++[ -f /etc/profile ] && . /etc/profile
++[ -f ~/.profile ] && . ~/.profile
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f ~/.xprofile ] && . ~/.xprofile
+ 
diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 522f9e3b1..24edd91a4 100644
--- a/community/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
@@ -5,6 +5,7 @@ post_install() {
     getent passwd lxdm > /dev/null 2>&1 || useradd -c 'LXDE Display Manager' -u 121 -g lxdm -d /var/lib/lxdm -s /sbin/nologin lxdm
     passwd -l lxdm > /dev/null
     chown -R lxdm:lxdm /var/lib/lxdm > /dev/null
+    chmod +r /etc/lxdm/lxdm.conf
 }
 
 post_upgrade() {
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 8a48efd84..34a55480c 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mongodb
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A high-performance, open source, schema-free document-oriented database.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index 52dfc21e9..26f31340e 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 59962 2011-12-02 21:00:24Z ibiru $
+# $Id: PKGBUILD 60037 2011-12-03 17:31:58Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
 pkgver=2.9.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qbittorrent.org/"
 license=('GPL')
 depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
 makedepends=('boost' 'geoip')
-optdepends=('python2: needed for search'
+optdepends=('python: needed for search'
             'geoip: improves peer country resolution')
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
@@ -21,11 +21,6 @@ md5sums=('0c2188e0065be57e50c06f5934d5f7a2')
 build() {
   cd qbittorrent-${pkgver}
 
-  sed -i \
-    -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find ./ -name '*.py')
-
   ./configure \
     --prefix=/usr
 
diff --git a/community/sarg/PKGBUILD b/community/sarg/PKGBUILD
index 4a5b15381..dc61c3a03 100644
--- a/community/sarg/PKGBUILD
+++ b/community/sarg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 32752 2010-11-17 21:07:25Z spupykin $
+# $Id: PKGBUILD 60007 2011-12-03 08:04:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://sarg.sourceforge.net"
 license=('GPL')
 depends=('gd' 'libldap')
+makedepends=('cmake')
 backup=('etc/sarg/css.tpl'
 	'etc/sarg/exclude_codes'
 	'etc/sarg/sarg.conf'
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 55a3b9402..d4e795cc7 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=sslh
 pkgver=1.10
-pkgrel=4
+pkgrel=5
 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
 arch=('i686' 'x86_64')
 url='http://www.rutschle.net/tech/sslh.shtml'
@@ -15,8 +15,8 @@ source=("http://www.rutschle.net/tech/${pkgname}-${pkgver}.tar.gz"
         'sslh.rc'
         'sslh.conf')
 md5sums=('bc34e9a4770d634633e70589c72708cc'
-         '42f3cda8f18abdf5edcd762e6dcda5d7'
-         '8275b5dd363891139398be1d0e92dd57')
+         '0680f09267c33205acf16ac6d4adf926'
+         '808199410bd6ab67421bf3544f805d1a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf
index 2c4e676a8..eb79e7c51 100644
--- a/community/sslh/sslh.conf
+++ b/community/sslh/sslh.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAMEON_OPTIONS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody -P /var/lock/sslh.lock'
+DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody -P /var/lock/sslh.lock'
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index 1532b8c10..05b03bc3e 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -11,7 +11,7 @@ PID=$(pidof -o %PPID $DAEMON)
 case "$1" in
 	start)
 		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon $NAME && stat_done && exit 0
+		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
 		stat_fail
 	;;
   stop)
diff --git a/community/start-stop-daemon/PKGBUILD b/community/start-stop-daemon/PKGBUILD
new file mode 100644
index 000000000..b469afe43
--- /dev/null
+++ b/community/start-stop-daemon/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$ 
+# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Contributor: Soup <soup a.t soultrap d.o.t n.e.t>
+# Contributor: Vladimir Koshelenko <koshelenko@rndavia.ru>
+
+pkgname=start-stop-daemon
+pkgver=1.15.8.11
+pkgrel=1
+pkgdesc='Start and stop system daemon programs'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://packages.qa.debian.org/d/dpkg.html'
+source=("http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.bz2")
+md5sums=('58a1a3ab86ab3220e469cb75f6fb6d7c')
+
+build() {
+  cd dpkg-$pkgver
+  ./configure --without-dselect --without-update-alternatives --without-install-info
+  (cd lib && make)
+  cd utils && make
+}
+
+package() {
+  cd dpkg-$pkgver
+  install -D -m 755 utils/start-stop-daemon "$pkgdir/usr/bin/start-stop-daemon"
+  install -D -m 644 man/start-stop-daemon.8 "$pkgdir/usr/share/man/man8/start-stop-daemon.8"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index b06c7ea16..bc16759fa 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58251 2011-11-09 12:36:02Z ibiru $
+# $Id: PKGBUILD 60048 2011-12-03 18:39:55Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
 pkgver=4.1.6
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=4
+arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
@@ -183,7 +183,7 @@ md5sums=('89b979d1b817242c7cdcb489898f166a'
          '5f85710e0b8606de967716ded7b2d351'
          '6ab2455c391d8cc005e2f4461ae26a3b'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         'bb9f83f91349437825edc7bc9a294aee'
+         'cd8a53d0bfb26632d5b4d4e91a2b91d2'
          '97e193f050574dd272a38e5ee5ebe62b'
          '3c08ad30b89add47d3f45121200a5360'
          'e7416331d0bc331f3b5aae3e5d104642')
diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild
index fdfbe712f..c74004199 100755
--- a/community/virtualbox/vboxbuild
+++ b/community/virtualbox/vboxbuild
@@ -52,6 +52,7 @@ fi
 
 for kernver; do
   export KERN_DIR=/lib/modules/$kernver/build
+  export MODULE_DIR=/lib/modules/$kernver/extramodules
   if [[ ! -d $KERN_DIR ]]; then
     printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
         "$KERN_DIR"
@@ -73,6 +74,8 @@ for kernver; do
         stat_fail
       fi
     done
+    gzip -9 "$MODULE_DIR"/*.ko
+    depmod "$kernver"
   stat_done
 done
 
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 9eabbf7e3..f4709bf19 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131761 2011-07-14 17:10:17Z remy $
+# $Id: PKGBUILD 144094 2011-12-03 17:46:02Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.13
+pkgver=2.15
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('python2:           for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=('b4f2b72c0a4e7a02b716bfd0ad64bab45c567bbd')
+sha1sums=('e0fb336c195fb21a39e3d0f3acd4881ce5e170a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 77c52b0f7..d20eeb882 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143010 2011-11-20 20:58:22Z dan $
+# $Id: PKGBUILD 144099 2011-12-03 18:17:43Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.7.4
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('5b6920989480a37ec65977e756b24961578795dd'
-          'cb21e55ae793865453c165a0e666348f2db8c740'
+sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398'
+          '93315f7f51d7f27d3e421c9b0d64afa27f3d16df'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 373444048..8653eac60 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 140175 2011-10-08 12:02:46Z ibiru $
+# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.81
+pkgver=0.82
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('b7a7914f1fc1b5a21ab10bdca44356e1')
+md5sums=('10601ea543fda3e51545c4bce195b64c')
 
 build() {
-    install -d  "${srcdir}/"{mtr-cli,mtr-gtk}
-    cd "${srcdir}/mtr-cli"
-    ../${pkgbase}-${pkgver}/configure --prefix=/usr --disable-gtktest --without-gtk
+    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
+    cd "$srcdir/mtr-cli"
+    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
     make
 
-    cd "${srcdir}/mtr-gtk"
-    ../${pkgbase}-${pkgver}/configure --prefix=/usr
+    cd "$srcdir/mtr-gtk"
+    ../$pkgbase-$pkgver/configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
     depends=('ncurses')
-    cd "${srcdir}/mtr-cli"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/mtr-cli"
+    make DESTDIR="$pkgdir" install
 }
 
 package_mtr-gtk() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (GTK version)"
     depends=('ncurses' "gtk2")
     conflicts=("mtr")
-    provides=("mtr=${pkgver}")
+    provides=("mtr=$pkgver")
 
-    cd "${srcdir}/mtr-gtk"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/mtr-gtk"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index fb2ee89fc..4ded98b7e 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $
+# $Id: PKGBUILD 144087 2011-12-03 09:31:31Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
 makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('python2-numpy: Python 2.x interface'
-            'eigen2')
+optdepends=('opencv-docs'
+            'opencv-samples'
+            'eigen2'
+            'python2-numpy: Python 2.x interface')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
-md5sums=('827c9f8aa14384c531c73aa165f9b777')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
+md5sums=('82e4b6bfa349777233eea09b075e931e')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -45,7 +48,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D USE_FAST_MATH=ON')
 
 build() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   # x64, i.e "Athlon64" and upwards, can use SSE3
   [ $CARCH = x86_64 ] && \
@@ -57,14 +60,12 @@ build() {
 }
 
 package_opencv() {
-  install=$pkgname.install
-
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
@@ -85,8 +86,8 @@ package_opencv() {
 
 package_opencv-docs() {
   pkgdesc+=" (documentation)"
-  depends=()
-  optdepends=()
+  unset depends
+  unset optdepends
   options=('docs')
 
   cd "$srcdir"
@@ -97,9 +98,9 @@ package_opencv-docs() {
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=()
-  optdepends=()
-  options=()
+  depends=('bash')
+  unset optdepends
+  unset options
 
   cd "$srcdir"
 
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
index adaf7563c..a1b61d31f 100644
--- a/testing/binutils/PKGBUILD
+++ b/testing/binutils/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 144069 2011-12-02 21:03:50Z allan $
+# $Id: PKGBUILD 144110 2011-12-04 03:46:03Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.22
-pkgrel=1
+pkgrel=2
 _date=20111201
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
+groups=('base-devel')
 depends=('glibc>=2.14' 'zlib')
 checkdepends=('dejagnu')
 options=('!libtool' '!distcc' '!ccache')
diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD
new file mode 100644
index 000000000..966f32b38
--- /dev/null
+++ b/testing/fakeroot/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 144101 2011-12-03 22:12:51Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Jochem Kossen <j.kossen@home.nl>
+
+pkgname=fakeroot
+pkgver=1.18.2
+pkgrel=1
+pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://packages.debian.org/fakeroot"
+groups=('base-devel')
+install=fakeroot.install
+depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
+options=('!libtool')
+source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
+md5sums=('79f32331358ad58499704ea5e19fd0ae')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
+              --disable-static --with-ipc=sysv
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+
+  install -dm755 ${pkgdir}/etc/ld.so.conf.d/
+  echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
+
+  # install README for sysv/tcp usage
+  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+}
diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install
new file mode 100644
index 000000000..986c91b06
--- /dev/null
+++ b/testing/fakeroot/fakeroot.install
@@ -0,0 +1,14 @@
+post_install() {
+  sbin/ldconfig -r .
+}
+
+post_upgrade() {
+  if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
+    sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
+  fi
+  sbin/ldconfig -r .
+}
+
+pre_remove() {
+  sbin/ldconfig -r .
+}
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
index 4c4cec15d..d57464ec6 100644
--- a/testing/gcc/PKGBUILD
+++ b/testing/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144071 2011-12-02 21:13:00Z allan $
+# $Id: PKGBUILD 144107 2011-12-04 02:41:48Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.2
-pkgrel=2
+pkgrel=3
 _snapshot=4.6-20111125
 _libstdcppmanver=20110814		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
@@ -20,11 +20,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
-	gcc-hash-style-both.patch)
+	gcc-hash-style-both.patch
+	gcc-pr49720.patch)
 md5sums=('922b0ee688669c188d237bbd21d42d07'
          'ce920d2550ff7e042b9f091d27764d8f'
          '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f')
+         '4df25b623799b148a0703eaeec8fdf3f'
+         'f9d7e5b792c59175f3da3f8421447512')
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -46,6 +48,9 @@ build() {
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
+  # fix compiler segfault in binutils testsuite
+  patch -Np1 -i ${srcdir}/gcc-pr49720.patch
+
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
diff --git a/testing/gcc/gcc-pr49720.patch b/testing/gcc/gcc-pr49720.patch
new file mode 100644
index 000000000..8f50c4120
--- /dev/null
+++ b/testing/gcc/gcc-pr49720.patch
@@ -0,0 +1,26 @@
+--- trunk/gcc/simplify-rtx.c	2011/10/28 05:55:10	180603
++++ trunk/gcc/simplify-rtx.c	2011/10/28 06:35:31	180604
+@@ -4352,10 +4352,20 @@
+     {
+       rtx x = XEXP (op0, 0);
+       rtx c = XEXP (op0, 1);
++      enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS;
++      rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c);
+ 
+-      c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS,
+-			       cmp_mode, op1, c);
+-      return simplify_gen_relational (code, mode, cmp_mode, x, c);
++      /* Detect an infinite recursive condition, where we oscillate at this
++	 simplification case between:
++	    A + B == C  <--->  C - B == A,
++	 where A, B, and C are all constants with non-simplifiable expressions,
++	 usually SYMBOL_REFs.  */
++      if (GET_CODE (tem) == invcode
++	  && CONSTANT_P (x)
++	  && rtx_equal_p (c, XEXP (tem, 1)))
++	return NULL_RTX;
++
++      return simplify_gen_relational (code, mode, cmp_mode, x, tem);
+     }
+ 
+   /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is
diff --git a/testing/jack/40-hpet-permissions.rules b/testing/jack/40-hpet-permissions.rules
index 5a640b34a..7af3780f9 100644
--- a/testing/jack/40-hpet-permissions.rules
+++ b/testing/jack/40-hpet-permissions.rules
@@ -1,2 +1,2 @@
-KERNEL=="rtc0", GROUP="realtime"
-KERNEL=="hpet", GROUP="realtime"
+KERNEL=="rtc0", GROUP="audio"
+KERNEL=="hpet", GROUP="audio"
diff --git a/testing/jack/PKGBUILD b/testing/jack/PKGBUILD
index 357e7c795..5409abd5c 100644
--- a/testing/jack/PKGBUILD
+++ b/testing/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143225 2011-11-23 16:14:06Z schiv $
+# $Id: PKGBUILD 144098 2011-12-03 18:03:15Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -25,7 +25,7 @@ source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
         '40-hpet-permissions.rules')
 md5sums=('35f470f7422c37b33eb965033f7a42e8'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '6a1017041c024cea57da9bd726b664d7')
+         '471aad533ff56c5d3cbbf65ce32cadef')
 
 build() {
   cd "$srcdir/$_longname-$pkgver"
diff --git a/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD
new file mode 100644
index 000000000..918527cd2
--- /dev/null
+++ b/testing/module-init-tools/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 144112 2011-12-04 04:52:36Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=module-init-tools
+pkgver=3.16
+pkgrel=3
+pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules"
+arch=('i686' 'x86_64')
+url="https://modules.wiki.kernel.org"
+license=('GPL')
+depends=('glibc')
+makedepends=('docbook2x')
+backup=('etc/modprobe.d/modprobe.conf'
+        'etc/depmod.d/depmod.conf')
+source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2"
+        modprobe.conf
+        depmod.conf
+        docfix.patch)
+md5sums=('bc44832c6e41707b8447e2847d2019f5'
+         '325657db471b3190f685e5a89c9b90e3'
+         '4b8cbcbc54b9029c99fd730e257d4436'
+         '4320d19902ded43bed55c804b065cdc7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # fix headers in SGML manpage sources and an XML typo
+  patch -Np0 < "$srcdir/docfix.patch"
+
+  ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR=$pkgdir install
+
+  # extra modprobe.d and depmod.d conf dirs
+  install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d"
+
+  # Install custom depmod config to allow searching extramodules/
+  install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf"
+
+  # Install our custom (empty) modprobe.conf
+  install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf"
+}
diff --git a/testing/module-init-tools/depmod.conf b/testing/module-init-tools/depmod.conf
new file mode 100644
index 000000000..3feb67b05
--- /dev/null
+++ b/testing/module-init-tools/depmod.conf
@@ -0,0 +1,5 @@
+#
+# /etc/depmod.d/depmod.conf
+#
+
+search updates extramodules built-in
diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch
new file mode 100644
index 000000000..0151ca3f1
--- /dev/null
+++ b/testing/module-init-tools/docfix.patch
@@ -0,0 +1,90 @@
+--- doc/depmod.conf.sgml.orig	2011-06-25 10:07:15.897805024 -0400
++++ doc/depmod.conf.sgml	2011-06-25 10:07:48.810805020 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/depmod.sgml.orig	2011-06-25 10:07:15.898805024 -0400
++++ doc/depmod.sgml	2011-06-25 10:07:56.636805021 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+@@ -52,7 +52,7 @@
+       <arg><option>-n</option></arg>
+       <arg><option>-v</option></arg>
+       <arg><option>-P <replaceable>prefix</replaceable></option></arg>
+-      <arg><option>-w</option><arg>
++      <arg><option>-w</option></arg>
+       <arg><option><replaceable>version</replaceable></option></arg>
+       <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
+     </cmdsynopsis>
+--- doc/insmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
++++ doc/insmod.sgml	2011-06-25 10:07:59.228805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/lsmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
++++ doc/lsmod.sgml	2011-06-25 10:08:04.804805020 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modinfo.sgml.orig	2011-06-25 10:07:15.900805024 -0400
++++ doc/modinfo.sgml	2011-06-25 10:08:07.630805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modprobe.conf.sgml.orig	2011-06-25 10:07:15.901805024 -0400
++++ doc/modprobe.conf.sgml	2011-06-25 10:08:10.173805018 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modprobe.sgml.orig	2011-06-25 10:07:15.902805024 -0400
++++ doc/modprobe.sgml	2011-06-25 10:08:13.623805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modules.dep.sgml.orig	2011-06-25 10:07:15.903805024 -0400
++++ doc/modules.dep.sgml	2011-06-25 10:08:19.323805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/rmmod.sgml.orig	2011-06-25 10:07:15.904805024 -0400
++++ doc/rmmod.sgml	2011-06-25 10:08:27.691805017 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf
new file mode 100644
index 000000000..551bdfbdf
--- /dev/null
+++ b/testing/module-init-tools/modprobe.conf
@@ -0,0 +1,3 @@
+#
+# /etc/modprobe.d/modprobe.conf
+#
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
index 42a553e0f..c7196a385 100644
--- a/testing/shadow/PKGBUILD
+++ b/testing/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143705 2011-11-28 13:37:43Z dreisner $
+# $Id: PKGBUILD 144103 2011-12-04 01:16:49Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=shadow
 pkgver=4.1.4.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
index c1bd1066b..e990bfe39 100644
--- a/testing/shadow/shadow.install
+++ b/testing/shadow/shadow.install
@@ -1,8 +1,9 @@
 post_upgrade() {
-  grpck -r &>/dev/null
+  grpck -r >/dev/null 2>&1
   if [ $? -eq 2 ]; then
-    echo "Fixing gshadow file ..."
-    while :; do echo "y"; done | grpck &>/dev/null
+    printf '%s\n' \
+      "==> Warning: /etc/group or /etc/gshadow are inconsistant." \
+      "    Run 'grpck' to correct this."
   fi
   return 0
 }
diff --git a/~lukeshu/parabolaweb-git/PKGBUILD b/~lukeshu/parabolaweb-git/PKGBUILD
new file mode 100644
index 000000000..9b2614ed8
--- /dev/null
+++ b/~lukeshu/parabolaweb-git/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=parabolaweb-git
+pkgver=20111204
+pkgrel=1
+pkgdesc="The Parabola website, fork of archweb"
+arch=('any')
+url="https://projects.parabolagnulinux.org/parabolaweb.git/"
+license=('GPL2')
+depends=('python2' 'git'
+    'django=1.3.1'
+    'python-markdown=2.0.3'
+    'python-south=0.7.3'
+    'python2-pyinotify=0.9.2'
+    'python-memcached=1.47'
+    'python2-pytz>=2011n'
+
+    'python2-psycopg2'
+)
+install=parabolaweb.install
+
+# These will make it install into /http/srv/web
+_install_dir=/srv/http
+_gitname=web
+
+_gitroot=https://projects.parabolagnulinux.org/parabolaweb.git
+_gitbranch="master"
+
+build() {
+    sed -i \
+	-e "s|^_install_dir=.*|_install_dir='$_install_dir'|" \
+	-e "s|^_gitname=.*|_gitname='$_gitname'|" \
+	-e "s|^_gitroot=.*|_gitroot='$_gitroot'|" \
+	-e "s|^_gitbranch=.*|_gitbranch='$_gitbranch'|" \
+	../parabolaweb.install
+}
+
+package() {
+    install -d "${pkgdir}/${_install_dir}"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~lukeshu/parabolaweb-git/parabolaweb.install b/~lukeshu/parabolaweb-git/parabolaweb.install
new file mode 100644
index 000000000..0eaaf84c9
--- /dev/null
+++ b/~lukeshu/parabolaweb-git/parabolaweb.install
@@ -0,0 +1,59 @@
+# These will make it install into /http/srv/web
+_install_dir='/srv/http'
+_gitname='web'
+
+_gitroot='https://projects.parabolagnulinux.org/parabolaweb.git'
+_gitbranch='master'
+
+msg() {
+  echo $@
+}
+
+_main() {
+  set -e
+  if [ ! -d "$_install_dir" ]; then
+    mkdir "$_install_dir"
+  fi
+  cd "$_install_dir"
+
+  msg "Connecting to GIT server...."
+
+  if [ -d ${_gitname} ] ; then
+    cd ${_gitname}
+    git pull ${_gitroot}
+    msg "The local files are updated."
+  else
+    git clone ${_gitroot} ${_gitname}
+    cd ${_gitname}
+  fi
+  git checkout ${_gitbranch}
+
+  msg "GIT checkout done or server timeout"
+
+  msg "Checking configuration...."
+
+  if [ ! -f local_settings.py ]; then
+    cp local_settings.py.example local_settings.py.tmp
+    $EDITOR local_settings.py.tmp
+    mv local_settings.py.tmp local_settings.py
+    msg "Creating database...."
+    ./manage.py syncdb
+  fi
+  
+  find . -name '*.pyc' -delete
+  ./manage.py migrate
+  ./manage.py loaddata */fixtures/*.json
+}
+
+# arg 1:  the new package version
+post_install() {
+  _main
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  _main
+}
+
+# vim:set ts=2 sw=2 et: