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.thom...@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 <jrin...@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 <jrin...@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


Reply via email to