From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 26 Sep 2024 15:19:47 +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 1stoPK-00313J-1F for lore@lore.pengutronix.de; Thu, 26 Sep 2024 15:19:47 +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 1stoPK-0001Of-VC; Thu, 26 Sep 2024 15:19:46 +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 1stoOb-0008EW-Gf; Thu, 26 Sep 2024 15:19:01 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.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 1stoOb-001h90-4D; Thu, 26 Sep 2024 15:19:01 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1stoOb-007Ct6-0H; Thu, 26 Sep 2024 15:19:01 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 26 Sep 2024 15:19:01 +0200 Message-Id: <20240926131901.1717829-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240924090331.2643891-1-bst@pengutronix.de> References: <20240924090331.2643891-1-bst@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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: 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 Thanks, applied as 5624977948d9900399db9a51305f434972712609. Michael [sent from post-receive hook] On Thu, 26 Sep 2024 15:19:00 +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 > Message-Id: <20240924090331.2643891-1-bst@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tcpreplay.make b/rules/tcpreplay.make > index 3f1568ad0db9..b28bc571aadf 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