forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-fs/samba: do not install python DSDB bits when USE=-addc
If ADDC is disabled, samba-4.8.6 was still installing python module smbd_dns.so , which links to libdnsserver-common-samba4.so but the latter is NOT installed. This causes infinite revdep-rebuild errors. This commit patches the build system to prevent said file from being installed. Bumped directly to stable by maintainers. Signed-off-by: Ian Stakenvicius <[email protected]> Package-Manager: Portage-2.3.49, Repoman-2.3.11
- Loading branch information
1 parent
7725f04
commit c3c0a86
Showing
2 changed files
with
36 additions
and
0 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
Do not install the python DSDB modules when ADDC is disabled. | ||
This is a change integrated upstream in 4.9.1 (or earlier). | ||
|
||
Without this, the python dsdb_dns.so module is installed, which | ||
is linked to libdnsserver-common.so that is NOT installed, and so | ||
potential breakage ensues. | ||
|
||
--- a/source4/dsdb/wscript_build 2018-01-17 03:08:39.000000000 -0500 | ||
+++ b/source4/dsdb/wscript_build 2018-11-08 10:43:58.064486832 -0500 | ||
@@ -63,10 +63,11 @@ | ||
) | ||
|
||
bld.SAMBA_PYTHON('python_dsdb', | ||
source='pydsdb.c', | ||
# the dependency on dcerpc here is because gensec | ||
# depends on dcerpc but the waf circular dependency finder | ||
# removes it so we end up with unresolved symbols. | ||
deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones', | ||
- realname='samba/dsdb.so' | ||
+ realname='samba/dsdb.so', | ||
+ enabled=bld.AD_DC_BUILD_IS_ENABLED() | ||
) | ||
--- a/source4/dns_server/wscript_build 2018-11-08 11:49:03.450296286 -0500 | ||
+++ b/source4/dns_server/wscript_build 2018-11-08 11:49:23.327864408 -0500 | ||
@@ -64,9 +64,10 @@ | ||
private_library=True, | ||
deps='samba-hostconfig samdb-common gensec popt dnsserver_common', | ||
enabled=bld.AD_DC_BUILD_IS_ENABLED()) | ||
|
||
|
||
bld.SAMBA_PYTHON('python_dsdb_dns', | ||
source='pydns.c', | ||
deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util', | ||
- realname='samba/dsdb_dns.so') | ||
+ realname='samba/dsdb_dns.so', | ||
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) |
File renamed without changes.