[ptxdist] [PATCH] softhsm: fix download URL

[ptxdist] [PATCH] softhsm: fix download URL

[Michael Tretter]

dist.opendnssec.org is not available anymore. https://www.softhsm.org/
refers to GitHub for official releases. Update the download URL and
checksum.

Add an autogen.sh link, since the tarball from GitHub doesn't contain
the configure script.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 patches/softhsm-2.6.1/autogen.sh | 1 +
 rules/softhsm.make               | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 120000 patches/softhsm-2.6.1/autogen.sh

diff --git a/patches/softhsm-2.6.1/autogen.sh b/patches/softhsm-2.6.1/autogen.sh
new file mode 120000
index 000000000000..9f8a4cb7ddcb
--- /dev/null
+++ b/patches/softhsm-2.6.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/softhsm.make b/rules/softhsm.make
index bc16dc6a5bee..3d14198b6a26 100644
--- a/rules/softhsm.make
+++ b/rules/softhsm.make
@@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_SOFTHSM) += softhsm
 # Paths and names
 #
 SOFTHSM_VERSION	:= 2.6.1
-SOFTHSM_MD5	:= 040b93ca327cbe0a3a8661e7c371ab16
+SOFTHSM_MD5	:= 2f6f21d859ad08fec55c61bb4e1747c4
 SOFTHSM		:= softhsm-$(SOFTHSM_VERSION)
 SOFTHSM_SUFFIX	:= tar.gz
-SOFTHSM_URL	:= https://dist.opendnssec.org/source/$(SOFTHSM).$(SOFTHSM_SUFFIX)
+SOFTHSM_URL	:= https://github.com/softhsm/SoftHSMv2/archive/refs/tags/$(HOST_SOFTHSM_VERSION).$(HOST_SOFTHSM_SUFFIX)
 SOFTHSM_SOURCE	:= $(SRCDIR)/$(SOFTHSM).$(SOFTHSM_SUFFIX)
 SOFTHSM_DIR	:= $(BUILDDIR)/$(SOFTHSM)
 SOFTHSM_LICENSE	:= BSD-2-Clause
-- 
2.39.5

Re: [ptxdist] [PATCH] softhsm: fix download URL

[Michael Olbrich]

On Fri, Apr 04, 2025 at 12:45:38PM +0200, Michael Tretter wrote:
> dist.opendnssec.org is not available anymore. https://www.softhsm.org/
> refers to GitHub for official releases. Update the download URL and
> checksum.
> 
> Add an autogen.sh link, since the tarball from GitHub doesn't contain
> the configure script.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
>  patches/softhsm-2.6.1/autogen.sh | 1 +
>  rules/softhsm.make               | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>  create mode 120000 patches/softhsm-2.6.1/autogen.sh
> 
> diff --git a/patches/softhsm-2.6.1/autogen.sh b/patches/softhsm-2.6.1/autogen.sh
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/softhsm-2.6.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/softhsm.make b/rules/softhsm.make
> index bc16dc6a5bee..3d14198b6a26 100644
> --- a/rules/softhsm.make
> +++ b/rules/softhsm.make
> @@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_SOFTHSM) += softhsm
>  # Paths and names
>  #
>  SOFTHSM_VERSION	:= 2.6.1
> -SOFTHSM_MD5	:= 040b93ca327cbe0a3a8661e7c371ab16
> +SOFTHSM_MD5	:= 2f6f21d859ad08fec55c61bb4e1747c4

The archive filename remains the same, so this would break with already
cached archives. Add the new md5 before the old one (with a space as
separator). The way, either one is valid.
And calling autogen.sh for the old one should work as well.

>  SOFTHSM		:= softhsm-$(SOFTHSM_VERSION)
>  SOFTHSM_SUFFIX	:= tar.gz
> -SOFTHSM_URL	:= https://dist.opendnssec.org/source/$(SOFTHSM).$(SOFTHSM_SUFFIX)
> +SOFTHSM_URL	:= https://github.com/softhsm/SoftHSMv2/archive/refs/tags/$(HOST_SOFTHSM_VERSION).$(HOST_SOFTHSM_SUFFIX)
>  SOFTHSM_SOURCE	:= $(SRCDIR)/$(SOFTHSM).$(SOFTHSM_SUFFIX)
>  SOFTHSM_DIR	:= $(BUILDDIR)/$(SOFTHSM)
>  SOFTHSM_LICENSE	:= BSD-2-Clause
> -- 
> 2.39.5
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |