diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
commit | dec82423b45179c362a4727cc3d63fb2349af369 (patch) | |
tree | 552f0832ffe5dab6305382ea0c0e4a42da17063a /core/openldap | |
parent | a0f85906119bcb8e7269dee701076946b3ec45ea (diff) | |
parent | ef815a5d80eecd4ba0679a376386741c374e0d1b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dzen2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
core/openldap/PKGBUILD
extra/geeqie/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libksane/PKGBUILD
extra/moc/PKGBUILD
extra/strigi/PKGBUILD
extra/vice/PKGBUILD
Diffstat (limited to 'core/openldap')
-rw-r--r-- | core/openldap/PKGBUILD | 18 | ||||
-rwxr-xr-x | core/openldap/slapd | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 041b69d8b..21b04e4a1 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,30 +1,28 @@ -# $Id: PKGBUILD 162887 2012-07-02 18:03:02Z eric $ +# $Id: PKGBUILD 164817 2012-08-06 19:23:29Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.31 -pkgrel=4 +pkgver=2.4.32 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd slapd.default slapd.service slapd.tmpfiles - ntlm.patch - mutex-end-of-struct-sigsegv.patch) -sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' - 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' + ntlm.patch) +sha1sums=('294d5e9711bcb6850188ed895eeb986d43b62664' + 'b684038a7f5bc7d2ba470b2d16ee47b5aae64c65' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' 'f86a82e35ebe15026980467c9dee4007e686b795' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' - '694269dad78c7a806649c2d7f57bb7e503df3af1') + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') build() { cd "${srcdir}"/${pkgbase}-${pkgver} patch -Np1 -i "${srcdir}"/ntlm.patch - patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.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 diff --git a/core/openldap/slapd b/core/openldap/slapd index 4f212da66..604f6b275 100755 --- a/core/openldap/slapd +++ b/core/openldap/slapd @@ -19,9 +19,9 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else + add_daemon slapd stat_done fi - add_daemon slapd else stat_fail fi |