Sun May 24 01:22:16 2020 UTC ()
Use FreeBSD ACL code on NetBSD as well.


(joerg)
diff -r1.54 -r1.55 pkgsrc/sysutils/bacula/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/bacula/patches/patch-configure
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl.c
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.c
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.h
cvs diff -r1.54 -r1.55 pkgsrc/sysutils/bacula/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/distinfo 2020/03/06 19:48:47 1.54
+++ pkgsrc/sysutils/bacula/distinfo 2020/05/24 01:22:15 1.55
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1$NetBSD: distinfo,v 1.54 2020/03/06 19:48:47 jnemeth Exp $ 1$NetBSD: distinfo,v 1.55 2020/05/24 01:22:15 joerg Exp $
2 2
3SHA1 (bacula-9.6.2.tar.gz) = 23c1c2a6a9626dc9d4169a685aa3a12648b00247 3SHA1 (bacula-9.6.2.tar.gz) = 23c1c2a6a9626dc9d4169a685aa3a12648b00247
4RMD160 (bacula-9.6.2.tar.gz) = 82980cdf196c423fa9dc351e334582a6d718dcd9 4RMD160 (bacula-9.6.2.tar.gz) = 82980cdf196c423fa9dc351e334582a6d718dcd9
5SHA512 (bacula-9.6.2.tar.gz) = a02d4ba92a3937e41a5b86c93969ca2b993b677a12b8731daea12271d33e636a7a6c7b399c5cae2afb2dde38b622e8b8e5906aff072e0a1a360b0a08749b91a1 5SHA512 (bacula-9.6.2.tar.gz) = a02d4ba92a3937e41a5b86c93969ca2b993b677a12b8731daea12271d33e636a7a6c7b399c5cae2afb2dde38b622e8b8e5906aff072e0a1a360b0a08749b91a1
6Size (bacula-9.6.2.tar.gz) = 4539091 bytes 6Size (bacula-9.6.2.tar.gz) = 4539091 bytes
7SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01 7SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01
8SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 8SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
9SHA1 (patch-configure) = 94e6714a6d19ae07c1141c59702b546e595e0bb1 9SHA1 (patch-configure) = fb2c8ec47f0b51f53b61d51df2855d944507bfc7
10SHA1 (patch-scripts_baculabackupreport.in) = 58047124ad82dd5d0f2aa786251ba012ae7f07b0 10SHA1 (patch-scripts_baculabackupreport.in) = 58047124ad82dd5d0f2aa786251ba012ae7f07b0
11SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885 11SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885
12SHA1 (patch-src_console_Makefile.in) = f997b8f8bc8c7cca5b06a8f046558951caa14094 12SHA1 (patch-src_console_Makefile.in) = f997b8f8bc8c7cca5b06a8f046558951caa14094
13SHA1 (patch-src_console_conio.c) = 92445b01e2ad17de5215315df916f1f1bd45108b 13SHA1 (patch-src_console_conio.c) = 92445b01e2ad17de5215315df916f1f1bd45108b
14SHA1 (patch-src_dird_Makefile.in) = 0f088f3af4bcacb260fb50124723babd69f5caee 14SHA1 (patch-src_dird_Makefile.in) = 0f088f3af4bcacb260fb50124723babd69f5caee
15SHA1 (patch-src_filed_Makefile.in) = 12d7498d65c9f4f0a844a1c4648c782ce1b5ab48 15SHA1 (patch-src_filed_Makefile.in) = 12d7498d65c9f4f0a844a1c4648c782ce1b5ab48
 16SHA1 (patch-src_filed_bacl.c) = 6eb8d9e5198d91ea52b8ab4a31bf0cc565f3ee07
 17SHA1 (patch-src_filed_bacl__freebsd.c) = 0a90b6621e3b18b43f7f9e0d7af50ba7f17ca708
 18SHA1 (patch-src_filed_bacl__freebsd.h) = 44a888985cb7dfde52603e3e19ed117e4b922641
