mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-19 21:31:10 +02:00
ldb: unfork
This commit is contained in:
Rick Farina (Zero_Chaos)
parent
e7c922308b
commit
7ac366b1d1
6 changed files with 0 additions and 278 deletions
|
|
@ -1 +0,0 @@
|
|||
DIST ldb-2.8.0.tar.gz 1747616 BLAKE2B 19fd4cc0893ca36e7aa65eb605b050e3faeb7add6c00a2dfd8415334c58b7dc644ffaad41c24fe358b39292aaa581e3231e6b8161b03c073e903cdae16050ac5 SHA512 b6f289af3137e02a8e3ee0588bc300d1756b8980558e0b3a3a9eee4449100ccd42ed873187dbdb334e7e7834a8bff8478cd4f20588d4ca834d9ea14c0ee2c2f9
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
--- a/wscript 2017-07-05 15:35:52.178964698 -0400
|
||||
+++ b/wscript 2017-07-05 15:49:20.137977649 -0400
|
||||
@@ -208,6 +208,14 @@
|
||||
ldb_headers = ('include/ldb.h include/ldb_errors.h '
|
||||
'include/ldb_module.h include/ldb_handlers.h')
|
||||
|
||||
+ # we're not currently linking against the ldap libs, but ldb.pc.in
|
||||
+ # has @LDAP_LIBS@
|
||||
+ bld.env.LDAP_LIBS = ''
|
||||
+
|
||||
+ if not 'PACKAGE_VERSION' in bld.env:
|
||||
+ bld.env.PACKAGE_VERSION = VERSION
|
||||
+ bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
|
||||
+
|
||||
bld.SAMBA_LIBRARY('ldb',
|
||||
COMMON_SRC + ' ' + LDB_MAP_SRC,
|
||||
deps='tevent LIBLDB_MAIN replace',
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
--- ldb-1.5.2/wscript
|
||||
+++ ldb-1.5.2/wscript
|
||||
@@ -33,6 +33,10 @@
|
||||
opt.RECURSE('lib/tevent')
|
||||
opt.RECURSE('lib/replace')
|
||||
opt.load('python') # options for disabling pyc or pyo compilation
|
||||
+ if opt.IN_LAUNCH_DIR():
|
||||
+ opt.add_option('--disable-ldap',
|
||||
+ help=("disable ldap support"),
|
||||
+ action="store_true", dest='disable_ldap', default=False)
|
||||
|
||||
opt.add_option('--without-ldb-lmdb',
|
||||
help='disable new LMDB backend for LDB',
|
||||
@@ -40,6 +44,10 @@
|
||||
|
||||
|
||||
def configure(conf):
|
||||
+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
|
||||
+
|
||||
+ conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
|
||||
+
|
||||
conf.RECURSE('lib/tdb')
|
||||
conf.RECURSE('lib/tevent')
|
||||
|
||||
@@ -157,9 +165,12 @@
|
||||
if conf.env.standalone_ldb:
|
||||
conf.CHECK_XSLTPROC_MANPAGES()
|
||||
|
||||
- # we need this for the ldap backend
|
||||
- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
|
||||
- conf.env.ENABLE_LDAP_BACKEND = True
|
||||
+ if not conf.env.disable_ldap:
|
||||
+ # we need this for the ldap backend
|
||||
+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
|
||||
+ conf.env.ENABLE_LDAP_BACKEND = True
|
||||
+ else:
|
||||
+ conf.env.ENABLE_LDAP_BACKEND = False
|
||||
|
||||
# we don't want any libraries or modules to rely on runtime
|
||||
# resolution of symbols
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 38f5e8e09a7ae641b3669068b10c6bd966e46632 Mon Sep 17 00:00:00 2001
|
||||
From: Mathieu Parent <math.parent@gmail.com>
|
||||
Date: Thu, 4 Nov 2021 22:46:15 +0100
|
||||
Subject: [PATCH] Skip failing tests (on 32-bit architectures)
|
||||
|
||||
See https://bugzilla.samba.org/show_bug.cgi?id=14558#c17
|
||||
---
|
||||
tests/python/api.py | 4 ++++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tests/python/api.py b/tests/python/api.py
|
||||
index 8d154aa..e1de40c 100755
|
||||
--- a/tests/python/api.py
|
||||
+++ b/tests/python/api.py
|
||||
@@ -44,6 +44,8 @@ class NoContextTests(TestCase):
|
||||
self.assertEqual("19700101000000.0Z", ldb.timestring(0))
|
||||
self.assertEqual("20071119191012.0Z", ldb.timestring(1195499412))
|
||||
|
||||
+ self.skipTest('Test failing on 32-bit')
|
||||
+
|
||||
self.assertEqual("00000101000000.0Z", ldb.timestring(-62167219200))
|
||||
self.assertEqual("99991231235959.0Z", ldb.timestring(253402300799))
|
||||
|
||||
@@ -62,6 +64,8 @@ class NoContextTests(TestCase):
|
||||
self.assertEqual(0, ldb.string_to_time("19700101000000.0Z"))
|
||||
self.assertEqual(1195499412, ldb.string_to_time("20071119191012.0Z"))
|
||||
|
||||
+ self.skipTest('Test failing on 32-bit')
|
||||
+
|
||||
self.assertEqual(-62167219200, ldb.string_to_time("00000101000000.0Z"))
|
||||
self.assertEqual(253402300799, ldb.string_to_time("99991231235959.0Z"))
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- ldb-1.3.6/lib/tevent/wscript
|
||||
+++ ldb-1.3.6/lib/tevent/wscript
|
||||
@@ -34,8 +34,7 @@
|
||||
if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
|
||||
onlyif='talloc', implied_deps='replace talloc'):
|
||||
conf.define('USING_SYSTEM_TEVENT', 1)
|
||||
- if not conf.env.disable_python and \
|
||||
- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
|
||||
+ if not conf.env.disable_python:
|
||||
conf.define('USING_SYSTEM_PYTEVENT', 1)
|
||||
|
||||
if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
|
||||
|
|
@ -1,173 +0,0 @@
|
|||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
inherit python-single-r1 waf-utils multilib-minimal
|
||||
|
||||
DESCRIPTION="LDAP-like embedded database"
|
||||
HOMEPAGE="https://ldb.samba.org"
|
||||
SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="doc ldap +lmdb python test"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
test? ( lmdb )"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
TALLOC_VERSION="2.4.1"
|
||||
TDB_VERSION="1.4.9"
|
||||
TEVENT_VERSION="0.15.0"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/libbsd[${MULTILIB_USEDEP}]
|
||||
dev-libs/popt[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
|
||||
ldap? ( net-nds/openldap:= )
|
||||
lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
|
||||
sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
|
||||
sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/libcrypt
|
||||
test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] )
|
||||
"
|
||||
BDEPEND="${PYTHON_DEPS}
|
||||
dev-libs/libxslt
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
|
||||
WAF_BINARY="${S}/buildtools/bin/waf"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
|
||||
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
|
||||
"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
|
||||
"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# Package fails to build with distcc
|
||||
export DISTCC_DISABLE=1
|
||||
export PYTHONHASHSEED=1
|
||||
|
||||
# waf requires a python interpreter
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
check_samba_dep_versions() {
|
||||
actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
|
||||
if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
|
||||
eerror "Source talloc version: ${TALLOC_VERSION}"
|
||||
eerror "Ebuild talloc version: ${actual_talloc_version}"
|
||||
die "Ebuild needs to fix TALLOC_VERSION!"
|
||||
fi
|
||||
|
||||
actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
|
||||
if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
|
||||
eerror "Source tdb version: ${TDB_VERSION}"
|
||||
eerror "Ebuild tdb version: ${actual_tdb_version}"
|
||||
die "Ebuild needs to fix TDB_VERSION!"
|
||||
fi
|
||||
|
||||
actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
|
||||
if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
|
||||
eerror "Source tevent version: ${TEVENT_VERSION}"
|
||||
eerror "Ebuild tevent version: ${actual_tevent_version}"
|
||||
die "Ebuild needs to fix TEVENT_VERSION!"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
check_samba_dep_versions
|
||||
|
||||
if use test && ! use python ; then
|
||||
# We want to be able to run tests w/o Python as it makes
|
||||
# automated testing much easier (as USE=python isn't default-enabled).
|
||||
truncate -s0 tests/python/{repack,index,api,crash}.py || die
|
||||
fi
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# When specifying libs for samba build you must append NONE to the end to
|
||||
# stop it automatically including things
|
||||
local bundled_libs="NONE"
|
||||
|
||||
# We "use" bundled cmocka when we're not running tests as we're
|
||||
# not using it anyway. Means we avoid making users install it for
|
||||
# no reason. bug #802531
|
||||
if ! use test; then
|
||||
bundled_libs="cmocka,${bundled_libs}"
|
||||
fi
|
||||
|
||||
local myconf=(
|
||||
$(usex ldap '' --disable-ldap)
|
||||
$(usex lmdb '' --without-ldb-lmdb)
|
||||
--disable-rpath
|
||||
--disable-rpath-install
|
||||
--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
|
||||
--bundled-libraries="${bundled_libs}"
|
||||
--builtin-libraries=NONE
|
||||
)
|
||||
|
||||
if ! use python || ! multilib_is_native_abi; then
|
||||
myconf+=( --disable-python )
|
||||
fi
|
||||
|
||||
waf-utils_src_configure "${myconf[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
waf-utils_src_compile
|
||||
multilib_is_native_abi && use doc && doxygen Doxyfile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
if multilib_is_native_abi; then
|
||||
WAF_MAKE=1 \
|
||||
PATH=buildtools/bin:../../../buildtools/bin:${PATH}:"${BUILD_DIR}"/bin/shared/private/ \
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
|
||||
waf test || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
waf-utils_src_install
|
||||
|
||||
if multilib_is_native_abi && use doc; then
|
||||
doman apidocs/man/man3/*.3
|
||||
docinto html
|
||||
dodoc -r apidocs/html/.
|
||||
fi
|
||||
|
||||
# bug #726454
|
||||
use python && python_optimize
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if has_version sys-auth/sssd; then
|
||||
ewarn "You have sssd installed. It is known to break after ldb upgrades,"
|
||||
ewarn "so please try to rebuild it before reporting bugs."
|
||||
ewarn "See https://bugs.gentoo.org/404281"
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in a new issue