From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 24 Sep 2024 11:07:17 +0200 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 1st1Vr-0028aD-31 for lore@lore.pengutronix.de; Tue, 24 Sep 2024 11:07:17 +0200 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 1st1Vs-0007JX-Lj; Tue, 24 Sep 2024 11:07:16 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1st1Vj-0007J0-Rx; Tue, 24 Sep 2024 11:07:07 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1st1Vj-001AmO-FM; Tue, 24 Sep 2024 11:07:07 +0200 Received: from rhi by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1st1Vj-009Odj-1G; Tue, 24 Sep 2024 11:07:07 +0200 Date: Tue, 24 Sep 2024 11:07:07 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Message-ID: <20240924090707.fddbn2zpizayajwp@pengutronix.de> References: <20240924090331.2643891-1-bst@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240924090331.2643891-1-bst@pengutronix.de> Subject: Re: [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files 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: ore@pengutronix.de, Bastian Krause 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 On Tue, Sep 24, 2024 at 11:03:31AM +0200, Bastian Krause wrote: > As tcpreplay is GPL software, include a file mentioning that it's under > GPL (src/tcpreplay.c) > > Additionally, docs/LICENSE states: > > Please note that this license covers the files that I have written. > Some files distributed with the Tcpreplay Suite are copyrighted by > other authors and have a different license. These files & directories > are marked as such. > > This probably applies to src/common/err.c (BSD-4-Clause-UC) and to > src/common/fakepoll.c (BSD-3-Clause). > > Add those licenses and pin the corresponding files. > > Suggested-by: Roland Hieber > Signed-off-by: Bastian Krause Reviewed-by: Roland Hieber > --- > Originally sent as "[PATCH v2] tcpreplay: new package" > (<20240923132020.1626850-1-bst@pengutronix.de>), but v1 was already > applied on master. So turn this into a separate commit instead. > > Since the above version, I've also pinned down src/tcpreplay.c. > --- > rules/tcpreplay.make | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/rules/tcpreplay.make b/rules/tcpreplay.make > index 3f1568ad0..b28bc571a 100644 > --- a/rules/tcpreplay.make > +++ b/rules/tcpreplay.make > @@ -21,9 +21,12 @@ TCPREPLAY_SUFFIX := tar.xz > TCPREPLAY_URL := https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX) > TCPREPLAY_SOURCE := $(SRCDIR)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX) > TCPREPLAY_DIR := $(BUILDDIR)/$(TCPREPLAY) > -TCPREPLAY_LICENSE := GPL-3.0-only > +TCPREPLAY_LICENSE := GPL-3.0-only AND BSD-4-Clause-UC AND BSD-3-Clause > TCPREPLAY_LICENSE_FILES := \ > - file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8 > + file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8 \ > + file://src/tcpreplay.c;startline=4;endline=15;md5=9b41c5c891f51dfe9669e794a1d680c7 \ > + file://src/common/err.c;startline=14;endline=43;md5=0fd028531634bf7aba2791035e3c2de4 \ > + file://src/common/fakepoll.c;startline=8;endline=36;md5=903f05912a12e9a01b3018b915a1a7df > > # ---------------------------------------------------------------------------- > # Prepare > -- > 2.39.5 > > > -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |