CVS commit: pkgsrc/databases/tdb

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 29 23:33:54 UTC 2019

Modified Files:
        pkgsrc/databases/tdb: distinfo
Added Files:
        pkgsrc/databases/tdb/patches:
            patch-buildtools_wafsamba_samba__conftests.py

Log Message:
tdb: Fix build on SunOS (unicode vs str assertion failures).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/tdb/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py

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

Modified files:

Index: pkgsrc/databases/tdb/distinfo
diff -u pkgsrc/databases/tdb/distinfo:1.15 pkgsrc/databases/tdb/distinfo:1.16
--- pkgsrc/databases/tdb/distinfo:1.15  Thu Jan 17 21:29:39 2019
+++ pkgsrc/databases/tdb/distinfo       Tue Jan 29 23:33:54 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2019/01/17 21:29:39 adam Exp $
+$NetBSD: distinfo,v 1.16 2019/01/29 23:33:54 jperkin Exp $
 
 SHA1 (tdb-1.3.17.tar.gz) = 4cff48170f2ad3bfc85364f6f245d0b785260dba
 RMD160 (tdb-1.3.17.tar.gz) = e1a39c84812e5f95bfdce8ae8cdf90c81f383c88
 SHA512 (tdb-1.3.17.tar.gz) = ef25dad520a12d75e541802a46e418fe61ac691126600f24158cd5b95091b4c536ffc4d4aff6608cca087291fde0b86b44ff7b1a7837d816cd534e9688c39eff
 Size (tdb-1.3.17.tar.gz) = 697224 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
+SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 69cb193ba4e1f5ba9a478c21aee166dc499d37f1

Added files:

Index: pkgsrc/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py
diff -u /dev/null pkgsrc/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py:1.1
--- /dev/null   Tue Jan 29 23:33:54 2019
+++ pkgsrc/databases/tdb/patches/patch-buildtools_wafsamba_samba__conftests.py  Tue Jan 29 23:33:54 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-buildtools_wafsamba_samba__conftests.py,v 1.1 2019/01/29 23:33:54 jperkin Exp $
+
+Ensure defines are strings to avoid assertion failure, some
+returned values are unicode.
+
+--- buildtools/wafsamba/samba_conftests.py.orig        2019-01-29 23:12:58.026242040 +0000
++++ buildtools/wafsamba/samba_conftests.py
+@@ -97,9 +97,9 @@ def CHECK_LARGEFILE(conf, define='HAVE_L
+                 if flag[:2] == "-D":
+                     flag_split = flag[2:].split('=')
+                     if len(flag_split) == 1:
+-                        conf.DEFINE(flag_split[0], '1')
++                        conf.DEFINE(str(flag_split[0]), '1')
+                     else:
+-                        conf.DEFINE(flag_split[0], flag_split[1])
++                        conf.DEFINE(str(flag_split[0]), str(flag_split[1]))
+ 
+     if conf.CHECK_CODE('return !(sizeof(off_t) >= 8)',
+                        define,