* [ptxdist] [PATCH v2 1/2] autossh: update URL
@ 2024-03-17 9:05 Bruno Thomsen
2024-03-17 9:05 ` [ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen
2024-03-23 8:59 ` [ptxdist] [APPLIED] autossh: update URL Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Bruno Thomsen @ 2024-03-17 9:05 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>
---
v2: No change
rules/autossh.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/autossh.make b/rules/autossh.make
index ef8240bcb19a..879cd1c99ce0 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: 19fb5785f39403e214704cb866ddce530ffa9582
--
2.44.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g
2024-03-17 9:05 [ptxdist] [PATCH v2 1/2] autossh: update URL Bruno Thomsen
@ 2024-03-17 9:05 ` Bruno Thomsen
2024-03-23 8:59 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-23 8:59 ` [ptxdist] [APPLIED] autossh: update URL Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Bruno Thomsen @ 2024-03-17 9:05 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
https://www.harding.motd.ca/autossh/CHANGES.txt
Patch removed as change has been upstreamed.
Add license file (autossh.c) and hash. Changed SPDX indentifier
to custom as I have been unable to determine license with SPDX
Check License[1] or by manual review. It looks like a blend of
MIT and BSD.
[1] https://tools.spdx.org/app/check_license/
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
v2: squash patch 2 and 3
Add license and version bump in one patch.
Update license from unknown to custom.
...e-friendly-towards-packaging-with-DE.patch | 47 -------------------
patches/autossh-1.4c/series | 4 --
rules/autossh.make | 18 +++----
3 files changed, 10 insertions(+), 59 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 96fca563aa50..000000000000
--- 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 29f971c73214..000000000000
--- 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 879cd1c99ce0..86dae4db7762 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.4g
+AUTOSSH_MD5 := 2b804bc1bf6d2f2afaa526d02df7c0a2
+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 := custom
+AUTOSSH_LICENSE_FILES := \
+ file://autossh.c;startline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b
# ----------------------------------------------------------------------------
# Prepare
--
2.44.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] autossh: update URL
2024-03-17 9:05 [ptxdist] [PATCH v2 1/2] autossh: update URL Bruno Thomsen
2024-03-17 9:05 ` [ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen
@ 2024-03-23 8:59 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-03-23 8:59 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as dbed1fb29767fbd29fa905fe36ae9d70c83aab54.
Michael
[sent from post-receive hook]
On Sat, 23 Mar 2024 09:59:34 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> 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>
> Message-Id: <20240317090522.9271-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/autossh.make b/rules/autossh.make
> index ef8240bcb19a..879cd1c99ce0 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] autossh: Version bump 1.4c -> 1.4g
2024-03-17 9:05 ` [ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen
@ 2024-03-23 8:59 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-03-23 8:59 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 60a75dfe5effe0376e414e2d57c6613746d7eb32.
Michael
[sent from post-receive hook]
On Sat, 23 Mar 2024 09:59:35 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> https://www.harding.motd.ca/autossh/CHANGES.txt
>
> Patch removed as change has been upstreamed.
>
> Add license file (autossh.c) and hash. Changed SPDX indentifier
> to custom as I have been unable to determine license with SPDX
> Check License[1] or by manual review. It looks like a blend of
> MIT and BSD.
>
> [1] https://tools.spdx.org/app/check_license/
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20240317090522.9271-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 96fca563aa50..000000000000
> --- 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 29f971c73214..000000000000
> --- 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 879cd1c99ce0..86dae4db7762 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.4g
> +AUTOSSH_MD5 := 2b804bc1bf6d2f2afaa526d02df7c0a2
> +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 := custom
> +AUTOSSH_LICENSE_FILES := \
> + file://autossh.c;startline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-23 9:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-17 9:05 [ptxdist] [PATCH v2 1/2] autossh: update URL Bruno Thomsen
2024-03-17 9:05 ` [ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g Bruno Thomsen
2024-03-23 8:59 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-23 8:59 ` [ptxdist] [APPLIED] autossh: update URL Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox