Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 55 insertions, 46 deletions

diff --git a/pcr/openchange/PKGBUILD b/pcr/openchange/PKGBUILD
index 9a774867a..8ed9d2e90 100644
--- a/pcr/openchange/PKGBUILD
+++ b/pcr/openchange/PKGBUILD
@@ -1,67 +1,76 @@
-# Maintainer (Arch): Michael Hansen <zrax0111 gmail com>
-# Contributor (Arch): ngoonee <ngoonee.talk@gmail.com>
-# Contributor (Arch): Adam Russell <adamlr6+arch@gmail.com>
+# Maintainer: Michael Hansen <zrax0111 gmail com>
+# Contributor: DJ Lucas <dj@linuxfromscratch.org>
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Adam Russell <adamlr6+arch@gmail.com>
 pkgname=openchange
-_codename=BORG
-_dlid=180
-pkgver=1.0
-pkgrel=6
-pkgdesc="Library for MAPI connectivity with Microsoft Exchange. This package was SPECIFICALLY created to support evolution-mapi and may not work for any other purpose."
-arch=('i686' 'x86_64' 'mips64el')
+_codename=NANOPROBE
+_dlid=246
+pkgver=2.2
+pkgrel=4
+pkgdesc="A portable, open source implementation of Microsoft Exchange server \
+and Exchange protocols.  This package was originally created to support \
+evolution-mapi and may not work for any other purpose."
+arch=('i686' 'x86_64')
 url="http://www.openchange.org"
 license=('GPL3')
-depends=('samba4>=4.0.0B1' 'popt' 'libical' 'sqlite3' 'file' 'boost' 'zlib')
-makedepends=('ccache' 'python2' 'subversion' 'docbook-xsl' 'libxslt' 'flex' 'bison' 'autoconf' 'automake')
+depends=('samba>=4.2' 'libical' 'sqlite3' 'file' 'boost' 'python2' 'libmariadbclient')
+makedepends=('ccache' 'python2' 'docbook-xsl' 'libxslt')
 options=(!makeflags)
 # Releases are mirrored at http://tracker.openchange.org/projects/openchange/files
 source=("http://tracker.openchange.org/attachments/download/${_dlid}/${pkgname}-${pkgver}-${_codename}.tar.gz"
-        "bugzilla_682449.patch")
+        "openchange-samba42.patch")
 
-md5sums=('9b57a325e90e5ad3a702ddc6e8762ab6'
-         '7521f89f8ffaa733ed72532334951b90')
-_prefix="/opt/samba4"
+sha256sums=('f15eb26d16370e85f01649300dd6722c31f0750437a4b60acd604a79439cf688'
+            '8e4c2afede896e16a74be87323412bdcad8173d6943107a0aab38c6b77860887')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}-${_codename}
+    cd "${srcdir}/${pkgname}-${pkgver}-${_codename}"
 
-	patch -i ../bugzilla_682449.patch
+    patch -p1 < "${srcdir}/openchange-samba42.patch"
 
-	SAVEIFS=${IFS}
-	IFS=$(echo -en "\n\b")
-	PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py')
-$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/  -type f)
-$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/ -name 'configure.ac')"
-	sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
-	       -e "s|python-config$|python2-config|" \
-	       -e "s|bin/python$|bin/python2|" \
-	    ${PYTHON_CALLERS}
+    PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py')
+                    $(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name 'configure.ac')
+                    setup/openchange_newuser setup/openchange_provision
+                    mapiproxy/services/web/rpcproxy/rpcproxy.wsgi"
+    sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
+           -e "s|python-config|python2-config|" \
+           -e "s|bin/python|bin/python2|" \
+        ${PYTHON_CALLERS}
 
-	# Patch for samba4-alpha19+
-	SRC_FILES="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.c')"
-	sed -i -e "s|#include <samba/popt.h>|#include <popt.h>|" ${SRC_FILES}
-	IFS=${SAVEIFS}
+    # Fix linking of boost_thread in autoconf test
+    sed -i -e "s|-lboost_thread\$BOOST_LIB_SUFFIX|-lboost_thread\$BOOST_LIB_SUFFIX -lboost_system\$BOOST_LIB_SUFFIX|" \
+        configure.ac
 
-	export PYTHON=/usr/bin/python2
+    export PYTHON=/usr/bin/python2
 
-	export PKG_CONFIG_PATH="${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig"
-	export BOOST_LIB_SUFFIX="-mt"
-	./autogen.sh
-
-  sed -i -e "s|python-config|python2-config|g" configure
-	./configure --prefix=${_prefix} --with-samba=${_prefix}
-	make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1
+    ./autogen.sh
+    ./configure \
+        --prefix=/usr \
+        --sbindir=/usr/bin \
+        --datadir=/usr/share/samba \
+        --enable-pyopenchange \
+        --with-modulesdir=/usr/lib/samba/modules
+    rm mapiproxy/libmapi{proxy,store}/backends/*.po
+    rm mapiproxy/util/*.po
+    make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1
 }
 
 package() {
-	_pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+    _pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+
+    cd "${srcdir}/${pkgname}-${pkgver}-${_codename}"
+    make DESTDIR="$pkgdir/" install
 
-	cd ${srcdir}/${pkgname}-${pkgver}-${_codename}
-	make DESTDIR="$pkgdir/" install
+    # NOTE:  Not using `make installman' because that generates a bunch
+    #   of doxygen-based manpages which may have conflicting names with
+    #   other system man pages
+    install -d "${pkgdir}/usr/share/man"
+    cp -r doc/man/man* "${pkgdir}/usr/share/man"
 
-	cd ${pkgdir}/${_prefix}/lib/
-	ln -s libmapi.so libmapi.so.0
-	ln -s libocpf.so libocpf.so.0
+    cd "${pkgdir}/usr/lib"
+    ln -s libmapi.so libmapi.so.0
+    ln -s libocpf.so libocpf.so.0
 
-	find ${pkgdir}/${_prefix}/lib/python${_pyver}/site-packages/ -name '*.py' | \
-	     xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+    find "${pkgdir}/usr/lib/python${_pyver}/site-packages" -name '*.py' | \
+         xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
 }