commit: ffa408b3d9e5462d6b8233309eedbd1e6781b236 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Fri Jul 29 18:10:58 2022 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Jul 29 18:12:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa408b3
net-fs/samba: add tevent detection patch Closes: https://bugs.gentoo.org/590026 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch | 12 ++++++++++++ net-fs/samba/samba-4.14.14.ebuild | 1 + net-fs/samba/samba-4.15.9.ebuild | 1 + net-fs/samba/samba-4.16.4.ebuild | 1 + 4 files changed, 15 insertions(+) diff --git a/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch new file mode 100644 index 000000000000..4578435064b0 --- /dev/null +++ b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch @@ -0,0 +1,12 @@ +--- 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'): diff --git a/net-fs/samba/samba-4.14.14.ebuild b/net-fs/samba/samba-4.14.14.ebuild index d7e8bd93a28f..860cd1aeb3f2 100644 --- a/net-fs/samba/samba-4.14.14.ebuild +++ b/net-fs/samba/samba-4.14.14.ebuild @@ -143,6 +143,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" + "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9.ebuild index a2c269deaa76..2ba0530bb6ae 100644 --- a/net-fs/samba/samba-4.15.9.ebuild +++ b/net-fs/samba/samba-4.15.9.ebuild @@ -140,6 +140,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" + "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4.ebuild index 6aa50af58785..02f5797dfdc2 100644 --- a/net-fs/samba/samba-4.16.4.ebuild +++ b/net-fs/samba/samba-4.16.4.ebuild @@ -143,6 +143,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" + "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
