Hi On Saturday 31 May 2014, Gerald Turner wrote: > Stefan Lippers-Hollmann <s....@gmx.de> writes: > > On Saturday 31 May 2014, Gerald Turner wrote: > > [...] > >> I paid particular attention to merging upstream's defconfgs and > >> debian/config/* files, activating several options: > > [...] > > > > Thank you for your efforts, but these changes are the straight-forward > > and easy part. What you've missed in your patch, is the actual > > difficulty (well, not 'difficult', but extremely time-consuming and > > tiresome) involved, updating debian/copyright... Upstream relicensed > > from dual-licensed "GPL2 || BSD" to 3-clause BSD exclusively[1], due > > to significant files movements (wpa_supplicant learning more tricks > > that were usually reserved to hostapd) and quite a few new features > > from new authors (like WiFi Direct/ p2p) it is not done with a mere > > s/BSD\ or\ GPL-2/BSD/. > > Yikes! Last week I had opened that file (first step: where's upstream?) > and was horrified by all the attributions in individual files. I > suppose this is made worse by upstream having two git repositories > (manual work to track file movements).
Yes, the project being split into the, now abandoned,
git://w1.fi/srv/git/hostap-1.git and git://w1.fi/srv/git/hostap.git
repos (with no tags from the 1.x branch in hostap.git) makes the
'natural' way of using git --follow unfortunately impossible - and the
large code movements from hostapd/ to common code defeats plain diff
(or rather makes it just as difficult as starting from scratch).
Likewise the natural approach of splitting the task into small chunks
(like 5 files a day) is not really possible, as one needs a fresh
memory to collate matching/ overlapping copyright stanzas for several
files.
In the end it does boil down to pretty much forgetting about the
existing debian/copyright (which is (hopefully) 100% correct for wpa
1.1) and starting from scratch again for 2.x. Last time I did that (for
0.7.3, the intermediate steps up to 1.1 were reasonable to update in
place), it took most of a full day and left me pretty wasted/
demotivated for a couple of days.
> Would you like me to spend some time reconstructing a DEP-5 copyright
> file for 2.1, or would that also be wasted effort?
It doesn't make sense to start collecting the copyright information
from the 2.1 release, as meanwhile 28 files changed their copyright
(new years, typically 2014, added), 24 new files were added + the whole
new subdirectory hs20/ (which is fortunately licensed rather uniformly)
and with 6 files being completely removed. If we already had this DEP-5
listing for 2.1, it would be reasonable to update it, but when starting
from scratch, it only makes sense to start from current upstream HEAD
(and then to use git diff <hash>..hostap_2_2, to fill up the gaps until
v2.1 gets tagged. I'm not asking you to spend time on this, as I know
far too well how demotivating this is, but I certainly wouldn't say no
to a patch either.
Right now I'm a little sidetracked with preparing lirc 0.9.1 (which is
currently at pre3) for unstable, as it needs quite a few of code
changes and upstream fixes before it can be uploaded, but I hope to
dive into debian/copyright for wpa just afterwards, hopefully soon.
Regards
Stefan Lippers-Hollmann
signature.asc
Description: This is a digitally signed message part.
