Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=0110f1f2719b25d23a67860190ab3b4a966575ea
commit 0110f1f2719b25d23a67860190ab3b4a966575ea Author: crazy <[email protected]> Date: Wed Jan 6 19:34:16 2016 +0100 openldap-2.4.43-1-x86_64 * Version bump * fix missing Fln * added m4.patch to fix some build issue :-) diff --git a/source/network-extra/openldap/FrugalBuild b/source/network-extra/openldap/FrugalBuild index 8358de2..e565c7a 100644 --- a/source/network-extra/openldap/FrugalBuild +++ b/source/network-extra/openldap/FrugalBuild @@ -1,33 +1,32 @@ # Compiling Time: 1.03 SBU # Maintainer: Miklos Vajna <[email protected]> -options+=('asneeded') - pkgname=openldap -pkgver=2.4.42 +pkgver=2.4.43 pkgrel=1 pkgdesc="A suite of the Lightweight Directory Access Protocol servers" url="http://www.openldap.org/"; groups=('network-extra') archs=('i686' 'x86_64' 'arm') backup=(etc/openldap/ldap.conf etc/openldap/slapd.conf) -depends=('db>=4.7.25-4' 'libtool') +depends=('db>=6.1.26' 'libtool>=2.4.6-4') rodepends=("libldap=$pkgver") -makedepends=('openssl>=1.0.0' 'cyrus-sasl>=2.1.23-4' 'groff') +makedepends=('openssl>=1.0.2-3' 'cyrus-sasl>=2.1.26' 'groff>=1.22.3-2') up2date="Flasttar http://www.openldap.org/software/download/"; source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$pkgname-$pkgver.tgz \ - slapd.service slapd.sysconfig create_initial_ldap slapd.init.ldif slapd.init.conf DB_CONFIG) -sha1sums=('ec03e061bfdb2e6a90827855cf77a72cb3f89cf4' \ + slapd.service slapd.sysconfig create_initial_ldap slapd.init.ldif slapd.init.conf DB_CONFIG m4.patch) +sha1sums=('3b52924df2f45e81f25ecbe37551bc837d090cfa' \ '01796e95dfc853b789f41a908ab340fa4e2334d4' \ 'fe4a47065a0b3b7c61d768dd5216b28f1254ffb0' \ '31d5ecdba5d490763fb06df5452cb48157a73871' \ '5fc92cf30d4826be94e2ef421a951f49849dbe3c' \ 'b176d6d6075735c89546d2d50497def889219d76' \ - '8a5d021410d00e00445a380ee65df7c14d3a3805') + '8a5d021410d00e00445a380ee65df7c14d3a3805' \ + '3823d99d18035d7922768be198f2ae3ec3b7b491') subpkgs=('libldap') subdescs=('OpenLDAP library.') -subdepends=('openssl>=1.0.0 cyrus-sasl') +subdepends=('openssl>=1.0.2-3 cyrus-sasl>=2.1.26') subgroups=('lib') subarchs=('i686 x86_64 arm') @@ -57,8 +56,12 @@ build() make DESTDIR=$Fdestdir install || return 1 + Ffix_la_files + Fremove_static_libs + Fln liblber.so /usr/lib/liblber.so.2 Fln libldap.so /usr/lib/libldap.so.2 + Fln libldap_r.so /usr/lib/liblber_r.so.2 chmod +x $Fdestdir/usr/lib/*so* Ffile slapd.sysconfig /etc/sysconfig/slapd diff --git a/source/network-extra/openldap/m4.patch b/source/network-extra/openldap/m4.patch new file mode 100644 index 0000000..8cbad6d --- /dev/null +++ b/source/network-extra/openldap/m4.patch @@ -0,0 +1,17 @@ +diff -Naur openldap-2.4.43/build/openldap.m4 openldap-2.4.43-db/build/openldap.m4 +--- openldap-2.4.43/build/openldap.m4 2015-11-30 18:02:00.000000000 +0100 ++++ openldap-2.4.43-db/build/openldap.m4 2016-01-06 19:18:02.981818924 +0100 +@@ -554,12 +554,9 @@ + #define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH) + + /* require 4.4 or later, but less than 6.0.20 */ +-#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014 ++#if DB_VERSION_FULL >= 0x040400 + __db_version_compat + #endif +-#if DB_VERSION_FULL >= 0x060014 +-#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP" +-#endif + ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) + ]) + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
