[csw-devel] SF.net SVN: gar:[21997] csw/mgar/pkg/samba/branches/samba3

[lblume at users.sourceforge.net]

Revision: 21997
          http://gar.svn.sourceforge.net/gar/?rev=21997&view=rev
Author:   lblume
Date:     2013-09-25 08:45:20 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
samba/branches/samba3: Bump to 3.6.19; move GARCOMPILER lines where they work; add patch to remove spurious errors from the logs

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile
    csw/mgar/pkg/samba/branches/samba3/checksums

Added Paths:
-----------
    csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2013-09-25 08:36:30 UTC (rev 21996)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-09-25 08:45:20 UTC (rev 21997)
@@ -2,7 +2,7 @@
 # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time
 
 NAME    = samba
-VERSION = 3.6.18
+VERSION = 3.6.19
 GARTYPE = v2
 
 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -10,6 +10,8 @@
   Tools to access a servers filespace and printers via SMB (server)
 endef
 
+# GARCOMPILER is set below the include
+
 MASTER_SITES = http://samba.org/samba/ftp/stable/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += cswsamba
@@ -27,14 +29,8 @@
 PATCHFILES += 0001-nss_winbind.patch
 PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch
 PATCHFILES += 0003-rename-nss-modules.patch
+PATCHFILES += 0004-illegal-multibyte-error.patch
 
-# Studio 12 is the last supported on Solaris 9
-ifeq ($(shell /usr/bin/uname -r),5.9)
-  GARCOMPILER = SOS12
-else
-  GARCOMPILER = SOS12U3
-endif
-
 BUILD_DEP_PKGS += CSWlibtalloc-dev
 BUILD_DEP_PKGS += CSWopenldap-dev
 BUILD_DEP_PKGS += CSWlibkrb5-dev
@@ -393,6 +389,12 @@
 
 include gar/category.mk
 
+# Studio 12 is the last supported on Solaris 9
+GARCOMPILER_5.9 = SOS12
+GARCOMPILER_5.10 = SOS12U3
+GARCOMPILER_5.11 = SOS12U3
+GARCOMPILER = $(GARCOMPILER_$(GAROSREL))
+
 # Set the target dir for modules with the proper arch
 NSS_MODULE_DIR = /usr/lib
 PAM_MODULE_DIR = /usr/lib/security

Modified: csw/mgar/pkg/samba/branches/samba3/checksums
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/checksums	2013-09-25 08:36:30 UTC (rev 21996)
+++ csw/mgar/pkg/samba/branches/samba3/checksums	2013-09-25 08:45:20 UTC (rev 21997)
@@ -1 +1 @@
-c7eec3e83fe4c4750240a8a0a214bbd4  samba-3.6.18.tar.gz
+afe9c7c590f3093555cd6e870d2532e1  samba-3.6.19.tar.gz

Added: csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba3/files/0004-illegal-multibyte-error.patch	2013-09-25 08:45:20 UTC (rev 21997)
@@ -0,0 +1,22 @@
+index 5aafe2f..e1aedf1 100644
+--- a/source3/smbd/mangle_hash2.c
++++ b/source3/smbd/mangle_hash2.c
+@@ -626,7 +626,8 @@ static bool is_legal_name(const char *name)
+ 	while (*name) {
+ 		if (((unsigned int)name[0]) > 128 && (name[1] != 0)) {
+ 			/* Possible start of mb character. */
+-			char mbc[2];
++			size_t size = 0;
++			(void)next_codepoint(name, &size);
+ 			/*
+ 			 * Note that if CH_UNIX is utf8 a string may be 3
+ 			 * bytes, but this is ok as mb utf8 characters don't
+@@ -634,7 +635,7 @@ static bool is_legal_name(const char *name)
+ 			 * for mb UNIX asian characters like Japanese (SJIS) here.
+ 			 * JRA.
+ 			 */
+-			if (convert_string(CH_UNIX, CH_UTF16LE, name, 2, mbc, 2, False) == 2) {
++			if (size == 2) {
+ 				/* Was a good mb string. */
+ 				name += 2;
+ 				continue;

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