Hi On Monday 02 June 2014, Gerald Turner wrote: > 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.
I've just finished cross-checking debian/copyright and ended up with
the attached diff[1]. A few differences can be attributed to slightly
different collation methods, some add copyright information which is
hard to parse/ find automatically and some add information that your
parser appears to have missed.
By the way, I've disabled Hotspot 2.0 support for now, as it appears
to require a PHP- and webserver for the server part (hostapd), which
would require quite significant packaging changes that would need
confirmation (and efforts) of someone who actually intends to use it.
Likewise I've disabled SQLITE support for hostapd, while hostapd isn't
as size sensitive (nor critical in regards to its FHS location) as
wpa_supplicant would be, adding sqlite seems just to optimise managing
of the eap_user database, which is also available in a (duplicate) text
file format. IMHO this can be left disabled, until anyone actually
needs it and presents a use case requiring this functionality.
If you did enable those symbols for a specific reason other than them
just being there in the new version, please give me a hint.
Regards
Stefan Lippers-Hollmann
[1]
http://anonscm.debian.org/viewvc/pkg-wpa/wpa/trunk/debian/copyright?revision=1881&view=markup
--- /tmp/pkg/copyright 2014-07-01 03:08:02.301296645 +0200
+++ debian/copyright 2014-07-01 03:12:39.995009298 +0200
@@ -7,108 +7,75 @@ Files: *
Copyright: 2002-2014, Jouni Malinen <j...@w1.fi>
License: BSD
+Files: hostapd/logwatch/*
+Copyright: 2005, Henrik Brix Andersen <b...@gentoo.org>
+License: BSD or GPL-2
+
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
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
+
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>
- 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.
+ 2002-2004, Instant802 Networks, Inc.
2005-2006, Devicescape Software, Inc.
License: BSD
-Files: src/ap/beacon.*
-Copyright: 2002-2004, Instant802 Networks, Inc.
- 2005-2006, Devicescape Software, Inc.
- 2007-2008, Intel Corporation
- 2008-2012, Jouni Malinen <j...@w1.fi>
-License: BSD
-
Files: src/ap/dfs.*
Copyright: 2002-2013, Jouni Malinen <j...@w1.fi>
2013, Qualcomm Atheros, Inc.
License: BSD
Files: src/ap/gas_serv.*
+ src/ap/wnm_ap.*
+ src/common/ieee802_1x_defs.h
+ src/common/qca-vendor*
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.*
+ wpa_supplicant/hs20_supplicant.*
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
-Copyright: 2002-2013, Jouni Malinen <j...@w1.fi>
+Files: src/ap/ieee802_11_ht.c
+Copyright: 2002-2009, Jouni Malinen <j...@w1.fi>
2007-2008, Intel Corporation
License: BSD
-Files: src/ap/p2p_hostapd.c
+Files: src/ap/p2p_hostapd.*
Copyright: 2009-2010, Atheros Communications
License: BSD
-Files: src/ap/sta_info.c
-Copyright: 2002-2013, Jouni Malinen <j...@w1.fi>
- 2007-2008, Intel Corporation
-License: BSD
-
-Files: src/ap/vlan_init.*
-Copyright: 2003, Instant802 Networks, Inc.
- 2005-2006, Devicescape Software, Inc.
- 2009, Jouni Malinen <j...@w1.fi>
-License: BSD
-
Files: src/ap/vlan_util.*
Copyright: 2012, Michael Braun <michael-...@fami-braun.de>
License: BSD
-Files: src/ap/wmm.*
-Copyright: 2002-2003, Instant802 Networks, Inc.
- 2005-2006, Devicescape Software, Inc.
- 2009, Jouni Malinen <j...@w1.fi>
-License: BSD
-
-Files: src/ap/wnm_ap.*
-Copyright: 2011-2013, Qualcomm Atheros, Inc.
-License: BSD
-
Files: src/common/gas.*
Copyright: 2009, Atheros Communications
2011-2012, Qualcomm Atheros
@@ -119,22 +86,39 @@ Copyright: 2002-2009, Jouni Malinen <j@w
2007-2008, Intel Corporation
License: BSD
-Files: src/common/ieee802_1x_defs.h
-Copyright: 2013-2014, Qualcomm Atheros, Inc.
+Files: src/common/wpa_helpers.*
+Copyright: 2010-2011, Atheros Communications, Inc.
+ 2011-2012, Qualcomm Atheros, Inc.
License: BSD
-Files: src/common/qca-vendor*
-Copyright: 2014, Qualcomm Atheros, Inc.
+Files: src/crypto/aes-internal*
+Copyright: 2000, Vincent Rijmen <vincent.rij...@esat.kuleuven.ac.be>
+ 2000, Antoon Bosselaers <antoon.bossela...@esat.kuleuven.ac.be>
+ 2000, Paulo Barreto <paulo.barr...@terra.com.br>
+ 2003-2012, Jouni Malinen <j...@w1.fi>
License: BSD
-Files: src/common/wpa_helpers.*
-Copyright: 2010-2011, Atheros Communications, Inc.
- 2011-2012, Qualcomm Atheros, Inc.
+Files: src/crypto/des-internal.c
+Copyright: 2005, Tom St Denis <tomstde...@gmail.com>
+ 2006-2009, Jouni Malinen <j...@w1.fi>
License: BSD
-Files: src/drivers/driver.h
-Copyright: 2002-2014, Jouni Malinen <j...@w1.fi>
- 2007-2008, Intel Corporation
+Files: src/crypto/md4-internal.c
+Copyright: 1993, Colin Plumb
+ 2004, Todd C. Miller
+ 2006, Jouni Malinen <j...@w1.fi>
+License: BSD
+
+Files: src/crypto/md5-internal.c
+Copyright: 1993, Colin Plumb
+ 2003-2005, Jouni Malinen <j...@w1.fi>
+License: BSD
+
+Files: src/crypto/sha1-internal.c
+Copyright: 1998, Steve Reid <sr...@sea-to-sky.net>
+ 1998, James H. Brown <jbr...@burgoyne.com>
+ 2001, Saul Kravitz <saul.krav...@celera.com>
+ 2001-2005, Jouni Malinen <j...@w1.fi>
License: BSD
Files: src/drivers/driver_atheros.c
@@ -145,8 +129,8 @@ Copyright: 2004, Sam Leffler <sam@errno.
License: BSD
Files: src/drivers/driver_bsd.c
-Copyright: 2004, 2Wire, Inc
- 2004, Sam Leffler <s...@errno.com>
+Copyright: 2004, Sam Leffler <s...@errno.com>
+ 2004, 2Wire, Inc
License: BSD
Files: src/drivers/driver_macsec_qca.c
@@ -174,7 +158,7 @@ Copyright: 2008, Atheros Communications
License: BSD
Files: src/drivers/driver_openbsd.c
-Copyright: 2013, Mark Kettenis
+Copyright: 2013, Mark Kettenis <mark.kette...@xs4all.nl>
License: BSD
Files: src/drivers/driver_roboswitch.c
@@ -182,27 +166,28 @@ Copyright: 2008-2009, Jouke Witteveen
License: BSD
Files: src/drivers/driver_wired.c
-Copyright: 2002-2009, Jouni Malinen <j...@w1.fi>
+Copyright: 2005-2009, Jouni Malinen <j...@w1.fi>
2004, Gunter Burchardt <t...@isx.de>
License: BSD
Files: src/drivers/nl80211_copy.h
-Copyright: 2006-2010 Johannes Berg <johan...@sipsolutions.net>
+Copyright: 2006-2010, Johannes Berg <johan...@sipsolutions.net>
2008, Michael Wu <flaming...@sourmilk.net>
2008, Luis Carlos Cobo <lui...@cozybit.com>
2008, Michael Buesch <m...@bues.ch>
- 2008-2009 Luis R. Rodriguez <lrodrig...@atheros.com>
+ 2008-2009, Luis R. Rodriguez <lrodrig...@atheros.com>
2008, Jouni Malinen <jouni.mali...@atheros.com>
2008, Colin McCabe <co...@cozybit.com>
License: ISC
Files: src/eap_common/eap_pwd_common.*
+ src/eap_peer/eap_pwd.c
src/eap_server/eap_server_pwd.c
Copyright: 2010, Dan Harkins <dhark...@lounge.org>
License: BSD
Files: src/eap_peer/eap_proxy*
-Copyright: 2011-2013, Qualcomm Atheros, Inc.
+Copyright: 2011-2013 Qualcomm Atheros, Inc.
License: BSD
Files: src/l2_packet/l2_packet_freebsd.c
@@ -222,27 +207,25 @@ Files: src/rsn_supp/tdls.c
Copyright: 2010-2011, Atheros Communications
License: BSD
-Files: src/utils/browser*
-Copyright: 2013, Qualcomm Atheros, Inc.
-License: BSD
+Files: src/tls/libtommath.c
+Copyright: 2005-2007, Tom St Denis <tomstde...@gmail.com>
+License: public-domain
-Files: src/utils/http*
+Files: src/utils/browser*
+ src/utils/http*
+ src/utils/xml*
Copyright: 2012-2014, Qualcomm Atheros, Inc.
License: BSD
Files: src/utils/radiotap.c
- src/utils/radiotap_iter.h
Copyright: 2007, Andy Green <a...@warmcat.com>
2009, Johannes Berg <johan...@sipsolutions.net>
-License: BSD or GPL-2
+License: BSD
Files: src/utils/radiotap.h
-Copyright: 2003-2004 David Young
+Copyright: 2003-2004, David Young
License: BSD
-Files: src/utils/xml*
-Copyright: 2012-2013, Qualcomm Atheros, Inc.
-
Files: src/wps/http.h
src/wps/upnp_xml.*
src/wps/wps_upnp.*
@@ -271,61 +254,31 @@ Files: src/wps/wps_validate.c
Copyright: 2010, Atheros Communications, Inc.
License: BSD
-Files: wpa_supplicant/Android.mk
-Copyright: 2008, The Android Open Source Project
-License: Apache-2.0
-
-Files: wpa_supplicant/ap.*
-Copyright: 2002-2009, Jouni Malinen <j...@w1.fi>
- 2007-2008, Intel Corporation
- 2009, Atheros Communications
-License: BSD
-
-Files: wpa_supplicant/autoscan*
-Copyright: 2012, Intel Corporation. All rights reserved.
-License: BSD
-
-Files: wpa_supplicant/dbus/*
+Files: wpa_supplicant/dbus/dbus_common.*
+ wpa_supplicant/dbus/dbus_common_i.h
+ wpa_supplicant/dbus/dbus_new.*
+ wpa_supplicant/dbus/dbus_new_handlers.*
+ wpa_supplicant/dbus/dbus_new_handlers_wps.c
+ wpa_supplicant/dbus/dbus_new_helpers.*
+ wpa_supplicant/dbus/dbus_new_introspect.c
Copyright: 2006, Dan Williams <d...@redhat.com> and Red Hat, Inc.
2009-2010, Witold Sowa <witold.s...@gmail.com>
- 2009, Jouni Malinen <j...@w1.fi>
-License: BSD
-
-Files: wpa_supplicant/driver_i.h
-Copyright: 2002-2009, Jouni Malinen <j...@w1.fi>
- 2007-2008, Intel Corporation
+ 2009-2010, Jouni Malinen <j...@w1.fi>
License: BSD
-Files: wpa_supplicant/gas_query.*
- wpa_supplicant/offchannel.*
- wpa_supplicant/p2p_supplicant.*
-Copyright: 2009-2010, Atheros Communications
- 2011-2014, Qualcomm Atheros
- 2011-2014, Jouni Malinen <j...@w1.fi>
-License: BSD
-
-Files: wpa_supplicant/hs20_supplicant.*
-Copyright: 2009, Atheros Communications, Inc.
- 2011-2013, Qualcomm Atheros, Inc.
+Files: wpa_supplicant/dbus/dbus_dict_helpers.*
+ wpa_supplicant/dbus/dbus_old*
+Copyright: 2006, Dan Williams <d...@redhat.com> and Red Hat, Inc.
License: BSD
-Files: wpa_supplicant/interworking.*
-Copyright: 2011-2014, Jouni Malinen <j...@w1.fi>
- 2011-2013, Qualcomm Atheros, Inc.
+Files: wpa_supplicant/dbus/dbus_new_handlers_p2p.*
+ wpa_supplicant/examples/p2p/*
+ wpa_supplicant/examples/dbus-listen-preq.py
+Copyright: 2011-2012, Intel Corporation
License: BSD
Files: wpa_supplicant/utils/log2pcap.py
-Copyright: 2012, Intel Corporation
-License: BSD
-
-Files: wpa_supplicant/wifi_display.*
-Copyright: 2011, Atheros Communications, Inc.
- 2011-2012, Qualcomm Atheros, Inc.
-License: BSD
-
-Files: wpa_supplicant/wnm_sta.*
-Copyright: 2011-2013, Qualcomm Atheros, Inc.
-License: BSD
+Copyright: Johannes Berg <johan...@sipsolutions.net>, Intel Corporation
Files: wpa_supplicant/wpa_gui-qt4/icons/ap.svg
Copyright: 2008, mystica
@@ -356,12 +309,34 @@ Files: wpa_supplicant/wpa_gui-qt4/signal
Copyright: 2011, Kel Modderman <k...@otaku42.de>
License: BSD
-Files: wpa_supplicant/wpa_supplicant_conf.*
-Copyright: 2010, The Android Open Source Project
+Files: wpa_supplicant/Android.mk
+ wpa_supplicant/wpa_supplicant_conf.*
+Copyright: 2008-2010, The Android Open Source Project
License: BSD
-Files: wpa_supplicant/wpas_kay.c
-Copyright: 2013-2014, Qualcomm Atheros, Inc.
+Files: wpa_supplicant/ap.*
+Copyright: 2003-2009, Jouni Malinen <j...@w1.fi>
+ 2009, Atheros Communications
+License: BSD
+
+Files: wpa_supplicant/autoscan*
+Copyright: 2012, Intel Corporation
+License: BSD
+
+Files: wpa_supplicant/gas_query.*
+ wpa_supplicant/offchannel.*
+ wpa_supplicant/p2p_supplicant.*
+ wpa_supplicant/wifi_display.*
+Copyright: 2009-2011, Atheros Communications
+ 2011-2014, Qualcomm Atheros
+ 2011-2014, Jouni Malinen <j...@w1.fi>
+License: BSD
+
+Files: wpa_supplicant/interworking.*
+ wpa_supplicant/wnm_sta.*
+ wpa_supplicant/wpas_kay.*
+Copyright: 2011-2014, Qualcomm Atheros
+ 2011-2014, Jouni Malinen <j...@w1.fi>
License: BSD
Files: debian/*
@@ -371,23 +346,7 @@ Copyright: 2004-2006, Kyle McMartin <kyl
2006-2012, Kel Modderman <k...@otaku42.de>
2010, Jan Dittberner <ja...@debian.org>
2010-2014, Stefan Lippers-Hollmann <s....@gmx.de>
-License: BSD or GPL-2
-
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache version 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
+License: BSD
License: BSD
Redistribution and use in source and binary forms, with or without
@@ -416,10 +375,6 @@ License: BSD
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- Note that this distribution of hostapd comes with configuration options that
- link it to the OpenSSL library. The OpenSSL license is GPL-incompatible,
- therefore in this distribution only the BSD license applies.
License: GPL-2
This program is free software; you can redistribute it and/or modify
@@ -466,3 +421,4 @@ License: public-domain
default settings. The main purpose of having this version here is to make it
easier to build bignum.c wrapper without having to install and build an
external library.
+
signature.asc
Description: This is a digitally signed message part.
