0004-Disable-build-of-manpages-and-documentation.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116
  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. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  18. ---
  19. buildtools/wafsamba/wafsamba.py | 10 +++++-----
  20. docs-xml/wscript_build | 34 +++++++++++++++++-----------------
  21. source4/scripting/wscript_build | 4 ++--
  22. 3 files changed, 24 insertions(+), 24 deletions(-)
  23. diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
  24. index 4bb19d070e2..a255d841111 100644
  25. --- a/buildtools/wafsamba/wafsamba.py
  26. +++ b/buildtools/wafsamba/wafsamba.py
  27. @@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  28. else:
  29. bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
  30. - if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
  31. - bld.env['XSLTPROC_MANPAGES']):
  32. - bld.MANPAGES(manpages, install)
  33. +# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
  34. +# bld.env['XSLTPROC_MANPAGES']):
  35. +# bld.MANPAGES(manpages, install)
  36. Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
  37. @@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source,
  38. samba_ldflags = pie_ldflags
  39. )
  40. - if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  41. - bld.MANPAGES(manpages, install)
  42. +# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  43. +# bld.MANPAGES(manpages, install)
  44. Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
  45. diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
  46. index 954c62a29bc..1169158fd57 100644
  47. --- a/docs-xml/wscript_build
  48. +++ b/docs-xml/wscript_build
  49. @@ -147,20 +147,20 @@ bld.SAMBA_GENERATOR(parameter_all,
  50. rule=smbdotconf_generate_parameter_list,
  51. dep_vars=bld.dynconfig_varnames())
  52. -def SMBDOTCONF_MANPAGE(bld, target):
  53. - ''' assemble and build smb.conf.5 manual page'''
  54. - bld.SAMBAMANPAGES(target, parameter_all)
  55. -
  56. -if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
  57. -
  58. - SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
  59. - bld.SAMBAMANPAGES(manpages)
  60. -
  61. - if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
  62. - bld.SAMBAMANPAGES(pam_winbind_manpages)
  63. -
  64. - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
  65. - bld.SAMBAMANPAGES(krb5_locator_manpages)
  66. -
  67. - if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
  68. - bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
  69. +#def SMBDOTCONF_MANPAGE(bld, target):
  70. +# ''' assemble and build smb.conf.5 manual page'''
  71. +# bld.SAMBAMANPAGES(target, parameter_all)
  72. +#
  73. +#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
  74. +#
  75. +# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
  76. +# bld.SAMBAMANPAGES(manpages)
  77. +#
  78. +# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
  79. +# bld.SAMBAMANPAGES(pam_winbind_manpages)
  80. +#
  81. +# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
  82. +# bld.SAMBAMANPAGES(krb5_locator_manpages)
  83. +#
  84. +# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
  85. +# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
  86. diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
  87. index 2f53cce12b7..9841ae0a116 100644
  88. --- a/source4/scripting/wscript_build
  89. +++ b/source4/scripting/wscript_build
  90. @@ -12,8 +12,8 @@ if sbin_files:
  91. bld.INSTALL_FILES('${SBINDIR}',
  92. sbin_files,
  93. chmod=MODE_755, python_fixup=True, flat=True)
  94. - if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  95. - bld.MANPAGES(man_files, True)
  96. +# if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
  97. +# bld.MANPAGES(man_files, True)
  98. if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
  99. bld.INSTALL_FILES('${BINDIR}',
  100. --
  101. 2.14.4