CVS commit: pkgsrc/sysutils/bacula

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun May 24 01:22:16 UTC 2020

Modified Files:
        pkgsrc/sysutils/bacula: distinfo
        pkgsrc/sysutils/bacula/patches: patch-configure
Added Files:
        pkgsrc/sysutils/bacula/patches: patch-src_filed_bacl.c
            patch-src_filed_bacl__freebsd.c patch-src_filed_bacl__freebsd.h

Log Message:
Use FreeBSD ACL code on NetBSD as well.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/bacula/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/bacula/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl.c \
    pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.c \
    pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.h

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

Modified files:

Index: pkgsrc/sysutils/bacula/distinfo
diff -u pkgsrc/sysutils/bacula/distinfo:1.54 pkgsrc/sysutils/bacula/distinfo:1.55
--- pkgsrc/sysutils/bacula/distinfo:1.54        Fri Mar  6 19:48:47 2020
+++ pkgsrc/sysutils/bacula/distinfo     Sun May 24 01:22:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2020/03/06 19:48:47 jnemeth Exp $
+$NetBSD: distinfo,v 1.55 2020/05/24 01:22:15 joerg Exp $
 
 SHA1 (bacula-9.6.2.tar.gz) = 23c1c2a6a9626dc9d4169a685aa3a12648b00247
 RMD160 (bacula-9.6.2.tar.gz) = 82980cdf196c423fa9dc351e334582a6d718dcd9
@@ -6,13 +6,16 @@ SHA512 (bacula-9.6.2.tar.gz) = a02d4ba92
 Size (bacula-9.6.2.tar.gz) = 4539091 bytes
 SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01
 SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
-SHA1 (patch-configure) = 94e6714a6d19ae07c1141c59702b546e595e0bb1
+SHA1 (patch-configure) = fb2c8ec47f0b51f53b61d51df2855d944507bfc7
 SHA1 (patch-scripts_baculabackupreport.in) = 58047124ad82dd5d0f2aa786251ba012ae7f07b0
 SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885
 SHA1 (patch-src_console_Makefile.in) = f997b8f8bc8c7cca5b06a8f046558951caa14094
 SHA1 (patch-src_console_conio.c) = 92445b01e2ad17de5215315df916f1f1bd45108b
 SHA1 (patch-src_dird_Makefile.in) = 0f088f3af4bcacb260fb50124723babd69f5caee
 SHA1 (patch-src_filed_Makefile.in) = 12d7498d65c9f4f0a844a1c4648c782ce1b5ab48
+SHA1 (patch-src_filed_bacl.c) = 6eb8d9e5198d91ea52b8ab4a31bf0cc565f3ee07
+SHA1 (patch-src_filed_bacl__freebsd.c) = 0a90b6621e3b18b43f7f9e0d7af50ba7f17ca708
+SHA1 (patch-src_filed_bacl__freebsd.h) = 44a888985cb7dfde52603e3e19ed117e4b922641
 SHA1 (patch-src_filed_bxattr.c) = 2689b8bb6f5ddf14d7253e45353c5a40e5e9867e
 SHA1 (patch-src_filed_bxattr__netbsd.c) = bc2a0417c852b76ddc4324c39ae5f6ec0387ab30
 SHA1 (patch-src_filed_bxattr__netbsd.h) = 791a2da696da049a6091c4c460aec0bd00dfa5ff

Index: pkgsrc/sysutils/bacula/patches/patch-configure
diff -u pkgsrc/sysutils/bacula/patches/patch-configure:1.2 pkgsrc/sysutils/bacula/patches/patch-configure:1.3
--- pkgsrc/sysutils/bacula/patches/patch-configure:1.2  Thu Feb  7 11:29:31 2019
+++ pkgsrc/sysutils/bacula/patches/patch-configure      Sun May 24 01:22:16 2020
@@ -1,10 +1,29 @@
-$NetBSD: patch-configure,v 1.2 2019/02/07 11:29:31 markd Exp $
+$NetBSD: patch-configure,v 1.3 2020/05/24 01:22:16 joerg Exp $
 
