0003-Disable-build-of-manpages-and-documentation.patch 4.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123
  1. From 3cd608170b99492bdd5fe3b7b8e7db61af199845 Mon Sep 17 00:00:00 2001
  2. From: Bernd Kuhls <bernd.kuhls@t-online.de>
  3. Date: Thu, 9 Aug 2018 09:59:06 +0200
  4. Subject: [PATCH] Disable build of manpages and documentation
  5. This patch fixes a bug described in an upstream bug report
  6. https://bugzilla.samba.org/show_bug.cgi?id=9515
  7. which was closed as WONTFIX by disabling the build of manpages and
  8. documentation.
  9. If installed on the host, samba4 uses the docbook-xsl package to build
  10. parts of the documentation. This package is broken, on Debian for
  11. example the bug reported to samba4 was fixed in the docbook-xsl package:
  12. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567
  13. Since we do not provide a host version of docbook-xsl we need to disable
  14. the build of manpages and documentation.
  15. Patch was downloaded from
  16. https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch
  17. [Bernd: rebased for samba-4.8.5]
  18. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  19. ---
  20. buildtools/wafsamba/wafsamba.py | 10 ++++-----
  21. docs-xml/wscript_build | 40 ++++++++++++++++-----------------
  22. source4/scripting/wscript_build | 4 ++--
  23. 3 files changed, 27 insertions(+), 27 deletions(-)
  24. diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
  25. index 4bb19d070e2..a255d841111 100644
  26. --- a/buildtools/wafsamba/wafsamba.py
  27. +++ b/buildtools/wafsamba/wafsamba.py
  28. @@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  29. else:
  30. bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
  31. - if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
  32. - bld.env['XSLTPROC_MANPAGES']):
  33. - bld.MANPAGES(manpages, install)
  34. +# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
  35. +# bld.env['XSLTPROC_MANPAGES']):
  36. +# bld.MANPAGES(manpages, install)
  37. Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
  38. @@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source,
  39. samba_ldflags = pie_ldflags
  40. )
  41. - if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  42. - bld.MANPAGES(manpages, install)
  43. +# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  44. +# bld.MANPAGES(manpages, install)
  45. Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
  46. diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
  47. index ec5d28fc62a..f81c125bcd4 100644
  48. --- a/docs-xml/wscript_build
  49. +++ b/docs-xml/wscript_build
  50. @@ -148,23 +148,23 @@ bld.SAMBA_GENERATOR(parameter_all,
  51. rule=smbdotconf_generate_parameter_list,
  52. dep_vars=bld.dynconfig_varnames())
  53. -def SMBDOTCONF_MANPAGE(bld, target):
  54. - ''' assemble and build smb.conf.5 manual page'''
  55. - bld.SAMBAMANPAGES(target, parameter_all)
  56. -
  57. -if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
  58. -
  59. - SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
  60. - bld.SAMBAMANPAGES(manpages)
  61. -
  62. - if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
  63. - bld.SAMBAMANPAGES(pam_winbind_manpages)
  64. -
  65. - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
  66. - bld.SAMBAMANPAGES(krb5_locator_manpages)
  67. -
  68. - if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
  69. - bld.SAMBAMANPAGES(krb5_localauth_manpages)
  70. -
  71. - if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
  72. - bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
  73. +#def SMBDOTCONF_MANPAGE(bld, target):
  74. +# ''' assemble and build smb.conf.5 manual page'''
  75. +# bld.SAMBAMANPAGES(target, parameter_all)
  76. +#
  77. +#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
  78. +#
  79. +# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
  80. +# bld.SAMBAMANPAGES(manpages)
  81. +#
  82. +# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
  83. +# bld.SAMBAMANPAGES(pam_winbind_manpages)
  84. +#
  85. +# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
  86. +# bld.SAMBAMANPAGES(krb5_locator_manpages)
  87. +#
  88. +# if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
  89. +# bld.SAMBAMANPAGES(krb5_localauth_manpages)
  90. +#
  91. +# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
  92. +# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
  93. diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
  94. index 2f53cce12b7..9841ae0a116 100644
  95. --- a/source4/scripting/wscript_build
  96. +++ b/source4/scripting/wscript_build
  97. @@ -12,8 +12,8 @@ if sbin_files:
  98. bld.INSTALL_FILES('${SBINDIR}',
  99. sbin_files,
  100. chmod=MODE_755, python_fixup=True, flat=True)
  101. - if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  102. - bld.MANPAGES(man_files, True)
  103. +# if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  104. +# bld.MANPAGES(man_files, True)
  105. if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
  106. bld.INSTALL_FILES('${BINDIR}',
  107. --
  108. 2.18.0