diff mbox series

[2/2] package/ncurses: Switch to git repo with snapshots

Message ID 20230103103438.1889-2-dennis.vanhoorick@barco.com
State Accepted
Headers show
Series [1/2] package/ncurses: Fix homepage in Config.in | expand

Commit Message

Dennis Van Hoorick Jan. 3, 2023, 10:34 a.m. UTC 
Switching to Thomas E. Dickey's github (Thomas is the ncurses maintainer, so we can trust him).
This avoids needing to list all incremental patches, and will make future bumping easier.

Signed-off-by: Dennis Van Hoorick <dennis.vanhoorick@barco.com>
---
 package/ncurses/ncurses.hash | 65 +-------------------------------
 package/ncurses/ncurses.mk   | 73 ++++--------------------------------
 2 files changed, 9 insertions(+), 129 deletions(-)

Comments

Yann E. MORIN Jan. 3, 2023, 8:32 p.m. UTC | #1 
Dennis, All,

On 2023-01-03 11:34 +0100, Dennis Van Hoorick spake thusly:
> Switching to Thomas E. Dickey's github (Thomas is the ncurses maintainer, so we can trust him).
> This avoids needing to list all incremental patches, and will make future bumping easier.

I've extended on the commit log a bit, but mostly see below...

> Signed-off-by: Dennis Van Hoorick <dennis.vanhoorick@barco.com>
[--SNIP--]
> diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
> index 4d93a992e4..0ba98b4d64 100644
> --- a/package/ncurses/ncurses.mk
> +++ b/package/ncurses/ncurses.mk
> @@ -4,79 +4,20 @@
>  #
>  ################################################################################
>  
> -NCURSES_VERSION = 6.3
> -NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses

So, 6.4 is out now, and I was wondering what would happen if we wanted
to use a version that had no snapshot yet [0]...

> +NCURSES_VERSION_MAJOR = 6.3
> +NCURSES_SNAPSHOT_DATE = 20221224
> +NCURSES_VERSION = v$(subst .,_,$(NCURSES_VERSION_MAJOR))_$(NCURSES_SNAPSHOT_DATE)

... so here we would generate version like "v6_4_" which is not nice at
all.

First, we do not include the 'v' prefix in the version string; we only
add it in the call to the github macro.

Second, of course, is that the version ends in an underscore, bleh...
And the version people are usually used to is 6.4, not 6_4, so meh
too...

So, I extended a bit to fix all that. Please look at the resulting
commit.

Applied to master, thanks! :-)

Oh, and since 6.4 is out now, I'll take you at your word: "This [...]
will make future bumping easier". So... ;-)

[0] There actually is a snapshot now, but I don't think we can rely on
one to be available on the first day of the release.

Regards,
Yann E. MORIN.
diff mbox series

Patch

diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash
index c72a2abf46..b7a9bbaa53 100644
--- a/package/ncurses/ncurses.hash
+++ b/package/ncurses/ncurses.hash
@@ -1,65 +1,4 @@ 
-# Locally calculated after checking pgp signature
-sha256  97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059  ncurses-6.3.tar.gz
-sha256  51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570  ncurses-6.3-20211026.patch.gz
-sha256  4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249  ncurses-6.3-20211030.patch.gz
-sha256  de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f  ncurses-6.3-20211106.patch.gz
-sha256  df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab  ncurses-6.3-20211113.patch.gz
-sha256  b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee  ncurses-6.3-20211115.patch.gz
-sha256  7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec  ncurses-6.3-20211120.patch.gz
-sha256  ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684  ncurses-6.3-20211127.patch.gz
-sha256  9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7  ncurses-6.3-20211204.patch.gz
-sha256  6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679  ncurses-6.3-20211211.patch.gz
-sha256  acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae  ncurses-6.3-20211219.patch.gz
-sha256  f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036  ncurses-6.3-20211225.patch.gz
-sha256  ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7  ncurses-6.3-20220101.patch.gz
-sha256  7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78  ncurses-6.3-20220115.patch.gz
-sha256  ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e  ncurses-6.3-20220122.patch.gz
-sha256  32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4  ncurses-6.3-20220129.patch.gz
-sha256  f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7  ncurses-6.3-20220205.patch.gz
-sha256  6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1  ncurses-6.3-20220212.patch.gz
-sha256  349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145  ncurses-6.3-20220219.patch.gz
-sha256  2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197  ncurses-6.3-20220226.patch.gz
-sha256  1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5  ncurses-6.3-20220305.patch.gz
-sha256  ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799  ncurses-6.3-20220312.patch.gz
-sha256  450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254  ncurses-6.3-20220319.patch.gz
-sha256  c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7  ncurses-6.3-20220326.patch.gz
-sha256  4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb  ncurses-6.3-20220402.patch.gz
-sha256  5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa  ncurses-6.3-20220409.patch.gz
-sha256  fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360  ncurses-6.3-20220416.patch.gz
-sha256  1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72  ncurses-6.3-20220423.patch.gz
-sha256  f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322  ncurses-6.3-20220430.patch.gz
-sha256  a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4  ncurses-6.3-20220501.patch.gz
-sha256  79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7  ncurses-6.3-20220507.patch.gz
-sha256  1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2  ncurses-6.3-20220514.patch.gz
-sha256  0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6  ncurses-6.3-20220521.patch.gz
-sha256  411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee  ncurses-6.3-20220529.patch.gz
-sha256  acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7  ncurses-6.3-20220604.patch.gz
-sha256  2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada  ncurses-6.3-20220612.patch.gz
-sha256  1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de  ncurses-6.3-20220618.patch.gz
-sha256  65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626  ncurses-6.3-20220625.patch.gz
-sha256  028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d  ncurses-6.3-20220703.patch.gz
-sha256  06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955  ncurses-6.3-20220709.patch.gz
-sha256  66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb  ncurses-6.3-20220716.patch.gz
-sha256  fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf  ncurses-6.3-20220724.patch.gz
-sha256  1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9  ncurses-6.3-20220729.patch.gz
-sha256  d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc  ncurses-6.3-20220806.patch.gz
-sha256  10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d  ncurses-6.3-20220813.patch.gz
-sha256  b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869  ncurses-6.3-20220820.patch.gz
-sha256  7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8  ncurses-6.3-20220827.patch.gz
-sha256  5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483  ncurses-6.3-20220903.patch.gz
-sha256  b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f  ncurses-6.3-20220910.patch.gz
-sha256  f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b  ncurses-6.3-20220917.patch.gz
-sha256  bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3  ncurses-6.3-20220924.patch.gz
-sha256  7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5  ncurses-6.3-20221001.patch.gz
-sha256  204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49  ncurses-6.3-20221008.patch.gz
-sha256  f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b  ncurses-6.3-20221015.patch.gz
-sha256  b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e  ncurses-6.3-20221023.patch.gz
-sha256  e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea  ncurses-6.3-20221029.patch.gz
-sha256  4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2  ncurses-6.3-20221105.patch.gz
-sha256  b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155  ncurses-6.3-20221112.patch.gz
-sha256  bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f  ncurses-6.3-20221119.patch.gz
-sha256  32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103  ncurses-6.3-20221126.patch.gz
-sha256  8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56  ncurses-6.3-20221203.patch.gz
-
+# Locally calculated
+sha256  4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da  ncurses-v6_3_20221224.tar.gz
 # Locally computed
 sha256  63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac  COPYING
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 4d93a992e4..0ba98b4d64 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -4,79 +4,20 @@ 
 #
 ################################################################################
 
