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 <[email protected]> > Signed-off-by: Bastian Krause <[email protected]>
Reviewed-by: Roland Hieber <[email protected]> > --- > Originally sent as "[PATCH v2] tcpreplay: new package" > (<[email protected]>), 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. | [email protected] | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
