From nobody Tue Aug 26 16:45:38 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBD766Zypz65pLY; Tue, 26 Aug 2025 16:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBD765YM4z3qkN; Tue, 26 Aug 2025 16:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756226738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T52uQRv13LZJ8rO5RE7gG/OUZk5ERQRmWb6Pq/dOW1A=; b=lG+gx6zVrL+agjoLISVv75n9xnDHliUH++3MEC/w8BJCTiTfXRE7hBy1Yk1i6tWzsXwDXL DTUuPA0nSHN2Fb1+Z9vfvY3KrLWgr8Tsy9f1QLf/QZrlHvKeEQZ7Csa2emdTCfXAL+Nu6q eAeeztBdPmsVJBePUmMCfz/rzbszHaiYsVj4YYL28jV7/9oYzSzG0OUgFOttEzTgy+Lfp7 KQPdzRr6DFPrt8WoWVGLG8dmg+L18sLdLPW5RE64Tt4uRkfR4nCermczya+cGoM0kVBkTq exa9uYP1H5fr635XWcw8CSRp12lSJLW9nI1MnMzujYNfpVyMp2fKilGY6HglMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756226738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T52uQRv13LZJ8rO5RE7gG/OUZk5ERQRmWb6Pq/dOW1A=; b=U/ECbZEP6FQbBsm0rZd42hRu08yXquMzJcKwjsHSl3nZxcVCRRYFyR4tFh9BDZLB4glUEO LuUf6vv8/AAo4gxtuf2shprHIyw7rbwePBvhCSOy+JMkoZzpoYFByiyGgS94xnCjR4kTDa OxU3N0bn24a0wbuwUzlSNdHGdj7c/tMY8Gsu8N/2ua35/F1HHv+3vBsd9T5XC3U95zZ6EU r3vtGegh2G0NFHyAY3RDS50rJozihlV6w29WMMJCe8f142RK7qEXyx+aj7OK60UYwC4c4X BBzOGpydcqz4/8FhwQ1Tf83Urw8gtivdrXXKg8qukkA01L/1TYF/YvJv2y7KzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756226738; a=rsa-sha256; cv=none; b=CXEjrPFbAfMOCvq/UwzpkUYQSGAFD+EKU865WU+Q8QKyqhfajBDrujOlbYj6BnCgJ9DIAd FzNR5c/zRkSfHBtxree61LQzIX0hBrvVZ1zGOSrDjIPwLuoE6GeIVSF98vFKXDa2AcvYxY 9PgWmqhSYvXO3ZYj+q3QAgnOdoFawPYlDBZThxMKhwoRnmxp1hEgFP079Y4I1jsM72UHq/ I/9Nnemd6SlU2MUu1hT1CB/KOomNhil+xf/wh1ZFId6jE4AqbZoUNHLU803Bcvrim5A0ee MC7koHKvyct1HoZJ8G5blvtlObQq6jMwcljxWUHJ3LZ76IrEeWIzm344KiCeBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBD764Lz0zlMn; Tue, 26 Aug 2025 16:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57QGjcwW022548; Tue, 26 Aug 2025 16:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QGjcHj022545; Tue, 26 Aug 2025 16:45:38 GMT (envelope-from git) Date: Tue, 26 Aug 2025 16:45:38 GMT Message-Id: <202508261645.57QGjcHj022545@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 12f0c8603e2c - main - devel/talloc243: Repocopy from devel/talloc242 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12f0c8603e2c480aeb74c0d21fd50fa552588e0b Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=12f0c8603e2c480aeb74c0d21fd50fa552588e0b commit 12f0c8603e2c480aeb74c0d21fd50fa552588e0b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-08-26 14:21:37 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-26 16:44:03 +0000 devel/talloc243: Repocopy from devel/talloc242 PR: 287985 Reported by: Andrej Ebert Sponsored by: Klara, Inc. --- devel/talloc243/Makefile | 70 ++++++++++++++++++++++ devel/talloc243/distinfo | 3 + .../patch-buildtools_wafsamba_samba__autoconf.py | 35 +++++++++++ .../patch-buildtools_wafsamba_samba__install.py | 11 ++++ .../files/patch-buildtools_wafsamba_wscript | 15 +++++ devel/talloc243/files/patch-lib_replace_wscript | 11 ++++ devel/talloc243/files/patch-talloc.c | 20 +++++++ devel/talloc243/files/patch-wscript | 18 ++++++ devel/talloc243/pkg-descr | 2 + devel/talloc243/pkg-plist | 10 ++++ 10 files changed, 195 insertions(+) diff --git a/devel/talloc243/Makefile b/devel/talloc243/Makefile new file mode 100644 index 000000000000..456bd27bd165 --- /dev/null +++ b/devel/talloc243/Makefile @@ -0,0 +1,70 @@ +PORTNAME= talloc +DISTVERSION= 2.4.2 +PORTREVISION= 2 +CATEGORIES= devel +MASTER_SITES= SAMBA +PKGNAMESUFFIX= 242 + +MAINTAINER= samba@FreeBSD.org +COMMENT= Hierarchical pool based memory allocator +WWW= https://talloc.samba.org/ + +LICENSE= LGPL3 + +USES= compiler pkgconfig shebangfix waf +USE_LDCONFIG= yes +SHEBANG_GLOB= *.py +WAF_CMD= buildtools/bin/waf +CONFIGURE_LOG= bin/config.log + +PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig +PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;^${PREFIX}/;;} + +CONFIGURE_ARGS+= --disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --without-gettext +CONFIGURE_ENV= PYTHONHASHSEED=1 +MAKE_ENV= PYTHONHASHSEED=1 + +CONFLICTS_INSTALL= talloc + +OPTIONS_DEFINE= DEBUG MANPAGES PYTHON +OPTIONS_DEFAULT= MANPAGES PYTHON +OPTIONS_SUB= yes + +DEBUG_CFLAGS= -g -ggdb3 -O0 +DEBUG_CONFIGURE_ON= --verbose --enable-debug +DEBUG_MAKE_ARGS= --verbose + +PYTHON_USES= gettext-runtime python +PYTHON_USES_OFF= python:build,test +PYTHON_CONFIGURE_OFF= --disable-python + +MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ + xsltproc:textproc/libxslt +MANPAGES_CONFIGURE_ENV_OFF= XSLTPROC="false" + +# No fancy color error messages +CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} +CFLAGS_clang= -fno-color-diagnostics +CONFIGURE_ENV+= NOCOLOR=yes +MAKE_ENV+= NOCOLOR=yes +# Some symbols in talloc's linker version scripts are not defined, but since the +# scripts are generated dynamically, suppress errors with lld >= 17 due to these +# undefined symbols. +LDFLAGS+= -Wl,--undefined-version + +post-patch: + @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ + ${BUILD_WRKSRC}/wscript + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so.2 + +post-install-PYTHON-on: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so + +.include diff --git a/devel/talloc243/distinfo b/devel/talloc243/distinfo new file mode 100644 index 000000000000..21db59527faa --- /dev/null +++ b/devel/talloc243/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1737641773 +SHA256 (talloc-2.4.2.tar.gz) = 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 +SIZE (talloc-2.4.2.tar.gz) = 679750 diff --git a/devel/talloc243/files/patch-buildtools_wafsamba_samba__autoconf.py b/devel/talloc243/files/patch-buildtools_wafsamba_samba__autoconf.py new file mode 100644 index 000000000000..42607c1b5813 --- /dev/null +++ b/devel/talloc243/files/patch-buildtools_wafsamba_samba__autoconf.py @@ -0,0 +1,35 @@ +--- buildtools/wafsamba/samba_autoconf.py.orig 2019-09-03 13:59:55 UTC ++++ buildtools/wafsamba/samba_autoconf.py +@@ -573,7 +573,7 @@ def library_flags(self, libs): + + + @conf +-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False): ++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None): + '''check if a set of libraries exist as system libraries + + returns the sublist of libs that do exist as a syslib or [] +@@ -593,11 +593,14 @@ int foo() + ret.append(lib) + continue + ++ if msg is None: ++ msg = 'Checking for library %s' % lib ++ + (ccflags, ldflags, cpppath) = library_flags(conf, lib) + if shlib: +- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) + else: +- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) ++ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) + + if not res: + if mandatory: +@@ -944,5 +947,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf): + conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True) + + if (conf.env.undefined_ignore_ldflags == [] and +- conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])): ++ conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)): + conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] diff --git a/devel/talloc243/files/patch-buildtools_wafsamba_samba__install.py b/devel/talloc243/files/patch-buildtools_wafsamba_samba__install.py new file mode 100644 index 000000000000..5a85a034aea7 --- /dev/null +++ b/devel/talloc243/files/patch-buildtools_wafsamba_samba__install.py @@ -0,0 +1,11 @@ +--- buildtools/wafsamba/samba_install.py.orig 2019-03-21 10:12:32 UTC ++++ buildtools/wafsamba/samba_install.py +@@ -115,7 +115,7 @@ def install_library(self): + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) + inst_name = bld.make_libname(t.target) + if not self.private_library or not t.env.SONAME_ST: diff --git a/devel/talloc243/files/patch-buildtools_wafsamba_wscript b/devel/talloc243/files/patch-buildtools_wafsamba_wscript new file mode 100644 index 000000000000..3d4b6a56e345 --- /dev/null +++ b/devel/talloc243/files/patch-buildtools_wafsamba_wscript @@ -0,0 +1,15 @@ +--- buildtools/wafsamba/wscript.orig 2019-03-21 10:12:32 UTC ++++ buildtools/wafsamba/wscript +@@ -82,10 +82,10 @@ def options(opt): + + opt.add_option('--with-libiconv', + help='additional directory to search for libiconv', +- action='store', dest='iconv_open', default='/usr/local', ++ action='store', dest='iconv_open', default=None, + match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) + opt.add_option('--without-gettext', +- help=("Disable use of gettext"), ++ help=("disable use of gettext"), + action="store_true", dest='disable_gettext', default=False) + + gr = opt.option_group('developer options') diff --git a/devel/talloc243/files/patch-lib_replace_wscript b/devel/talloc243/files/patch-lib_replace_wscript new file mode 100644 index 000000000000..d476cec47cfb --- /dev/null +++ b/devel/talloc243/files/patch-lib_replace_wscript @@ -0,0 +1,11 @@ +--- lib/replace/wscript.orig 2019-03-21 10:12:32 UTC ++++ lib/replace/wscript +@@ -119,7 +119,7 @@ def configure(conf): + conf.CHECK_HEADERS('sys/atomic.h stdatomic.h') + conf.CHECK_HEADERS('libgen.h') + +- if conf.CHECK_CFLAGS('-Wno-format-truncation'): ++ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS): + conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1') + + if conf.CHECK_CFLAGS('-Wno-unused-function'): diff --git a/devel/talloc243/files/patch-talloc.c b/devel/talloc243/files/patch-talloc.c new file mode 100644 index 000000000000..2add4433b724 --- /dev/null +++ b/devel/talloc243/files/patch-talloc.c @@ -0,0 +1,20 @@ +--- talloc.c.orig 2019-03-21 10:12:32 UTC ++++ talloc.c +@@ -396,6 +396,9 @@ void talloc_lib_init(void) __attribute__ + void talloc_lib_init(void) + { + uint32_t random_value; ++#if defined(HAVE_ARC4RANDOM) ++ random_value = arc4random(); ++#else + #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM) + uint8_t *p; + /* +@@ -429,6 +432,7 @@ void talloc_lib_init(void) + */ + random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF); + } ++#endif /* HAVE_ARC4RANDOM */ + talloc_magic = random_value & ~TALLOC_FLAG_MASK; + } + #else diff --git a/devel/talloc243/files/patch-wscript b/devel/talloc243/files/patch-wscript new file mode 100644 index 000000000000..8097c806c2a4 --- /dev/null +++ b/devel/talloc243/files/patch-wscript @@ -0,0 +1,18 @@ +--- wscript.orig 2019-03-21 10:12:32 UTC ++++ wscript +@@ -45,13 +45,14 @@ def configure(conf): + conf.env.TALLOC_COMPAT1 = False + if conf.env.standalone_talloc: + conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 +- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' ++ conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' + conf.env.TALLOC_VERSION = VERSION + + conf.CHECK_XSLTPROC_MANPAGES() + + conf.CHECK_HEADERS('sys/auxv.h') + conf.CHECK_FUNCS('getauxval') ++ conf.CHECK_FUNCS('arc4random') + + conf.SAMBA_CONFIG_H() + diff --git a/devel/talloc243/pkg-descr b/devel/talloc243/pkg-descr new file mode 100644 index 000000000000..70543e3f9210 --- /dev/null +++ b/devel/talloc243/pkg-descr @@ -0,0 +1,2 @@ +A hierarchical pool based memory allocator with destructors. It uses +reference counting to determine when memory should be freed. diff --git a/devel/talloc243/pkg-plist b/devel/talloc243/pkg-plist new file mode 100644 index 000000000000..aa22a5d358d7 --- /dev/null +++ b/devel/talloc243/pkg-plist @@ -0,0 +1,10 @@ +%%PYTHON%%include/pytalloc.h +include/talloc.h +%%PYTHON%%lib/libpytalloc-util%%PYTHON_TAG%%.so +%%PYTHON%%lib/libpytalloc-util%%PYTHON_TAG%%.so.2 +lib/libtalloc.so +lib/libtalloc.so.2 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_TAG%%.so +%%PYTHON%%%%PKGCONFIGDIR%%/pytalloc-util%%PYTHON_TAG%%.pc +%%PKGCONFIGDIR%%/talloc.pc +%%MANPAGES%%share/man/man3/talloc.3.gz