[csw-devel] SF.net SVN: gar:[20271] csw/mgar/pkg/samba/trunk
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Fri Feb 8 08:41:32 CET 2013
Revision: 20271
http://gar.svn.sourceforge.net/gar/?rev=20271&view=rev
Author: janholzh
Date: 2013-02-08 07:41:31 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------
samba/trunk: this does build now,packaging needs now to be done
Modified Paths:
--------------
csw/mgar/pkg/samba/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/samba/trunk/files/0001-fix-xml.patch
Removed Paths:
-------------
csw/mgar/pkg/samba/trunk/files/0001-Use-correct-struct-fields-in-vfs_commit.c.patch
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-02-07 20:30:37 UTC (rev 20270)
+++ csw/mgar/pkg/samba/trunk/Makefile 2013-02-08 07:41:31 UTC (rev 20271)
@@ -22,14 +22,8 @@
# This is taken from the old Samba package
DISTFILES += cswkrb5.conf
-# Use patch until this is fixed:
-# https://bugzilla.samba.org/show_bug.cgi?id=9604
-#PATCHFILES += 0001-Use-correct-struct-fields-in-vfs_commit.c.patch
+PATCHFILES += 0001-fix-xml.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
Deleted: csw/mgar/pkg/samba/trunk/files/0001-Use-correct-struct-fields-in-vfs_commit.c.patch
===================================================================
--- csw/mgar/pkg/samba/trunk/files/0001-Use-correct-struct-fields-in-vfs_commit.c.patch 2013-02-07 20:30:37 UTC (rev 20270)
+++ csw/mgar/pkg/samba/trunk/files/0001-Use-correct-struct-fields-in-vfs_commit.c.patch 2013-02-08 07:41:31 UTC (rev 20271)
@@ -1,30 +0,0 @@
-From 66bde8fc0a71ada36fe80f44a998b22f83fd34af Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 26 Jan 2013 11:40:51 +0100
-Subject: [PATCH] Use correct struct fields in vfs_commit.c
-
----
- source3/modules/vfs_commit.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
-index 865250a..c9c0a05 100644
---- a/source3/modules/vfs_commit.c
-+++ b/source3/modules/vfs_commit.c
-@@ -307,10 +307,10 @@ static int commit_ftruncate(
- static struct vfs_fn_pointers vfs_commit_fns = {
- .open_fn = commit_open,
- .close_fn = commit_close,
-- .write = commit_write,
-- .pwrite = commit_pwrite,
-+ .write_fn = commit_write,
-+ .pwrite_fn = commit_pwrite,
- .connect_fn = commit_connect,
-- .ftruncate = commit_ftruncate
-+ .ftruncate_fn = commit_ftruncate
- };
-
- NTSTATUS vfs_commit_init(void);
---
-1.8.0
-
Added: csw/mgar/pkg/samba/trunk/files/0001-fix-xml.patch
===================================================================
--- csw/mgar/pkg/samba/trunk/files/0001-fix-xml.patch (rev 0)
+++ csw/mgar/pkg/samba/trunk/files/0001-fix-xml.patch 2013-02-08 07:41:31 UTC (rev 20271)
@@ -0,0 +1,25 @@
+From a38fbe7bb3660add428675ec662c46583cdee354 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Thu, 7 Feb 2013 10:12:04 +0100
+Subject: [PATCH] fix-xml
+
+---
+ buildtools/wafsamba/wafsamba.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
+index dcbb047..bb4b3b2 100644
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -790,7 +790,7 @@ 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:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
++ bld.env.SAMBA_CATALOGS = 'file:///etc/opt/csw/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+
+ for m in manpages.split():
+ source = m + '.xml'
+--
+1.8.1
+
Deleted: 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 2013-02-07 20:30:37 UTC (rev 20270)
+++ csw/mgar/pkg/samba/trunk/files/0002-Use-OpenCSW-xml-catalog-and-work-around-bashism.patch 2013-02-08 07:41:31 UTC (rev 20271)
@@ -1,34 +0,0 @@
-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.
More information about the devel
mailing list