diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | pkg-config.patch | 15 |
3 files changed, 11 insertions, 37 deletions
@@ -1,31 +1,25 @@ # Generated by mksrcinfo v8 -# Fri May 27 18:20:15 UTC 2016 +# Wed Oct 26 17:32:04 UTC 2016 pkgbase = 389-ds-base pkgdesc = 389 Directory Server (base) - pkgver = 1.3.5.4 + pkgver = 1.3.5.14 pkgrel = 1 url = http://port389.org/ install = 389-ds-base.install arch = i686 arch = x86_64 license = GPL - depends = db depends = cyrus-sasl depends = cyrus-sasl-gssapi depends = icu depends = lm_sensors depends = net-snmp - depends = nspr - depends = nss + depends = libsystemd depends = openldap - depends = openssl - depends = pcre depends = perl-mozldap depends = perl-netaddr-ip depends = perl-socket depends = svrcore>=4.1.2 - depends = tcp_wrappers - depends = zlib options = !libtool backup = etc/default/dirsrv backup = etc/default/dirsrv.systemd @@ -33,10 +27,8 @@ 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.5.4.tar.bz2 - source = pkg-config.patch - sha512sums = 0cf3a1e403bc6d417525f908263d59689bbee1db887c5ba552fdae28252a59c37ee8e47ec29c48eb18fc1384652b94667f5768df87602f4c37b86d7ef0df284e - sha512sums = d20a7387c509983fa68ff22d5cd363e41d3c91ebd9232921edcc6c4b61a960a2cfd85e6f76152c39abf6a3c75f1617b8e94492fe2fdc3538038bd14c05bbac75 + source = http://www.port389.org/binaries/389-ds-base-1.3.5.14.tar.bz2 + sha512sums = d267048048c781ddefb06b53dace6bc741138c95a25c6546abb5049a4d2c7af03e0da4aca259d5cbb5e56750c0c1b8a4fe8d835dff04ead50370375cf17404b3 pkgname = 389-ds-base @@ -4,15 +4,15 @@ BUILD_SELINUX=false pkgname=389-ds-base -pkgver=1.3.5.4 +pkgver=1.3.5.14 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>=4.1.2' - tcp_wrappers zlib) +depends=(cyrus-sasl cyrus-sasl-gssapi icu lm_sensors net-snmp libsystemd + openldap perl-mozldap perl-netaddr-ip perl-socket 'svrcore>=4.1.2') + if [[ "${BUILD_SELINUX}" = "true" ]]; then depends+=(selinux-usr-policycoreutils) fi @@ -24,10 +24,8 @@ backup=(etc/default/dirsrv etc/dirsrv/config/template-initconfig) options=(!libtool) install=${pkgname}.install -source=("http://www.port389.org/binaries/${pkgname}-${pkgver}.tar.bz2" - "pkg-config.patch") -sha512sums=('0cf3a1e403bc6d417525f908263d59689bbee1db887c5ba552fdae28252a59c37ee8e47ec29c48eb18fc1384652b94667f5768df87602f4c37b86d7ef0df284e' - 'd20a7387c509983fa68ff22d5cd363e41d3c91ebd9232921edcc6c4b61a960a2cfd85e6f76152c39abf6a3c75f1617b8e94492fe2fdc3538038bd14c05bbac75') +source=("http://www.port389.org/binaries/${pkgname}-${pkgver}.tar.bz2") +sha512sums=('d267048048c781ddefb06b53dace6bc741138c95a25c6546abb5049a4d2c7af03e0da4aca259d5cbb5e56750c0c1b8a4fe8d835dff04ead50370375cf17404b3') build() { cd "${pkgname}-${pkgver}" @@ -41,7 +39,6 @@ build() { export USE_64=1 fi - patch -p1 < "${srcdir}/pkg-config.patch" autoreconf ./configure \ diff --git a/pkg-config.patch b/pkg-config.patch deleted file mode 100644 index 0f21f1b015b5..000000000000 --- a/pkg-config.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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]) |