[1/1] package/sslh: fixup the 'v' prefix in the version
diff mbox series

Message ID 20190911174630.648-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series
  • [1/1] package/sslh: fixup the 'v' prefix in the version
Related show

Commit Message

Fabrice Fontaine Sept. 11, 2019, 5:46 p.m. UTC
In order for the sslh version to match what is given by
release-monitoring.org, the 'v' prefix should be encoded in
SSLH_SOURCE and not SSLH_VERSION.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/sslh/sslh.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Peter Korsgaard Sept. 15, 2019, 7:17 a.m. UTC | #1
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > In order for the sslh version to match what is given by
 > release-monitoring.org, the 'v' prefix should be encoded in
 > SSLH_SOURCE and not SSLH_VERSION.

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 >  package/sslh/sslh.mk | 3 ++-

You don't seem to change sslh.hash?
Thomas Petazzoni Sept. 15, 2019, 7:58 a.m. UTC | #2
On Sun, 15 Sep 2019 09:17:57 +0200
Peter Korsgaard <peter@korsgaard.com> wrote:

> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:  
> 
>  > In order for the sslh version to match what is given by
>  > release-monitoring.org, the 'v' prefix should be encoded in
>  > SSLH_SOURCE and not SSLH_VERSION.  
> 
>  > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>  > ---
>  >  package/sslh/sslh.mk | 3 ++-  
> 
> You don't seem to change sslh.hash?

The tarball name doesn't change:

-SSLH_VERSION = v1.20
+SSLH_VERSION = 1.20
+SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz

This package is not fetched from Github, so it's not us who control the
tarball name. Here the tarball name is the one from upstream, and it
doesn't change, so the .hash file doesn't change.

After applying this patch:

sslh-v1.20.tar.gz: OK (sha256: a7f49b0a1cfcb7bb9d97f5ffa932bff11c5f65d9a9bd8fe1812481dee5855116)
>>> sslh 1.20 Extracting
gzip -d -c /home/thomas/dl/sslh/sslh-v1.20.tar.gz | tar --strip-components=1 -C /home/thomas/projets/buildroot/output/build/sslh-1.20   -xf -

Thomas
Thomas Petazzoni Sept. 15, 2019, 7:58 a.m. UTC | #3
On Wed, 11 Sep 2019 19:46:30 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> In order for the sslh version to match what is given by
> release-monitoring.org, the 'v' prefix should be encoded in
> SSLH_SOURCE and not SSLH_VERSION.
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/sslh/sslh.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
Peter Korsgaard Sept. 15, 2019, 8:14 a.m. UTC | #4
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > On Sun, 15 Sep 2019 09:17:57 +0200
 > Peter Korsgaard <peter@korsgaard.com> wrote:

 >> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:  
 >> 
 >> > In order for the sslh version to match what is given by
 >> > release-monitoring.org, the 'v' prefix should be encoded in
 >> > SSLH_SOURCE and not SSLH_VERSION.  
 >> 
 >> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 >> > ---
 >> >  package/sslh/sslh.mk | 3 ++-  
 >> 
 >> You don't seem to change sslh.hash?

 > The tarball name doesn't change:

 > -SSLH_VERSION = v1.20
 > +SSLH_VERSION = 1.20
 > +SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz

 > This package is not fetched from Github, so it's not us who control the
 > tarball name. Here the tarball name is the one from upstream, and it
 > doesn't change, so the .hash file doesn't change.

 > After applying this patch:

 > sslh-v1.20.tar.gz: OK (sha256: a7f49b0a1cfcb7bb9d97f5ffa932bff11c5f65d9a9bd8fe1812481dee5855116)
 >>>> sslh 1.20 Extracting
 > gzip -d -c /home/thomas/dl/sslh/sslh-v1.20.tar.gz | tar --strip-components=1 -C /home/thomas/projets/buildroot/output/build/sslh-1.20   -xf -

Ahh yes, indeed - Sorry for the noise.

Patch
diff mbox series

diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
index 6e29a99189..ba91f8c4d6 100644
--- a/package/sslh/sslh.mk
+++ b/package/sslh/sslh.mk
@@ -4,7 +4,8 @@ 
 #
 ################################################################################
 
-SSLH_VERSION = v1.20
+SSLH_VERSION = 1.20
+SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz
 SSLH_SITE = http://www.rutschle.net/tech/sslh
 SSLH_LICENSE = GPL-2.0+
 SSLH_LICENSE_FILES = COPYING