CVS commit: pkgsrc/devel/talloc

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 29 23:40:37 UTC 2019

Modified Files:
        pkgsrc/devel/talloc: distinfo
Added Files:
        pkgsrc/devel/talloc/patches:
            patch-buildtools_wafsamba_samba__conftests.py

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/talloc/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/talloc/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/devel/talloc/distinfo
diff -u pkgsrc/devel/talloc/distinfo:1.21 pkgsrc/devel/talloc/distinfo:1.22
--- pkgsrc/devel/talloc/distinfo:1.21   Thu Jan 17 21:29:39 2019
+++ pkgsrc/devel/talloc/distinfo        Tue Jan 29 23:40:37 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2019/01/17 21:29:39 adam Exp $
+$NetBSD: distinfo,v 1.22 2019/01/29 23:40:37 jperkin Exp $
 
 SHA1 (talloc-2.1.15.tar.gz) = 17c74ab8612f17ae1ed65751da1335a5a2d93704
 RMD160 (talloc-2.1.15.tar.gz) = 805fea7f529c8fb1f0488b54c28e6d4b50c7c182
 SHA512 (talloc-2.1.15.tar.gz) = 41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40
 Size (talloc-2.1.15.tar.gz) = 634092 bytes
+SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d53847b1006b7a87add2303f170bb5f23d5f738c
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d

Added files:

Index: pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py
diff -u /dev/null pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py:1.3
--- /dev/null   Tue Jan 29 23:40:37 2019
+++ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py   Tue Jan 29 23:40:37 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-buildtools_wafsamba_samba__conftests.py,v 1.3 2019/01/29 23:40:37 jperkin Exp $
+
+Ensure defines are strings to avoid assertion failure, some
+returned values are unicode.
+
+--- buildtools/wafsamba/samba_conftests.py.orig        2019-01-14 22:24:44.000000000 +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,