[ptxdist] [PATCH 1/3] autossh: update URL

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH 1/3] autossh: update URL
@ 2024-03-08 17:16 Bruno Thomsen
  2024-03-08 17:16 ` [ptxdist] [PATCH 2/3] autossh: add license file and hash Bruno Thomsen
  2024-03-08 17:16 ` [ptxdist] [PATCH 3/3] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen
  0 siblings, 2 replies; 5+ messages in thread
From: Bruno Thomsen @ 2024-03-08 17:16 UTC (permalink / raw)
  To: ptxdist; +Cc: bruno.thomsen

Update URL from http to https as it returns 301 Moved Permanently.

Download log:

--2024-03-08 13:14:10--  http://www.harding.motd.ca/autossh/autossh-1.4c.tgz
Resolving www.harding.motd.ca (www.harding.motd.ca)... 70.73.86.42
Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:80... connected.
HTTP request sent, awaiting response... 301 Moved Permanently
Location: https://www.harding.motd.ca/autossh/autossh-1.4c.tgz [following]
--2024-03-08 13:14:11--  https://www.harding.motd.ca/autossh/autossh-1.4c.tgz
Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 65191 (64K) [application/octet-stream]

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/autossh.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/autossh.make b/rules/autossh.make
index ef8240bcb..879cd1c99 100644
--- a/rules/autossh.make
+++ b/rules/autossh.make
@@ -18,7 +18,7 @@ AUTOSSH_VERSION	:= 1.4c
 AUTOSSH_MD5	:= 26520eea934f296be0783dabe7fcfd28
 AUTOSSH		:= autossh-$(AUTOSSH_VERSION)
 AUTOSSH_SUFFIX	:= tgz
-AUTOSSH_URL	:= http://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
+AUTOSSH_URL	:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
 AUTOSSH_SOURCE	:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
 AUTOSSH_DIR	:= $(BUILDDIR)/$(AUTOSSH)
 AUTOSSH_LICENSE	:= unknown

base-commit: 6d4773f25c3b1fa958bc1c41b1219e79c813bd8b
-- 
2.44.0




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [ptxdist] [PATCH 2/3] autossh: add license file and hash
  2024-03-08 17:16 [ptxdist] [PATCH 1/3] autossh: update URL Bruno Thomsen
@ 2024-03-08 17:16 ` Bruno Thomsen
  2024-03-15  6:30   ` Michael Olbrich
  2024-03-08 17:16 ` [ptxdist] [PATCH 3/3] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen
  1 sibling, 1 reply; 5+ messages in thread
From: Bruno Thomsen @ 2024-03-08 17:16 UTC (permalink / raw)
  To: ptxdist; +Cc: bruno.thomsen

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/autossh.make | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/rules/autossh.make b/rules/autossh.make
index 879cd1c99..19512070e 100644
--- a/rules/autossh.make
+++ b/rules/autossh.make
@@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh
 #
 # Paths and names
 #
-AUTOSSH_VERSION	:= 1.4c
-AUTOSSH_MD5	:= 26520eea934f296be0783dabe7fcfd28
-AUTOSSH		:= autossh-$(AUTOSSH_VERSION)
-AUTOSSH_SUFFIX	:= tgz
-AUTOSSH_URL	:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
-AUTOSSH_SOURCE	:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
-AUTOSSH_DIR	:= $(BUILDDIR)/$(AUTOSSH)
-AUTOSSH_LICENSE	:= unknown
+AUTOSSH_VERSION		:= 1.4c
+AUTOSSH_MD5		:= 26520eea934f296be0783dabe7fcfd28
+AUTOSSH			:= autossh-$(AUTOSSH_VERSION)
+AUTOSSH_SUFFIX		:= tgz
+AUTOSSH_URL		:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
+AUTOSSH_SOURCE		:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
+AUTOSSH_DIR		:= $(BUILDDIR)/$(AUTOSSH)
+AUTOSSH_LICENSE		:= unknown
+AUTOSSH_LICENSE_FILES	:= \
+	file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.44.0




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [ptxdist] [PATCH 3/3] autossh: Version bump 1.4c -> 1.4g
  2024-03-08 17:16 [ptxdist] [PATCH 1/3] autossh: update URL Bruno Thomsen
  2024-03-08 17:16 ` [ptxdist] [PATCH 2/3] autossh: add license file and hash Bruno Thomsen