-NCURSES_VERSION = 6.3
-NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
+NCURSES_VERSION_MAJOR = 6.3
+NCURSES_SNAPSHOT_DATE = 20221224
+NCURSES_VERSION = v$(subst .,_,$(NCURSES_VERSION_MAJOR))_$(NCURSES_SNAPSHOT_DATE)
+NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,$(NCURSES_VERSION))
 NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
 NCURSES_LICENSE = MIT with advertising clause
 NCURSES_LICENSE_FILES = COPYING
 NCURSES_CPE_ID_VENDOR = gnu
+NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR)
 NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config
-# patch 20220416
+
+# Fixed since snapshot 20220416
 NCURSES_IGNORE_CVES += CVE-2022-29458
-NCURSES_PATCH = \
-	$(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \
-		ncurses-6.3-20211026.patch.gz \
-		ncurses-6.3-20211030.patch.gz \
-		ncurses-6.3-20211106.patch.gz \
-		ncurses-6.3-20211113.patch.gz \
-		ncurses-6.3-20211115.patch.gz \
-		ncurses-6.3-20211120.patch.gz \
-		ncurses-6.3-20211127.patch.gz \
-		ncurses-6.3-20211204.patch.gz \
-		ncurses-6.3-20211211.patch.gz \
-		ncurses-6.3-20211219.patch.gz \
-		ncurses-6.3-20211225.patch.gz \
-		ncurses-6.3-20220101.patch.gz \
-		ncurses-6.3-20220115.patch.gz \
-		ncurses-6.3-20220122.patch.gz \
-		ncurses-6.3-20220129.patch.gz \
-		ncurses-6.3-20220205.patch.gz \
-		ncurses-6.3-20220212.patch.gz \
-		ncurses-6.3-20220219.patch.gz \
-		ncurses-6.3-20220226.patch.gz \
-		ncurses-6.3-20220305.patch.gz \
-		ncurses-6.3-20220312.patch.gz \
-		ncurses-6.3-20220319.patch.gz \
-		ncurses-6.3-20220326.patch.gz \
-		ncurses-6.3-20220402.patch.gz \
-		ncurses-6.3-20220409.patch.gz \
-		ncurses-6.3-20220416.patch.gz \
-		ncurses-6.3-20220423.patch.gz \
-		ncurses-6.3-20220430.patch.gz \
-		ncurses-6.3-20220501.patch.gz \
-		ncurses-6.3-20220507.patch.gz \
-		ncurses-6.3-20220514.patch.gz \
-		ncurses-6.3-20220521.patch.gz \
-		ncurses-6.3-20220529.patch.gz \
-		ncurses-6.3-20220604.patch.gz \
-		ncurses-6.3-20220612.patch.gz \
-		ncurses-6.3-20220618.patch.gz \
-		ncurses-6.3-20220625.patch.gz \
-		ncurses-6.3-20220703.patch.gz \
-		ncurses-6.3-20220709.patch.gz \
-		ncurses-6.3-20220716.patch.gz \
-		ncurses-6.3-20220724.patch.gz \
-		ncurses-6.3-20220729.patch.gz \
-		ncurses-6.3-20220806.patch.gz \
-		ncurses-6.3-20220813.patch.gz \
-		ncurses-6.3-20220820.patch.gz \
-		ncurses-6.3-20220827.patch.gz \
-		ncurses-6.3-20220903.patch.gz \
-		ncurses-6.3-20220910.patch.gz \
-		ncurses-6.3-20220917.patch.gz \
-		ncurses-6.3-20220924.patch.gz \
-		ncurses-6.3-20221001.patch.gz \
-		ncurses-6.3-20221008.patch.gz \
-		ncurses-6.3-20221015.patch.gz \
-		ncurses-6.3-20221023.patch.gz \
-		ncurses-6.3-20221029.patch.gz \
-		ncurses-6.3-20221105.patch.gz \
-		ncurses-6.3-20221112.patch.gz \
-		ncurses-6.3-20221119.patch.gz \
-		ncurses-6.3-20221126.patch.gz \
-		ncurses-6.3-20221203.patch.gz \
-	)
 
 NCURSES_CONF_OPTS = \
 	--without-cxx \