[Buildroot] [PATCH 1/1] package/dhcpcd: bump to version 10.0.1

[Buildroot] [PATCH 1/1] package/dhcpcd: bump to version 10.0.1

[Xiangyu Chen]

From: Xiangyu Chen <xiangyu.chen@windriver.com>

Using github as package site as announced here:
https://roy.marples.name/downloads/dhcpcd/

Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
---
 package/dhcpcd/dhcpcd.hash | 4 ++--
 package/dhcpcd/dhcpcd.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash
index 532fbd467e..879c3db1af 100644
--- a/package/dhcpcd/dhcpcd.hash
+++ b/package/dhcpcd/dhcpcd.hash
@@ -1,4 +1,4 @@
-# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo
-sha256  819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c  dhcpcd-9.4.1.tar.xz
+# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.1
+sha256  6e9f6a5c47fcd8a763cfa26f1ca6eedf1e534992224a01d6c1ab8abb154af972  dhcpcd-10.0.1.tar.xz
 # Locally calculated
 sha256  4f21ce186859516dcab9b3197f3e9533a9bd1b87932015c87f539af4a48cd592  LICENSE
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 922d289b26..82efe10ef9 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DHCPCD_VERSION = 9.4.1
+DHCPCD_VERSION = 10.0.1
 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz
-DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
+DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION)
 DHCPCD_DEPENDENCIES = host-pkgconf
 DHCPCD_LICENSE = BSD-2-Clause
 DHCPCD_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/dhcpcd: bump to version 10.0.1

[Thomas Devoogdt]

Hi,

Buildroot has a custom site handling for GitHub [1] nowadays.
So it should be something like this:

DHCPCD_VERSION = 10.0.1
DHCPCD_SITE = $(call github,NetworkConfiguration,dhcpcd,v$(DHCPCD_VERSION))

And the DHCPCD_SOURCE line can be dropped.

kr,

Thomas

[1]: https://buildroot.org/downloads/manual/manual.html#github-download-url
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/dhcpcd: bump to version 10.0.1

[Yann E. MORIN]

Xiangyu Chen, All,

On 2023-04-28 11:31 +0800, Xiangyu Chen spake thusly:
> From: Xiangyu Chen <xiangyu.chen@windriver.com>
> 
> Using github as package site as announced here:
> https://roy.marples.name/downloads/dhcpcd/
> 
> Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
> ---
>  package/dhcpcd/dhcpcd.hash | 4 ++--
>  package/dhcpcd/dhcpcd.mk   | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash
> index 532fbd467e..879c3db1af 100644
> --- a/package/dhcpcd/dhcpcd.hash
> +++ b/package/dhcpcd/dhcpcd.hash
> @@ -1,4 +1,4 @@
> -# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-9.4.1.tar.xz.distinfo
> -sha256  819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c  dhcpcd-9.4.1.tar.xz
> +# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.1
> +sha256  6e9f6a5c47fcd8a763cfa26f1ca6eedf1e534992224a01d6c1ab8abb154af972  dhcpcd-10.0.1.tar.xz
>  # Locally calculated
>  sha256  4f21ce186859516dcab9b3197f3e9533a9bd1b87932015c87f539af4a48cd592  LICENSE

    $ make dhcpcd-legal-info
    >>> dhcpcd 10.0.1 Collecting legal info
    ERROR: LICENSE has wrong sha256 hash:
    ERROR: expected: 4f21ce186859516dcab9b3197f3e9533a9bd1b87932015c87f539af4a48cd592
    ERROR: got     : a7d6da3a202cdd38eaab0bcea4d25f60d002980f3785b3e896d9bf387f093ac8
    ERROR: Incomplete download, or man-in-the-middle (MITM) attack
    make[1]: *** [package/dhcpcd/dhcpcd.mk:77: dhcpcd-legal-info] Error 1

This is because the copyright years have been updated in the license
file.

I've fixed that when applying, and extended the commit log accordingly.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
> index 922d289b26..82efe10ef9 100644
> --- a/package/dhcpcd/dhcpcd.mk
> +++ b/package/dhcpcd/dhcpcd.mk
> @@ -4,9 +4,9 @@
>  #
>  ################################################################################
>  
> -DHCPCD_VERSION = 9.4.1
> +DHCPCD_VERSION = 10.0.1
>  DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz
> -DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
> +DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION)
>  DHCPCD_DEPENDENCIES = host-pkgconf
>  DHCPCD_LICENSE = BSD-2-Clause
>  DHCPCD_LICENSE_FILES = LICENSE
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/dhcpcd: bump to version 10.0.1

[Yann E. MORIN]

Thomas, All,

On 2023-05-01 18:19 +0200, Thomas Devoogdt spake thusly:
> Buildroot has a custom site handling for GitHub [1] nowadays.
> So it should be something like this:
> 
> DHCPCD_VERSION = 10.0.1
> DHCPCD_SITE = $(call github,NetworkConfiguration,dhcpcd,v$(DHCPCD_VERSION))

The $(gihub) helper should only be used for autogenetaed archives, i.e.
archives that are generated on-the-fly by Github.

For archives that were uploaded by the maintainers of a repository, the
$(github) helper must not be used, and the actual URL be used.

See the manual:
    https://buildroot.org/downloads/manual/manual.html#github-download-url

For dhcpcd, we are not using an autogenerated archive, but one uploaded
by the maintainer, so we can't use the github helper.

Regards,
Yann E. MORIN.

> And the DHCPCD_SOURCE line can be dropped.
> 
> kr,
> 
> Thomas
> 
> [1]: https://buildroot.org/downloads/manual/manual.html#github-download-url
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/dhcpcd: bump to version 10.0.1

[Thomas Devoogdt]

Hi,

Thanks for pointing that out, you are right, I also see the file is
hosted under another URL,
so the helper can't be used to pick the release version.

Kind regards,

Thomas

Op ma 8 mei 2023 om 22:28 schreef Yann E. MORIN <yann.morin.1998@free.fr>:
>
> Thomas, All,
>
> On 2023-05-01 18:19 +0200, Thomas Devoogdt spake thusly:
> > Buildroot has a custom site handling for GitHub [1] nowadays.
> > So it should be something like this:
> >
> > DHCPCD_VERSION = 10.0.1
> > DHCPCD_SITE = $(call github,NetworkConfiguration,dhcpcd,v$(DHCPCD_VERSION))
>
> The $(gihub) helper should only be used for autogenetaed archives, i.e.
> archives that are generated on-the-fly by Github.
>
> For archives that were uploaded by the maintainers of a repository, the
> $(github) helper must not be used, and the actual URL be used.
>
> See the manual:
>     https://buildroot.org/downloads/manual/manual.html#github-download-url
>
> For dhcpcd, we are not using an autogenerated archive, but one uploaded
> by the maintainer, so we can't use the github helper.
>
> Regards,
> Yann E. MORIN.
>
> > And the DHCPCD_SOURCE line can be dropped.
> >
> > kr,
> >
> > Thomas
> >
> > [1]: https://buildroot.org/downloads/manual/manual.html#github-download-url
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot