Revision: 25427
http://sourceforge.net/p/gar/code/25427
Author: janholzh
Date: 2015-12-02 08:58:36 +0000 (Wed, 02 Dec 2015)
Log Message:
-----------
samba/branches/samba4: update to 4.3.2
Modified Paths:
--------------
csw/mgar/pkg/samba/branches/samba4/Makefile
csw/mgar/pkg/samba/branches/samba4/checksums
Added Paths:
-----------
csw/mgar/pkg/samba/branches/samba4/files/talloc_dict_sigbus.patch
Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-12-02 08:26:37 UTC (rev
25426)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-12-02 08:58:36 UTC (rev
25427)
@@ -1,5 +1,5 @@
NAME = samba
-VERSION = 4.3.1
+VERSION = 4.3.2
GARTYPE = v2
DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -54,11 +54,14 @@
#PATCHFILES +=fix_bugid_11508
#From https://bugzilla.samba.org/show_bug.cgi?id=11511
-PATCHFILES +=fix_bugid_11511
+#PATCHFILES +=fix_bugid_11511
#From https://bugzilla.samba.org/show_bug.cgi?id=11512
-PATCHFILES +=fix_bugid_11512
+#PATCHFILES +=fix_bugid_11512
+#From
https://hg.java.net/hg/solaris-userland~gate/file/73dae8fa5c34/components/samba/samba/patches/talloc_dict_sigbus.patch
+PATCHFILES += talloc_dict_sigbus.patch
+
#fix build problems with idmap patch not in 4.3 but master
#https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392
PATCHFILES +=idmap_fix
Modified: csw/mgar/pkg/samba/branches/samba4/checksums
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/checksums 2015-12-02 08:26:37 UTC
(rev 25426)
+++ csw/mgar/pkg/samba/branches/samba4/checksums 2015-12-02 08:58:36 UTC
(rev 25427)
@@ -1 +1 @@
-e63a481cad0603db1a9239d7606cbc9a samba-4.3.1.tar.gz
+61188e76b272c1b1b3730bf1933a791f samba-4.3.2.tar.gz
Added: csw/mgar/pkg/samba/branches/samba4/files/talloc_dict_sigbus.patch
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/talloc_dict_sigbus.patch
(rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/talloc_dict_sigbus.patch
2015-12-02 08:58:36 UTC (rev 25427)
@@ -0,0 +1,44 @@
+Based on patch sent me by Ralph Boehme <s...@samba.org> :
+
+https://lists.samba.org/archive/samba-technical/2015-November/110889.html
+
+...patch is assumed to be released in community.
+
+--- a/source3/lib/talloc_dict.c 2013-06-13 02:21:02.000000000 -0700
++++ b/source3/lib/talloc_dict.c 2015-11-27 15:11:39.212179014 -0800
+@@ -72,7 +72,11 @@
+ TALLOC_FREE(rec);
+ return false;
+ }
++#if defined(__SUNPRO_C) && (defined(__sparcv9) && defined(_LP64))
++ memcpy(&old_data, value.dptr, sizeof(old_data));
++#else /* Do not chase memcpy on archs where unaligned address do not throw
SIGBUS */
+ old_data = *(void **)(value.dptr);
++#endif
+ TALLOC_FREE(old_data);
+ if (data == NULL) {
+ status = dbwrap_record_delete(rec);
+@@ -138,6 +142,7 @@
+ TDB_DATA value;
+ struct talloc_dict_traverse_state *state =
+ (struct talloc_dict_traverse_state *)private_data;
++ void *p;
+
+ key = dbwrap_record_get_key(rec);
+ value = dbwrap_record_get_value(rec);
+@@ -145,8 +150,14 @@
+ if (value.dsize != sizeof(void *)) {
+ return -1;
+ }
++
++#if defined(__SUNPRO_C) && (defined(__sparcv9) && defined(_LP64))
++ memcpy(&p, value.dptr, sizeof(p));
++#else /* Do not chase memcpy on archs where unaligned address do not throw
SIGBUS */
++ p = *(void **)(value.dptr);
++#endif
+ return state->fn(data_blob_const(key.dptr, key.dsize),
+- *(void **)value.dptr, state->private_data);
++ p, state->private_data);
+ }
+
+ /*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
