Diff openldap-2.6.4-r1 with a openldap-2.6.4-r2

/usr/portage/net-nds/openldap/openldap-2.6.4-r2.ebuild 2023-10-09 14:52:34.724368482 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6 6
# Re cleanups:
7 7
# 2.5.x is an LTS release so we want to keep it for a while.
8 8

  
9
inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
9
inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
10
inherit ssl-cert toolchain-funcs systemd tmpfiles
10 11

  
11 12
MY_PV="$(ver_rs 1-2 _)"
12 13

  
......
25 26
LICENSE="OPENLDAP GPL-2"
26 27
# Subslot added for bug #835654
27 28
SLOT="0/$(ver_cut 1-2)"
28
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
29
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
29 30

  
30 31
IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
31 32
IUSE_OVERLAY="overlays perl autoca"
32
IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test"
33
IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test"
33 34
IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
34 35
IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
35 36
IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
......
56 57
	)
57 58
	sasl? ( dev-libs/cyrus-sasl:= )
58 59
	!minimal? (
60
		dev-libs/libevent:=
59 61
		dev-libs/libltdl
60 62
		sys-fs/e2fsprogs
61 63
		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
......
340 342
	#
341 343
	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
342 344
	# the bundled lmdb's header to find out the version.
343
	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' libraries/liblmdb/lmdb.h || die)
345
	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
346
		libraries/liblmdb/lmdb.h || die)
344 347
	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
345 348

  
346 349
	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
......
362 365
	sed -i \
363 366
		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
364 367
		-e '/MKDIR.*.(DESTDIR)\/run/d' \
365
		-e '/MKDIR.*.(DESTDIR).*.(runstatedir)/d' \
366 368
		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
367 369

  
368 370
	pushd build &>/dev/null || die "pushd build"
......
399 401
		$(use_enable debug)
400 402
		--enable-dynamic
401 403
		$(use_enable syslog)
402
		$(use_enable ipv6)
404
		--enable-ipv6
403 405
		--enable-local
404 406
	)
405 407

  
......
469 471
		# compile-in the syncprov
470 472
		myconf+=( --enable-syncprov=yes )
471 473

  
474
		# Build the standalone load balancer (lloadd) - also available as a slapd module; --enable-balancer=mod
475
		myconf+=( --enable-balancer=yes )
476

  
472 477
		# SLAPD Password Module Options
473 478
		myconf+=(
474 479
			$(use_enable argon2)
......
709 714
			einfo "Adding $(basename ${x})"
710 715
			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
711 716
		done
712
		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
717
		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
718
			-i "${configfile}" || die
713 719
		use prefix || fowners root:ldap /etc/openldap/slapd.conf
714 720
		fperms 0640 /etc/openldap/slapd.conf
715 721
		cp "${configfile}" "${configfile}".default || die
Thank you!