Update to talloc-2.1.16

devel/libtalloc/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2019/11/08 19:44:31 jca Exp $
+# $OpenBSD: Makefile,v 1.23 2019/12/04 00:15:22 jca Exp $
 
 COMMENT=	hierarchical memory pool system with destructors
 
 # Keep in sync with the version bundled in net/samba
-DISTNAME=	talloc-2.1.14
+DISTNAME=	talloc-2.1.16
 PKGNAME=	lib${DISTNAME}
-REVISION=	0
 
 SHARED_LIBS+=	talloc		1.1
 SHARED_LIBS+=	pytalloc-util	0.1
@@ -21,8 +20,9 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += intl m pthread util ${MODPY_WANTLIB}
 
-MASTER_SITES=	https://filedump.se.rit.edu/pub/distfiles/ \
-		https://download.samba.org/pub/talloc/
+MASTER_SITES=	https://download.samba.org/pub/talloc/
+
+DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 MODULES=	lang/python
 MODPY_RUNDEP=	No

devel/libtalloc/distinfo

@@ -1,2 +1,2 @@
-SHA256 (talloc-2.1.14.tar.gz) = sYVgJ1amKLrFB/qK+LnfkqzmnSfArdXauTGQrXwzZ84=
-SIZE (talloc-2.1.14.tar.gz) = 444589
+SHA256 (talloc-2.1.16.tar.gz) = GVv2gwoHDesRxJK4zVdaWc1NO2NBZPP2k/Y4j4BqUqk=
+SIZE (talloc-2.1.16.tar.gz) = 634906

devel/libtalloc/patches/patch-Makefile

@@ -1,11 +1,13 @@
-$OpenBSD: patch-Makefile,v 1.1 2015/07/18 02:13:25 jca Exp $
---- Makefile.orig	Wed Jul 15 22:53:08 2015
-+++ Makefile	Wed Jul 15 22:52:56 2015
-@@ -1,6 +1,6 @@
- # simple makefile wrapper to run waf
+$OpenBSD: patch-Makefile,v 1.2 2019/12/04 00:15:22 jca Exp $
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -2,7 +2,7 @@
  
--WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
-+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf ${WAF_ARGS}
+ WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+ WAF_BINARY=$(PYTHON) $(WAF_BIN)
+-WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
++WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) $(WAR_ARGS)
  
  all:
  	$(WAF) build

devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py

@@ -1,10 +1,11 @@
-$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.3 2016/04/22 11:44:48 jca Exp $
+$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.4 2019/12/04 00:15:22 jca Exp $
 
 - respect OpenBSD shared libraries versioning
 - --version-script fails if specified multipled times
 
---- buildtools/wafsamba/samba_install.py.orig	Thu Dec 10 12:01:40 2015
-+++ buildtools/wafsamba/samba_install.py	Sun Apr 17 19:31:51 2016
+Index: buildtools/wafsamba/samba_install.py
+--- buildtools/wafsamba/samba_install.py.orig
++++ buildtools/wafsamba/samba_install.py
 @@ -117,11 +117,15 @@ def install_library(self):
              else:
                  inst_name    = bld.make_libname(t.target)
@@ -24,7 +25,7 @@ $OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.3 2016/04/22 11:44:48 j
                  # only generate the dev link for non-bundled libs
                  dev_link     = bld.make_libname(target_name)
          elif getattr(self, 'soname', ''):
-@@ -171,7 +175,7 @@ def apply_vscript(self):
+@@ -172,7 +176,7 @@ def apply_vscript(self):
      '''add version-script arguments to library build'''
  
      if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):

devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py

@@ -1,11 +1,11 @@
-$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.4 2018/02/09 11:04:13 jca Exp $
+$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.5 2019/12/04 00:15:22 jca Exp $
 
 - allow the library version to be overriden
 
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -222,6 +222,12 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -214,6 +214,12 @@ def SAMBA_LIBRARY(bld, libname, source,
      realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
      link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
  

devel/libtalloc/pkg/PLIST

@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/07/18 02:13:25 jca Exp $
+@comment $OpenBSD: PLIST,v 1.4 2019/12/04 00:15:22 jca Exp $
 include/pytalloc.h
 include/talloc.h
 @lib lib/libpytalloc-util.so.${LIBpytalloc-util_VERSION}
 @lib lib/libtalloc.so.${LIBtalloc_VERSION}
 lib/pkgconfig/pytalloc-util.pc
 lib/pkgconfig/talloc.pc
-lib/python${MODPY_VERSION}/site-packages/talloc.so
+@so lib/python${MODPY_VERSION}/site-packages/talloc.so
 @man man/man3/talloc.3