@ 2024-03-08 17:16 ` Bruno Thomsen
  1 sibling, 0 replies; 5+ messages in thread
From: Bruno Thomsen @ 2024-03-08 17:16 UTC (permalink / raw)
  To: ptxdist; +Cc: bruno.thomsen

https://www.harding.motd.ca/autossh/CHANGES.txt

Patch removed as change has been upstreamed.

Separate LICENSE file has been removed but the same text is in
autossh.c but year info updated from "2002-2008" to "2002-2018".

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 ...e-friendly-towards-packaging-with-DE.patch | 47 -------------------
 patches/autossh-1.4c/series                   |  4 --
 rules/autossh.make                            |  6 +--
 3 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
 delete mode 100644 patches/autossh-1.4c/series

diff --git a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch b/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
deleted file mode 100644
index 96fca563a..000000000
--- a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Jon Ringle <jringle@gridpoint.com>
-Date: Fri, 27 Jun 2014 16:39:41 -0400
-Subject: [PATCH] Make install rule friendly towards packaging with $DESTDIR
-
-Signed-off-by: Jon Ringle <jringle@gridpoint.com>
----
- Makefile.in | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index fb7cc1d..a8e7a7e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -45,18 +45,18 @@ distclean:	allclean
- 		- /bin/rm -f Makefile
- 
- install:	$(TARGET)
--		mkdir -p -m 755 $(bindir)
--		mkdir -p -m 755 $(prefix)/share/doc/autossh
--		mkdir -p -m 755 $(datadir)/examples/autossh
--		mkdir -p -m 755 $(mandir)/man1
--		cp $(TARGET) $(bindir)
--		cp CHANGES README $(datadir)/doc/autossh
--		cp autossh.host	$(datadir)/examples/autossh
--		cp rscreen $(datadir)/examples/autossh
--		cp autossh.1 $(mandir)/man1
--		chmod 755 $(bindir)/$(TARGET)
--		chmod 644 $(datadir)/doc/autossh/CHANGES
--		chmod 644 $(datadir)/doc/autossh/README
--		chmod 644 $(datadir)/examples/autossh/autossh.host 
--		chmod 644 $(datadir)/examples/autossh/rscreen
--		chmod 644 $(mandir)/man1/autossh.1 
-+		mkdir -p -m 755 $(DESTDIR)$(bindir)
-+		mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh
-+		mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh
-+		mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
-+		cp $(TARGET) $(DESTDIR)$(bindir)
-+		cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh
-+		cp autossh.host	$(DESTDIR)$(datadir)/examples/autossh
-+		cp rscreen $(DESTDIR)$(datadir)/examples/autossh
-+		cp autossh.1 $(DESTDIR)$(mandir)/man1
-+		chmod 755 $(DESTDIR)$(bindir)/$(TARGET)
-+		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES
-+		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README
-+		chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host 
-+		chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen
-+		chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 
diff --git a/patches/autossh-1.4c/series b/patches/autossh-1.4c/series
deleted file mode 100644
index 29f971c73..000000000
--- a/patches/autossh-1.4c/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
-# ecdd87ec5c25c56d421024daf8acf722  - git-ptx-patches magic
diff --git a/rules/autossh.make b/rules/autossh.make
index 19512070e..f7feaa261 100644
--- a/rules/autossh.make
+++ b/rules/autossh.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh
 #
 # Paths and names
 #
-AUTOSSH_VERSION		:= 1.4c
-AUTOSSH_MD5		:= 26520eea934f296be0783dabe7fcfd28
+AUTOSSH_VERSION		:= 1.4g
+AUTOSSH_MD5		:= 2b804bc1bf6d2f2afaa526d02df7c0a2
 AUTOSSH			:= autossh-$(AUTOSSH_VERSION)
 AUTOSSH_SUFFIX		:= tgz
 AUTOSSH_URL		:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
@@ -23,7 +23,7 @@ AUTOSSH_SOURCE		:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
 AUTOSSH_DIR		:= $(BUILDDIR)/$(AUTOSSH)
 AUTOSSH_LICENSE		:= unknown
 AUTOSSH_LICENSE_FILES	:= \
-	file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5
+	file://autossh.c;startline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.44.0




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 2/3] autossh: add license file and hash
  2024-03-08 17:16 ` [ptxdist] [PATCH 2/3] autossh: add license file and hash Bruno Thomsen
@ 2024-03-15  6:30   ` Michael Olbrich
  2024-03-17  9:00     ` Bruno Thomsen
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2024-03-15  6:30 UTC (permalink / raw)
  To: Bruno Thomsen; +Cc: ptxdist

