Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
Hi On Thursday 05 June 2014, Gerald Turner wrote: > Raphael Hertzog writes: > > On Wed, 04 Jun 2014, Stefan Lippers-Hollmann wrote: [...] > > Files: * > > Copyright: 1991-2012 Linus Torvalds and many others > > License: GPL-2 > > Thanks Raphael, I was wondering about this. > > Looks like Jouni Malinen began changing from dual license BSD/GPL-2 to > BSD-only in February 2012 and the transition is well documented in the > CONTRIBUTIONS file. > > Very few files remain containing the dual license file header comments: > > Files: hostapd/logwatch/* > Copyright: 2005, Henrik Brix Andersen > License: BSD or GPL-2 > > Files: src/utils/radiotap.c > src/utils/radiotap_iter.h > Copyright: 2007, Andy Green > 2009, Johannes Berg > License: BSD or GPL-2 > > There's also a couple other files: copy of nl80211.h from Linux kernel, > some artwork, a spurious Android Makefile. > > Other than those exceptions, perhaps the following is sufficient as > Raphael suggests: > > Files: * > Copyright: 2002-2014, Jouni Malinen > License: BSD If you look at the existing debian/copyright for wpa 0.7.x-1.x, you'll notice that I've tried to follow this collation order - but it only applies to files where Jouni Malinen is the sole (listed) copyright holder. There rest of the (existing listing) are just the exceptions of the norm, but there are quite a few of those. e.g. (I'm using debian/copyright of wpa 1.1-1 as reference): Files: src/ap/ap_list.* src/ap/ap_mlme.* src/ap/beacon.* src/ap/hw_features.* src/ap/vlan_init.* src/ap/wmm.* Copyright: 2002-2009, Jouni Malinen 2002-2004, Instant802 Networks, Inc. 2005-2006, Devicescape Software, Inc. License: BSD or GPL-2 Just listing "Instant802 Networks, Inc." and "Devicescape Software, Inc." wouldn't be sufficient here, as the exception doesn't inherit the catch-all stanza for "Jouni Malinen"; it's open to discussion if it could be simplified to: Copyright: 2002-2009, Jouni Malinen 2002-2006, Devicescape Software, Inc. though, as Instant802 Networks renamed itself to Devicescape Software in 2005. > An oddity I've noticed while scrutinizing over the git history is that > one attribution statement in particular, "2007-2008, Intel Corporation", > has been deleted from many files. Should debian/copyright care? This is a result of larger code refactoring, the copyright stanzas were'nt just forgotten (I'm only looking at hostap_0_7_0..HEAD, if it happened before, I might have missed it), the code bearing them (hostapd/ap_list.*, hostapd/beacon.*, hostapd/config.*, hostapd/driver_i.*, hostapd/hostapd.h, hostapd/ieee802_11.* and hostapd/sta_info.c) actually went away (in the non git-rename meaning of the word). > Also there are a lot of attributions to "Atheros Communications" and > "Qualcomm Atheros, Inc.", looks like these companies merged and Jouni > Malinen works at Qualcomm, further supporting a simplification of > debian/copyright. Here you do have to distinguish between the person and the company as copyright holder, which are not equivalent at all. Much of the code attributed to QCA Atheros has not been written/ submitted by Jouni Malinen, but rather different (former-) Atheros employees. Especially in the kernel context, several subsystem maintainers and regular contributors carefully distinguish this difference by either signing off their code submission either with their personal mail address or the corporate one of their current employer. Copies of nl80211.h are a more difficult question though, as its copyright status in the kernel tree is scarcely documented, but also a can of worms if you actually go to the roots of it[1]. Regards Stefan Lippers-Hollmann [1] http://anonscm.debian.org/viewvc/pkg-wpa/iw/trunk/debian/copyright?view=markup#l13 signature.asc Description: This is a digitally signed message part.
Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
Raphael Hertzog writes: > On Wed, 04 Jun 2014, Stefan Lippers-Hollmann wrote: >> > The Perl script (attached) took a few hours to write - there's a >> > brick of about 60 lines to munge file moves. Then about another >> > hour to inspect all that output, plus poking at each file to make >> > sure that the license change actually occured. >> >> Thank you a lot, this really helps. I'll integrate your changes over >> the next few days after some further local testing. > > I'm glad that this got sorted out but I wanted to point out that > you are actually too demanding of yourself in terms of what to put in > debian/copyright. > > You don't have to document the copyright holders of each and every > file. What truly matters is to properly distinguish the different > licenses and the files concerned by each license. > > Listing of copyright holders doesn't have to be exhaustive (it's > impossible for big projects) and it's perfectly acceptable to group > them for a set of files that share a common license. See how the linux > packages uses: > > Files: * > Copyright: 1991-2012 Linus Torvalds and many others > License: GPL-2 Thanks Raphael, I was wondering about this. Looks like Jouni Malinen began changing from dual license BSD/GPL-2 to BSD-only in February 2012 and the transition is well documented in the CONTRIBUTIONS file. Very few files remain containing the dual license file header comments: Files: hostapd/logwatch/* Copyright: 2005, Henrik Brix Andersen License: BSD or GPL-2 Files: src/utils/radiotap.c src/utils/radiotap_iter.h Copyright: 2007, Andy Green 2009, Johannes Berg License: BSD or GPL-2 There's also a couple other files: copy of nl80211.h from Linux kernel, some artwork, a spurious Android Makefile. Other than those exceptions, perhaps the following is sufficient as Raphael suggests: Files: * Copyright: 2002-2014, Jouni Malinen License: BSD An oddity I've noticed while scrutinizing over the git history is that one attribution statement in particular, "2007-2008, Intel Corporation", has been deleted from many files. Should debian/copyright care? Also there are a lot of attributions to "Atheros Communications" and "Qualcomm Atheros, Inc.", looks like these companies merged and Jouni Malinen works at Qualcomm, further supporting a simplification of debian/copyright. -- Gerald Turner Encrypted mail preferred! OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80 3858 EC94 2276 FDB8 716D pgpNnI8PtZm5g.pgp Description: PGP signature
Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
Hi, On Wed, 04 Jun 2014, Stefan Lippers-Hollmann wrote: > > The Perl script (attached) took a few hours to write - there's a brick > > of about 60 lines to munge file moves. Then about another hour to > > inspect all that output, plus poking at each file to make sure that the > > license change actually occured. > > Thank you a lot, this really helps. I'll integrate your changes over > the next few days after some further local testing. I'm glad that this got sorted out but I wanted to point out that you are actually too demanding of yourself in terms of what to put in debian/copyright. You don't have to document the copyright holders of each and every file. What truly matters is to properly distinguish the different licenses and the files concerned by each license. Listing of copyright holders doesn't have to be exhaustive (it's impossible for big projects) and it's perfectly acceptable to group them for a set of files that share a common license. See how the linux packages uses: Files: * Copyright: 1991-2012 Linus Torvalds and many others License: GPL-2 Cheers, -- Raphaël Hertzog ◈ Debian Developer Discover the Debian Administrator's Handbook: → http://debian-handbook.info/get/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
Hi On Monday 02 June 2014, Gerald Turner wrote: > Stefan Lippers-Hollmann writes: > > On Saturday 31 May 2014, Stefan Lippers-Hollmann wrote: > >> On Saturday 31 May 2014, Gerald Turner wrote: > >> > Stefan Lippers-Hollmann writes: > >> > > On Saturday 31 May 2014, Gerald Turner wrote: [...] > > Just as a hint, I have just[1] updated debian/get-orig-source to work > > with wpa 2.2~. Using a version number like e.g. > > 2.1+git20140531.1+147848e-1 > > then fetches the according upstream tarball. > > Well, I've done it, and it sure was tedious! > > Steps: > > git log --full-diff -p hostapd hs20 patches src wpa_supplicant | \ > egrep '(^diff|Copyright)' | \ > grep -B1 Copyright | \ > ./git-log-full-diff-parse-copyright > > The Perl script (attached) took a few hours to write - there's a brick > of about 60 lines to munge file moves. Then about another hour to > inspect all that output, plus poking at each file to make sure that the > license change actually occured. Thank you a lot, this really helps. I'll integrate your changes over the next few days after some further local testing. Regards Stefan Lippers-Hollmann signature.asc Description: This is a digitally signed message part.
