FreeBSD Bugzilla – Attachment 166735 Details for
Bug 206808
net/samba36: security/vuxml: ineffective vuxml entry
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
samba43-4.3.4.patch
samba43-4.3.4.patch (text/plain), 38.88 KB, created by
takefu
on 2016-02-08 08:37:22 UTC
(
hide
)
Description:
samba43-4.3.4.patch
Filename:
MIME Type:
Creator:
takefu
Created:
2016-02-08 08:37:22 UTC
Size:
38.88 KB
patch
obsolete
>diff -dpruN /usr/ports/net/samba43/Makefile ./Makefile >--- /usr/ports/net/samba43/Makefile 2015-12-19 22:51:10.000000000 +0000 >+++ ./Makefile 2016-02-08 07:53:54.000000000 +0000 >@@ -15,11 +15,9 @@ LICENSE= GPLv3 > > CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* > >-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 >- > SAMBA4_BASENAME= samba > SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 >-SAMBA4_VERSION= 4.3.3 >+SAMBA4_VERSION= 4.3.4 > SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} > > WRKSRC?= ${WRKDIR}/${DISTNAME} >@@ -105,8 +103,8 @@ BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/ > RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb > SAMBA4_BUNDLED_LIBS+= !tdb > # ldb >-BUILD_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb >-RUN_DEPENDS+= ldb>=1.1.24:${PORTSDIR}/databases/ldb >+BUILD_DEPENDS+= ldb>=1.1.25:${PORTSDIR}/databases/ldb >+RUN_DEPENDS+= ldb>=1.1.25:${PORTSDIR}/databases/ldb > SAMBA4_BUNDLED_LIBS+= !ldb > # Don't use external libcom_err > SAMBA4_BUNDLED_LIBS+= com_err >diff -dpruN /usr/ports/net/samba43/distinfo ./distinfo >--- /usr/ports/net/samba43/distinfo 2015-12-19 22:51:10.000000000 +0000 >+++ ./distinfo 2016-02-08 07:35:33.000000000 +0000 >@@ -1,2 +1,2 @@ >-SHA256 (samba-4.3.3.tar.gz) = e62d21313acbb29e24b0b80aaf2b63fdd1ccce4cfb741f333deca95a1a3a70df >-SIZE (samba-4.3.3.tar.gz) = 20427281 >+SHA256 (samba-4.3.4.tar.gz) = 5d0eb52e842832af922f7d57716eacff23192906ec3bdf6727e18ca24f1419d9 >+SIZE (samba-4.3.4.tar.gz) = 20434434 >diff -dpruN /usr/ports/net/samba43/files/extra-patch-security ./files/extra-patch-security >--- /usr/ports/net/samba43/files/extra-patch-security 2015-12-19 22:51:10.000000000 +0000 >+++ ./files/extra-patch-security 1970-01-01 00:00:00.000000000 +0000 >@@ -1,534 +0,0 @@ >-From a4e75bba5d2b799c11aac9eb1c345b8e58563089 Mon Sep 17 00:00:00 2001 >-From: Stefan Metzmacher <metze@samba.org> >-Date: Wed, 25 Nov 2015 10:17:34 +0100 >-Subject: [PATCH 1/4] dbwrap_rbt: use talloc_zero_size() instead of a partial >- ZERO_STRUCT() >- >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 >- >-Signed-off-by: Stefan Metzmacher <metze@samba.org> >-Reviewed-by: Volker Lendecke <vl@samba.org> >-(cherry picked from commit f3d1fc1d06822a951a2a3eeb5aa53748b9b5b299) >---- >- lib/dbwrap/dbwrap_rbt.c | 4 +--- >- 1 file changed, 1 insertion(+), 3 deletions(-) >- >-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c >-index 03f2f57..2d65647 100644 >---- a/lib/dbwrap/dbwrap_rbt.c >-+++ b/lib/dbwrap/dbwrap_rbt.c >-@@ -153,7 +153,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- return NT_STATUS_INSUFFICIENT_RESOURCES; >- } >- >-- node = talloc_size(db_ctx, reclen); >-+ node = talloc_zero_size(db_ctx, reclen); >- if (node == NULL) { >- return NT_STATUS_NO_MEMORY; >- } >-@@ -172,8 +172,6 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- */ >- } >- >-- ZERO_STRUCT(node->rb_node); >-- >- node->keysize = rec->key.dsize; >- node->valuesize = data.dsize; >- >--- >-1.9.1 >- >- >-From 3f448c47a8567b0e4794e787399202f050002819 Mon Sep 17 00:00:00 2001 >-From: Stefan Metzmacher <metze@samba.org> >-Date: Wed, 25 Nov 2015 09:22:08 +0100 >-Subject: [PATCH 2/4] dbwrap_rbt: add nested traverse protection >- >-Multiple dbwrap_traverse_read() calls are possible. >- >-store() and delete() on a fetch locked record >-are rejected during dbwrap_traverse_read(). >- >-A dbwrap_traverse() within a dbwrap_traverse_read() >-behaves like a dbwrap_traverse_read(). >- >-Nested dbwrap_traverse() calls are not possible. >- >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 >- >-Signed-off-by: Stefan Metzmacher <metze@samba.org> >-Reviewed-by: Volker Lendecke <vl@samba.org> >-(cherry picked from commit 590507951fc514a679f44b8bfdd03c721189c3fa) >---- >- lib/dbwrap/dbwrap_rbt.c | 71 ++++++++++++++++++++++++++++--------------------- >- 1 file changed, 40 insertions(+), 31 deletions(-) >- >-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c >-index 2d65647..d4cb40d 100644 >---- a/lib/dbwrap/dbwrap_rbt.c >-+++ b/lib/dbwrap/dbwrap_rbt.c >-@@ -27,6 +27,8 @@ >- >- struct db_rbt_ctx { >- struct rb_root tree; >-+ size_t traverse_read; >-+ bool traverse_write; >- }; >- >- struct db_rbt_rec { >-@@ -126,6 +128,10 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- ssize_t reclen; >- TDB_DATA this_key, this_val; >- >-+ if (db_ctx->traverse_read > 0) { >-+ return NT_STATUS_MEDIA_WRITE_PROTECTED; >-+ } >-+ >- if (rec_priv->node != NULL) { >- >- /* >-@@ -222,6 +228,10 @@ static NTSTATUS db_rbt_delete(struct db_record *rec) >- rec->db->private_data, struct db_rbt_ctx); >- struct db_rbt_rec *rec_priv = (struct db_rbt_rec *)rec->private_data; >- >-+ if (db_ctx->traverse_read > 0) { >-+ return NT_STATUS_MEDIA_WRITE_PROTECTED; >-+ } >-+ >- if (rec_priv->node == NULL) { >- return NT_STATUS_OK; >- } >-@@ -232,16 +242,6 @@ static NTSTATUS db_rbt_delete(struct db_record *rec) >- return NT_STATUS_OK; >- } >- >--static NTSTATUS db_rbt_store_deny(struct db_record *rec, TDB_DATA data, int flag) >--{ >-- return NT_STATUS_MEDIA_WRITE_PROTECTED; >--} >-- >--static NTSTATUS db_rbt_delete_deny(struct db_record *rec) >--{ >-- return NT_STATUS_MEDIA_WRITE_PROTECTED; >--} >-- >- struct db_rbt_search_result { >- TDB_DATA key; >- TDB_DATA val; >-@@ -414,13 +414,8 @@ static int db_rbt_traverse_internal(struct db_context *db, >- ZERO_STRUCT(rec); >- rec.db = db; >- rec.private_data = &rec_priv; >-- if (rw) { >-- rec.store = db_rbt_store; >-- rec.delete_rec = db_rbt_delete; >-- } else { >-- rec.store = db_rbt_store_deny; >-- rec.delete_rec = db_rbt_delete_deny; >-- } >-+ rec.store = db_rbt_store; >-+ rec.delete_rec = db_rbt_delete; >- db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); >- >- ret = f(&rec, private_data); >-@@ -440,18 +435,21 @@ static int db_rbt_traverse_internal(struct db_context *db, >- return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw); >- } >- >--static int db_rbt_traverse(struct db_context *db, >-- int (*f)(struct db_record *db, >-- void *private_data), >-- void *private_data) >-+static int db_rbt_traverse_read(struct db_context *db, >-+ int (*f)(struct db_record *db, >-+ void *private_data), >-+ void *private_data) >- { >- struct db_rbt_ctx *ctx = talloc_get_type_abort( >- db->private_data, struct db_rbt_ctx); >- uint32_t count = 0; >-+ int ret; >- >-- int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, >-- f, private_data, &count, >-- true /* rw */); >-+ ctx->traverse_read++; >-+ ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, >-+ f, private_data, &count, >-+ false /* rw */); >-+ ctx->traverse_read--; >- if (ret != 0) { >- return -1; >- } >-@@ -461,18 +459,29 @@ static int db_rbt_traverse(struct db_context *db, >- return count; >- } >- >--static int db_rbt_traverse_read(struct db_context *db, >-- int (*f)(struct db_record *db, >-- void *private_data), >-- void *private_data) >-+static int db_rbt_traverse(struct db_context *db, >-+ int (*f)(struct db_record *db, >-+ void *private_data), >-+ void *private_data) >- { >- struct db_rbt_ctx *ctx = talloc_get_type_abort( >- db->private_data, struct db_rbt_ctx); >- uint32_t count = 0; >-+ int ret; >-+ >-+ if (ctx->traverse_write) { >-+ return -1; >-+ }; >-+ >-+ if (ctx->traverse_read > 0) { >-+ return db_rbt_traverse_read(db, f, private_data); >-+ } >- >-- int ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, >-- f, private_data, &count, >-- false /* rw */); >-+ ctx->traverse_write = true; >-+ ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, >-+ f, private_data, &count, >-+ true /* rw */); >-+ ctx->traverse_write = false; >- if (ret != 0) { >- return -1; >- } >--- >-1.9.1 >- >- >-From a2e7deb101d4aee633015fdd22df6255ee03c00e Mon Sep 17 00:00:00 2001 >-From: Stefan Metzmacher <metze@samba.org> >-Date: Wed, 25 Nov 2015 09:22:08 +0100 >-Subject: [PATCH 3/4] dbwrap_rbt: fix modifying the db during traverse >- >-We delete and add of records rebalace the tree, but our >-traverse code doesn't handle that and skips records >-randomly. >- >-We maintain records in a linked list for now >-in addition to the rbtree and use that list during >-traverse. >- >-This add a bit overhead, but at least it works reliable. >-If someone finds a way to do reliable traverse with the >-rebalanced tree, we can replace this commit. >- >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 >- >-Signed-off-by: Stefan Metzmacher <metze@samba.org> >-Reviewed-by: Volker Lendecke <vl@samba.org> >-(cherry picked from commit 0f46da08e160e6712e5282af14e1ec4012614fc7) >---- >- lib/dbwrap/dbwrap_rbt.c | 104 ++++++++++++++++++++++++++---------------------- >- 1 file changed, 57 insertions(+), 47 deletions(-) >- >-diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c >-index d4cb40d..a9cc641 100644 >---- a/lib/dbwrap/dbwrap_rbt.c >-+++ b/lib/dbwrap/dbwrap_rbt.c >-@@ -22,13 +22,15 @@ >- #include "dbwrap/dbwrap_private.h" >- #include "dbwrap/dbwrap_rbt.h" >- #include "../lib/util/rbtree.h" >-+#include "../lib/util/dlinklist.h" >- >- #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15) >- >- struct db_rbt_ctx { >- struct rb_root tree; >-+ struct db_rbt_node *nodes; >- size_t traverse_read; >-- bool traverse_write; >-+ struct db_rbt_node **traverse_nextp; >- }; >- >- struct db_rbt_rec { >-@@ -40,6 +42,7 @@ struct db_rbt_rec { >- struct db_rbt_node { >- struct rb_node rb_node; >- size_t keysize, valuesize; >-+ struct db_rbt_node *prev, *next; >- }; >- >- /* >-@@ -123,7 +126,8 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- struct db_rbt_node *node; >- >- struct rb_node ** p; >-- struct rb_node * parent; >-+ struct rb_node *parent = NULL; >-+ struct db_rbt_node *parent_node = NULL; >- >- ssize_t reclen; >- TDB_DATA this_key, this_val; >-@@ -165,12 +169,19 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- } >- >- if (rec_priv->node != NULL) { >-+ if (db_ctx->traverse_nextp != NULL) { >-+ if (*db_ctx->traverse_nextp == rec_priv->node) { >-+ *db_ctx->traverse_nextp = node; >-+ } >-+ } >-+ >- /* >- * We need to delete the key from the tree and start fresh, >- * there's not enough space in the existing record >- */ >- >- rb_erase(&rec_priv->node->rb_node, &db_ctx->tree); >-+ DLIST_REMOVE(db_ctx->nodes, rec_priv->node); >- >- /* >- * Keep the existing node around for a while: If the record >-@@ -197,10 +208,11 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- TDB_DATA search_key, search_val; >- int res; >- >-- parent = (*p); >-- >- r = db_rbt2node(*p); >- >-+ parent = (*p); >-+ parent_node = r; >-+ >- db_rbt_parse_node(r, &search_key, &search_val); >- >- res = db_rbt_compare(this_key, search_key); >-@@ -217,6 +229,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) >- } >- >- rb_link_node(&node->rb_node, parent, p); >-+ DLIST_ADD_AFTER(db_ctx->nodes, node, parent_node); >- rb_insert_color(&node->rb_node, &db_ctx->tree); >- >- return NT_STATUS_OK; >-@@ -236,7 +249,14 @@ static NTSTATUS db_rbt_delete(struct db_record *rec) >- return NT_STATUS_OK; >- } >- >-+ if (db_ctx->traverse_nextp != NULL) { >-+ if (*db_ctx->traverse_nextp == rec_priv->node) { >-+ *db_ctx->traverse_nextp = rec_priv->node->next; >-+ } >-+ } >-+ >- rb_erase(&rec_priv->node->rb_node, &db_ctx->tree); >-+ DLIST_REMOVE(db_ctx->nodes, rec_priv->node); >- TALLOC_FREE(rec_priv->node); >- >- return NT_STATUS_OK; >-@@ -383,56 +403,48 @@ static NTSTATUS db_rbt_parse_record(struct db_context *db, TDB_DATA key, >- } >- >- static int db_rbt_traverse_internal(struct db_context *db, >-- struct rb_node *n, >- int (*f)(struct db_record *db, >- void *private_data), >- void *private_data, uint32_t* count, >- bool rw) >- { >-- struct rb_node *rb_right; >-- struct rb_node *rb_left; >-- struct db_record rec; >-- struct db_rbt_rec rec_priv; >-+ struct db_rbt_ctx *ctx = talloc_get_type_abort( >-+ db->private_data, struct db_rbt_ctx); >-+ struct db_rbt_node *cur = NULL; >-+ struct db_rbt_node *next = NULL; >- int ret; >- >-- if (n == NULL) { >-- return 0; >-- } >-- >-- rb_left = n->rb_left; >-- rb_right = n->rb_right; >-+ for (cur = ctx->nodes; cur != NULL; cur = next) { >-+ struct db_record rec; >-+ struct db_rbt_rec rec_priv; >- >-- ret = db_rbt_traverse_internal(db, rb_left, f, private_data, count, rw); >-- if (ret != 0) { >-- return ret; >-- } >-+ rec_priv.node = cur; >-+ next = rec_priv.node->next; >- >-- rec_priv.node = db_rbt2node(n); >-- /* n might be altered by the callback function */ >-- n = NULL; >-+ ZERO_STRUCT(rec); >-+ rec.db = db; >-+ rec.private_data = &rec_priv; >-+ rec.store = db_rbt_store; >-+ rec.delete_rec = db_rbt_delete; >-+ db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); >- >-- ZERO_STRUCT(rec); >-- rec.db = db; >-- rec.private_data = &rec_priv; >-- rec.store = db_rbt_store; >-- rec.delete_rec = db_rbt_delete; >-- db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); >-- >-- ret = f(&rec, private_data); >-- (*count) ++; >-- if (ret != 0) { >-- return ret; >-- } >-- >-- if (rec_priv.node != NULL) { >-- /* >-- * If the current record is still there >-- * we should take the current rb_right. >-- */ >-- rb_right = rec_priv.node->rb_node.rb_right; >-+ if (rw) { >-+ ctx->traverse_nextp = &next; >-+ } >-+ ret = f(&rec, private_data); >-+ (*count) ++; >-+ if (rw) { >-+ ctx->traverse_nextp = NULL; >-+ } >-+ if (ret != 0) { >-+ return ret; >-+ } >-+ if (rec_priv.node != NULL) { >-+ next = rec_priv.node->next; >-+ } >- } >- >-- return db_rbt_traverse_internal(db, rb_right, f, private_data, count, rw); >-+ return 0; >- } >- >- static int db_rbt_traverse_read(struct db_context *db, >-@@ -446,7 +458,7 @@ static int db_rbt_traverse_read(struct db_context *db, >- int ret; >- >- ctx->traverse_read++; >-- ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, >-+ ret = db_rbt_traverse_internal(db, >- f, private_data, &count, >- false /* rw */); >- ctx->traverse_read--; >-@@ -469,7 +481,7 @@ static int db_rbt_traverse(struct db_context *db, >- uint32_t count = 0; >- int ret; >- >-- if (ctx->traverse_write) { >-+ if (ctx->traverse_nextp != NULL) { >- return -1; >- }; >- >-@@ -477,11 +489,9 @@ static int db_rbt_traverse(struct db_context *db, >- return db_rbt_traverse_read(db, f, private_data); >- } >- >-- ctx->traverse_write = true; >-- ret = db_rbt_traverse_internal(db, ctx->tree.rb_node, >-+ ret = db_rbt_traverse_internal(db, >- f, private_data, &count, >- true /* rw */); >-- ctx->traverse_write = false; >- if (ret != 0) { >- return -1; >- } >--- >-1.9.1 >- >- >-From 88752f5f769bae1edf6f395303b9daf9d13131f1 Mon Sep 17 00:00:00 2001 >-From: Stefan Metzmacher <metze@samba.org> >-Date: Wed, 25 Nov 2015 00:13:17 +0100 >-Subject: [PATCH 4/4] s3:torture: add traverse testing to LOCAL-RBTREE >- >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11375 >-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11394 >- >-Signed-off-by: Stefan Metzmacher <metze@samba.org> >-Reviewed-by: Volker Lendecke <vl@samba.org> >- >-Autobuild-User(master): Stefan Metzmacher <metze@samba.org> >-Autobuild-Date(master): Fri Nov 27 13:16:59 CET 2015 on sn-devel-104 >- >-(cherry picked from commit bb9f13ab4165f150e01a88ddcc51605a7c176f5d) >---- >- source3/torture/torture.c | 39 +++++++++++++++++++++++++++++++++++++++ >- 1 file changed, 39 insertions(+) >- >-diff --git a/source3/torture/torture.c b/source3/torture/torture.c >-index 7bb776f..505920f 100644 >---- a/source3/torture/torture.c >-+++ b/source3/torture/torture.c >-@@ -8348,11 +8348,29 @@ static bool rbt_testval(struct db_context *db, const char *key, >- return ret; >- } >- >-+static int local_rbtree_traverse_read(struct db_record *rec, void *private_data) >-+{ >-+ int *count2 = (int *)private_data; >-+ (*count2)++; >-+ return 0; >-+} >-+ >-+static int local_rbtree_traverse_delete(struct db_record *rec, void *private_data) >-+{ >-+ int *count2 = (int *)private_data; >-+ (*count2)++; >-+ dbwrap_record_delete(rec); >-+ return 0; >-+} >-+ >- static bool run_local_rbtree(int dummy) >- { >- struct db_context *db; >- bool ret = false; >- int i; >-+ NTSTATUS status; >-+ int count = 0; >-+ int count2 = 0; >- >- db = db_open_rbt(NULL); >- >-@@ -8395,6 +8413,27 @@ static bool run_local_rbtree(int dummy) >- } >- >- ret = true; >-+ count = 0; count2 = 0; >-+ status = dbwrap_traverse_read(db, local_rbtree_traverse_read, >-+ &count2, &count); >-+ printf("%s: read1: %d %d, %s\n", __func__, count, count2, nt_errstr(status)); >-+ if ((count != count2) || (count != 1000)) { >-+ ret = false; >-+ } >-+ count = 0; count2 = 0; >-+ status = dbwrap_traverse(db, local_rbtree_traverse_delete, >-+ &count2, &count); >-+ printf("%s: delete: %d %d, %s\n", __func__, count, count2, nt_errstr(status)); >-+ if ((count != count2) || (count != 1000)) { >-+ ret = false; >-+ } >-+ count = 0; count2 = 0; >-+ status = dbwrap_traverse_read(db, local_rbtree_traverse_read, >-+ &count2, &count); >-+ printf("%s: read2: %d %d, %s\n", __func__, count, count2, nt_errstr(status)); >-+ if ((count != count2) || (count != 0)) { >-+ ret = false; >-+ } >- >- done: >- TALLOC_FREE(db); >--- >-1.9.1 >- >diff -dpruN /usr/ports/net/samba43/files/patch-buildtools__scripts__abi_gen.sh ./files/patch-buildtools__scripts__abi_gen.sh >--- /usr/ports/net/samba43/files/patch-buildtools__scripts__abi_gen.sh 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-buildtools__scripts__abi_gen.sh 2016-02-08 07:47:35.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./buildtools/scripts/abi_gen.sh.orig 2013-02-10 00:47:43.199878737 +0000 >-+++ ./buildtools/scripts/abi_gen.sh 2013-02-10 00:47:55.789877693 +0000 >-@@ -9,6 +9,7 @@ >+--- buildtools/scripts/abi_gen.sh.orig 2015-07-21 09:47:48 UTC >++++ buildtools/scripts/abi_gen.sh >+@@ -9,6 +9,7 @@ GDBSCRIPT="gdb_syms.$$" > cat <<EOF > set height 0 > set width 0 >@@ -8,7 +8,7 @@ > EOF > nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | egrep -v ' (__bss_start|_edata|_init|_fini|_end)' | cut -c3- | sort | while read s; do > echo "echo $s: " >-@@ -17,5 +17,5 @@ >+@@ -17,5 +18,5 @@ done > ) > $GDBSCRIPT > > # forcing the terminal avoids a problem on Fedora12 >diff -dpruN /usr/ports/net/samba43/files/patch-buildtools__wafsamba__samba_install.py ./files/patch-buildtools__wafsamba__samba_install.py >--- /usr/ports/net/samba43/files/patch-buildtools__wafsamba__samba_install.py 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-buildtools__wafsamba__samba_install.py 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./buildtools/wafsamba/samba_install.py.orig 2015-07-21 09:47:48.000000000 +0000 >-+++ ./buildtools/wafsamba/samba_install.py 2015-10-05 13:00:26.761717407 +0000 >-@@ -116,7 +116,7 @@ >+--- buildtools/wafsamba/samba_install.py.orig 2015-07-21 09:47:48 UTC >++++ buildtools/wafsamba/samba_install.py >+@@ -116,7 +116,7 @@ def install_library(self): > inst_name = bld.make_libname(t.target) > elif self.vnum: > vnum_base = self.vnum.split('.')[0] >diff -dpruN /usr/ports/net/samba43/files/patch-buildtools__wafsamba__samba_pidl.py ./files/patch-buildtools__wafsamba__samba_pidl.py >--- /usr/ports/net/samba43/files/patch-buildtools__wafsamba__samba_pidl.py 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-buildtools__wafsamba__samba_pidl.py 2016-02-08 07:47:43.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./buildtools/wafsamba/samba_pidl.py.orig 2013-01-27 23:15:21.739874063 +0000 >-+++ ./buildtools/wafsamba/samba_pidl.py 2013-01-27 23:15:50.549893124 +0000 >-@@ -88,7 +88,7 @@ >+--- buildtools/wafsamba/samba_pidl.py.orig 2015-07-21 09:47:48 UTC >++++ buildtools/wafsamba/samba_pidl.py >+@@ -88,7 +88,7 @@ def SAMBA_PIDL(bld, pname, source, > # prime the list of nodes we are dependent on with the cached pidl sources > t.allnodes = pidl_src_nodes > >diff -dpruN /usr/ports/net/samba43/files/patch-buildtools__wafsamba__wafsamba.py ./files/patch-buildtools__wafsamba__wafsamba.py >--- /usr/ports/net/samba43/files/patch-buildtools__wafsamba__wafsamba.py 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-buildtools__wafsamba__wafsamba.py 2016-02-08 07:47:51.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48.000000000 +0000 >-+++ ./buildtools/wafsamba/wafsamba.py 2015-10-05 20:12:39.057228568 +0000 >-@@ -892,7 +892,7 @@ >+--- buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48 UTC >++++ buildtools/wafsamba/wafsamba.py >+@@ -892,7 +892,7 @@ def SAMBAMANPAGES(bld, manpages, extra_s > 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_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' >diff -dpruN /usr/ports/net/samba43/files/patch-docs-xml__wscript_build ./files/patch-docs-xml__wscript_build >--- /usr/ports/net/samba43/files/patch-docs-xml__wscript_build 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-docs-xml__wscript_build 2016-02-08 07:36:14.000000000 +0000 >@@ -1,7 +1,7 @@ >---- ./docs-xml/wscript_build.orig 2013-02-05 02:34:14.929894486 +0000 >-+++ ./docs-xml/wscript_build 2013-02-05 02:34:33.030266035 +0000 >-@@ -3,7 +3,6 @@ >- manpages=''' >+--- docs-xml/wscript_build.orig 2015-07-21 09:47:48 UTC >++++ docs-xml/wscript_build >+@@ -4,7 +4,6 @@ manpages=''' >+ manpages/dbwrap_tool.1 > manpages/eventlogadm.8 > manpages/findsmb.1 > - manpages/libsmbclient.7 >diff -dpruN /usr/ports/net/samba43/files/patch-dynconfig__wscript ./files/patch-dynconfig__wscript >--- /usr/ports/net/samba43/files/patch-dynconfig__wscript 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-dynconfig__wscript 2016-02-08 07:47:59.000000000 +0000 >@@ -1,15 +1,15 @@ >---- ./dynconfig/wscript.orig 2012-11-13 08:03:38.000000000 +0000 >-+++ ./dynconfig/wscript 2013-01-29 19:43:57.489880918 +0000 >-@@ -127,6 +127,8 @@ >+--- dynconfig/wscript.orig 2015-07-21 09:47:48 UTC >++++ dynconfig/wscript >+@@ -137,6 +137,8 @@ dynconfig = { > 'PKGCONFIGDIR' : { > 'STD-PATH': '${LIBDIR}/pkgconfig', > 'FHS-PATH': '${LIBDIR}/pkgconfig', > + 'OPTION': '--with-pkgconfigdir', > + 'HELPTEXT': 'Where to put .pc files', > }, >- 'SWATDIR' : { >- 'STD-PATH': '${DATADIR}/swat', >-@@ -236,8 +238,8 @@ >+ 'CODEPAGEDIR' : { >+ 'STD-PATH': '${DATADIR}/codepages', >+@@ -242,8 +244,8 @@ dynconfig = { > 'DELAY': True, > }, > 'CONFIGFILE' : { >@@ -20,7 +20,7 @@ > 'DELAY': True, > }, > 'LMHOSTSFILE' : { >-@@ -294,9 +296,6 @@ >+@@ -300,9 +302,6 @@ def configure(conf): > flavor = 'FHS-PATH' > else: > flavor = 'STD-PATH' >diff -dpruN /usr/ports/net/samba43/files/patch-lib__crypto__wscript_configure ./files/patch-lib__crypto__wscript_configure >--- /usr/ports/net/samba43/files/patch-lib__crypto__wscript_configure 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-lib__crypto__wscript_configure 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- lib/crypto/wscript_configure.orig 2015-08-30 08:56:39.517693933 +0000 >-+++ lib/crypto/wscript_configure 2015-08-30 08:57:16.167655660 +0000 >-@@ -1,8 +1,8 @@ >+--- lib/crypto/wscript_configure.orig 2015-07-21 09:47:48 UTC >++++ lib/crypto/wscript_configure >+@@ -1,9 +1,9 @@ > if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', > checklibc=True): > - conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', >@@ -11,3 +11,4 @@ > + checklibc=True) > conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h', > checklibc=True) >+ >diff -dpruN /usr/ports/net/samba43/files/patch-lib_replace_replace.c ./files/patch-lib_replace_replace.c >--- /usr/ports/net/samba43/files/patch-lib_replace_replace.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-lib_replace_replace.c 2016-02-08 07:50:58.000000000 +0000 >@@ -1,19 +1,6 @@ >-From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001 >-From: Volker Lendecke <vl@samba.org> >-Date: Tue, 18 Aug 2015 20:57:27 +0200 >-Subject: [PATCH] replace: Fix bug 11455 >- >-Don't call rep_strtoull recursively >- >-Signed-off-by: Volker Lendecke <vl@samba.org> >-Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455 >- >-https://lists.samba.org/archive/samba-technical/2015-July/108587.html >-https://lists.samba.org/archive/samba-technical/2015-July/108588.html >- >---- ./lib/replace/replace.c.orig 2015-09-08 13:45:25.000000000 +0000 >-+++ ./lib/replace/replace.c 2015-10-21 09:02:20.747229821 +0000 >-@@ -541,6 +541,7 @@ >+--- lib/replace/replace.c.orig 2015-09-08 13:45:25 UTC >++++ lib/replace/replace.c >+@@ -541,6 +541,7 @@ long long int rep_strtoll(const char *st > #undef strtoll > long long int rep_strtoll(const char *str, char **endptr, int base) > { >@@ -21,7 +8,7 @@ https://lists.samba.org/archive/samba-te > long long int nb = strtoll(str, endptr, base); > /* With glibc EINVAL is only returned if base is not ok */ > if (errno == EINVAL) { >-@@ -549,7 +550,7 @@ >+@@ -549,7 +550,7 @@ long long int rep_strtoll(const char *st > * able to make the convertion. > * Let's reset errno. > */ >@@ -30,7 +17,7 @@ https://lists.samba.org/archive/samba-te > } > } > return nb; >-@@ -572,26 +573,24 @@ >+@@ -572,26 +573,24 @@ unsigned long long int rep_strtoull(cons > #endif > } > #else >diff -dpruN /usr/ports/net/samba43/files/patch-nsswitch__wins_freebsd.c ./files/patch-nsswitch__wins_freebsd.c >--- /usr/ports/net/samba43/files/patch-nsswitch__wins_freebsd.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-nsswitch__wins_freebsd.c 2016-02-08 07:36:14.000000000 +0000 >@@ -1,5 +1,5 @@ >---- ./nsswitch/wins_freebsd.c.orig 2013-07-03 01:06:20.689871582 +0000 >-+++ ./nsswitch/wins_freebsd.c 2013-07-03 01:33:02.779873084 +0000 >+--- nsswitch/wins_freebsd.c.orig 2016-02-08 07:35:58 UTC >++++ nsswitch/wins_freebsd.c > @@ -0,0 +1,81 @@ > +/* > + Unix SMB/CIFS implementation. >diff -dpruN /usr/ports/net/samba43/files/patch-nsswitch__wscript_build ./files/patch-nsswitch__wscript_build >--- /usr/ports/net/samba43/files/patch-nsswitch__wscript_build 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-nsswitch__wscript_build 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- nsswitch/wscript_build.orig 2015-03-25 00:53:56.295051994 +0000 >-+++ nsswitch/wscript_build 2015-03-25 00:57:12.566911686 +0000 >-@@ -14,7 +14,7 @@ >+--- nsswitch/wscript_build.orig 2015-07-21 09:47:49 UTC >++++ nsswitch/wscript_build >+@@ -14,7 +14,7 @@ bld.SAMBA_LIBRARY('winbind-client', > bld.SAMBA_BINARY('nsstest', > source='nsstest.c', > deps='replace dl', >@@ -9,7 +9,7 @@ > ) > > # The nss_wrapper code relies strictly on the linux implementation and >-@@ -39,7 +39,6 @@ >+@@ -39,7 +39,6 @@ if (Utils.unversioned_sys_platform() == > pc_files=[], > vnum='2') > >@@ -17,7 +17,7 @@ > bld.SAMBA3_LIBRARY('nss_wins', > keep_underscore=True, > source='wins.c', >-@@ -57,6 +56,12 @@ >+@@ -57,6 +56,12 @@ elif (host_os.rfind('freebsd') > -1): > realname='nss_winbind.so.1', > vnum='1') > >diff -dpruN /usr/ports/net/samba43/files/patch-source3__client__dnsbrowse.c ./files/patch-source3__client__dnsbrowse.c >--- /usr/ports/net/samba43/files/patch-source3__client__dnsbrowse.c 2015-12-19 22:51:10.000000000 +0000 >+++ ./files/patch-source3__client__dnsbrowse.c 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- source3/client/dnsbrowse.c.orig 2015-07-21 09:47:49.000000000 +0000 >-+++ source3/client/dnsbrowse.c 2015-12-07 02:08:01.627022117 +0000 >-@@ -91,7 +91,7 @@ >+--- source3/client/dnsbrowse.c.orig 2015-07-21 09:47:49 UTC >++++ source3/client/dnsbrowse.c >+@@ -91,7 +91,7 @@ static void do_smb_resolve(struct mdns_s > } > } > >@@ -9,7 +9,7 @@ > DNSServiceRefDeallocate(mdns_conn_sdref); > } > >-@@ -168,7 +168,7 @@ >+@@ -168,7 +168,7 @@ int do_smb_browse(void) > for (;;) { > int revents; > >diff -dpruN /usr/ports/net/samba43/files/patch-source3__smbd__quotas.c ./files/patch-source3__smbd__quotas.c >--- /usr/ports/net/samba43/files/patch-source3__smbd__quotas.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source3__smbd__quotas.c 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/smbd/quotas.c.orig 2012-10-02 08:24:45.000000000 +0000 >-+++ ./source3/smbd/quotas.c 2013-11-18 22:45:12.800444516 +0000 >-@@ -144,6 +144,7 @@ >+--- source3/smbd/quotas.c.orig 2015-07-21 09:47:49 UTC >++++ source3/smbd/quotas.c >+@@ -144,6 +144,7 @@ static bool nfs_quotas(char *nfspath, ui > if (!cutstr) > return False; > >@@ -8,7 +8,7 @@ > memset(cutstr, '\0', len+1); > host = strncat(cutstr,mnttype, sizeof(char) * len ); > DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr)); >-@@ -152,7 +153,7 @@ >+@@ -152,7 +153,7 @@ static bool nfs_quotas(char *nfspath, ui > args.gqa_pathp = testpath+1; > args.gqa_uid = uid; > >diff -dpruN /usr/ports/net/samba43/files/patch-source3__utils__net.c ./files/patch-source3__utils__net.c >--- /usr/ports/net/samba43/files/patch-source3__utils__net.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source3__utils__net.c 2016-02-08 07:36:14.000000000 +0000 >@@ -1,7 +1,7 @@ >---- ./source3/utils/net.c.orig 2013-01-29 08:49:31.000000000 +0000 >-+++ ./source3/utils/net.c 2013-01-31 15:04:24.069877314 +0000 >-@@ -898,8 +898,13 @@ >- set_global_myname(c->opt_requester_name); >+--- source3/utils/net.c.orig 2015-07-21 09:47:49 UTC >++++ source3/utils/net.c >+@@ -943,8 +943,13 @@ static struct functable net_func[] = { >+ lp_set_cmdline("netbios name", c->opt_requester_name); > } > > - if (!c->opt_user_name && getenv("LOGNAME")) { >diff -dpruN /usr/ports/net/samba43/files/patch-source3__utils__net_time.c ./files/patch-source3__utils__net_time.c >--- /usr/ports/net/samba43/files/patch-source3__utils__net_time.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source3__utils__net_time.c 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- ./source3/utils/net_time.c.orig 2010-04-01 15:26:22.000000000 +0200 >-+++ ./source3/utils/net_time.c 2010-04-23 01:08:35.000000000 +0200 >-@@ -87,10 +87,15 @@ >+--- source3/utils/net_time.c.orig 2015-07-21 09:47:49 UTC >++++ source3/utils/net_time.c >+@@ -75,10 +75,15 @@ static const char *systime(time_t t) > if (!tm) { > return "unknown"; > } >diff -dpruN /usr/ports/net/samba43/files/patch-source3__wscript ./files/patch-source3__wscript >--- /usr/ports/net/samba43/files/patch-source3__wscript 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source3__wscript 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- source3/wscript.orig 2015-09-08 13:45:25.000000000 +0000 >-+++ source3/wscript 2015-10-05 13:01:27.137800191 +0000 >-@@ -34,6 +34,7 @@ >+--- source3/wscript.orig 2015-09-08 13:45:25 UTC >++++ source3/wscript >+@@ -34,6 +34,7 @@ def set_options(opt): > opt.SAMBA3_ADD_OPTION('utmp') > opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True) > opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable") >@@ -8,7 +8,7 @@ > opt.SAMBA3_ADD_OPTION('iconv') > opt.SAMBA3_ADD_OPTION('acl-support') > opt.SAMBA3_ADD_OPTION('dnsupdate') >-@@ -542,7 +543,7 @@ >+@@ -542,7 +543,7 @@ return acl_get_perm_np(permset_d, perm); > conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt') > conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt') > conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt') >@@ -17,7 +17,7 @@ > if not conf.CONFIG_SET('HAVE_AIO'): > conf.DEFINE('HAVE_NO_AIO', '1') > else: >-@@ -863,6 +864,17 @@ >+@@ -863,6 +864,17 @@ msg.msg_accrightslen = sizeof(fd); > conf.SET_TARGET_TYPE('avahi-common', 'EMPTY') > conf.SET_TARGET_TYPE('avahi-client', 'EMPTY') > >@@ -35,7 +35,7 @@ > if Options.options.with_iconv: > conf.env.with_iconv = True > if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'): >-@@ -1652,9 +1664,6 @@ >+@@ -1652,9 +1664,6 @@ main() { > if conf.CONFIG_SET('HAVE_VXFS'): > default_shared_modules.extend(TO_LIST('vfs_vxfs')) > >diff -dpruN /usr/ports/net/samba43/files/patch-source3__wscript_build ./files/patch-source3__wscript_build >--- /usr/ports/net/samba43/files/patch-source3__wscript_build 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source3__wscript_build 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- source3/wscript_build.orig 2015-02-24 18:59:51.000000000 +0000 >-+++ source3/wscript_build 2015-03-25 01:00:04.143487619 +0000 >-@@ -601,6 +601,7 @@ >+--- source3/wscript_build.orig 2015-07-21 09:47:49 UTC >++++ source3/wscript_build >+@@ -625,6 +625,7 @@ bld.SAMBA3_LIBRARY('smbd_base', > smbd_conn > param_service > AVAHI >@@ -8,7 +8,7 @@ > PRINTBASE > PROFILE > LOCKING >-@@ -1043,6 +1044,7 @@ >+@@ -1076,6 +1077,7 @@ bld.SAMBA3_BINARY('client/smbclient', > msrpc3 > RPC_NDR_SRVSVC > cli_smb_common >@@ -16,7 +16,7 @@ > ''' + bld.env['archive_lib']) > > bld.SAMBA3_BINARY('net', >-@@ -1457,7 +1459,7 @@ >+@@ -1492,7 +1494,7 @@ bld.SAMBA3_PYTHON('pysmbd', > > bld.SAMBA3_PYTHON('pylibsmb', > source='libsmb/pylibsmb.c', >diff -dpruN /usr/ports/net/samba43/files/patch-source4__dns_server__dns_crypto.c ./files/patch-source4__dns_server__dns_crypto.c >--- /usr/ports/net/samba43/files/patch-source4__dns_server__dns_crypto.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source4__dns_server__dns_crypto.c 2016-02-08 07:51:10.000000000 +0000 >@@ -1,20 +1,6 @@ >-From 27b732f6bfcdcd96fd76e89c624f5f18ca944531 Mon Sep 17 00:00:00 2001 >-From: Guenter Kukkukk <kukks@samba.org> >-Date: Sat, 16 Feb 2013 16:53:16 +0100 >-Subject: [PATCH] Fix internal DNS dyn. update, seen as: ; TSIG error with server: tsig verify failure >- >-The dns update signed response must be handled differently than the TKEY response >- >-Signed-off-by: Guenter Kukkukk <kukks@samba.org> >---- >- source4/dns_server/dns_crypto.c | 44 ++++++++++++++++++++++++++++++++------ >- 1 files changed, 37 insertions(+), 7 deletions(-) >- >-diff --git a/source4/dns_server/dns_crypto.c b/source4/dns_server/dns_crypto.c >-index 7604a05..71adf68 100644 >---- ./source4/dns_server/dns_crypto.c.orig 2012-10-02 08:24:46.000000000 +0000 >-+++ ./source4/dns_server/dns_crypto.c 2013-11-18 22:45:12.818702284 +0000 >-@@ -244,6 +244,8 @@ >+--- source4/dns_server/dns_crypto.c.orig 2015-07-21 09:47:49 UTC >++++ source4/dns_server/dns_crypto.c >+@@ -247,6 +247,8 @@ WERROR dns_sign_tsig(struct dns_server * > DATA_BLOB packet_blob, tsig_blob, sig; > uint8_t *buffer = NULL; > size_t buffer_len = 0; >@@ -23,7 +9,7 @@ index 7604a05..71adf68 100644 > struct dns_server_tkey * tkey = NULL; > struct dns_res_rec *tsig = talloc_zero(mem_ctx, struct dns_res_rec); > >-@@ -298,16 +300,44 @@ >+@@ -301,16 +303,44 @@ WERROR dns_sign_tsig(struct dns_server * > return DNS_ERR(SERVER_FAILURE); > } > >diff -dpruN /usr/ports/net/samba43/files/patch-source4__lib__http__http.c ./files/patch-source4__lib__http__http.c >--- /usr/ports/net/samba43/files/patch-source4__lib__http__http.c 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-source4__lib__http__http.c 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- source4/lib/http/http.c.orig 2015-07-14 10:41:44.000000000 +0000 >-+++ source4/lib/http/http.c 2015-08-09 23:25:46.480162006 +0000 >-@@ -112,7 +112,19 @@ >+--- source4/lib/http/http.c.orig 2015-07-21 09:47:49 UTC >++++ source4/lib/http/http.c >+@@ -112,7 +112,19 @@ static enum http_read_status http_parse_ > return HTTP_ALL_DATA_READ; > } > >@@ -20,7 +20,7 @@ > if (n != 2) { > DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line)); > status = HTTP_DATA_CORRUPTED; >-@@ -138,7 +150,7 @@ >+@@ -138,7 +150,7 @@ error: > static bool http_parse_response_line(struct http_read_response_state *state) > { > bool status = true; >@@ -29,7 +29,7 @@ > char *msg = NULL; > char major; > char minor; >-@@ -158,12 +170,22 @@ >+@@ -158,12 +170,22 @@ static bool http_parse_response_line(str > return false; > } > >@@ -56,7 +56,7 @@ > > if (n != 5) { > DEBUG(0, ("%s: Error parsing header\n", __func__)); >-@@ -171,6 +193,10 @@ >+@@ -171,6 +193,10 @@ static bool http_parse_response_line(str > goto error; > } > >diff -dpruN /usr/ports/net/samba43/files/patch-third_party__waf__wafadmin__Logs.py ./files/patch-third_party__waf__wafadmin__Logs.py >--- /usr/ports/net/samba43/files/patch-third_party__waf__wafadmin__Logs.py 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-third_party__waf__wafadmin__Logs.py 2016-02-08 07:36:14.000000000 +0000 >@@ -1,6 +1,6 @@ >---- third_party/waf/wafadmin/Logs.py.orig 2015-07-21 09:47:50.000000000 +0000 >-+++ third_party/waf/wafadmin/Logs.py 2015-10-05 18:46:33.937351181 +0000 >-@@ -23,6 +23,9 @@ >+--- third_party/waf/wafadmin/Logs.py.orig 2015-07-21 09:47:50 UTC >++++ third_party/waf/wafadmin/Logs.py >+@@ -23,6 +23,9 @@ colors_lst = { > 'cursor_off' :'\x1b[?25l', > } > >@@ -10,7 +10,7 @@ > got_tty = False > term = os.environ.get('TERM', 'dumb') > if not term in ['dumb', 'emacs']: >-@@ -84,7 +87,7 @@ >+@@ -84,7 +87,7 @@ class log_filter(logging.Filter): > > class formatter(logging.Formatter): > def __init__(self): >diff -dpruN /usr/ports/net/samba43/files/patch-wscript ./files/patch-wscript >--- /usr/ports/net/samba43/files/patch-wscript 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-wscript 2016-02-08 07:36:14.000000000 +0000 >@@ -1,18 +1,18 @@ >---- wscript.orig 2014-10-01 09:17:32.000000000 +0000 >-+++ wscript 2014-11-03 14:50:56.381380474 +0000 >-@@ -40,7 +40,6 @@ >- opt.RECURSE('lib/ntdb') >+--- wscript.orig 2015-10-20 10:40:54 UTC >++++ wscript >+@@ -39,7 +39,6 @@ def set_options(opt): >+ opt.RECURSE('lib/ldb') > opt.RECURSE('selftest') > opt.RECURSE('source4/lib/tls') > - opt.RECURSE('pidl') > opt.RECURSE('source3') > opt.RECURSE('lib/util') >- >-@@ -162,7 +161,6 @@ >- conf.RECURSE('lib/subunit/c') >+ opt.RECURSE('ctdb') >+@@ -147,7 +146,6 @@ def configure(conf): >+ conf.RECURSE('nsswitch') > conf.RECURSE('libcli/smbreadline') > conf.RECURSE('lib/crypto') > - conf.RECURSE('pidl') > conf.RECURSE('selftest') >- conf.RECURSE('source3') >- conf.RECURSE('lib/texpect') >+ if conf.CONFIG_GET('ENABLE_SELFTEST'): >+ conf.RECURSE('lib/nss_wrapper') >diff -dpruN /usr/ports/net/samba43/files/patch-wscript_build ./files/patch-wscript_build >--- /usr/ports/net/samba43/files/patch-wscript_build 2015-11-30 01:35:36.000000000 +0000 >+++ ./files/patch-wscript_build 2016-02-08 07:36:14.000000000 +0000 >@@ -1,8 +1,8 @@ >---- ./wscript_build.orig 2013-01-27 22:58:14.032166250 +0000 >-+++ ./wscript_build 2013-01-27 23:03:34.089892588 +0000 >-@@ -130,7 +130,6 @@ >- if bld.AD_DC_BUILD_IS_ENABLED(): >- bld.RECURSE('source4/setup') >+--- wscript_build.orig 2015-07-21 09:47:50 UTC >++++ wscript_build >+@@ -141,7 +141,6 @@ if bld.AD_DC_BUILD_IS_ENABLED(): >+ if bld.env.with_ctdb: >+ bld.RECURSE('ctdb') > bld.RECURSE('source4/scripting') > -bld.RECURSE('pidl') > bld.RECURSE('lib') >diff -dpruN /usr/ports/net/samba43/pkg-plist ./pkg-plist >--- /usr/ports/net/samba43/pkg-plist 2015-12-19 22:51:10.000000000 +0000 >+++ ./pkg-plist 2016-02-08 08:29:04.000000000 +0000 >@@ -1,4 +1,3 @@ >-bin/async_connect_send_test > bin/cifsdd > bin/dbwrap_tool > bin/eventlogadm
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=166735">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 206808
:
166536
|
166734
| 166735 |
166736