CVS commit: pkgsrc/net/samba4

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Apr 25 16:25:02 UTC 2022

Modified Files:
        pkgsrc/net/samba4: distinfo
Added Files:
        pkgsrc/net/samba4/patches: patch-source3_modules_vfs__solarisacl.c
            patch-source3_modules_vfs__solarisacl.h
            patch-source3_printing_samba-bgqd.c

Log Message:
samba4: Build fixes, primarily for SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/net/samba4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.c \
    pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.h \
    pkgsrc/net/samba4/patches/patch-source3_printing_samba-bgqd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/distinfo
diff -u pkgsrc/net/samba4/distinfo:1.76 pkgsrc/net/samba4/distinfo:1.77
--- pkgsrc/net/samba4/distinfo:1.76     Thu Mar 24 10:16:13 2022
+++ pkgsrc/net/samba4/distinfo  Mon Apr 25 16:25:02 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2022/03/24 10:16:13 hauke Exp $
+$NetBSD: distinfo,v 1.77 2022/04/25 16:25:02 jperkin Exp $
 
 BLAKE2s (samba-4.15.6.tar.gz) = b11fd56c12dfbb3e0dc3e7b5e25b73f964b3b26afcc504293f2050c9bb9b0cfd
 SHA512 (samba-4.15.6.tar.gz) = cd193d74173831449abc24f1769f0af2dabd5dd8a65507af7b09fde6dd5780d30336d59600add939b044cfa5781f357ec9192c7fed1a1e7278812b6c07b824e2
@@ -25,6 +25,9 @@ SHA1 (patch-nsswitch_stress-nss-libwbcli
 SHA1 (patch-nsswitch_winbind__nss__netbsd.c) = 2773ec9269d1fe0d7ce7ed220f6a7122d187fabe
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
 SHA1 (patch-source3_libsmb_pylibsmb.c) = 962bb35b140ec11c0035ffa7fb83c9143fa5615f
+SHA1 (patch-source3_modules_vfs__solarisacl.c) = 087db5db78bce27a71caee5c78eb4f9aba81b428
+SHA1 (patch-source3_modules_vfs__solarisacl.h) = 11f8664641a14fd83d78b1a7e10056a77b7b634f
+SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efbcdf76
 SHA1 (patch-source3_smbd_open.c) = 002f26f77dad54617bf9c0fe4fa12f093ef3b66c
 SHA1 (patch-source3_smbd_process.c) = 3a6f9682aca6473e364d0be0f601774df4fd1296
 SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77

Added files:

Index: pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.c:1.1
--- /dev/null   Mon Apr 25 16:25:02 2022
+++ pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.c   Mon Apr 25 16:25:02 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-source3_modules_vfs__solarisacl.c,v 1.1 2022/04/25 16:25:02 jperkin Exp $
+
+https://bugzilla.samba.org/attachment.cgi?id=16710
+
+--- source3/modules/vfs_solarisacl.c.orig      2021-08-09 13:38:36.435381200 +0000
++++ source3/modules/vfs_solarisacl.c
+@@ -204,7 +204,7 @@ int solarisacl_sys_acl_set_fd(vfs_handle
+       DEBUG(10, ("solarisacl_sys_acl_set_fd %s.\n",
+                  ((ret == 0) ? "succeeded" : "failed" )));
+       SAFE_FREE(solaris_acl);
+-      SAFE_FREE(default_acl);
++      SAFE_FREE(other_acl);
+       return ret;
+ }
+ 
+@@ -252,7 +252,7 @@ int solarisacl_sys_acl_delete_def_fd(vfs
+       }
+       ret = acl(fsp->fsp_name->base_name, SETACL, count, solaris_acl);
+       if (ret != 0) {
+-              DBG_DEBG("settinge file acl failed!\n");
++              DBG_DEBUG("settinge file acl failed!\n");
+       }
+ 
+  done:
Index: pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.h
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.h:1.1
--- /dev/null   Mon Apr 25 16:25:02 2022
+++ pkgsrc/net/samba4/patches/patch-source3_modules_vfs__solarisacl.h   Mon Apr 25 16:25:02 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-source3_modules_vfs__solarisacl.h,v 1.1 2022/04/25 16:25:02 jperkin Exp $
+
+Fix function prototype to match.
+
+--- source3/modules/vfs_solarisacl.h.orig      2022-03-15 13:19:34.136201100 +0000
++++ source3/modules/vfs_solarisacl.h
+@@ -20,7 +20,7 @@
+ #ifndef __VFS_SOLARISACL_H__
+ #define __VFS_SOLARISACL_H__
+ 
+-SMB_ACL_T solarisacl_sys_acl_get_file(vfs_handle_struct *handle,
++static SMB_ACL_T solarisacl_sys_acl_get_file(vfs_handle_struct *handle,
+                               const struct smb_filename *smb_fname,
+                               SMB_ACL_TYPE_T type,
+                               TALLOC_CTX *mem_ctx);
Index: pkgsrc/net/samba4/patches/patch-source3_printing_samba-bgqd.c
diff -u /dev/null pkgsrc/net/samba4/patches/patch-source3_printing_samba-bgqd.c:1.1
--- /dev/null   Mon Apr 25 16:25:02 2022
+++ pkgsrc/net/samba4/patches/patch-source3_printing_samba-bgqd.c       Mon Apr 25 16:25:02 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-source3_printing_samba-bgqd.c,v 1.1 2022/04/25 16:25:02 jperkin Exp $
+
+Fix includes for SIG*.
+
+--- source3/printing/samba-bgqd.c.orig 2022-03-15 13:19:34.136201100 +0000
++++ source3/printing/samba-bgqd.c
+@@ -15,6 +15,7 @@
+  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include "includes.h"
+ #include "replace.h"
+ #include "system/filesys.h"
+ #include "lib/util/server_id.h"