From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 17 Mar 2024 10:07:36 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rlmUS-00Atun-2V for lore@lore.pengutronix.de; Sun, 17 Mar 2024 10:07:36 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rlmUS-00073x-6k; Sun, 17 Mar 2024 10:07:36 +0100 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1rlmUK-00073o-DW for ptxdist@pengutronix.de; Sun, 17 Mar 2024 10:07:29 +0100 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a466a256726so567181366b.1 for ; Sun, 17 Mar 2024 02:07:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710666447; x=1711271247; darn=pengutronix.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/u/sXACe7rIf0C1zrjXG7aLKCXpD56H3yLVEJ1HUFV8=; b=f14IN4+6CET0ZJfg1deiqRLvwAe4vbO96WaDo3L/TcTXc1p7uMmm1Qz6hpRyfJiRzh 6nKM0Y372QQOwJFOx6SVq64wWLU1i2+TaaghWEG+NtRPn7T0UvIbP024B+hftpFFaZ0M nhFkoVGV6wwP3bzWk1lfHPdUb5E0XfPsIK8j3EaICMv+FHDFwnwWdRLhmaFNQiLHJaI6 6V+EdgjdI76Q/LJz+TDTp3RxyDH7GrmlepmX4NadYiOG8kbvKmtQUP4VOMkXsGd17wr9 49beQ1NWv+zCaER6R783CvEm3aWZy/QMb/TNKsEaaZi+B80uQidx/t2FSXVvh7W3Y9Bw zpHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710666447; x=1711271247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/u/sXACe7rIf0C1zrjXG7aLKCXpD56H3yLVEJ1HUFV8=; b=YCcJ6WDgAx2jQxelo3vu90D4fu0WsNEo/rnhMSNujOsJhDB6UImz9KiLP7dkZA8DyE wkKLc/kHsr/t3cOnf9hUlHlCFfrGT5i7uQpkxxrNpR9pAjPWdKv3Wl7S5+O6eoVPy1/a rWZcQFMo51kxr1MfTpk0lDlYcgWzpyOZa01DjJHrjK4bFsWywceOdjeiLZfvqO0S/kJZ HAsKH3Eygg85VgLSkv5r7peESU6imuC/oL2so9oqU1utwOIPxYKYJ1cWX/F+5EMP6l7S r7OtQKxxX+3zp5dtTgiHD0nYylfh7kD00SfywRsqARCpX1EH6zgY5yRtSwR9BCYdYRfr ffNA== X-Gm-Message-State: AOJu0YwiJgZ4xlrR5jYWZb5Awvk/yZmplEuOGeJ5/1hOuYuJBIK2PX7F UzKtT/6KQyu3GWaAGi3WHXBv9h6arnoEbM5fFLqa6YWRTylmLeek4zlV2B5+ X-Google-Smtp-Source: AGHT+IHbjKEmVTj6yecz8l/JF0b+e8WYWchnW6lsxrMylS7TK3AD79kVBAe0Kr8vject3uAGTTKLgg== X-Received: by 2002:a17:906:c411:b0:a46:8227:2d0c with SMTP id u17-20020a170906c41100b00a4682272d0cmr5265436ejz.1.1710666447062; Sun, 17 Mar 2024 02:07:27 -0700 (PDT) Received: from stormwind.. (85.191.88.68.dynamic.dhcp.aura-net.dk. [85.191.88.68]) by smtp.gmail.com with ESMTPSA id g17-20020a17090670d100b00a46a04d7dc4sm1662318ejk.61.2024.03.17.02.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Mar 2024 02:07:26 -0700 (PDT) From: Bruno Thomsen To: ptxdist@pengutronix.de Date: Sun, 17 Mar 2024 10:05:22 +0100 Message-ID: <20240317090522.9271-2-bruno.thomsen@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240317090522.9271-1-bruno.thomsen@gmail.com> References: <20240317090522.9271-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: bruno.thomsen@gmail.com Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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 -Date: Fri, 27 Jun 2014 16:39:41 -0400 -Subject: [PATCH] Make install rule friendly towards packaging with $DESTDIR - -Signed-off-by: Jon Ringle ---- - 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