On Fri, Mar 08, 2024 at 06:16:17PM +0100, Bruno Thomsen wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/autossh.make | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/autossh.make b/rules/autossh.make
> index 879cd1c99..19512070e 100644
> --- a/rules/autossh.make
> +++ b/rules/autossh.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh
>  #
>  # Paths and names
>  #
> -AUTOSSH_VERSION	:= 1.4c
> -AUTOSSH_MD5	:= 26520eea934f296be0783dabe7fcfd28
> -AUTOSSH		:= autossh-$(AUTOSSH_VERSION)
> -AUTOSSH_SUFFIX	:= tgz
> -AUTOSSH_URL	:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> -AUTOSSH_SOURCE	:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> -AUTOSSH_DIR	:= $(BUILDDIR)/$(AUTOSSH)
> -AUTOSSH_LICENSE	:= unknown
> +AUTOSSH_VERSION		:= 1.4c
> +AUTOSSH_MD5		:= 26520eea934f296be0783dabe7fcfd28
> +AUTOSSH			:= autossh-$(AUTOSSH_VERSION)
> +AUTOSSH_SUFFIX		:= tgz
> +AUTOSSH_URL		:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> +AUTOSSH_SOURCE		:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> +AUTOSSH_DIR		:= $(BUILDDIR)/$(AUTOSSH)
> +AUTOSSH_LICENSE		:= unknown

If there is no patching spdx identifier, then use 'custom' for the license.
'unknown' means, nobody looked at it.

> +AUTOSSH_LICENSE_FILES	:= \
> +	file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5

I'm not seeing a LICENSE file in the source package.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.44.0
> 
> 
> 

-- 
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 |



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 2/3] autossh: add license file and hash
  2024-03-15  6:30   ` Michael Olbrich
@ 2024-03-17  9:00     ` Bruno Thomsen
  0 siblings, 0 replies; 5+ messages in thread
From: Bruno Thomsen @ 2024-03-17  9:00 UTC (permalink / raw)
  To: Bruno Thomsen, ptxdist

Den fre. 15. mar. 2024 kl. 07.30 skrev Michael Olbrich
<m.olbrich@pengutronix.de>:
>
> On Fri, Mar 08, 2024 at 06:16:17PM +0100, Bruno Thomsen wrote:
> > Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> > ---
> >  rules/autossh.make | 18 ++++++++++--------
> >  1 file changed, 10 insertions(+), 8 deletions(-)
> >
> > diff --git a/rules/autossh.make b/rules/autossh.make
> > index 879cd1c99..19512070e 100644
> > --- a/rules/autossh.make
> > +++ b/rules/autossh.make
> > @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh
> >  #
> >  # Paths and names
> >  #
> > -AUTOSSH_VERSION      := 1.4c
> > -AUTOSSH_MD5  := 26520eea934f296be0783dabe7fcfd28
> > -AUTOSSH              := autossh-$(AUTOSSH_VERSION)
> > -AUTOSSH_SUFFIX       := tgz
> > -AUTOSSH_URL  := https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> > -AUTOSSH_SOURCE       := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> > -AUTOSSH_DIR  := $(BUILDDIR)/$(AUTOSSH)
> > -AUTOSSH_LICENSE      := unknown
> > +AUTOSSH_VERSION              := 1.4c
> > +AUTOSSH_MD5          := 26520eea934f296be0783dabe7fcfd28
> > +AUTOSSH                      := autossh-$(AUTOSSH_VERSION)
> > +AUTOSSH_SUFFIX               := tgz
> > +AUTOSSH_URL          := https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> > +AUTOSSH_SOURCE               := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> > +AUTOSSH_DIR          := $(BUILDDIR)/$(AUTOSSH)
> > +AUTOSSH_LICENSE              := unknown
>
> If there is no patching spdx identifier, then use 'custom' for the license.
> 'unknown' means, nobody looked at it.

Thanks for the review.
I overlooked that difference but can see that it's in the documentation.

>
> > +AUTOSSH_LICENSE_FILES        := \
> > +     file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5
>
> I'm not seeing a LICENSE file in the source package.

Let's just squash patch 2 and 3 with removal of the unknown
license tag.

/Bruno

>
> Michael
>
> >
> >  # ----------------------------------------------------------------------------
> >  # Prepare
> > --
> > 2.44.0
> >
> >
> >
>
> --
> 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 |



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-03-17  9:01 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-08 17:16 [ptxdist] [PATCH 1/3] autossh: update URL Bruno Thomsen
2024-03-08 17:16 ` [ptxdist] [PATCH 2/3] autossh: add license file and hash Bruno Thomsen
2024-03-15  6:30   ` Michael Olbrich
2024-03-17  9:00     ` Bruno Thomsen
2024-03-08 17:16 ` [ptxdist] [PATCH 3/3] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox