From: Bruno Thomsen <bruno.thomsen@gmail.com>
To: ptxdist@pengutronix.de
Cc: bruno.thomsen@gmail.com
Subject: [ptxdist] [PATCH 3/3] autossh: Version bump 1.4c -> 1.4g
Date: Fri, 8 Mar 2024 18:16:18 +0100 [thread overview]
Message-ID: <20240308171618.4616-3-bruno.thomsen@gmail.com> (raw)
In-Reply-To: <20240308171618.4616-1-bruno.thomsen@gmail.com>
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
prev parent reply other threads:[~2024-03-08 17:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Bruno Thomsen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240308171618.4616-3-bruno.thomsen@gmail.com \
--to=bruno.thomsen@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox