From nobody Wed Feb 28 15:00:25 2024 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 4TlHbK2Pnyz5BkmC; Wed, 28 Feb 2024 15:00:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlHbK0PtMz4pDb; Wed, 28 Feb 2024 15:00:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id fKXVrbpe4GAIJfLQ3rPgAD; Wed, 28 Feb 2024 15:00:27 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id fLQ2rhHDVByQrfLQ3rGzQe; Wed, 28 Feb 2024 15:00:27 +0000 X-Authority-Analysis: v=2.4 cv=UOF+Hzfy c=1 sm=1 tr=0 ts=65df4a8b a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=k7vzHIieQBIA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=HGOPIYcMI9wX1PRNW5gA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E6629D48; Wed, 28 Feb 2024 07:00:25 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id DD40F1E9; Wed, 28 Feb 2024 07:00:25 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mikael Urankar cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 06b59a3047f5 - main - net/samba419: fix conflict with talloc In-reply-to: <202402281430.41SEULaD091826@gitrepo.freebsd.org> References: <202402281430.41SEULaD091826@gitrepo.freebsd.org> Comments: In-reply-to Mikael Urankar message dated "Wed, 28 Feb 2024 14:30:21 +0000." 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 28 Feb 2024 07:00:25 -0800 Message-Id: <20240228150025.DD40F1E9@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDgR3w3SY84qbdsL/+kXzD9ZCNghWX0I+teaoFYNfh8aai11x7qo/vEmRHmWnRjS+xy7Q1KSsa4DUAHNsDqdwcw854EmK7DwhIwfAOtdTNSV9gX+df7M flO5uQWyRtn1FR46JYZ/w4pVsB0S4mS6wY8uPtCRVMi3svf93l393LrT05ZyWUGWxPbn1OtY+7Mx01RZUsFge1J6chtR61EgJctz6dizBKE4OvV4tpBTZpPK LhBfOtkRZS07LfBa9ykhUPbgZsDg90+GZ88UgtD64RNzaMjpCVEpEFeWX5EF/aUCyXUMkpmbaIag3Zqwr9Zv5cypGUu765KVYGniYdMcYVU= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4TlHbK0PtMz4pDb In message <202402281430.41SEULaD091826@gitrepo.freebsd.org>, Mikael Urankar wr ites: > The branch main has been updated by mikael: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=06b59a3047f5d79b229135a0c9a64f > e359ae13b0 > > commit 06b59a3047f5d79b229135a0c9a64fe359ae13b0 > Author: Denis Shaposhnikov > AuthorDate: 2024-02-28 14:28:06 +0000 > Commit: Mikael Urankar > CommitDate: 2024-02-28 14:30:15 +0000 > > net/samba419: fix conflict with talloc > > PR: 276988 > --- > net/samba419/Makefile | 10 ++++++++-- > net/samba419/pkg-plist | 2 +- > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/net/samba419/Makefile b/net/samba419/Makefile > index fad94b93861b..312dba2f48b8 100644 > --- a/net/samba419/Makefile > +++ b/net/samba419/Makefile > @@ -1,6 +1,6 @@ > PORTNAME= ${SAMBA4_BASENAME}419 > PORTVERSION= ${SAMBA4_VERSION} > -PORTREVISION= 0 > +PORTREVISION= 1 > CATEGORIES?= net > MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc > DISTNAME= ${SAMBA4_DISTNAME} > @@ -213,7 +213,6 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA=" > @comment " > # talloc > .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes > SAMBA4_BUNDLED_LIBS+= talloc > -CONFLICTS_INSTALL+= talloc-* talloc1-* > PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" > SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" > .else > @@ -658,6 +657,13 @@ post-install-fix-manpages: > ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/${f} > ${STAGEDIR}${PREFIX}/share/man/man1/samba-${f} > . endfor > .endif > + > +.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes > +. for f in talloc.3 > + ${MV} ${STAGEDIR}${PREFIX}/share/man/man3/${f} > ${STAGEDIR}${PREFIX}/share/man/man3/samba-${f} > +. endfor > +.endif > + > .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes > . for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8 > ${MV} ${STAGEDIR}${PREFIX}/share/man/man8/${f} > ${STAGEDIR}${PREFIX}/share/man/man8/samba-${f} > diff --git a/net/samba419/pkg-plist b/net/samba419/pkg-plist > index c9087d686bb1..93e4d4c12334 100644 > --- a/net/samba419/pkg-plist > +++ b/net/samba419/pkg-plist > @@ -454,7 +454,7 @@ share/man/man8/winbindd.8.gz > %%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT > _SUFFIX%%.so > %%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpytalloc-ut > il%%PYTHON_EXT_SUFFIX%%-samba4.so > %%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_LIBDIR%%/private/libtalloc-samba4.so > -%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/talloc.3.gz > +%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/samba-talloc.3.gz > %%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_tdb_text.py > %%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFI > X%%.so > %%SAMBA4_BUNDLED_TDB%%bin/tdbbackup > Wouldn't we want to do the same for the tevent component of samba419 too? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0