From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sa-prd-fep-048.btinternet.com (mailomta19-sa.btinternet.com [213.120.69.25]) by sourceware.org (Postfix) with ESMTPS id C5BA03858D35 for ; Wed, 18 Jan 2023 16:17:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C5BA03858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=dronecode.org.uk Received: from sa-prd-rgout-005.btmx-prd.synchronoss.net ([10.2.38.8]) by sa-prd-fep-048.btinternet.com with ESMTP id <20230118161732.WLIY1091.sa-prd-fep-048.btinternet.com@sa-prd-rgout-005.btmx-prd.synchronoss.net>; Wed, 18 Jan 2023 16:17:32 +0000 Authentication-Results: btinternet.com; auth=pass (PLAIN) smtp.auth=jonturney@btinternet.com; bimi=skipped X-SNCR-Rigid: 6139452E4C680B6C X-Originating-IP: [81.153.98.246] X-OWM-Source-IP: 81.153.98.246 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvhedruddtkedgkeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuueftkffvkffujffvgffngfevqffopdfqfgfvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefkffggfgfuvfhfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeflohhnucfvuhhrnhgvhicuoehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkqeenucggtffrrghtthgvrhhnpeegleetjeetteetueffgfffleetffeludelvedtgfejieduleeludeltedtudegteenucffohhmrghinheptgihghifihhnrdgtohhmpdhgihhthhhusgdrihhonecukfhppeekuddrudehfedrleekrddvgeeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehhvghloheplgduledvrdduieekrddurddutdeingdpihhnvghtpeekuddrudehfedrleekrddvgeeipdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepvddprhgtphhtthhopegruggrmhesughinhifohhoughivgdrohhrghdprhgtphhtthhopegthihgfihinhdqrghpphhssegthihgfihinhdrtghomh X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from [192.168.1.106] (81.153.98.246) by sa-prd-rgout-005.btmx-prd.synchronoss.net (5.8.716.04) (authenticated as jonturney@btinternet.com) id 6139452E4C680B6C; Wed, 18 Jan 2023 16:17:32 +0000 Message-ID: Date: Wed, 18 Jan 2023 16:17:31 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: Version string of package Content-Language: en-GB To: Adam Dinwoodie , "cygwin-apps@cygwin.com" References: <20230113205210.e23a2f47c2ffd6ea86d97541@nifty.ne.jp> <20230117235902.f7sr234ptcj77ees@lucy.dinwoodie.org> From: Jon Turney In-Reply-To: <20230117235902.f7sr234ptcj77ees@lucy.dinwoodie.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1197.8 required=5.0 tests=BAYES_00,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 17/01/2023 23:59, Adam Dinwoodie wrote: > On Fri, Jan 13, 2023 at 01:22:44PM +0000, Jon Turney via Cygwin-apps wrote: >> >> [1] https://cygwin.com/packaging-package-files.html > > I just spotted [0] in the Cygport documentation, and was reminded of > this conversation. According to that, the version string is explicitly > allowed to include hyphens! I suspect that's fundamentally a > documentanion bug these days, and should just be expunged... > > [0]: https://cygwin.github.io/cygport/syntax_cygpart.html#VERSION > > Quick patch below; I can submit this properly as a GitHub PR or with > `git send-email` or otherwise if that'd be useful... > > diff --git a/lib/syntax.cygpart b/lib/syntax.cygpart > index 4a400a71..6b992031 100644 > --- a/lib/syntax.cygpart > +++ b/lib/syntax.cygpart > @@ -316,7 +316,7 @@ __target_is_embedded() { > #****v* Globals/VERSION > # DESCRIPTION > # The upstream package version number. PV must begin with a digit 0-9, and > -# subsequent characters can be a digit, letter, dot, hyphen, or underscore. > +# subsequent characters can be a digit, letter, dot, or underscore. > #**** > #****v* Globals/RELEASE > # DESCRIPTION Thanks. But that's not quite right either, since we currently allow '+' in version. I revised [1] a bit to mention what I think the valid character set is, and disallow a hyphen in version. It might make sense to point to that from NAME, VERSION, RELEASE in the cygport documentation, rather than repeat it. (That's assuming I've got the intersection of what's valid in cygport, calm and setup correct, of course)