16SHA1 (patch-src_filed_bxattr.c) = 2689b8bb6f5ddf14d7253e45353c5a40e5e9867e 19SHA1 (patch-src_filed_bxattr.c) = 2689b8bb6f5ddf14d7253e45353c5a40e5e9867e
17SHA1 (patch-src_filed_bxattr__netbsd.c) = bc2a0417c852b76ddc4324c39ae5f6ec0387ab30 20SHA1 (patch-src_filed_bxattr__netbsd.c) = bc2a0417c852b76ddc4324c39ae5f6ec0387ab30
18SHA1 (patch-src_filed_bxattr__netbsd.h) = 791a2da696da049a6091c4c460aec0bd00dfa5ff 21SHA1 (patch-src_filed_bxattr__netbsd.h) = 791a2da696da049a6091c4c460aec0bd00dfa5ff
19SHA1 (patch-src_findlib_attribs.c) = f3665a012e3a0cc06ff2c9ab922324b1df3b2819 22SHA1 (patch-src_findlib_attribs.c) = f3665a012e3a0cc06ff2c9ab922324b1df3b2819
20SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1 23SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1
21SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e 24SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e
22SHA1 (patch-src_plugins_fd_docker_baculatar_baculatar) = ba5fb5edc8ee98f09d31f36e840d68facfe48233 25SHA1 (patch-src_plugins_fd_docker_baculatar_baculatar) = ba5fb5edc8ee98f09d31f36e840d68facfe48233
23SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad 26SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad
24SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = 83b48b321de88aa766aa2fc082c95a3a8665981d 27SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = 83b48b321de88aa766aa2fc082c95a3a8665981d
25SHA1 (patch-src_stored_Makefile.in) = 2c1a2b095593f88649bd0dc21f03cfbd24894fb5 28SHA1 (patch-src_stored_Makefile.in) = 2c1a2b095593f88649bd0dc21f03cfbd24894fb5
26SHA1 (patch-src_tools_Makefile.in) = 3448f4a472c8c339415ac8b3618dd09cb9d3cfd6 29SHA1 (patch-src_tools_Makefile.in) = 3448f4a472c8c339415ac8b3618dd09cb9d3cfd6
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/bacula/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/patches/patch-configure 2019/02/07 11:29:31 1.2
+++ pkgsrc/sysutils/bacula/patches/patch-configure 2020/05/24 01:22:16 1.3
@@ -1,16 +1,35 @@ @@ -1,16 +1,35 @@
1$NetBSD: patch-configure,v 1.2 2019/02/07 11:29:31 markd Exp $ 1$NetBSD: patch-configure,v 1.3 2020/05/24 01:22:16 joerg Exp $
2 2
3NetBSD has xattr 3NetBSD has xattr and acl.
4 4
5--- configure.orig 2018-12-21 08:40:51.000000000 +0000 5--- configure.orig 2020-02-26 14:11:43.000000000 +0000
6+++ configure 6+++ configure
7@@ -30658,6 +30658,9 @@ $as_echo "#define HAVE_XATTR 1" >>confde 7@@ -30085,7 +30085,7 @@ $as_echo "no" >&6; }
 8 fi
 9
 10 if test $have_acl = yes -a \
 11- x${HAVE_FREEBSD_OS_TRUE} = x; then
 12+ \( x${HAVE_FREEBSD_OS_TRUE} = x -o x${HAVE_NETBSD_OS_TRUE} = x \); then
 13 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_NFS4 in acl.h include file" >&5
 14 $as_echo_n "checking for ACL_TYPE_NFS4 in acl.h include file... " >&6; }
 15 grep ACL_TYPE_NFS4 /usr/include/sys/acl.h > /dev/null 2>&1
 16@@ -30232,6 +30232,9 @@ $as_echo "#define HAVE_ACL 1" >>confdefs
 17 if test x${HAVE_FREEBSD_OS_TRUE} = x; then
 18 ACLOBJS="bacl.c bacl_freebsd.c"
 19 fi
 20+ if test x${HAVE_NETBSD_OS_TRUE} = x; then
 21+ ACLOBJS="bacl.c bacl_freebsd.c"
 22+ fi
 23 if test x${HAVE_DARWIN_OS_TRUE} = x; then
 24 ACLOBJS="bacl.c bacl_osx.c"
 25 fi
 26@@ -30706,6 +30709,9 @@ $as_echo "#define HAVE_XATTR 1" >>confde
8 if test x${HAVE_FREEBSD_OS_TRUE} = x; then 27 if test x${HAVE_FREEBSD_OS_TRUE} = x; then
9 XATTROBJS="bxattr.c bxattr_freebsd.c" 28 XATTROBJS="bxattr.c bxattr_freebsd.c"
10 fi 29 fi
11+ if test x${HAVE_NETBSD_OS_TRUE} = x; then 30+ if test x${HAVE_NETBSD_OS_TRUE} = x; then
12+ XATTROBJS="bxattr.c bxattr_netbsd.c" 31+ XATTROBJS="bxattr.c bxattr_netbsd.c"
13+ fi 32+ fi
14 if test x${HAVE_DARWIN_OS_TRUE} = x; then 33 if test x${HAVE_DARWIN_OS_TRUE} = x; then
15 XATTROBJS="bxattr.c bxattr_osx.c" 34 XATTROBJS="bxattr.c bxattr_osx.c"
16 fi 35 fi
File Added: pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl.c
$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();
File Added: pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.c
$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)
File Added: pkgsrc/sysutils/bacula/patches/patch-src_filed_bacl__freebsd.h
$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 */