CVS commit: pkgsrc/sysutils/bareos

["Frank Kardel" <kardel%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kardel
Date:           Tue Aug  4 12:56:15 UTC 2020

Modified Files:
        pkgsrc/sysutils/bareos: distinfo
        pkgsrc/sysutils/bareos/patches: patch-core_src_lmdb_mdb.c

Log Message:
improve lmdb compile patch


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/bareos/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c

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

Modified files:

Index: pkgsrc/sysutils/bareos/distinfo
diff -u pkgsrc/sysutils/bareos/distinfo:1.1 pkgsrc/sysutils/bareos/distinfo:1.2
--- pkgsrc/sysutils/bareos/distinfo:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/distinfo     Tue Aug  4 12:56:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: distinfo,v 1.2 2020/08/04 12:56:15 kardel Exp $
 
 SHA1 (bareos-19.2.8.tar.gz) = b26f7db66e108eed1e20b11c36f994456419748e
 RMD160 (bareos-19.2.8.tar.gz) = 221777925946ab05ddc00063ba51daf4555f16d1
@@ -32,7 +32,7 @@ SHA1 (patch-core_src_findlib_find__one.c
 SHA1 (patch-core_src_lib_mem__pool.cc) = 16b5adc4a5b2b4fd542b4d330e03283b8994a4a7
 SHA1 (patch-core_src_lib_scsi__lli.cc) = 09aa887d71009baa2ce2203c46c88a89097d6546
 SHA1 (patch-core_src_lib_version.c) = edfd88aed983ea3ce1ead6846707b5625ad5fc51
-SHA1 (patch-core_src_lmdb_mdb.c) = 70c76d7ecf610edb47afbb91f3c4d500d85583fe
+SHA1 (patch-core_src_lmdb_mdb.c) = 6cb69f975c23ec5ae52eb1daa8f6f73b7cbf71fd
 SHA1 (patch-core_src_plugins_stored_scsicrypto-sd.cc) = d59125fd445536e220140acf16e43605a4a98e9c
 SHA1 (patch-core_src_plugins_stored_scsitapealert-sd.cc) = 92ef75fbddb587957ec972480a87fe0f5b110111
 SHA1 (patch-core_src_stored_acquire.cc) = c239b2a4a3769b3f99315fae5cc5ee564454a1ad

Index: pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c:1.1        Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c    Tue Aug  4 12:56:15 2020
@@ -1,25 +1,19 @@
-$NetBSD: patch-core_src_lmdb_mdb.c,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_lmdb_mdb.c,v 1.2 2020/08/04 12:56:15 kardel Exp $
 
-       Fix compilation on NetBSD
+       use POSIX semaphores on NetBSD
 
---- core/src/lmdb/mdb.c.orig   2018-12-20 08:51:51.000000000 +0000
+--- core/src/lmdb/mdb.c.orig   2020-08-04 12:17:56.368741881 +0000
 +++ core/src/lmdb/mdb.c
-@@ -150,7 +150,8 @@ typedef SSIZE_T    ssize_t;
+@@ -150,7 +150,11 @@ typedef SSIZE_T   ssize_t;
  
  #if defined(__APPLE__) || defined (BSD)
  # if !(defined(MDB_USE_POSIX_MUTEX) || defined(MDB_USE_POSIX_SEM))
 -# define MDB_USE_SYSV_SEM     1
-+/* # define MDB_USE_SYSV_SEM  1 */
-+# define MDB_USE_POSIX_SEM    1
++#   if defined(__NetBSD__)
++#     define MDB_USE_POSIX_SEM        1
++#   else
++#     define MDB_USE_SYSV_SEM 1
++#   endif
  # endif
  # define MDB_FDATASYNC                fsync
  #elif defined(ANDROID)
-@@ -4829,7 +4830,7 @@ mdb_env_setup_locks(MDB_env *env, char *
- #endif
- #ifdef MDB_USE_SYSV_SEM
-       int semid;
--      union semun semu;
-+      // XXXkd: union semun semu;
- #endif
-       int rc;
-       off_t size, rsize;