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

Conflicts:
	community/python-simplejson/PKGBUILD
	community/teeworlds/PKGBUILD
	core/openldap/PKGBUILD
	core/zlib/PKGBUILD
	extra/soprano/PKGBUILD
	extra/ucommon/PKGBUILD

4 files changed, 67 insertions, 21 deletions

diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 917572ea5..14abe79d0 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 182592 2013-04-10 20:23:35Z eric $
+# $Id: PKGBUILD 184147 2013-05-02 19:39:44Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.35
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
-makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
 options=('!makeflags')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd.service slapd.tmpfiles ntlm.patch)
+        slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch)
 sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266'
           '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393'
           'f86a82e35ebe15026980467c9dee4007e686b795'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
+          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
+          'b2d11b4c522750ad9da3409333094fb599ac2c85')
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/openldap-ntlm.patch
+  patch -p0 -i "${srcdir}"/openldap-nssov.patch
   sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
   sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
+  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
   sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+}
 
+build() {
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
     --sysconfdir=/etc --localstatedir=/var/lib/openldap \
     --enable-ipv6 --enable-syslog --enable-local \
@@ -36,10 +40,14 @@ build() {
     --enable-spasswd --with-cyrus-sasl \
     --enable-overlays=mod --enable-modules=yes
   make
+
+  cd contrib/slapd-modules/nssov
+  make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap
+  chrpath -d .libs/nssov.so
 }
 
 check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make test
 }
 
@@ -49,7 +57,7 @@ package_libldap() {
   backup=('etc/openldap/ldap.conf')
   options=('!libtool')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   for dir in include libraries doc/man/man3 ; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -69,16 +77,24 @@ package_libldap() {
 package_openldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
   depends=("libldap>=${pkgver}" 'libltdl')
-  backup=('etc/openldap/slapd.conf')
+  backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif')
   options=('!libtool' 'emptydirs')
   install=openldap.install
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in clients servers doc/man/man{1,5,8} ; do
+  cd ${pkgbase}-${pkgver}
+  for dir in clients servers doc/man/man{1,5,8}; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
     popd
   done
+
+  pushd contrib/slapd-modules/nssov
+  install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap
+  ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so
+  ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0
+  install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema
+  popd
+
   rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
   rm -r "${pkgdir}"/run
 
@@ -87,8 +103,8 @@ package_openldap() {
 
   ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
 
-  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+  chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+  chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
 
   install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
   install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
diff --git a/core/openldap/openldap-nssov.patch b/core/openldap/openldap-nssov.patch
new file mode 100644
index 000000000..5ec2c36f3
--- /dev/null
+++ b/core/openldap/openldap-nssov.patch
@@ -0,0 +1,30 @@
+--- contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h	2013-03-28 11:41:51.000000000 -0400
++++ contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h	2012-07-08 04:34:12.000000000 -0400
+@@ -71,6 +71,16 @@
+    1.0 release of nss-pam-ldapd is made. */
+ #define NSLCD_VERSION 1
+ 
++/* Get a NSLCD configuration option. There is one request parameter:
++    INT32   NSLCD_CONFIG_*
++  the result value is:
++    STRING  value, interpretation depending on request */
++#define NSLCD_ACTION_CONFIG_GET        20006
++
++/* return the message, if any, that is presented to the user when password
++   modification through PAM is prohibited */
++#define NSLCD_CONFIG_PAM_PASSWORD_PROHIBIT_MESSAGE  852
++
+ /* Email alias (/etc/aliases) NSS requests. The result values for a
+    single entry are:
+      STRING      alias name
+@@ -249,8 +262,10 @@
+ #define NSLCD_PAM_NEW_AUTHTOK_REQD   12 /* Password expired */
+ #define NSLCD_PAM_ACCT_EXPIRED       13 /* Account expired */
+ #define NSLCD_PAM_SESSION_ERR        14 /* Cannot make/remove session record */
++#define NSLCD_PAM_AUTHTOK_ERR        20 /* Authentication token manipulation error */
+ #define NSLCD_PAM_AUTHTOK_DISABLE_AGING 23 /* Password aging disabled */
+ #define NSLCD_PAM_IGNORE             25 /* Ignore module */
+ #define NSLCD_PAM_ABORT              26 /* Fatal error */
++#define NSLCD_PAM_AUTHTOK_EXPIRED    27 /* authentication token has expired */
+ 
+ #endif /* not _NSLCD_H */
diff --git a/core/openldap/ntlm.patch b/core/openldap/openldap-ntlm.patch
index 6804b610d..6804b610d 100644
--- a/core/openldap/ntlm.patch
+++ b/core/openldap/openldap-ntlm.patch
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index f69ac893e..bc6d05080 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $
+# $Id: PKGBUILD 184034 2013-05-02 08:15:23Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zlib
-pkgver=1.2.7
-pkgrel=1.1
+pkgver=1.2.8
+pkgrel=1
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.zlib.net/"
 depends=('glibc')
 source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('60df6a37c56e7c1366cca812414f7b85')
+md5sums=('44d667c142d7cda120332623eab69f40')
 
 build() {
 	cd ${srcdir}/zlib-$pkgver