1 |
commit: ffa408b3d9e5462d6b8233309eedbd1e6781b236 |
2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 29 18:10:58 2022 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 29 18:12:51 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa408b3 |
7 |
|
8 |
net-fs/samba: add tevent detection patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/590026 |
11 |
|
12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
13 |
|
14 |
net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch | 12 ++++++++++++ |
15 |
net-fs/samba/samba-4.14.14.ebuild | 1 + |
16 |
net-fs/samba/samba-4.15.9.ebuild | 1 + |
17 |
net-fs/samba/samba-4.16.4.ebuild | 1 + |
18 |
4 files changed, 15 insertions(+) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 000000000000..4578435064b0 |
23 |
--- /dev/null |
24 |
+++ b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch |
25 |
@@ -0,0 +1,12 @@ |
26 |
+--- ldb-1.3.6/lib/tevent/wscript |
27 |
++++ ldb-1.3.6/lib/tevent/wscript |
28 |
+@@ -34,8 +34,7 @@ |
29 |
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, |
30 |
+ onlyif='talloc', implied_deps='replace talloc'): |
31 |
+ conf.define('USING_SYSTEM_TEVENT', 1) |
32 |
+- if not conf.env.disable_python and \ |
33 |
+- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): |
34 |
++ if not conf.env.disable_python: |
35 |
+ conf.define('USING_SYSTEM_PYTEVENT', 1) |
36 |
+ |
37 |
+ if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): |
38 |
|
39 |
diff --git a/net-fs/samba/samba-4.14.14.ebuild b/net-fs/samba/samba-4.14.14.ebuild |
40 |
index d7e8bd93a28f..860cd1aeb3f2 100644 |
41 |
--- a/net-fs/samba/samba-4.14.14.ebuild |
42 |
+++ b/net-fs/samba/samba-4.14.14.ebuild |
43 |
@@ -143,6 +143,7 @@ BDEPEND="${PYTHON_DEPS} |
44 |
|
45 |
PATCHES=( |
46 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
47 |
+ "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" |
48 |
) |
49 |
|
50 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
51 |
|
52 |
diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9.ebuild |
53 |
index a2c269deaa76..2ba0530bb6ae 100644 |
54 |
--- a/net-fs/samba/samba-4.15.9.ebuild |
55 |
+++ b/net-fs/samba/samba-4.15.9.ebuild |
56 |
@@ -140,6 +140,7 @@ BDEPEND="${PYTHON_DEPS} |
57 |
|
58 |
PATCHES=( |
59 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
60 |
+ "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" |
61 |
) |
62 |
|
63 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
64 |
|
65 |
diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4.ebuild |
66 |
index 6aa50af58785..02f5797dfdc2 100644 |
67 |
--- a/net-fs/samba/samba-4.16.4.ebuild |
68 |
+++ b/net-fs/samba/samba-4.16.4.ebuild |
69 |
@@ -143,6 +143,7 @@ PATCHES=( |
70 |
"${FILESDIR}/${PN}-4.4.0-pam.patch" |
71 |
"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" |
72 |
"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" |
73 |
+ "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" |
74 |
) |
75 |
|
76 |
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |