Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
Stefan Lippers-Hollmann s@gmx.de writes: On Saturday 31 May 2014, Stefan Lippers-Hollmann wrote: On Saturday 31 May 2014, Gerald Turner wrote: Stefan Lippers-Hollmann s@gmx.de writes: On Saturday 31 May 2014, Gerald Turner wrote: [...] 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. 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. -- Gerald Turner gtur...@unzane.comEncrypted mail preferred! OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80 3858 EC94 2276 FDB8 716D Index: debian/copyright === --- debian/copyright (revision 1866) +++ debian/copyright (working copy) @@ -1,152 +1,248 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: wpa_supplicant +Upstream-Name: hostapd Upstream-Contact: Jouni Malinen j...@w1.fi -Source: http://w1.fi/wpa_supplicant/ +Source: git://w1.fi/srv/git/hostap.git Files: * -Copyright: 2002-2012, Jouni Malinen j...@w1.fi -License: BSD or GPL-2 +Copyright: 2002-2014, Jouni Malinen j...@w1.fi +License: BSD +Files: hostapd/Android.mk +Copyright: 2008, The Android Open Source Project +License: BSD + Files: hostapd/logwatch/* Copyright: 2005, Henrik Brix Andersen b...@gentoo.org License: BSD or GPL-2 -Files: hostapd/hostapd.8 - hostapd/hostapd_cli.1 -Copyright: 2005, Faidon Liambotis fai...@cube.gr -License: BSD or GPL-2 +Files: hs20/* +Copyright: 2012-2014, Qualcomm Atheros, Inc. +License: BSD -Files: patches/* -Copyright: 2005, Alexey Kobozev akobo...@cisco.com - 2005-2012, Jouni Malinen j...@w1.fi -License: BSD or GPL-2 +Files: src/ap/acs.* +Copyright: 2011, Atheros Communications + 2013, Qualcomm Atheros, Inc. +License: BSD +Files: src/ap/ap_config.* +Copyright: 2003-2014, Jouni Malinen j...@w1.fi + 2007-2008, Intel Corporation +License: BSD + 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 j...@w1.fi - 2002-2004, Instant802 Networks, Inc. + 2003-2004, Instant802 Networks, Inc. + 2006, Devicescape Software, Inc. + 2007-2008, Intel Corporation +License: BSD + +Files: src/ap/ap_mlme.* +Copyright: 2003-2008, Jouni Malinen j...@w1.fi + 2003-2004, Instant802 Networks, Inc. 2005-2006, Devicescape Software, Inc. -License: BSD or GPL-2 +License: BSD -Files: src/ap/ieee802_11_ht.c -Copyright: 2002-2009, Jouni Malinen j...@w1.fi +Files: src/ap/beacon.* +Copyright: 2002-2004, Instant802 Networks, Inc. + 2005-2006, Devicescape Software, Inc. 2007-2008, Intel Corporation -License: BSD or GPL-2 + 2008-2012, Jouni Malinen j...@w1.fi +License: BSD -Files: src/ap/p2p_hostapd.* +Files: src/ap/dfs.* +Copyright: 2002-2013, Jouni Malinen j...@w1.fi + 2013, Qualcomm Atheros, Inc. +License: BSD + +Files: src/ap/gas_serv.* +Copyright: 2011-2014, Qualcomm Atheros, Inc. +License: BSD + +Files: src/ap/hostapd.h +Copyright: 2002-2013, Jouni Malinen j...@w1.fi + 2007-2008, Intel Corporation +License: BSD + +Files: src/ap/hs20.* +Copyright: 2009, Atheros Communications, Inc. + 2011-2013, Qualcomm Atheros, Inc. +License: BSD + +Files: src/ap/hw_features.* +Copyright: 2002-2003, Instant802 Networks, Inc. + 2005-2006, Devicescape Software, Inc. + 2008-2012, Jouni Malinen j...@w1.fi +License: BSD + +Files: src/ap/ieee802_11.* + src/ap/ieee802_11_ht.c
Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
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.
Bug#718651: [pkg-wpa-devel] Bug#718651: Bug#718651: Built hostapd/wpasupplicant 2.1 (patch)
Hi On Saturday 31 May 2014, Stefan Lippers-Hollmann wrote: On Saturday 31 May 2014, Gerald Turner wrote: Stefan Lippers-Hollmann s@gmx.de writes: On Saturday 31 May 2014, Gerald Turner wrote: [...] 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. 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. Index: debian/changelog === --- debian/changelog(revision 1866) +++ debian/changelog(working copy) @@ -1,4 +1,4 @@ -wpa (1.1-2) UNRELEASED; urgency=medium +wpa (2.1+git20140531.1+147848e-1) UNRELEASED; urgency=medium * NOT RELEASED YET * drop pre-wheezy /lib/init/rw/sendsigs.omit.d/ migration support, invert the wpa/trunk$ mkdir ../tarballs wpa/trunk$ debian/rules get-orig-source [...] SUCCESS: New upstream tarball has been saved at ../tarballs/wpa_2.1+git20140531.1+147848e.orig.tar.xz wpa/trunk$ See debian/README.source[2] for the finer details. Regards Stefan Lippers-Hollmann [1] svn r1866 of Vcs-Svn: svn://anonscm.debian.org/pkg-wpa/wpa/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-wpa/wpa/trunk/ http://anonscm.debian.org/viewvc/pkg-wpa/wpa/trunk/?view=revisionrevision=1866 [2] http://anonscm.debian.org/viewvc/pkg-wpa/wpa/trunk/debian/README.source?view=markup signature.asc Description: This is a digitally signed message part.
