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

Conflicts:
	community/erlang/PKGBUILD
	community/virtkey/PKGBUILD
	community/yaws/PKGBUILD
	core/openldap/PKGBUILD
	extra/avahi/PKGBUILD
	extra/gdb/PKGBUILD

5 files changed, 17 insertions, 21 deletions

diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index d3ed8a1ae..880a15c88 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172032 2012-11-26 16:57:06Z jgc $
+# $Id: PKGBUILD 172097 2012-11-28 10:31:12Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.34.2
-pkgrel=2
+pkgver=2.34.3
+pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('python2: for gdbus-codegen')
 options=('!libtool' '!docs' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('2d99a8309cdd0c584bd5386a49265fb19ac64575fe108fd901d6f26c8d73c708'
+sha256sums=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 build() {
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index f6a80cf44..9c0b8a54d 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171270 2012-11-16 23:40:29Z stephane $
+# $Id: PKGBUILD 172113 2012-11-29 11:07:07Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
-pkgver=20121114
+pkgver=20121126
 pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,17 +19,13 @@ replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
 source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
-        tftp.xinetd
-        iputils-20121114-free-unintialized.patch)
-sha1sums=('6061bf2ddbf0339b0084eddc33716465b742b82d'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          '7f1262f4bed7fa122ea86f09cb81d817adbd8164')
+        tftp.xinetd)
+sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2'
+          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
 
 build() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
 
-  patch -Np1 -i ../iputils-20121114-free-unintialized.patch
-
   # Use our CFLAGS
   sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
 
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index 02c2e235d..4e8523774 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165854 2012-09-01 15:27:36Z tomegun $
+# $Id: PKGBUILD 172139 2012-11-30 00:38:49Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=libevent
-pkgver=2.0.20
+pkgver=2.0.21
 pkgrel=1
 pkgdesc="An event notification library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -30,5 +30,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('94270cdee32c0cd0aa9f4ee6ede27e8e'
-         '5310233871ef2f2b3536114bf0377a42')
+md5sums=('b2405cc9ebf264aa47ff615d9de527a2'
+         '31ffa4efc611c452697bd120a3bf8f9e')
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 8295e8054..e346d0936 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168672 2012-10-13 23:13:42Z eric $
+# $Id: PKGBUILD 172106 2012-11-28 19:30:47Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.33
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
@@ -16,7 +16,7 @@ source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver
 sha1sums=('0cea642ba2dae1eb719da41bfedb9eba72ad504d'
           'b684038a7f5bc7d2ba470b2d16ee47b5aae64c65'
           'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4'
+          '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393'
           'f86a82e35ebe15026980467c9dee4007e686b795'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
 
diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service
index d8baa57b5..79b2cf81f 100644
--- a/core/openldap/slapd.service
+++ b/core/openldap/slapd.service
@@ -3,7 +3,7 @@ Description=OpenLDAP server daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/slapd
+ExecStart=/usr/sbin/slapd -u ldap -g ldap
 
 [Install]
 WantedBy=multi-user.target