Attachment 246077 Details for Bug 274885 – Patch file

[patch] Patch file

net_samba.shebangfix.patch (text/plain), 3.46 KB, created by Yasuhiro Kimura on 2023-11-03 09:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2023-11-03 09:10:20 UTC

Size: 3.46 KB

patch

obsolete

>From 025c7182cba863669af219610cda87c9667f7c45 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Fri, 3 Nov 2023 17:59:50 +0900
>Subject: [PATCH] net/samba41[36]: Make 'USES=shebangfix' work as is expected
>
>While testing patch submitted to bug #270383, I noticed
>'USES=shebangfix' doesn't work as is expected with current samba
>ports. According to the investigation by Tatsuki Makino, it is because
>SHEBANG_FILES is defined after bsd.port.options.mk and bsd.port.pre.mk
>are included. So fix the issue by moving the definition before the
>inclusion of them
>
>Reference:	https://lists.freebsd.org/archives/freebsd-ports/2023-November/004849.html
>Reference:	https://lists.freebsd.org/archives/freebsd-ports/2023-November/004852.html
>Reference:	https://lists.freebsd.org/archives/freebsd-ports/2023-November/004853.html
>---
> net/samba413/Makefile | 10 +++++-----
> net/samba416/Makefile |  9 +++++----
> 2 files changed, 10 insertions(+), 9 deletions(-)
>
>diff --git a/net/samba413/Makefile b/net/samba413/Makefile
>index 4847973cf78d..81f7c3dec411 100644
>--- a/net/samba413/Makefile
>+++ b/net/samba413/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=			${SAMBA4_BASENAME}413
> PORTVERSION=			${SAMBA4_VERSION}
>-PORTREVISION=			6
>+PORTREVISION=			7
> CATEGORIES?=			net
> MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=			${SAMBA4_DISTNAME}
>@@ -99,6 +99,10 @@ USE_LDCONFIG=			${SAMBA4_LIBDIR}
> WAF_CMD=			buildtools/bin/waf
> CONFIGURE_LOG=			bin/config.log
> 
>+# Make sure that the right version of Python is used by the tools
>+# https://bugzilla.samba.org/show_bug.cgi?id=7305
>+SHEBANG_FILES=			${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
>+
> PKGCONFIGDIR?=			${PREFIX}/libdata/pkgconfig
> PKGCONFIGDIR_REL?=		${PKGCONFIGDIR:S,^${PREFIX}/,,}
> PLIST_SUB+=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
>@@ -572,10 +576,6 @@ MAKE_ENV+=			RPCGEN_CPP="${CPP}"
> # undefined symbols.
> LDFLAGS+=			-Wl,--undefined-version
> 
>-# Make sure that the right version of Python is used by the tools
>-# https://bugzilla.samba.org/show_bug.cgi?id=7305
>-SHEBANG_FILES=			${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
>-
> SAMBA4_SUB=			SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
> 				SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
> 				SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
>diff --git a/net/samba416/Makefile b/net/samba416/Makefile
>index a5fc03b75552..bf8aa8e724bc 100644
>--- a/net/samba416/Makefile
>+++ b/net/samba416/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=			${SAMBA4_BASENAME}416
> PORTVERSION=			${SAMBA4_VERSION}
>+PORTREVISION=			1
> CATEGORIES?=			net
> MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=			${SAMBA4_DISTNAME}
>@@ -104,6 +105,10 @@ USE_LDCONFIG=			${SAMBA4_LIBDIR}
> WAF_CMD=			buildtools/bin/waf
> CONFIGURE_LOG=			bin/config.log
> 
>+# Make sure that the right version of Python is used by the tools
>+# https://bugzilla.samba.org/show_bug.cgi?id=7305
>+SHEBANG_FILES=			${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
>+
> PKGCONFIGDIR?=			${PREFIX}/libdata/pkgconfig
> PKGCONFIGDIR_REL?=		${PKGCONFIGDIR:S,^${PREFIX}/,,}
> PLIST_SUB=			PKGCONFIGDIR=${PKGCONFIGDIR_REL}
>@@ -554,10 +559,6 @@ MAKE_ENV+=			RPCGEN_CPP="${CPP}"
> #CFLAGS+=			-D_FUNCTION_DEF
> #.endif
> 
>-# Make sure that the right version of Python is used by the tools
>-# https://bugzilla.samba.org/show_bug.cgi?id=7305
>-SHEBANG_FILES=			${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
>-
> SAMBA4_SUB=			SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
> 				SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
> 				SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
>-- 
>2.42.1
>

Actions: View | Diff

Attachments on bug 274885: 246077