[csw-devel] SF.net SVN: gar:[20223] csw/mgar/pkg/samba/trunk

[dmichelsen at users.sourceforge.net]

Revision: 20223
          http://gar.svn.sourceforge.net/gar/?rev=20223&view=rev
Author:   dmichelsen
Date:     2013-01-27 14:47:14 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
samba/trunk: It builds! Lots of checkpkg errors though

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/samba/trunk/files/0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2013-01-26 13:40:17 UTC (rev 20222)
+++ csw/mgar/pkg/samba/trunk/Makefile	2013-01-27 14:47:14 UTC (rev 20223)
@@ -26,6 +26,10 @@
 #   https://bugzilla.samba.org/show_bug.cgi?id=9604
 PATCHFILES += 0001-Use-correct-struct-fields-in-vfs_commit.c.patch
 
+# Use patch until this is fixed:
+#   https://bugzilla.samba.org/show_bug.cgi?id=9606
+PATCHFILES += 0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch
+
 BUILD_DEP_PKGS += CSWlibtalloc-dev
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -273,8 +277,9 @@
 EXTRA_CFLAGS = -lrt -lintl
 EXTRA_LDFLAGS = -lrt -lintl
 
-BUILD64 = 1
-ISAEXEC = 1
+# At the moment there are errors about python headers missing on 64 bit
+#BUILD64 = 1
+#ISAEXEC = 1
 
 GARCOMPILER = GNU
 
@@ -328,7 +333,13 @@
 # Tests need root
 SKIPTEST ?= 1
 
+# Some filenames contain a "=" which totally confuses the svr4 packaging system
+# These are:
+#   /opt/csw/share/setup/cn=replicator.ldif
+#   /opt/csw/share/setup/cn=samba-admin.ldif
+#   /opt/csw/share/setup/cn=samba.ldif
 
+EXTRA_PAX_ARGS += -s "/=/-/g"
 
 INITSMF += /etc/opt/csw/init.d/cswsamba
 INITSMF += /etc/opt/csw/init.d/cswwinbind
@@ -343,4 +354,7 @@
 	ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind
 	ginstall -d $(DESTDIR)/etc/opt/csw/samba
 	ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf
-	ginstall $(WORKSRC)/nsswitch/libnss_winbind.so $(DESTDIR)/$(libdir)/libnss_winbind.so.1
+	#ginstall $(WORKSRC)/nsswitch/libnss_winbind.so $(DESTDIR)/$(libdir)/libnss_winbind.so.1
+	@$(MAKECOOKIE)
+
+# python buildtools/bin/waf -v build 

Added: csw/mgar/pkg/samba/trunk/files/0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch
===================================================================
--- csw/mgar/pkg/samba/trunk/files/0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch	                        (rev 0)
+++ csw/mgar/pkg/samba/trunk/files/0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch	2013-01-27 14:47:14 UTC (rev 20223)
@@ -0,0 +1,34 @@
+From ba8709ceee319e011615e6c21b7fb9129a4080c4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 26 Jan 2013 15:32:48 +0100
+Subject: [PATCH] Use OpenCSW xml catalog and work around bashism
+
+---
+ buildtools/wafsamba/wafsamba.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
+index 9409669..94964ca 100644
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -790,14 +790,15 @@ def SAMBAMANPAGES(bld, manpages):
+     '''build and install manual pages'''
+     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
+     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
+-    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
++    bld.env.SAMBA_CATALOGS = 'file:///etc/opt/csw/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+     for m in manpages.split():
+         source = m + '.xml'
+         bld.SAMBA_GENERATOR(m,
+                             source=source,
+                             target=m,
+                             group='final',
+-                            rule='''export XML_CATALOG_FILES="${SAMBA_CATALOGS}"
++                            rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}"
++                                    export XML_CATALOG_FILES
+                                     ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
+                                     ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'''
+                             )
+-- 
+1.8.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.