summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD18
-rw-r--r--pkg-config.patch15
3 files changed, 36 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c3edf8771576..a505c78a2962 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri May 27 18:18:40 UTC 2016
pkgbase = 389-ds-base
pkgdesc = 389 Directory Server (base)
- pkgver = 1.3.4.1
+ pkgver = 1.3.5.4
pkgrel = 1
url = http://port389.org/
install = 389-ds-base.install
@@ -21,7 +23,7 @@ pkgbase = 389-ds-base
depends = perl-mozldap
depends = perl-netaddr-ip
depends = perl-socket
- depends = svrcore
+ depends = svrcore>=4.1.2
depends = tcp_wrappers
depends = zlib
options = !libtool
@@ -31,8 +33,10 @@ pkgbase = 389-ds-base
backup = etc/dirsrv/config/ldap-agent.conf
backup = etc/dirsrv/config/slapd-collations.conf
backup = etc/dirsrv/config/template-initconfig
- source = http://www.port389.org/binaries/389-ds-base-1.3.4.1.tar.bz2
- sha512sums = fb160600338d8ed2fe6f0ad0c724ad208347fb684981ce5839b57b1b3d2c42664fa2e803e826f1b1178a881dc0bf557a2c6e5a729e0208a0bb3ede571781bdbf
+ source = http://www.port389.org/binaries/389-ds-base-1.3.5.4.tar.bz2
+ source = pkg-config.patch
+ sha512sums = 0cf3a1e403bc6d417525f908263d59689bbee1db887c5ba552fdae28252a59c37ee8e47ec29c48eb18fc1384652b94667f5768df87602f4c37b86d7ef0df284e
+ sha512sums = d20a7387c509983fa68ff22d5cd363e41d3c91ebd9232921edcc6c4b61a960a2cfd85e6f76152c39abf6a3c75f1617b8e94492fe2fdc3538038bd14c05bbac75
pkgname = 389-ds-base
diff --git a/PKGBUILD b/PKGBUILD
index 2c7e00a8ee72..d8be1c8b8da0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Maintainer: Javier Torres <javitonino [at] gmail [dot] com>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
BUILD_SELINUX=false
pkgname=389-ds-base
-pkgver=1.3.4.1
+pkgver=1.3.5.4
pkgrel=1
pkgdesc="389 Directory Server (base)"
arch=(i686 x86_64)
url="http://port389.org/"
license=(GPL)
depends=(db cyrus-sasl cyrus-sasl-gssapi icu lm_sensors net-snmp nspr nss
- openldap openssl pcre perl-mozldap perl-netaddr-ip perl-socket svrcore
+ openldap openssl pcre perl-mozldap perl-netaddr-ip perl-socket 'svrcore>=4.1.2'
tcp_wrappers zlib)
if [[ "${BUILD_SELINUX}" = "true" ]]; then
depends+=(selinux-usr-policycoreutils)
@@ -23,8 +24,10 @@ backup=(etc/default/dirsrv
etc/dirsrv/config/template-initconfig)
options=(!libtool)
install=${pkgname}.install
-source=("http://www.port389.org/binaries/${pkgname}-${pkgver}.tar.bz2")
-sha512sums=('fb160600338d8ed2fe6f0ad0c724ad208347fb684981ce5839b57b1b3d2c42664fa2e803e826f1b1178a881dc0bf557a2c6e5a729e0208a0bb3ede571781bdbf')
+source=("http://www.port389.org/binaries/${pkgname}-${pkgver}.tar.bz2"
+ "pkg-config.patch")
+sha512sums=('0cf3a1e403bc6d417525f908263d59689bbee1db887c5ba552fdae28252a59c37ee8e47ec29c48eb18fc1384652b94667f5768df87602f4c37b86d7ef0df284e'
+ 'd20a7387c509983fa68ff22d5cd363e41d3c91ebd9232921edcc6c4b61a960a2cfd85e6f76152c39abf6a3c75f1617b8e94492fe2fdc3538038bd14c05bbac75')
build() {
cd "${pkgname}-${pkgver}"
@@ -38,11 +41,16 @@ build() {
export USE_64=1
fi
+ patch -p1 < "${srcdir}/pkg-config.patch"
+ autoreconf
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--sbindir=/usr/bin \
+ --localstatedir=/var \
--with-tmpfiles-d=/usr/lib/tmpfiles.d \
+ --with-systemd \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-systemdsystemconfdir=/etc/systemd/system \
--with-systemdgroupname=${pkgname}.target \
diff --git a/pkg-config.patch b/pkg-config.patch
new file mode 100644
index 000000000000..0f21f1b015b5
--- /dev/null
+++ b/pkg-config.patch
@@ -0,0 +1,15 @@
+--- a/m4/systemd4.md 2016-05-22 12:10:23.149034397 +0200
++++ b/m4/systemd.m4 2016-05-22 12:10:51.958881947 +0200
+@@ -50,9 +50,9 @@
+ fi
+ else
+
+- if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists systemd libsystemd-daemon ; then
+- systemd_inc=`$PKG_CONFIG --cflags-only-I systemd libsystemd-daemon`
+- systemd_lib=`$PKG_CONFIG --libs-only-l systemd libsystemd-daemon`
++ if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists systemd libsystemd ; then
++ systemd_inc=`$PKG_CONFIG --cflags-only-I systemd libsystemd`
++ systemd_lib=`$PKG_CONFIG --libs-only-l systemd libsystemd`
+ systemd_defs="-DWITH_SYSTEMD"
+ else
+ AC_MSG_ERROR([no Systemd pkg-config files])