[pkg-wpa-devel] r1880 - in /wpa/trunk/debian: changelog copyright
slh-guest at users.alioth.debian.org
slh-guest at users.alioth.debian.org
Tue Jul 1 01:05:34 UTC 2014
Author: slh-guest
Date: Tue Jul 1 01:05:34 2014
New Revision: 1880
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1880
Log:
#718651 for details), thanks very much.
- update debian/copyright manually.
Modified:
wpa/trunk/debian/changelog
wpa/trunk/debian/copyright
Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1880&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Tue Jul 1 01:05:34 2014
@@ -3,13 +3,11 @@
* NOT RELEASED YET
* DO NOT UPLOAD, work in progress.
* to-do:
- * verifiy debian/copyright
* run (by-hand) testsuite
* New upstream release:
- import suggested changes from Gerald Turner <gturner at unzane.com> (see
- #718651 for details), thanks very much. Use automatically parsed
- copyright information for now.
+ #718651 for details), thanks very much.
+ disable ACS for hostapd on kfreebsd-any (FTBS).
- fixed by the new upstream version:
+ wpa_supplicant: OpenSSL: tls_connection_handshake - Failed to read
@@ -23,6 +21,7 @@
+ sync with updated upstream defconfigs.
+ keep Hotspot 2.0 support disabled for the time being.
+ hostapd: keep sqlite3 support disabled for the time being.
+ - update debian/copyright manually.
* drop pre-wheezy /lib/init/rw/sendsigs.omit.d/ migration support, invert the
according versioned initscripts dependency to a versioned breaks relation.
* migrate from /var/run/ to /run/.
Modified: wpa/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/copyright?rev=1880&op=diff
==============================================================================
--- wpa/trunk/debian/copyright (original)
+++ wpa/trunk/debian/copyright Tue Jul 1 01:05:34 2014
@@ -1,25 +1,38 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: wpa_supplicant
+Upstream-Name: hostapd
Upstream-Contact: Jouni Malinen <j at w1.fi>
Source: http://w1.fi/wpa_supplicant/
Files: *
-Copyright: 2002-2012, Jouni Malinen <j at w1.fi>
-License: BSD or GPL-2
+Copyright: 2002-2014, Jouni Malinen <j at w1.fi>
+License: BSD
Files: hostapd/logwatch/*
Copyright: 2005, Henrik Brix Andersen <brix at gentoo.org>
License: BSD or GPL-2
+Files: hostapd/Android.mk
+Copyright: 2008, The Android Open Source Project
+License: BSD
+
Files: hostapd/hostapd.8
hostapd/hostapd_cli.1
Copyright: 2005, Faidon Liambotis <faidon at cube.gr>
-License: BSD or GPL-2
+License: BSD
+
+Files: hs20/*
+Copyright: 2012-2014, Qualcomm Atheros, Inc.
+License: BSD
Files: patches/*
Copyright: 2005, Alexey Kobozev <akobozev at cisco.com>
2005-2012, Jouni Malinen <j at w1.fi>
-License: BSD or GPL-2
+License: BSD
+
+Files: src/ap/acs.*
+Copyright: 2011, Atheros Communications
+ 2013, Qualcomm Atheros, Inc.
+License: BSD
Files: src/ap/ap_list.*
src/ap/ap_mlme.*
@@ -30,79 +43,132 @@
Copyright: 2002-2009, Jouni Malinen <j at w1.fi>
2002-2004, Instant802 Networks, Inc.
2005-2006, Devicescape Software, Inc.
-License: BSD or GPL-2
+License: BSD
+
+Files: src/ap/dfs.*
+Copyright: 2002-2013, Jouni Malinen <j at 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/hs20.*
+ wpa_supplicant/hs20_supplicant.*
+Copyright: 2009, Atheros Communications, Inc.
+ 2011-2013, Qualcomm Atheros, Inc.
+License: BSD
Files: src/ap/ieee802_11_ht.c
Copyright: 2002-2009, Jouni Malinen <j at w1.fi>
2007-2008, Intel Corporation
-License: BSD or GPL-2
+License: BSD
Files: src/ap/p2p_hostapd.*
Copyright: 2009-2010, Atheros Communications
-License: BSD or GPL-2
+License: BSD
+
+Files: src/ap/vlan_util.*
+Copyright: 2012, Michael Braun <michael-dev at fami-braun.de>
+License: BSD
Files: src/common/gas.*
Copyright: 2009, Atheros Communications
- 2011, Qualcomm Atheros
-License: BSD or GPL-2
+ 2011-2012, Qualcomm Atheros
+License: BSD
Files: src/common/ieee802_11_defs.h
Copyright: 2002-2009, Jouni Malinen <j at w1.fi>
2007-2008, Intel Corporation
-License: BSD or GPL-2
-
-Files: src/common/wireless_copy.h
-Copyright: 1997-2007, Jean Tourrilhes <jt at hpl.hp.com>
-License: BSD or GPL-2
+License: BSD
+
+Files: src/common/wpa_helpers.*
+Copyright: 2010-2011, Atheros Communications, Inc.
+ 2011-2012, Qualcomm Atheros, Inc.
+License: BSD
+
+Files: src/crypto/aes-internal*
+Copyright: 2000, Vincent Rijmen <vincent.rijmen at esat.kuleuven.ac.be>
+ 2000, Antoon Bosselaers <antoon.bosselaers at esat.kuleuven.ac.be>
+ 2000, Paulo Barreto <paulo.barreto at terra.com.br>
+ 2003-2012, Jouni Malinen <j at w1.fi>
+License: BSD
+
+Files: src/crypto/des-internal.c
+Copyright: 2005, Tom St Denis <tomstdenis at gmail.com>
+ 2006-2009, Jouni Malinen <j at w1.fi>
+License: BSD
+
+Files: src/crypto/md4-internal.c
+Copyright: 1993, Colin Plumb
+ 2004, Todd C. Miller
+ 2006, Jouni Malinen <j at w1.fi>
+License: BSD
+
+Files: src/crypto/md5-internal.c
+Copyright: 1993, Colin Plumb
+ 2003-2005, Jouni Malinen <j at w1.fi>
+License: BSD
+
+Files: src/crypto/sha1-internal.c
+Copyright: 1998, Steve Reid <sreid at sea-to-sky.net>
+ 1998, James H. Brown <jbrown at burgoyne.com>
+ 2001, Saul Kravitz <Saul.Kravitz at celera.com>
+ 2001-2005, Jouni Malinen <j at w1.fi>
+License: BSD
Files: src/drivers/driver_atheros.c
Copyright: 2004, Sam Leffler <sam at errno.com>
2004, Video54 Technologies
2005-2007, Jouni Malinen <j at w1.fi>
2009, Atheros Communications
-License: BSD or GPL-2
-
-Files: src/drivers/driver_broadcom.c
-Copyright: 2004, Nikki Chumkov <nikki at gattaca.ru>
- 2004, Jouni Malinen <j at w1.fi>
-License: BSD or GPL-2
+License: BSD
Files: src/drivers/driver_bsd.c
Copyright: 2004, Sam Leffler <sam at errno.com>
2004, 2Wire, Inc
-License: BSD or GPL-2
+License: BSD
+
+Files: src/drivers/driver_macsec_qca.c
+Copyright: 2004, Gunter Burchardt <tira at isx.de>
+ 2005-2009, Jouni Malinen <j at w1.fi>
+ 2013-2014, Qualcomm Atheros, Inc.
+License: BSD
Files: src/drivers/driver_madwifi.c
Copyright: 2004, Sam Leffler <sam at errno.com>
2004, Video54 Technologies
2004-2007, Jouni Malinen <j at w1.fi>
-License: BSD or GPL-2
+License: BSD
Files: src/drivers/driver_nl80211.c
-Copyright: 2002-2010, Jouni Malinen <j at w1.fi>
+Copyright: 2002-2014, Jouni Malinen <j at w1.fi>
2003-2004, Instant802 Networks, Inc.
2005-2006, Devicescape Software, Inc.
2007, Johannes Berg <johannes at sipsolutions.net>
2009-2010, Atheros Communications
-License: BSD or GPL-2
+License: BSD
Files: src/drivers/driver_none.c
Copyright: 2008, Atheros Communications
-License: BSD or GPL-2
-
-Files: src/drivers/driver_ralink.*
-Copyright: 2003-2006, Jouni Malinen <j at w1.fi>
- 2007, Snowpin Lee <snowpin_lee at ralinktech.com.tw>
-License: BSD or GPL-2
+License: BSD
+
+Files: src/drivers/driver_openbsd.c
+Copyright: 2013, Mark Kettenis <mark.kettenis at xs4all.nl>
+License: BSD
Files: src/drivers/driver_roboswitch.c
Copyright: 2008-2009, Jouke Witteveen
-License: BSD or GPL-2
+License: BSD
Files: src/drivers/driver_wired.c
Copyright: 2005-2009, Jouni Malinen <j at w1.fi>
2004, Gunter Burchardt <tira at isx.de>
-License: BSD or GPL-2
+License: BSD
Files: src/drivers/nl80211_copy.h
Copyright: 2006-2010, Johannes Berg <johannes at sipsolutions.net>
@@ -118,30 +184,43 @@
src/eap_peer/eap_pwd.c
src/eap_server/eap_server_pwd.c
Copyright: 2010, Dan Harkins <dharkins at lounge.org>
-License: BSD or GPL-2
+License: BSD
+
+Files: src/eap_peer/eap_proxy*
+Copyright: 2011-2013 Qualcomm Atheros, Inc.
+License: BSD
Files: src/l2_packet/l2_packet_freebsd.c
Copyright: 2003-2005, Jouni Malinen <j at w1.fi>
2005, Sam Leffler <sam at errno.com>
-License: BSD or GPL-2
+License: BSD
Files: src/p2p/*
Copyright: 2009-2010, Atheros Communications
-License: BSD or GPL-2
+License: BSD
+
+Files: src/pae/*
+Copyright: 2013-2014, Qualcomm Atheros, Inc.
+License: BSD
Files: src/rsn_supp/tdls.c
Copyright: 2010-2011, Atheros Communications
-License: BSD or GPL-2
+License: BSD
Files: src/tls/libtommath.c
-Copyright: Tom St Denis
-License: public-domain
+Copyright: 2005-2007, Tom St Denis <tomstdenis at gmail.com>
+License: public-domain
+
+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 <andy at warmcat.com>
- 2007, Johannes Berg <johannes at sipsolutions.net>
-License: BSD or GPL-2
+ 2009, Johannes Berg <johannes at sipsolutions.net>
+License: BSD
Files: src/utils/radiotap.h
Copyright: 2003-2004, David Young
@@ -162,18 +241,18 @@
Files: src/wps/httpread.*
Copyright: 2008, Ted Merrill, Atheros Communications
-License: BSD or GPL-2
+License: BSD
Files: src/wps/ndef.c
src/wps/wps_nfc.c
src/wps/wps_nfc_pn531.c
src/wps/wps_ufd.c
-Copyright: 2009, Masashi Honma <honma at ictec.co.jp>
-License: BSD or GPL-2
+Copyright: 2009-2012, Masashi Honma <honma at ictec.co.jp>
+License: BSD
Files: src/wps/wps_validate.c
Copyright: 2010, Atheros Communications, Inc.
-License: BSD or GPL-2
+License: BSD
Files: wpa_supplicant/dbus/dbus_common.*
wpa_supplicant/dbus/dbus_common_i.h
@@ -181,15 +260,25 @@
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 <dcbw at redhat.com> and Red Hat, Inc.
2009-2010, Witold Sowa <witold.sowa at gmail.com>
- 2009, Jouni Malinen <j at w1.fi>
-License: BSD or GPL-2
+ 2009-2010, Jouni Malinen <j at w1.fi>
+License: BSD
Files: wpa_supplicant/dbus/dbus_dict_helpers.*
wpa_supplicant/dbus/dbus_old*
Copyright: 2006, Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
-License: BSD or GPL-2
+License: BSD
+
+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: Johannes Berg <johannes at sipsolutions.net>, Intel Corporation
Files: wpa_supplicant/wpa_gui-qt4/icons/ap.svg
Copyright: 2008, mystica
@@ -214,31 +303,41 @@
Files: wpa_supplicant/wpa_gui-qt4/peers.*
wpa_supplicant/wpa_gui-qt4/stringquery.*
Copyright: 2009-2010, Atheros Communications
-License: BSD or GPL-2
+License: BSD
Files: wpa_supplicant/wpa_gui-qt4/signalbar.*
Copyright: 2011, Kel Modderman <kel at otaku42.de>
-License: BSD or GPL-2
+License: BSD
Files: wpa_supplicant/Android.mk
-Copyright: 2008, The Android Open Source Project
-License: Apache-2.0
+ wpa_supplicant/wpa_supplicant_conf.*
+Copyright: 2008-2010, The Android Open Source Project
+License: BSD
Files: wpa_supplicant/ap.*
Copyright: 2003-2009, Jouni Malinen <j at w1.fi>
2009, Atheros Communications
-License: BSD or GPL-2
+License: BSD
+
+Files: wpa_supplicant/autoscan*
+Copyright: 2012, Intel Corporation
+License: BSD
Files: wpa_supplicant/gas_query.*
wpa_supplicant/offchannel.*
wpa_supplicant/p2p_supplicant.*
-Copyright: 2009-2010, Atheros Communications
- 2011, Qualcomm Atheros
-License: BSD or GPL-2
+ wpa_supplicant/wifi_display.*
+Copyright: 2009-2011, Atheros Communications
+ 2011-2014, Qualcomm Atheros
+ 2011-2014, Jouni Malinen <j at w1.fi>
+License: BSD
Files: wpa_supplicant/interworking.*
-Copyright: 2011, Qualcomm Atheros
-License: BSD or GPL-2
+ wpa_supplicant/wnm_sta.*
+ wpa_supplicant/wpas_kay.*
+Copyright: 2011-2014, Qualcomm Atheros
+ 2011-2014, Jouni Malinen <j at w1.fi>
+License: BSD
Files: debian/*
Copyright: 2004-2006, Kyle McMartin <kyle at debian.org>
@@ -247,23 +346,7 @@
2006-2012, Kel Modderman <kel at otaku42.de>
2010, Jan Dittberner <jandd at debian.org>
2010-2014, Stefan Lippers-Hollmann <s.l-h at 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
@@ -292,10 +375,6 @@
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
More information about the Pkg-wpa-devel
mailing list