-NetBSD has xattr
+NetBSD has xattr and acl.
 
---- configure.orig     2018-12-21 08:40:51.000000000 +0000
+--- configure.orig     2020-02-26 14:11:43.000000000 +0000
 +++ configure
-@@ -30658,6 +30658,9 @@ $as_echo "#define HAVE_XATTR 1" >>confde
+@@ -30085,7 +30085,7 @@ $as_echo "no" >&6; }
+    fi
+ 
+             if test $have_acl = yes -a \
+-      x${HAVE_FREEBSD_OS_TRUE} = x; then
++      \( x${HAVE_FREEBSD_OS_TRUE} = x -o x${HAVE_NETBSD_OS_TRUE} = x \); then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_NFS4 in acl.h include file" >&5
+ $as_echo_n "checking for ACL_TYPE_NFS4 in acl.h include file... " >&6; }
+       grep ACL_TYPE_NFS4 /usr/include/sys/acl.h > /dev/null 2>&1
+@@ -30232,6 +30232,9 @@ $as_echo "#define HAVE_ACL 1" >>confdefs
+        if test x${HAVE_FREEBSD_OS_TRUE} = x; then
+           ACLOBJS="bacl.c bacl_freebsd.c"
+        fi
++       if test x${HAVE_NETBSD_OS_TRUE} = x; then
++          ACLOBJS="bacl.c bacl_freebsd.c"
++       fi
+        if test x${HAVE_DARWIN_OS_TRUE} = x; then
+           ACLOBJS="bacl.c bacl_osx.c"
+        fi
+@@ -30706,6 +30709,9 @@ $as_echo "#define HAVE_XATTR 1" >>confde
         if test x${HAVE_FREEBSD_OS_TRUE} = x; then
            XATTROBJS="bxattr.c bxattr_freebsd.c"
         fi

Added files:

Index: pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl.c
diff -u /dev/null pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl.c:1.1
--- /dev/null   Sun May 24 01:22:16 2020
+++ pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl.c       Sun May 24 01:22:16 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_filed_bacl.c,v 1.1 2020/05/24 01:22:16 joerg Exp $
+
+--- src/filed/bacl.c.orig      2020-05-23 22:26:28.106204817 +0000
++++ src/filed/bacl.c
+@@ -757,7 +757,7 @@ void *new_bacl()
+    return new BACL_OSX();
+ #elif defined(HAVE_LINUX_OS)
+    return new BACL_Linux();
+-#elif defined(HAVE_FREEBSD_OS)
++#elif defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+    return new BACL_FreeBSD();
+ #elif defined(HAVE_HURD_OS)
+    return new BACL_Hurd();
Index: pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.c
diff -u /dev/null pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.c:1.1
--- /dev/null   Sun May 24 01:22:16 2020
+++ pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.c      Sun May 24 01:22:16 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_filed_bacl__freebsd.c,v 1.1 2020/05/24 01:22:16 joerg Exp $
+
+--- src/filed/bacl_freebsd.c.orig      2020-05-23 22:41:29.838112856 +0000
++++ src/filed/bacl_freebsd.c
+@@ -29,7 +29,7 @@
+ #include "filed.h"
+ #include "bacl_freebsd.h"
+ 
+-#if defined(HAVE_FREEBSD_OS)
++#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+ 
+ /* check if ACL support is enabled */
+ #if defined(HAVE_ACL)
Index: pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.h
diff -u /dev/null pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.h:1.1
--- /dev/null   Sun May 24 01:22:16 2020
+++ pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.h      Sun May 24 01:22:16 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_filed_bacl__freebsd.h,v 1.1 2020/05/24 01:22:16 joerg Exp $
+
+--- src/filed/bacl_freebsd.h.orig      2020-05-23 22:42:58.371185596 +0000
++++ src/filed/bacl_freebsd.h
+@@ -28,7 +28,7 @@
+ #ifndef __BACL_FreeBSD_H_
+ #define __BACL_FreeBSD_H_
+ 
+-#if defined(HAVE_FREEBSD_OS)
++#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+ #include <sys/types.h>
+ 
+ /* check if ACL support is enabled */