Mon Oct 22 01:08:14 PDT 2012

14 files changed, 258 insertions, 31 deletions

diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
index 045e5e038..ee0a1bf57 100644
--- a/testing/btrfs-progs/PKGBUILD
+++ b/testing/btrfs-progs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167942 2012-10-03 23:03:54Z tomegun $
+# $Id: PKGBUILD 169471 2012-10-21 19:56:53Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=0.19.20120904
-pkgrel=6
+pkgver=0.19.20121005
+pkgrel=2
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -16,7 +16,10 @@ license=('GPL2')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
 	initcpio-install-btrfs
 	initcpio-hook-btrfs)
-install=btrfs.install
+install=btrfs-progs.install
+md5sums=('7fb014324954ee073b039dc0066de960'
+         'd7ad825b0b25f2be73289a20e7afcdb7'
+         'b09688a915a0ec8f40e2f5aacbabc9ad')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -38,6 +41,3 @@ package() {
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
 }
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
-         '2d3df276f80bb09813f56a56d6f93ddd'
-         '9fb35142755b477a96cb7292f3d64839')
diff --git a/testing/btrfs-progs/btrfs-progs.install b/testing/btrfs-progs/btrfs-progs.install
new file mode 100644
index 000000000..d6c0698a0
--- /dev/null
+++ b/testing/btrfs-progs/btrfs-progs.install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+  if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
+    echo "btrfs multi-device support now relies on linux 3.6 or later"
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs
index 913cec528..7965d0a8a 100644
--- a/testing/btrfs-progs/initcpio-hook-btrfs
+++ b/testing/btrfs-progs/initcpio-hook-btrfs
@@ -1,10 +1,7 @@
 #!/usr/bin/ash
 
 run_hook() {
-    # if udevd is running, this is done async by add/change events
-    if [ "$udevd_running" -ne 1 ]; then
-        btrfs device scan
-    fi
+    btrfs device scan
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
index fb64f12e2..aa06e55ac 100644
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ b/testing/btrfs-progs/initcpio-install-btrfs
@@ -8,7 +8,8 @@ build() {
 
 help() {
     cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes, in the absence of udev.
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
 HELPEOF
 }
 
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
index 3c814c345..3e619e29b 100644
--- a/testing/empathy/PKGBUILD
+++ b/testing/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169262 2012-10-18 19:29:01Z jgc $
+# $Id: PKGBUILD 169460 2012-10-21 14:03:14Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.6.0.2
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ options=('!libtool')
 groups=('gnome-extra')
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3c27db67236249e60ee0439d6a1098729939731ce597b724a058c8ce2eb659f9')
+sha256sums=('12d936a39182500da7541bdd42327949c241b454fde462be52d137aae3c56183')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD
index 29e0ffaac..53b80d6b3 100644
--- a/testing/glibmm/PKGBUILD
+++ b/testing/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169241 2012-10-18 19:27:44Z jgc $
+# $Id: PKGBUILD 169462 2012-10-21 15:00:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.33.14
+pkgver=2.34.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('5bf9e9338a8e50cf46e637abed9c62cba41cccecb6610f5bba2830d9afc4e6ed')
+sha256sums=('ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD
index c5b2f7937..c0f1b1005 100644
--- a/testing/gtkglext/PKGBUILD
+++ b/testing/gtkglext/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 168484 2012-10-12 16:59:46Z andyrtr $
-# Maintainer:
+# $Id: PKGBUILD 169440 2012-10-21 08:31:13Z andyrtr $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=8
+pkgrel=9
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
-depends=('gtk2' 'glu' 'libxmu')
+depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
 makedepends=('mesa')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
@@ -31,6 +31,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   make DESTDIR="${pkgdir}" install
 }
diff --git a/testing/ibus/PKGBUILD b/testing/ibus/PKGBUILD
index 79bf2f9b3..a0aeebf1a 100644
--- a/testing/ibus/PKGBUILD
+++ b/testing/ibus/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id$
+# $Id: PKGBUILD 169430 2012-10-21 04:52:25Z eric $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.4.99.20120822
+pkgver=1.4.99.20121006
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="http://ibus.googlecode.com"
 license=('LGPL')
 makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
-depends=('hicolor-icon-theme' 'gtk2' 'gtk3')
+depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('46d836b68733953b443859f47ad6991f4584658d')
+sha1sums=('e324382caa8dde8e4ea9c3d60a6ec5c96a313a86')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -28,7 +28,7 @@ build() {
     --disable-gconf \
     --enable-dconf \
     --disable-memconf \
-    --disable-ui
+    --enable-ui
   make
 }
 
diff --git a/testing/udisks2/PKGBUILD b/testing/udisks2/PKGBUILD
index 263e32349..176ef15f3 100644
--- a/testing/udisks2/PKGBUILD
+++ b/testing/udisks2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169147 2012-10-18 19:22:22Z jgc $
+# $Id: PKGBUILD 169452 2012-10-21 11:36:14Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=1.99.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support')
 options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176')
+sha256sums=('aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb')
 
 build() {
   cd "udisks-$pkgver"
diff --git a/testing/usermin/PKGBUILD b/testing/usermin/PKGBUILD
new file mode 100644
index 000000000..6e5eb6289
--- /dev/null
+++ b/testing/usermin/PKGBUILD
@@ -0,0 +1,134 @@
+# $Id: PKGBUILD 169457 2012-10-21 13:56:26Z tomegun $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=usermin
+pkgver=1.520
+pkgrel=2
+pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
+arch=(i686 x86_64)
+license=('custom:usermin')
+url="http://www.webmin.com/"
+depends=('perl' 'webmin')
+makedepends=('perl-net-ssleay')
+backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
+'etc/usermin/at/config' \
+'etc/usermin/man/config' \
+'etc/usermin/ssh/config' \
+'etc/usermin/chfn/config' \
+'etc/usermin/cron/config' \
+'etc/usermin/file/config' \
+'etc/usermin/plan/config' \
+'etc/usermin/proc/config' \
+'etc/usermin/spam/config' \
+'etc/usermin/htaccess/config' \
+'etc/usermin/cshrc/config' \
+'etc/usermin/gnupg/config' \
+'etc/usermin/mysql/config' \
+'etc/usermin/quota/config' \
+'etc/usermin/shell/config' \
+'etc/usermin/theme/config' \
+'etc/usermin/mailbox/config' \
+'etc/usermin/schedule/config' \
+'etc/usermin/config' \
+'etc/usermin/commands/config' \
+'etc/usermin/htaccess-htpasswd/config' \
+'etc/usermin/forward/config' \
+'etc/usermin/telnet/config' \
+'etc/usermin/tunnel/config' \
+'etc/usermin/updown/config' \
+'etc/usermin/procmail/config' \
+'etc/usermin/fetchmail/config' \
+'etc/usermin/changepass/config' \
+'etc/usermin/language/config' \
+'etc/usermin/postgresql/config' \
+'etc/usermin/usermount/config' \
+)
+install=usermin.install
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
+	usermin.rc 
+	usermin.service
+	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
+
+build() {
+  cd $startdir/src/$pkgname-$pkgver
+    
+  # remove modules we do not support
+
+  #remove config files from other distros
+  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
+  
+  # remove caldera theme
+  rm -rf caldera
+
+  # remove init-scripts from other distros
+  rm usermin-init
+  rm usermin-daemon
+
+  # setting perl path
+  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+  
+  # create dirs
+  mkdir -p $startdir/pkg/opt/usermin
+  mkdir -p $startdir/pkg/var/log/usermin
+  mkdir -p $startdir/pkg/etc/usermin
+  
+  # install pam stuff
+  install -D -m 644 usermin-pam $startdir/pkg/etc/pam.d/usermin
+  
+  # remove other distros and add only Archlinux don't change next line else it will not work!
+  rm os_list.txt
+  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
+  
+  # copy stuff to right dirs
+  cd $startdir/src/$pkgname-$pkgver
+  cp -rp * $startdir/pkg/opt/usermin
+  cd $startdir/src/usermin-config
+  cp -rfp * $startdir/pkg/opt/usermin
+
+  # define parameters for setup.sh
+  config_dir=$startdir/pkg/etc/usermin
+  var_dir=$startdir/pkg/var/log/usermin
+  perl=/usr/bin/perl
+  autoos=1
+  port=20000
+  login=root
+  crypt="XXX"
+  ssl=1
+  atboot=0
+  nostart=1
+  nochown=1
+  autothird=1
+  nouninstall=1
+  noperlpath=1
+  atbootyn=n
+  tempdir=$startdir/pkg/tmp
+  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
+  
+  # Fix setup.sh
+  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/usermin/setup.sh
+  $startdir/pkg/opt/usermin/setup.sh
+  
+  # Fixup the config files to use their real locations
+  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' $startdir/pkg/etc/usermin/miniserv.conf
+  find $startdir/pkg/etc/usermin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
+  
+  # make it only accessible by localhost
+  echo 'allow=127.0.0.1' >> $startdir/pkg/etc/usermin/miniserv.conf
+  
+  # enable user and password login
+  sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
+
+  #install systemd service file
+  install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
+ 
+ #install rc file
+  install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
+
+  # delete temp dir
+  rm -r $startdir/pkg/tmp
+  #install license
+  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
+}
+md5sums=('5819ba87796d9373a92116e90d1a35d4'
+         'cfef4490cd1ef9517c0b39a7bd75c968'
+         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
+         'ec37a79f948f778224550930d2a7ca07')
diff --git a/testing/usermin/usermin-config.tar.bz2 b/testing/usermin/usermin-config.tar.bz2
new file mode 100644
index 000000000..056bb6298
--- /dev/null
+++ b/testing/usermin/usermin-config.tar.bz2
diff --git a/testing/usermin/usermin.install b/testing/usermin/usermin.install
new file mode 100644
index 000000000..3ace10ea2
--- /dev/null
+++ b/testing/usermin/usermin.install
@@ -0,0 +1,34 @@
+# arg 1:  the new package version
+post_install() {
+  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
+  crypt=${crypt//\\/\\\\}
+  crypt=${crypt//\//\\\/}
+  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
+cat << EOF
+Note:
+==> It is not allowed to install 3rd party modules, or delete existing modules.
+==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
+Setup:
+==> To make usermin start at boot time, add usermin to rc.conf daemons
+==> Point your web browser to http://localhost:20000 to use usermin.
+==> To change the modules setup please use webmin.
+
+==> The access is restricted to localhost, if you want to connect from other locations
+==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
+==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
+EOF
+# fix man module
+  cd /opt/usermin/man
+  gzip -df $(find . -name '*.gz')
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  # uninstall unzipped files
+  rm -r /opt/usermin/man
+}
diff --git a/testing/usermin/usermin.rc b/testing/usermin/usermin.rc
new file mode 100644
index 000000000..af365780a
--- /dev/null
+++ b/testing/usermin/usermin.rc
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+start=/etc/usermin/start
+stop=/etc/usermin/stop
+lockfile=/var/lock/usermin
+
+case "$1" in
+'start')
+     stat_busy "Starting Usermin daemon"
+     $start >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     touch $lockfile >/dev/null 2>&1
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'stop')
+     stat_busy "Stopping Usermin daemon"
+     $stop >/dev/null 2>&1 </dev/null
+     RETVAL=$?
+     if [ "$RETVAL" = "0" ]; then
+     rm -f $lockfile
+     stat_done
+     else
+     stat_fail
+fi
+;;
+
+'restart')
+     $stop && $start
+     RETVAL=$?
+;;
+*)
+echo "Usage: $0 { start | stop | restart }"
+RETVAL=1
+;;
+esac
+exit $RETVAL
\ No newline at end of file
diff --git a/testing/usermin/usermin.service b/testing/usermin/usermin.service
new file mode 100644
index 000000000..e91164c63
--- /dev/null
+++ b/testing/usermin/usermin.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Usermin
+
+[Service]
+Type=forking
+ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
+
+[Install]
+WantedBy=multi-user.target