NetBSD Problem Report #54887

From www@netbsd.org  Thu Jan 23 21:19:39 2020
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 5B2467A172
	for <gnats-bugs@gnats.NetBSD.org>; Thu, 23 Jan 2020 21:19:39 +0000 (UTC)
Message-Id: <20200123211938.7F1837A1C4@mollari.NetBSD.org>
Date: Thu, 23 Jan 2020 21:19:38 +0000 (UTC)
From: js-pkgsrc@heap.zone
Reply-To: js-pkgsrc@heap.zone
To: gnats-bugs@NetBSD.org
Subject: [FIX] shells/fish gets version from pkgsrc git checkout
X-Send-Pr-Version: www-1.0

>Number:         54887
>Category:       pkg
>Synopsis:       [FIX] shells/fish gets version from pkgsrc git checkout
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bsiegert
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 23 21:20:00 +0000 2020
>Closed-Date:    Sat Jan 22 15:00:53 +0000 2022
>Last-Modified:  Sat Jan 22 15:00:53 +0000 2022
>Originator:     Jonathan Schleifer
>Release:        HEAD
>Organization:
>Environment:
>Description:
fish think it's built from a git checkout when pkgsrc is checked out via git, resulting in it reporting the wrong version.
>How-To-Repeat:

>Fix:
commit 7b9e4dc532ebcdd17ef17bd7f45a985e16c1fb32
Author: Jonathan Schleifer <js@nil.im>
Date:   Thu Jan 23 22:18:41 2020 +0100

    fish: Fix version when using pkgsrc via git

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index e24db24604f..d3f55f16cef 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2019/11/09 12:02:29 nia Exp $

 DISTNAME=		fish-3.0.2
+PKGREVISION=		1
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=		fish-shell
@@ -47,6 +48,7 @@ PLIST.open=	yes
 .endif

 pre-configure:
+	${RUN} echo ${PKGVERSION_NOREV} >${WRKSRC}/version
 	${RUN} cd ${WRKSRC} && autoreconf -fiv

 .include "options.mk"

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->bsiegert
Responsible-Changed-By: bsiegert@NetBSD.org
Responsible-Changed-When: Sun, 15 Mar 2020 20:14:42 +0000
Responsible-Changed-Why:
take


State-Changed-From-To: open->analyzed
State-Changed-By: maya@NetBSD.org
State-Changed-When: Tue, 13 Oct 2020 03:17:13 +0000
State-Changed-Why:
"Yes but no". Joerg removed the version file because of C++17 <version>. We probably shouldn't put it back for the same reason.


State-Changed-From-To: analyzed->suspended
State-Changed-By: maya@NetBSD.org
State-Changed-When: Tue, 13 Oct 2020 03:18:05 +0000
State-Changed-Why:
Might be the right state for "we probably don't want to apply this".


State-Changed-From-To: suspended->open
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Thu, 17 Jun 2021 00:50:47 +0000
State-Changed-Why:
we should, however, probably fix the issue by patching it to use a
filename that doesn't explode the build.


From: nia <nia@NetBSD.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/54887 ([FIX] shells/fish gets version from pkgsrc git
 checkout)
Date: Fri, 18 Jun 2021 17:34:14 +0000

 On Thu, Jun 17, 2021 at 12:50:48AM +0000, dholland@NetBSD.org wrote:
 > Synopsis: [FIX] shells/fish gets version from pkgsrc git checkout
 > 
 > State-Changed-From-To: suspended->open
 > State-Changed-By: dholland@NetBSD.org
 > State-Changed-When: Thu, 17 Jun 2021 00:50:47 +0000
 > State-Changed-Why:
 > we should, however, probably fix the issue by patching it to use a
 > filename that doesn't explode the build.
 > 
 > 
 > 

 I think this can be closed, fish works fine with c++17.

State-Changed-From-To: open->feedback
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Fri, 18 Jun 2021 22:06:05 +0000
State-Changed-Why:
Would that be a satisfactory resolution?


State-Changed-From-To: feedback->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Sat, 22 Jan 2022 15:00:53 +0000
State-Changed-Why:
Recent upstream releases come with a version file, which we rename to
version.txt. This fixes the original issue.


>Unformatted:

Home	PR Database Search