[Pkg-samba-maint] [samba] 01/02: Use the upstream version of the smb.conf.5 manpage

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit 68d4d69b93d09844b0578190ac9cc97f9f0eee5c
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Jun 8 23:15:57 2014 +0200

    Use the upstream version of the smb.conf.5 manpage
    
    This is a workaround for bug #750593 in xsltproc, which causes the build to
    fail.
---
 debian/changelog                                    |  5 +++++
 debian/patches/series                               |  1 +
 debian/patches/xsltproc_dont_build_smb.conf.5.patch | 20 ++++++++++++++++++++
 debian/rules                                        |  4 ++++
 4 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4f0e1d7a..e8954ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ samba (2:4.1.8+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release. Fixes:
     - CVE-2014-0239: dns: Don't reply to replies. Closes: #749845
     - CVE-2014-0178: Malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response.
+  * Use the upstream version of the smb.conf.5 manpage, instead of building
+    it. This is an ugly temporary workaround because xsltproc crashes on some
+    architectures when building this manpage (due to #750593).
+    This fixes the FTBFS, and should make samba installable with the new ldb
+    version. Closes: #750541, 750796
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 20 Apr 2014 22:12:12 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c8eec44..79134da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
 do-not-install-smbclient4-and-nmbclient4
+xsltproc_dont_build_smb.conf.5.patch
diff --git a/debian/patches/xsltproc_dont_build_smb.conf.5.patch b/debian/patches/xsltproc_dont_build_smb.conf.5.patch
new file mode 100644
index 0000000..6aee334
--- /dev/null
+++ b/debian/patches/xsltproc_dont_build_smb.conf.5.patch
@@ -0,0 +1,20 @@
+Description: Don't build smb.conf.5 manpage
+ This is a temporary workaround for a bug in xsltproc, which crashes on some
+ architectures when building the smb.conf.5 manpage
+Author: Ivo De Decker <ivo.dedecker at ugent.be>
+Bug-Debian: http://bugs.debian.org/750593
+Forwarded: not-needed
+
+diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
+index 9c6042f..7949c88 100644
+--- a/docs-xml/wscript_build
++++ b/docs-xml/wscript_build
+@@ -116,7 +116,7 @@ def SMBDOTCONF_MANPAGE(bld, target):
+ 
+ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
+ 
+-    SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
++    #SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
+     bld.SAMBAMANPAGES(manpages)
+ 
+     if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
diff --git a/debian/rules b/debian/rules
index 3836161..383385c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,6 +133,10 @@ override_dh_install:
 	mkdir -p debian/samba/usr/lib/$(PYSHORT)/dist-packages/samba
 	mv $(DESTDIR)/usr/lib/$(PYSHORT)/dist-packages/samba/dckeytab.so \
 	   debian/samba/usr/lib/$(PYSHORT)/dist-packages/samba/dckeytab.so
+	# use upstream version of smb.conf.5 if there is no built version
+	# this is a temporary workaround for #750593 in xsltproc
+	[ -e $(DESTIDR)/usr/share/man/man5/smb.conf.5 ] || \
+	   cp docs/manpages/smb.conf.5 $(DESTDIR)/usr/share/man/man5/smb.conf.5
 	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
 
 override_dh_python2:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git