--- connman-0.76.orig/debian/compat +++ connman-0.76/debian/compat @@ -0,0 +1 @@ +7 --- connman-0.76.orig/debian/watch +++ connman-0.76/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.kernel.org/pub/linux/network/connman/connman-(\d+\.\d+)\.tar\.gz debian uupdate \ No newline at end of file --- connman-0.76.orig/debian/connman.upstart +++ connman-0.76/debian/connman.upstart @@ -0,0 +1,9 @@ +description "Connection Manager" + +start on started dbus +stop on stopping dbus + +expect fork +respawn + +exec connmand -c --- connman-0.76.orig/debian/copyright +++ connman-0.76/debian/copyright @@ -0,0 +1,396 @@ +Format: http://dep.debian.net/deps/dep5/ +Name: Connman +Source: http://git.kernel.org/?p=network/connman/connman-gnome.git;a=summary + +Files: * +Copyright: (C) 2007-2009 Intel Corporation. All rights reserved. +License: GPL-2 + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL-2' + file. + +Files: debian/* +Copyright: (C) 2009 Canonical Ltd. All rights reserved +License: GPL-2+ + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL-2' + file. + +Files: ltmain.sh +Copyright: (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc +License: GPL-2+ + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL-2' + file. + +Files: ./gdbus/watch.c ./gdbus/mainloop.c ./gdbus/object.c +Copyright: 2004-2009 Marcel Holtmann +License: GPL-2+ + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL-2' + file. + +Files: ./doc/connman-*.xml +Copyright: 2007-2008 Intel Corporation. All rights reserved. +License: GFDL-1.1+-NIV-NFC-NBC + +License: GFDL-1.1+-NIV-NFC-NBC + GNU Free Documentation License, version 1.1 or (at your option) any later, with + no invariant sections no Front-Cover Texts, and no Back-Cover Texts: + . + GNU Free Documentation License + Version 1.1, March 2000 + . + Copyright (C) 2000 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + . + . + 0. PREAMBLE + . + The purpose of this License is to make a manual, textbook, or other + written document "free" in the sense of freedom: to assure everyone + the effective freedom to copy and redistribute it, with or without + modifying it, either commercially or noncommercially. Secondarily, + this License preserves for the author and publisher a way to get + credit for their work, while not being considered responsible for + modifications made by others. + . + This License is a kind of "copyleft", which means that derivative + works of the document must themselves be free in the same sense. It + complements the GNU General Public License, which is a copyleft + license designed for free software. + . + We have designed this License in order to use it for manuals for free + software, because free software needs free documentation: a free + program should come with manuals providing the same freedoms that the + software does. But this License is not limited to software manuals; + it can be used for any textual work, regardless of subject matter or + whether it is published as a printed book. We recommend this License + principally for works whose purpose is instruction or reference. + . + . + 1. APPLICABILITY AND DEFINITIONS + . + This License applies to any manual or other work that contains a + notice placed by the copyright holder saying it can be distributed + under the terms of this License. The "Document", below, refers to any + such manual or work. Any member of the public is a licensee, and is + addressed as "you". + . + A "Modified Version" of the Document means any work containing the + Document or a portion of it, either copied verbatim, or with + modifications and/or translated into another language. + . + A "Secondary Section" is a named appendix or a front-matter section of + the Document that deals exclusively with the relationship of the + publishers or authors of the Document to the Document's overall subject + (or to related matters) and contains nothing that could fall directly + within that overall subject. (For example, if the Document is in part a + textbook of mathematics, a Secondary Section may not explain any + mathematics.) The relationship could be a matter of historical + connection with the subject or with related matters, or of legal, + commercial, philosophical, ethical or political position regarding + them. + . + The "Invariant Sections" are certain Secondary Sections whose titles + are designated, as being those of Invariant Sections, in the notice + that says that the Document is released under this License. + . + The "Cover Texts" are certain short passages of text that are listed, + as Front-Cover Texts or Back-Cover Texts, in the notice that says that + the Document is released under this License. + . + A "Transparent" copy of the Document means a machine-readable copy, + represented in a format whose specification is available to the + general public, whose contents can be viewed and edited directly and + straightforwardly with generic text editors or (for images composed of + pixels) generic paint programs or (for drawings) some widely available + drawing editor, and that is suitable for input to text formatters or + for automatic translation to a variety of formats suitable for input + to text formatters. A copy made in an otherwise Transparent file + format whose markup has been designed to thwart or discourage + subsequent modification by readers is not Transparent. A copy that is + not "Transparent" is called "Opaque". + . + Examples of suitable formats for Transparent copies include plain + ASCII without markup, Texinfo input format, LaTeX input format, SGML + or XML using a publicly available DTD, and standard-conforming simple + HTML designed for human modification. Opaque formats include + PostScript, PDF, proprietary formats that can be read and edited only + by proprietary word processors, SGML or XML for which the DTD and/or + processing tools are not generally available, and the + machine-generated HTML produced by some word processors for output + purposes only. + . + The "Title Page" means, for a printed book, the title page itself, + plus such following pages as are needed to hold, legibly, the material + this License requires to appear in the title page. For works in + formats which do not have any title page as such, "Title Page" means + the text near the most prominent appearance of the work's title, + preceding the beginning of the body of the text. + . + . + 2. VERBATIM COPYING + . + You may copy and distribute the Document in any medium, either + commercially or noncommercially, provided that this License, the + copyright notices, and the license notice saying this License applies + to the Document are reproduced in all copies, and that you add no other + conditions whatsoever to those of this License. You may not use + technical measures to obstruct or control the reading or further + copying of the copies you make or distribute. However, you may accept + compensation in exchange for copies. If you distribute a large enough + number of copies you must also follow the conditions in section 3. + . + You may also lend copies, under the same conditions stated above, and + you may publicly display copies. + . + . + 3. COPYING IN QUANTITY + . + If you publish printed copies of the Document numbering more than 100, + and the Document's license notice requires Cover Texts, you must enclose + the copies in covers that carry, clearly and legibly, all these Cover + Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on + the back cover. Both covers must also clearly and legibly identify + you as the publisher of these copies. The front cover must present + the full title with all words of the title equally prominent and + visible. You may add other material on the covers in addition. + Copying with changes limited to the covers, as long as they preserve + the title of the Document and satisfy these conditions, can be treated + as verbatim copying in other respects. + . + If the required texts for either cover are too voluminous to fit + legibly, you should put the first ones listed (as many as fit + reasonably) on the actual cover, and continue the rest onto adjacent + pages. + . + If you publish or distribute Opaque copies of the Document numbering + more than 100, you must either include a machine-readable Transparent + copy along with each Opaque copy, or state in or with each Opaque copy + a publicly-accessible computer-network location containing a complete + Transparent copy of the Document, free of added material, which the + general network-using public has access to download anonymously at no + charge using public-standard network protocols. If you use the latter + option, you must take reasonably prudent steps, when you begin + distribution of Opaque copies in quantity, to ensure that this + Transparent copy will remain thus accessible at the stated location + until at least one year after the last time you distribute an Opaque + copy (directly or through your agents or retailers) of that edition to + the public. + . + It is requested, but not required, that you contact the authors of the + Document well before redistributing any large number of copies, to give + them a chance to provide you with an updated version of the Document. + . + . + 4. MODIFICATIONS + . + You may copy and distribute a Modified Version of the Document under + the conditions of sections 2 and 3 above, provided that you release + the Modified Version under precisely this License, with the Modified + Version filling the role of the Document, thus licensing distribution + and modification of the Modified Version to whoever possesses a copy + of it. In addition, you must do these things in the Modified Version: + . + A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. + B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has less than five). + C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. + D. Preserve all the copyright notices of the Document. + E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. + F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. + G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. + H. Include an unaltered copy of this License. + I. Preserve the section entitled "History", and its title, and add to + it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. + J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. + K. In any section entitled "Acknowledgements" or "Dedications", + preserve the section's title, and preserve in the section all the + substance and tone of each of the contributor acknowledgements + and/or dedications given therein. + L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. + M. Delete any section entitled "Endorsements". Such a section + may not be included in the Modified Version. + N. Do not retitle any existing section as "Endorsements" + or to conflict in title with any Invariant Section. + . + If the Modified Version includes new front-matter sections or + appendices that qualify as Secondary Sections and contain no material + copied from the Document, you may at your option designate some or all + of these sections as invariant. To do this, add their titles to the + list of Invariant Sections in the Modified Version's license notice. + These titles must be distinct from any other section titles. + . + You may add a section entitled "Endorsements", provided it contains + nothing but endorsements of your Modified Version by various + parties--for example, statements of peer review or that the text has + been approved by an organization as the authoritative definition of a + standard. + . + You may add a passage of up to five words as a Front-Cover Text, and a + passage of up to 25 words as a Back-Cover Text, to the end of the list + of Cover Texts in the Modified Version. Only one passage of + Front-Cover Text and one of Back-Cover Text may be added by (or + through arrangements made by) any one entity. If the Document already + includes a cover text for the same cover, previously added by you or + by arrangement made by the same entity you are acting on behalf of, + you may not add another; but you may replace the old one, on explicit + permission from the previous publisher that added the old one. + . + The author(s) and publisher(s) of the Document do not by this License + give permission to use their names for publicity for or to assert or + imply endorsement of any Modified Version. + . + . + 5. COMBINING DOCUMENTS + . + You may combine the Document with other documents released under this + License, under the terms defined in section 4 above for modified + versions, provided that you include in the combination all of the + Invariant Sections of all of the original documents, unmodified, and + list them all as Invariant Sections of your combined work in its + license notice. + . + The combined work need only contain one copy of this License, and + multiple identical Invariant Sections may be replaced with a single + copy. If there are multiple Invariant Sections with the same name but + different contents, make the title of each such section unique by + adding at the end of it, in parentheses, the name of the original + author or publisher of that section if known, or else a unique number. + Make the same adjustment to the section titles in the list of + Invariant Sections in the license notice of the combined work. + . + In the combination, you must combine any sections entitled "History" + in the various original documents, forming one section entitled + "History"; likewise combine any sections entitled "Acknowledgements", + and any sections entitled "Dedications". You must delete all sections + entitled "Endorsements." + . + . + 6. COLLECTIONS OF DOCUMENTS + . + You may make a collection consisting of the Document and other documents + released under this License, and replace the individual copies of this + License in the various documents with a single copy that is included in + the collection, provided that you follow the rules of this License for + verbatim copying of each of the documents in all other respects. + . + You may extract a single document from such a collection, and distribute + it individually under this License, provided you insert a copy of this + License into the extracted document, and follow this License in all + other respects regarding verbatim copying of that document. + . + . + 7. AGGREGATION WITH INDEPENDENT WORKS + . + A compilation of the Document or its derivatives with other separate + and independent documents or works, in or on a volume of a storage or + distribution medium, does not as a whole count as a Modified Version + of the Document, provided no compilation copyright is claimed for the + compilation. Such a compilation is called an "aggregate", and this + License does not apply to the other self-contained works thus compiled + with the Document, on account of their being thus compiled, if they + are not themselves derivative works of the Document. + . + If the Cover Text requirement of section 3 is applicable to these + copies of the Document, then if the Document is less than one quarter + of the entire aggregate, the Document's Cover Texts may be placed on + covers that surround only the Document within the aggregate. + Otherwise they must appear on covers around the whole aggregate. + . + . + 8. TRANSLATION + . + Translation is considered a kind of modification, so you may + distribute translations of the Document under the terms of section 4. + Replacing Invariant Sections with translations requires special + permission from their copyright holders, but you may include + translations of some or all Invariant Sections in addition to the + original versions of these Invariant Sections. You may include a + translation of this License provided that you also include the + original English version of this License. In case of a disagreement + between the translation and the original English version of this + License, the original English version will prevail. + . + . + 9. TERMINATION + . + You may not copy, modify, sublicense, or distribute the Document except + as expressly provided for under this License. Any other attempt to + copy, modify, sublicense or distribute the Document is void, and will + automatically terminate your rights under this License. However, + parties who have received copies, or rights, from you under this + License will not have their licenses terminated so long as such + parties remain in full compliance. + . + . + 10. FUTURE REVISIONS OF THIS LICENSE + . + The Free Software Foundation may publish new, revised versions + of the GNU Free Documentation License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. See + http://www.gnu.org/copyleft/. + . + Each version of the License is given a distinguishing version number. + If the Document specifies that a particular numbered version of this + License "or any later version" applies to it, you have the option of + following the terms and conditions either of that specified version or + of any later version that has been published (not as a draft) by the + Free Software Foundation. If the Document does not specify a version + number of this License, you may choose any version ever published (not + as a draft) by the Free Software Foundation. + . + . + ADDENDUM: How to use this License for your documents + . + To use this License in a document you have written, include a copy of + the License in the document and put the following copyright and + license notices just after the title page: + . + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + . + If you have no Invariant Sections, write "with no Invariant Sections" + instead of saying which ones are invariant. If you have no + Front-Cover Texts, write "no Front-Cover Texts" instead of + "Front-Cover Texts being LIST"; likewise for Back-Cover Texts. + . + If your document contains nontrivial examples of program code, we + recommend releasing these examples in parallel under your choice of + free software license, such as the GNU General Public License, + to permit their use in free software. + --- connman-0.76.orig/debian/connman.preinst +++ connman-0.76/debian/connman.preinst @@ -0,0 +1,34 @@ +#!/bin/sh + +set -e + +# Remove a no-longer used conffile +rm_conffile() { + local PKGNAME="$1" + local CONFFILE="$2" + + [ -e "$CONFFILE" ] || return 0 + + local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" + local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ + sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "0.55-0ubuntu2"; then + rm_conffile connman "/etc/default/connman" + fi +esac + +#DEBHELPER# + +exit 0 --- connman-0.76.orig/debian/source_connman.py +++ connman-0.76/debian/source_connman.py @@ -0,0 +1,29 @@ +'''Apport package hook for ConnMan + +(c) 2010 Canonical Ltd. +Contributors: +Kalle Valo + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +import apport.hookutils + +def add_info(report, ui): + apport.hookutils.attach_network(report) + apport.hookutils.attach_wifi(report) + apport.hookutils.attach_hardware(report) + if not apport.packaging.is_distro_package(report['Package'].split()[0]): + report['ThirdParty'] = 'True' + report['CrashDB'] = 'connman' + +if __name__ == '__main__': + report = {} + report['CrashDB'] = 'ubuntu' + add_info(report, None) + for key in report: + print '%s: %s' % (key, report[key].split('\n', 1)[0]) --- connman-0.76.orig/debian/connman-crashdb.conf +++ connman-0.76/debian/connman-crashdb.conf @@ -0,0 +1,5 @@ +connman = { + 'impl' : 'launchpad', + 'project' : 'connman', + 'bug_pattern_base' : None, + } --- connman-0.76.orig/debian/changelog +++ connman-0.76/debian/changelog @@ -0,0 +1,415 @@ +connman (0.76-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * debian/patches/0001-dhcp-don-t-set-hostname.patch: refreshed. + * debian/patches/04-wifi-add-a-disconnected-timer.patch: refreshed. + * debian/patches/10-fix-dhcp-renewal-disconnect.patch: dropped, it no longer + applies and appears to be covered by the upstream DHCP overhaul. + * debian/patches/11-dnsproxy-do-not-add-null-domains.patch: dropped, applied + upstream. + + -- Mathieu Trudel-Lapierre Wed, 03 Aug 2011 09:59:22 -0400 + +connman (0.69-0ubuntu2) natty; urgency=low + + * debian/rules: Remove unsupported configured switches --enable-dhclient + and --enable-udev. + * 11-dnsproxy-do-not-add-null-domains.patch: add to fix a crash with + domain handling. (LP: #734339) + * 04-wifi-add-a-disconnected-timer.patch: fix for a case if network is + null. (LP: #733458) + * debian/rules: enable nmcompat plugin so that applications can receive + network state signals. (LP: #586033) + + -- Kalle Valo Wed, 16 Mar 2011 10:53:33 +0200 + +connman (0.69-0ubuntu1) natty; urgency=low + + * New upstream release. + - dhcpd.conf domain-name not transmitted to /etc/resolv.conf (LP: #604581) + - provide NM compatiblity code for applications which request network + status (LP: #586033) + * debian/control: explicitly Conflict with network-manager. (LP: #659460) + * debian/rules: enable udev and the builtin dhclient during build. + * debian/patches/04-wifi-add-a-disconnected-timer.patch: refreshed. + * debian/patches/09-disable-wifi-legacy.patch: dropped. + * debian/control: drop dhcp3-client Build-Depends, it's no longer required. + * debian/patches/10-fix-dhcp-renewal-disconnect.patch: avoid disconnections + caused by calling dhcp_bound() when DHCP renewal results in no IP change. + (LP: #713146) + * debian/control: Recommend indicator-network for UI. (LP: #704867) + * debian/manpages/connmand.8: update to add BUGS section and fix AUTHORS + (LP: #587779) + * debian/control: Remove binary Depends on dhcp3-client for connman. + + -- Mathieu Trudel-Lapierre Tue, 15 Feb 2011 23:43:45 -0600 + +connman (0.64-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/patches/0001-dhcp-don-t-set-hostname.patch: update patch so that it + applies cleanly on this new release. + * debian/connman.install: don't install dhclient.conf and script, it's no + longer necessary (dhcp client support is builtin). + * debian/rules: don't pass --enable-udev, --enable-dhclient to configure + anymore, those are not required anymore (and builtin). + * debian/rules: now install upstream ChangeLog. + * debian/patches/01-add-more-debug-messages.patch: add more debug messages + to track supplicant state changes. Thanks to Kalle Valo for the patch. + * debian/patches/04-wifi-add-a-disconnected-timer.patch: implement a simple + inhibition timer to ensure we don't spam with "disconnected" messages on + large, multiple-AP networks. Thanks to Kalle Valo for the patch. + * debian/patches/05-wifi-don-t-set-associating-sta.patch: don't go + mentioning we're associating is by the time we get the event and are ready + to notify the user about it, the supplicant's state has already changed to + connected. Thanks to Kalle Valo for the patch. + * debian/patches/08-remove-internal-backtrace-hand.patch: remove crash signal + handler so that crashes can instead be caught by apport. Thanks Kalle Valo. + * debian/control: add iptables-dev to Build-Depends for xtables. + * debian/patches/09-disable-wifi-legacy.patch: force the usage of the new wifi + codepaths + + [ Ken VanDine ] + * debian/control + - Dropped Vcs-Bzr and Vcs-Browser, we'll maintain this as a source package + branch + + -- Mathieu Trudel-Lapierre Tue, 30 Nov 2010 15:56:50 -0500 + +connman (0.55-0ubuntu3) maverick; urgency=low + + [ Kalle Valo ] + * Compile all plugins builtin. Otherwise we don't get debug messages from + plugins (LP: #628135) + - update debian/rules + - update debian/connman.install + * Connman should use upstart (LP: #600499) + - remove debian/connman.default + - update debian/connman.install + - add debian/connman.presinst + - add debian/connman.upstart + - update debian/rules + * Add Apport support (LP: #600498) + - update debian/connman.install + - add debian/source_connman.py + - add debian/connman-crashdb.conf + + [ Chris Coulson ] + * Fix script-in-etc-init.d-not-registered-via-update-rc.d warning + triggered by shipping the symlink to the upstart job + - add debian/connman.lintian-overrides + + -- Kalle Valo Thu, 02 Sep 2010 16:50:03 +0100 + +connman (0.55-0ubuntu2) maverick; urgency=low + + * Fix DEB_DH_INSTALLINIT_ARGS arguments. Thanks to Kalle Valo for + the fix (LP: #614035) + - update debian/rules + + -- Chris Coulson Fri, 06 Aug 2010 10:23:30 +0100 + +connman (0.55-0ubuntu1) maverick; urgency=low + + [ Kalle Valo ] + * New upstream release 0.55. + * Use .tar.gz created by upstream which doesn't include rfc files. Now + +dfsg can be removed as there are no copyright issues anymore. + * Check if bootstrap is available and run it only then. + * Update watch file to use kernel.org connman directory. + * Drop debian/patches/02-set-default-interface-if-no-ga.patch - merged + upstream + + [ Chris Coulson ] + * Make get-orig-source target fetch the tarball from kernel.org for + non-GIT and non-DFSG versions + - update debian/rules + * Fix typo in arguments passed to dh_installinit - "--only-scripts" + should be "--onlyscripts". With this, we can drop the explicit + update-rc.d calls in the maintainer scripts + - update debian/rules + - update debian/connman.postinst + - remove debian/connman.postrm + - remove debian/connman.prerm + * Drop comment in debian/README.source about doc/*.txt, as we're not + removing those now + * Bump Standards-Version to 3.9.1, no other changes required + - update debian/control + * Remove doc/gtk-doc.make in clean target to avoid a Lintian warning + when building the source + - update debian/rules + + -- Kalle Valo Wed, 04 Aug 2010 17:22:28 +0300 + +connman (0.54+dfsg-0ubuntu1) maverick; urgency=low + + * New upstream version + * debian/patches/0001-dhcp-don-t-set-hostname.patch: + - change by Kalle Valo to not set dhcp hostname (lp: #586794) + + [ Mathieu Trudel ] + * update get-orig-source/GET_SOURCE code snippets to deal with dfsg, + as well as alternate branches. + - update debian/rules + + [ Chris Coulson ] + * Add patch from Kalle Valo to set default interface if no gateway is found + - add debian/patches/02-set-default-interface-if-no-ga.patch + - update debian/patches/series + * Build with --enable-ofono and drop --enable-hso + - update debian/rules + + -- Sebastien Bacher Mon, 28 Jun 2010 17:52:05 +0200 + +connman (0.53+dfsg-0ubuntu1) maverick; urgency=low + + * New upstream release 0.53 + + -- Chris Coulson Wed, 26 May 2010 10:55:04 +0100 + +connman (0.52+dfsg-0ubuntu1) maverick; urgency=low + + * New upstream release 0.52 + + -- Chris Coulson Thu, 20 May 2010 15:35:24 +0100 + +connman (0.48+dfsg-2) unstable; urgency=low + + * Ubuntu/Debian sync upload + * Re-add missing changes from 0.45+dfsg that made it only in Ubuntu: + - ship development parts in a connman-dev package (Closes: 546616) + - add debian/connman-dev.install + - update debian/control + * Update long descriptions for connman and connman-dev + - update debian/control + * Add missing Depends on libglib2.0-dev, libdbus-1-dev for connman-dev + - update debian/control + * Don't run bootstrap twice during build. + - update debian/rules + * Remove old configure option: enable-ppp, with-pppd, enable-novatel, + enable-huawei and enable-modemmgr are no longer recognized. + - update debian/rules + + -- Mathieu Trudel Fri, 12 Feb 2010 10:08:03 -0500 + +connman (0.48+dfsg-1) unstable; urgency=low + + * New upstream release 0.48 + * Drop PolicyKit support for now (Closes: #549497) + - update debian/connman.install + - update debian/control + - update debian/rules + * Exclude /usr/lib/connman from being handled by dh_makeshlibs. + - update debian/rules + * Add Depends for libdbus-1-dev and libglib2.0-dev. + - update debian/control + * Clean connman.install to remove inexistant files. + - update debian/connman.install + * Add new uploader: Mathieu Trudel + - update debian/control + * Bump debhelper b-dep to 7, add missing compat file. + - update debian/control + - add debian/compat + * Bump Standards-Version to 3.8.4 + - update debian/control + * Remove duplicate Section: net from binary package entry. + - update debian/control + * Update LSB headers patch to follow DEP-3 guidelines. + - update debian/patches/01-init-script-lsb-headers.patch + * Add debian/watch + * Silence update-rc.d in postinst and postrm scripts. + - update debian/connman.postinst + - update debian/connman.postrm + * Add manpage for connmand + - add debian/manpages/connmand.8 + - add debian/connman.manpages + + -- Mathieu Trudel Wed, 03 Feb 2010 22:54:32 -0500 + +connman (0.45+dfsg-0ubuntu1) lucid; urgency=low + + * new upstream release 0.45 + + * ship development parts in a connman-dev package (Closes: 546616) + - add debian/connman-dev.install + - update debian/control + + -- Alexander Sack Wed, 13 Jan 2010 06:32:31 +0100 + +connman (0.42+dfsg-1) unstable; urgency=low + + * new upstream release 0.42 with FFe (LP: #444172) + + [ Alexander Sack ] + * LP: #402998 - homepage used in package is outdated; updated to + http://www.connman.net + - update debian/control + * LP: #402999 - add Vcs-Browser to debian/control and change Vcs-Bzr + to read/write location + - update debian/control + * LP: #400576 - Please use compatible mode to provide NetworkManager + dbus interface; ship a /etc/default/connman which enables NM + compatibility mode; also include example how to enable debugging + - add debian/connman.default + * explicitly install init script + - debian/connnman.install + * set --only-scripts parameter for dh_installinit (cdbs) + - update debian/rules + + [ Mathieu Trudel ] + * bump Standards-Version to 3.8.3 + - update debian/control + * add GIT_BRANCH, GIT_BRANCH_NAME, DEB_MAJOR_VERSION to support daily builds + - update debian/rules + * Add update-local-branch code to work with local git copies + - update debian/rules + * Revise get-orig-source code, add get-current-source and GET_SOURCE snippets + - update debian/rules + * Handle dfsg special case, add MAKE_DFSG_COMPLIANT snippet + - update debian/rules + * Add pre-build, clean targets + - update debian/rules + * Patch init script to add LSB headers (Closes: #543869) + - add debian/patches/01-init-script-lsb-headers.patch + - update debian/patches/series + + -- Alexander Sack Sat, 31 Oct 2009 13:59:48 +0100 + +connman (0.42+dfsg-0ubuntu1) karmic; urgency=low + + * new upstream release 0.42 with FFe (LP: #444172) + + [ Alexander Sack ] + * LP: #402998 - homepage used in package is outdated; updated to + http://www.connman.net + - update debian/control + * LP: #402999 - add Vcs-Browser to debian/control and change Vcs-Bzr + to read/write location + - update debian/control + * LP: #400576 - Please use compatible mode to provide NetworkManager + dbus interface; ship a /etc/default/connman which enables NM + compatibility mode; also include example how to enable debugging + - add debian/connman.default + * explicitly install init script + - debian/connnman.install + * set --only-scripts parameter for dh_installinit (cdbs) + - update debian/rules + + [ Mathieu Trudel ] + * bump Standards-Version to 3.8.3 + - update debian/control + * add GIT_BRANCH, GIT_BRANCH_NAME, DEB_MAJOR_VERSION to support daily builds + - update debian/rules + * Add update-local-branch code to work with local git copies + - update debian/rules + * Revise get-orig-source code, add get-current-source and GET_SOURCE snippets + - update debian/rules + * Handle dfsg special case, add MAKE_DFSG_COMPLIANT snippet + - update debian/rules + * Add pre-build, clean targets + - update debian/rules + * Patch init script to add LSB headers (Closes: #543869) + - add debian/patches/01-init-script-lsb-headers.patch + - update debian/patches/series + + -- Mathieu Trudel Wed, 14 Oct 2009 23:59:04 +0200 + +connman (0.30+git.1.5b69740e1+dfsg-1) unstable; urgency=low + + * Upstream snapshot for debian: 0.30+git.1.5b69740e1 (Closes: #475022) + * addresses ftp-master review concerns; see: 0.19+dfsg-1 + * setup debian packaging branch: + - https://code.launchpad.net/~asac/connman/connman.debian.unstable + - adjust Vcs-Bzr: in debian/control accordingly + * debian/rules: make get-orig-source aware of +dfsg suffix + + -- Alexander Sack Wed, 22 Jul 2009 10:41:55 +0200 + +connman (0.30+git.1.5b69740e1+dfsg-0ubuntu1) karmic; urgency=low + + * new upstream snapshot 0.30 + 5b69740e1 + * debian/rules: make get-orig-source aware of +dfsg suffix + + -- Alexander Sack Wed, 22 Jul 2009 10:37:21 +0200 + +connman (0.23+git.1.e08a09987-0ubuntu1) karmic; urgency=low + + * new upstream release 0.23 + git snapshot + * fix broken build dependency: gtk-doc-tools + - update debian/control + + -- Tony Espy Tue, 14 Jul 2009 21:23:02 -0400 + +connman (0.19+dfsg-1) unstable; urgency=low + + * new copyright format; properly document docs + - update debian/copyright + * remove dfsg non-free files on tarball production + - update debian/rules + * document source information (e.g. files removed due to dfsg non-freeness) + - add debian/README.source + + -- Alexander Sack Mon, 08 Jun 2009 14:15:01 +0200 + +connman (0.19-0ubuntu1) karmic; urgency=low + + * new upstream release 0.19 + + -- Tony Espy Mon, 25 May 2009 12:18:32 +0200 + +connman (0.17-0ubuntu1) karmic; urgency=low + + * new upstream release 0.17 + * fix get-orig-source target to create tarball in topsrcdir + - update debian/rules + + -- Alexander Sack Mon, 25 May 2009 12:13:33 +0200 + +connman (0.15+git.1.864cd602c-0ubuntu1) karmic; urgency=low + + * new upstream snapshot 0.15 + git 864cd602c + * drop upstreamed patches + - delete debian/patches/fix_dhclient_configure_typo.patch + - delete debian/patches/fix_ubuntu_init_script.patch + - update debian/patches/series + * enable more plugins: modemmgr and ethernet + - update debian/rules + * make debian/rules in bzr executable + - update debian/rules + * add get-orig-source target that parses changelog to guess git commit + id or tag + - update debian/rules + + -- Alexander Sack Thu, 14 May 2009 18:47:17 +0200 + +connman (0.10+git20090203t223225-1) unstable; urgency=low + + * Initial upload to Debian - Closes: #475022 + * debian/control: add Vcs-Bzr info pointing to + + https://code.launchpad.net/~asac/connman/connman.ubuntu.head + + -- Alexander Sack Fri, 03 Apr 2009 14:02:57 +0200 + +connman (0.10+git20090203t223225-0ubuntu3) jaunty; urgency=low + + * debian/connman.postinst: making update-notifier optional, as + otherwise we would need a dependency on it (LP: #332217) + + -- bojo42 Fri, 20 Feb 2009 17:22:28 +0100 + +connman (0.10+git20090203t223225-0ubuntu2) jaunty; urgency=low + + * debian/patches/fix_ubuntu_init_script.patch: pass --make-pidfile to + start-stop-daemon invokation as connman doesnt create its own PIDFILE + * debian/patches/series: new series file + * debian/copyright: fix copyright/licensing details + * debian/control: fix Section: net + + -- Alexander Sack Tue, 17 Feb 2009 20:41:25 +0100 + +connman (0.10+git20090203t223225-0ubuntu1) jaunty; urgency=low + + * Initial release of upstream 0.10 + git snapshot + Tue Feb 3 23:32:25 2009 +0100 + + -- Alexander Sack Tue, 17 Feb 2009 11:58:09 +0100 --- connman-0.76.orig/debian/control +++ connman-0.76/debian/control @@ -0,0 +1,55 @@ +Source: connman +Section: net +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Alexander Sack +Uploaders: Alexander Sack , Mathieu Trudel +Homepage: http://www.connman.net +Build-Depends: cdbs, + debhelper (>= 7), + dpkg-dev (>= 1.13.19), + quilt, + libudev-dev, + ppp-dev, + libglib2.0-dev, + libdbus-1-dev, + iptables-dev, + gtk-doc-tools +Standards-Version: 3.9.1 + +Package: connman +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: network-manager +Recommends: indicator-network +Description: Intel Connection Manager daemon + The Linux Connection Manager project provides a daemon for managing + Internet connections within embedded devices running the Linux + operating system. The Connection Manager is designed to be slim and to + use as few resources as possible, so it can be easily integrated in + other Moblin-based embedded systems. It is fully modular system that + can be extended through plug-ins, to support all kinds of wired or + wireless technologies. Also, configuration methods like DHCP and + domain name resolving are implemented using plug-ins. The plug-in + approach allows for easy adaption and modification for various use cases. + . + This package contains the connman daemon and its plugins. + +Package: connman-dev +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev, libdbus-1-dev +Description: Development files for connman + The Linux Connection Manager project provides a daemon for managing + Internet connections within embedded devices running the Linux + operating system. The Connection Manager is designed to be slim and to + use as few resources as possible, so it can be easily integrated in + other Moblin-based embedded systems. It is fully modular system that + can be extended through plug-ins, to support all kinds of wired or + wireless technologies. Also, configuration methods like DHCP and + domain name resolving are implemented using plug-ins. The plug-in + approach allows for easy adaption and modification for various use cases. + . + This package contains headers, pkg-config support mainly useful for + developing connman plugins. + --- connman-0.76.orig/debian/rules +++ connman-0.76/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f + +GIT_URL := git://git.kernel.org/pub/scm/network/connman/connman.git +GIT_BRANCH := "master" +GIT_BRANCH_NAME := connman + +DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //') +DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //') +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') +DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//') + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DESTDIR = $(CURDIR)/debian/tmp/ + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --enable-ethernet=builtin \ + --enable-loopback=builtin \ + --enable-pie \ + --enable-wifi=builtin \ + --enable-ofono=builtin \ + --enable-bluetooth=builtin \ + --enable-nmcompat=builtin \ + --disable-polkit \ + --enable-client \ + $(NULL) + +DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/connman/ +DEB_INSTALL_CHANGELOGS_ALL := ChangeLog + +ifneq (,$(LOCAL_BRANCH)) +LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) +endif + +MAKE_DFSG_COMPLIANT = \ + echo "remove dfsg non-free files ..."; \ + rm -f doc/*.txt; + +GET_SOURCE = \ + set -e; \ + tmpdir=`mktemp -d -t`; \ + cd $$tmpdir; \ + echo "cloning upstream repository ..."; \ + git clone -b $(GIT_BRANCH) $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \ + echo "getting specific upstream revision/tag: $(1)"; \ + cd `ls | head -n 1`; git checkout -b orig $(1); \ + commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //' | sed -e 's/\.\.\.$$//'`; \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \ + version_suffix=`echo $(DEB_UPSTREAM_VERSION) | sed -e 's/.*git\(\(\.\?[a-z0-9]*\)*\)\([+~.].*\)/\3/'`; \ + if echo $(1) | grep -q -c "orig" || echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id$$version_suffix; \ + else \ + upstream_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + if echo $$version_suffix | grep -q -c 'dfsg'; \ + then \ + $(call MAKE_DFSG_COMPLIANT) \ + fi; \ + cd ..; tar --exclude=.git -czf $(CURDIR)/$(DEB_SOURCE)_$$upstream_version.orig.tar.gz `ls | head -n 1`; \ + cd $(CURDIR); rm -rf $$tmpdir; + +clean:: + rm -rf doc/gtk-doc.make + @echo "cleaning up autotools caches (autom4te.cache) ..."; + rm -rf autom4te.cache; + +pre-build:: bootstrap-stamp + +bootstrap-stamp: + @echo "gtkdocize ..."; + gtkdocize --copy --docdir doc; + if [ -x bootstrap ]; then \ + @echo "autotools bootstrapping ..."; \ + ./bootstrap; \ + fi + touch $@ + +get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch) + set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + else \ + git_version=`echo $(DEB_UPSTREAM_VERSION) | sed -e 's/+dfsg$$//'`; \ + fi; \ + $(call GET_SOURCE, $$git_version, "current") + +get-orig-source:: $(if $(LOCAL_BRANCH),update-local-branch) + if echo $(DEB_VERSION) | grep -q -c "git" || echo $(DEB_VERSION) | grep -q -c "dfsg" ; then \ + $(call GET_SOURCE, $(GIT_BRANCH), "orig") \ + else \ + wget -nv -O ../$(DEB_SOURCE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz http://www.kernel.org/pub/linux/network/connman/connman-$(DEB_UPSTREAM_VERSION).tar.gz ; \ + fi + +update-local-branch:: + @echo "updating local branch ($(LOCAL_BRANCH))" + @set -e; if ! test -d $(LOCAL_BRANCH); then mkdir -p $(LOCAL_BRANCH); fi + @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); if ! `git branch | grep -q -c "$(GIT_BRANCH)"`; then git branch $(GIT_BRANCH) remotes/origin/$(GIT_BRANCH); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git pull -f + @echo "updated local branch ($(LOCAL_BRANCH))" + +get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch) + @set -e; \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)+dfsg-.*$$/\2/g'`; \ + cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc $$git_version | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y-%m-%d %H:%M:%S (GMT)"`; \ + git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n"; --- connman-0.76.orig/debian/connman.install +++ connman-0.76/debian/connman.install @@ -0,0 +1,4 @@ +debian/tmp/etc/ +debian/tmp/usr/sbin/ +debian/source_connman.py /usr/share/apport/package-hooks/ +debian/connman-crashdb.conf /etc/apport/crashdb.conf.d/ --- connman-0.76.orig/debian/README.source +++ connman-0.76/debian/README.source @@ -0,0 +1,10 @@ + +Preferred way for producing orig.tar.gz is to use the debian/rules +get-orig-source rule. It will automatically guess the right git +commitid or tag; also it will automatically remove dfsg non-free files +from the tarball. + +Currently removed files due to dfsg non-freeness are: + + doc/rfc*txt (rfc files are non-free) + + -- Alexander Sack Mon, 8 Jun 2009 13:53:00 +0200 --- connman-0.76.orig/debian/connman.manpages +++ connman-0.76/debian/connman.manpages @@ -0,0 +1 @@ +debian/manpages/connmand.8 --- connman-0.76.orig/debian/connman.postinst +++ connman-0.76/debian/connman.postinst @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + if [ -x /usr/share/update-notifier/notify-reboot-required ]; then + /usr/share/update-notifier/notify-reboot-required + fi + ;; +esac + +#DEBHELPER# + +exit 0 --- connman-0.76.orig/debian/connman.lintian-overrides +++ connman-0.76/debian/connman.lintian-overrides @@ -0,0 +1 @@ +connman: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/connman --- connman-0.76.orig/debian/connman-dev.install +++ connman-0.76/debian/connman-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig/ --- connman-0.76.orig/debian/patches/series +++ connman-0.76/debian/patches/series @@ -0,0 +1,6 @@ +01-init-script-lsb-headers.patch +0001-dhcp-don-t-set-hostname.patch +01-add-more-debug-messages.patch +04-wifi-add-a-disconnected-timer.patch +05-wifi-don-t-set-associating-sta.patch +08-remove-internal-backtrace-hand.patch --- connman-0.76.orig/debian/patches/01-init-script-lsb-headers.patch +++ connman-0.76/debian/patches/01-init-script-lsb-headers.patch @@ -0,0 +1,20 @@ +From: Petter Reinholdtsen +Subject: connman: Missing LSB header in init.d script +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543869 + +--- a/scripts/connman.in ++++ b/scripts/connman.in +@@ -1,4 +1,13 @@ + #!/bin/sh ++### BEGIN INIT INFO ++# Provides: connman ++# Required-Start: $network $remote_fs $syslog ++# Required-Stop: $network $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: ++# Short-Description: Connection Manager ++### END INIT INFO ++ + + DAEMON=@prefix@/sbin/connmand + DESC="Connection Manager" --- connman-0.76.orig/debian/patches/05-wifi-don-t-set-associating-sta.patch +++ connman-0.76/debian/patches/05-wifi-don-t-set-associating-sta.patch @@ -0,0 +1,25 @@ +wifi: don't set associating state when roaming between APs + +From: Kalle Valo + +When wpasupplicant is roaming between APs it exposes all states to connman. +After the wifi network is connected, we should not set associating state +anymore. Otherwise we just end up into weird states. +--- + plugins/wifi.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +Index: head.packaging/plugins/wifi.c +=================================================================== +--- head.packaging.orig/plugins/wifi.c 2010-11-30 08:34:42.000000000 +0200 ++++ head.packaging/plugins/wifi.c 2010-11-30 08:34:50.000000000 +0200 +@@ -395,7 +395,8 @@ + + case G_SUPPLICANT_STATE_AUTHENTICATING: + case G_SUPPLICANT_STATE_ASSOCIATING: +- connman_network_set_associating(network, TRUE); ++ if (!connman_network_get_connected(network)) ++ connman_network_set_associating(network, TRUE); + break; + + case G_SUPPLICANT_STATE_COMPLETED: --- connman-0.76.orig/debian/patches/01-add-more-debug-messages.patch +++ connman-0.76/debian/patches/01-add-more-debug-messages.patch @@ -0,0 +1,63 @@ +Add more debug messages + +From: Kalle Valo + + +--- + plugins/wifi.c | 22 +++++++++++++++++++++- + src/service.c | 2 ++ + 2 files changed, 23 insertions(+), 1 deletions(-) + +Index: head.packaging/plugins/wifi.c +=================================================================== +--- head.packaging.orig/plugins/wifi.c 2010-11-30 08:32:46.000000000 +0200 ++++ head.packaging/plugins/wifi.c 2010-11-30 08:34:26.000000000 +0200 +@@ -291,6 +291,26 @@ + wifi_scan(wifi->device); + } + ++#define MAKE_CASE(c) case (c): return #c ++ ++static const gchar *state2str(GSupplicantState state) ++{ ++ switch (state) { ++ MAKE_CASE(G_SUPPLICANT_STATE_SCANNING); ++ MAKE_CASE(G_SUPPLICANT_STATE_AUTHENTICATING); ++ MAKE_CASE(G_SUPPLICANT_STATE_ASSOCIATING); ++ MAKE_CASE(G_SUPPLICANT_STATE_COMPLETED); ++ MAKE_CASE(G_SUPPLICANT_STATE_DISCONNECTED); ++ MAKE_CASE(G_SUPPLICANT_STATE_INACTIVE); ++ MAKE_CASE(G_SUPPLICANT_STATE_UNKNOWN); ++ MAKE_CASE(G_SUPPLICANT_STATE_ASSOCIATED); ++ MAKE_CASE(G_SUPPLICANT_STATE_4WAY_HANDSHAKE); ++ MAKE_CASE(G_SUPPLICANT_STATE_GROUP_HANDSHAKE); ++ } ++ ++ return "UNKNOWN"; ++} ++ + static void interface_state(GSupplicantInterface *interface) + { + struct connman_network *network; +@@ -302,7 +322,7 @@ + + wifi = g_supplicant_interface_get_data(interface); + +- DBG("wifi %p interface state %d", wifi, state); ++ DBG("wifi %p interface state %s (%d)", wifi, state2str(state), state); + + if (wifi == NULL) + return; +Index: head.packaging/src/service.c +=================================================================== +--- head.packaging.orig/src/service.c 2010-11-30 08:32:46.000000000 +0200 ++++ head.packaging/src/service.c 2010-11-30 08:34:26.000000000 +0200 +@@ -600,6 +600,8 @@ + if (str == NULL) + return; + ++ DBG("new state %s", str); ++ + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "State", + DBUS_TYPE_STRING, &str); --- connman-0.76.orig/debian/patches/04-wifi-add-a-disconnected-timer.patch +++ connman-0.76/debian/patches/04-wifi-add-a-disconnected-timer.patch @@ -0,0 +1,191 @@ +wifi: add a disconnected timer + +From: Kalle Valo + +In a big network, for example at Ubuntu Developer Summit which has >10 APs, +connman and wpasupplicant got out of sync very easily. connman claimed it +was connected even though wpasupplicant (and the kernel driver) was actually +connected to the AP. + +The problem is that while roaming between APs inside ESS wpasupplicant states +go like this: + +COMPLETED -> DISCONNECTED -> SCANNING -> AUTHENTICATING ... -> COMPLETED + +So what happens is that connman unnecessarily marks the network disconnected +even though wpasupplicant is just roaming to a different AP within ESS. + +To fix this add a timer which waits 10 seconds after a disconnected state. +If wpasupplicant hasn't connected to a network at time only then set the +network disconnected. +--- + plugins/wifi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 61 insertions(+), 3 deletions(-) + +Index: connman/plugins/wifi.c +=================================================================== +--- connman.orig/plugins/wifi.c 2011-08-02 19:22:51.507362698 -0400 ++++ connman/plugins/wifi.c 2011-08-02 19:23:27.807360947 -0400 +@@ -71,10 +71,13 @@ + int index; + unsigned flags; + unsigned int watch; ++ guint disconnect_timer; + }; + + static GList *iface_list = NULL; + ++static void stop_disconnected_timer(GSupplicantInterface *interface); ++ + static void handle_tethering(struct wifi_data *wifi) + { + if (wifi->tethering == FALSE) +@@ -485,6 +488,8 @@ + + connman_network_set_associating(network, FALSE); + ++ stop_disconnected_timer(wifi->interface); ++ + if (wifi->disconnecting == TRUE) + return -EALREADY; + +@@ -591,6 +596,75 @@ + return FALSE; + } + ++static gboolean disconnected_timeout(gpointer user_data) ++{ ++ GSupplicantInterface *interface; ++ struct connman_network *network; ++ struct wifi_data *wifi; ++ connman_bool_t wps; ++ ++ DBG(""); ++ ++ interface = user_data; ++ ++ wifi = g_supplicant_interface_get_data(interface); ++ ++ if (wifi == NULL) ++ return FALSE; ++ ++ network = wifi->network; ++ ++ if (network == NULL) ++ return FALSE; ++ ++ /* ++ * If we're in one of the idle modes, we have ++ * not started association yet and thus setting ++ * those ones to FALSE could cancel an association ++ * in progress. ++ */ ++ wps = connman_network_get_bool(network, "WiFi.UseWPS"); ++ if (wps == TRUE) ++ if (is_idle_wps(interface, wifi) == TRUE) ++ return FALSE; ++ ++ if (is_idle(wifi)) ++ return FALSE; ++ ++ connman_network_set_associating(network, FALSE); ++ connman_network_set_connected(network, FALSE); ++ ++ return FALSE; ++} ++ ++static void start_disconnected_timer(GSupplicantInterface *interface) ++{ ++ struct wifi_data *wifi = g_supplicant_interface_get_data(interface); ++ ++ if (wifi == NULL) ++ return; ++ ++ if (wifi->disconnect_timer != 0) ++ return; ++ ++ wifi->disconnect_timer = g_timeout_add(10000, disconnected_timeout, ++ interface); ++} ++ ++static void stop_disconnected_timer(GSupplicantInterface *interface) ++{ ++ struct wifi_data *wifi = g_supplicant_interface_get_data(interface); ++ ++ if (wifi == NULL) ++ return; ++ ++ if (wifi->disconnect_timer == 0) ++ return; ++ ++ g_source_remove(wifi->disconnect_timer); ++ wifi->disconnect_timer = 0; ++} ++ + static connman_bool_t handle_wps_completion(GSupplicantInterface *interface, + struct connman_network *network, + struct connman_device *device, +@@ -650,13 +724,13 @@ + return "UNKNOWN"; + } + ++ + static void interface_state(GSupplicantInterface *interface) + { + struct connman_network *network; + struct connman_device *device; + struct wifi_data *wifi; + GSupplicantState state = g_supplicant_interface_get_state(interface); +- connman_bool_t wps; + + wifi = g_supplicant_interface_get_data(interface); + +@@ -668,8 +742,10 @@ + network = wifi->network; + device = wifi->device; + +- if (device == NULL || network == NULL) ++ if (device == NULL || network == NULL) { ++ stop_disconnected_timer(interface); + return; ++ } + + switch (state) { + case G_SUPPLICANT_STATE_SCANNING: +@@ -679,7 +755,6 @@ + case G_SUPPLICANT_STATE_ASSOCIATING: + connman_network_set_associating(network, TRUE); + break; +- + case G_SUPPLICANT_STATE_COMPLETED: + if (handle_wps_completion(interface, network, device, wifi) == + FALSE) +@@ -688,25 +763,13 @@ + /* reset scan trigger and schedule background scan */ + connman_device_schedule_scan(device); + ++ stop_disconnected_timer(interface); ++ + connman_network_set_connected(network, TRUE); + break; + + case G_SUPPLICANT_STATE_DISCONNECTED: +- /* +- * If we're in one of the idle modes, we have +- * not started association yet and thus setting +- * those ones to FALSE could cancel an association +- * in progress. +- */ +- wps = connman_network_get_bool(network, "WiFi.UseWPS"); +- if (wps == TRUE) +- if (is_idle_wps(interface, wifi) == TRUE) +- break; +- +- if (is_idle(wifi)) +- break; +- connman_network_set_associating(network, FALSE); +- connman_network_set_connected(network, FALSE); ++ start_disconnected_timer(interface); + break; + + case G_SUPPLICANT_STATE_INACTIVE: --- connman-0.76.orig/debian/patches/0001-dhcp-don-t-set-hostname.patch +++ connman-0.76/debian/patches/0001-dhcp-don-t-set-hostname.patch @@ -0,0 +1,27 @@ +> From 8111fd495bc907b0502143c1c0338c4413030cf8 Mon Sep 17 00:00:00 2001 +From: Kalle Valo +Date: Fri, 18 Jun 2010 17:45:31 +0300 +Subject: [PATCH] dhcp: don't set hostname + +More information here: + +https://bugs.launchpad.net/indicator-network/+bug/586794 +--- + src/dhcp.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: connman/src/dhcp.c +=================================================================== +--- connman.orig/src/dhcp.c 2011-08-02 18:30:12.000000000 -0400 ++++ connman/src/dhcp.c 2011-08-02 18:31:05.503721004 -0400 +@@ -243,10 +243,6 @@ + if (option != NULL) + domainname = g_strdup(option->data); + +- option = g_dhcp_client_get_option(dhcp_client, G_DHCP_HOST_NAME); +- if (option != NULL) +- hostname = g_strdup(option->data); +- + option = g_dhcp_client_get_option(dhcp_client, G_DHCP_NTP_SERVER); + if (option != NULL) + timeserver = g_strdup(option->data); --- connman-0.76.orig/debian/patches/08-remove-internal-backtrace-hand.patch +++ connman-0.76/debian/patches/08-remove-internal-backtrace-hand.patch @@ -0,0 +1,82 @@ +Remove internal backtrace handler + +From: Kalle Valo + +The handler prevents creating core files and debugging with gdb, so +remove it for now. Maybe a proper fix would be to add a compile time +switch for the feature? +--- + src/log.c | 47 ----------------------------------------------- + 1 files changed, 0 insertions(+), 47 deletions(-) + +Index: head.packaging/src/log.c +=================================================================== +--- head.packaging.orig/src/log.c 2010-11-30 07:50:02.000000000 +0200 ++++ head.packaging/src/log.c 2010-11-30 08:34:57.000000000 +0200 +@@ -104,49 +104,6 @@ + va_end(ap); + } + +-static void signal_handler(int signo) +-{ +- void *frames[64]; +- char **symbols; +- size_t n_ptrs; +- unsigned int i; +- +- n_ptrs = backtrace(frames, G_N_ELEMENTS(frames)); +- symbols = backtrace_symbols(frames, n_ptrs); +- if (symbols == NULL) { +- connman_error("No backtrace symbols"); +- exit(1); +- } +- +- connman_error("Aborting (signal %d)", signo); +- connman_error("++++++++ backtrace ++++++++"); +- +- for (i = 1; i < n_ptrs; i++) +- connman_error("[%d]: %s", i - 1, symbols[i]); +- +- connman_error("+++++++++++++++++++++++++++"); +- +- g_free(symbols); +- exit(1); +-} +- +-static void signal_setup(sighandler_t handler) +-{ +- struct sigaction sa; +- sigset_t mask; +- +- sigemptyset(&mask); +- sa.sa_handler = handler; +- sa.sa_mask = mask; +- sa.sa_flags = 0; +- sigaction(SIGBUS, &sa, NULL); +- sigaction(SIGILL, &sa, NULL); +- sigaction(SIGFPE, &sa, NULL); +- sigaction(SIGSEGV, &sa, NULL); +- sigaction(SIGABRT, &sa, NULL); +- sigaction(SIGPIPE, &sa, NULL); +-} +- + extern struct connman_debug_desc __start___debug[]; + extern struct connman_debug_desc __stop___debug[]; + +@@ -226,8 +183,6 @@ + if (detach == FALSE) + option |= LOG_PERROR; + +- signal_setup(signal_handler); +- + openlog("connmand", option, LOG_DAEMON); + + syslog(LOG_INFO, "Connection Manager version %s", VERSION); +@@ -241,7 +196,5 @@ + + closelog(); + +- signal_setup(SIG_DFL); +- + g_strfreev(enabled); + } --- connman-0.76.orig/debian/manpages/connmand.8 +++ connman-0.76/debian/manpages/connmand.8 @@ -0,0 +1,60 @@ +.TH connmand 8 "3 February 2010" "" "connmand Manual" + +.SH NAME +connmand \- connection manager + +.SH SYNOPSIS +.B connmand +.RI [ options ] +.br + +.SH DESCRIPTION +This manual page explains the \fBconnmand\fP daemon. \fBconnmand\fP is used to manage internet connections on embedded devices. + +.SH OPTIONS +.IP \fB\-h/\-\-help\fP +Shows help options and usage information. + +.IP \fB\-d/\-\-debug=DEBUG\fP +Specify debug options to enable. + +.IP \fB\-i/\-\-device=DEV\fP +Specify a networking device or interface to manage. + +.IP \fB\-I/\-\-nodevice=DEV\fP +Specify a networking device or interface to ignore. + +.IP \fB\-p/\-\-plugin=NAME\fP +Specify a plugin that should be loaded. + +.IP \fB\-P/\-\-noplugin=NAME\fP +Specify a plugin that should be excluded from loading. + +.IP \fB\-W/\-\-wifi=NAME\fP +Specify a driver to use for WiFi/Supplicant. + +.IP \fB\-n/\-\-nodaemon\fP +Do not fork to background. + +.IP \fB\-c/\-\-compat\fP +Enable compatibility with NetworkManager. + +.IP \fB\-t/\-\-selftest\fP +Run self-testing routines. + +.IP \fB\-v/\-\-version\fP +Show version information and exit. + +.SH BUGS + +ConnMan bugs should be filed against the ConnMan project on the MeeGo bug +tracker, at \fBhttps://bugs.meego.com/\fP. + +.SH AUTHOR + +ConnMan was written by Marcel Holtmann , +Samuel Ortiz , and many others. + +This manual page was written by Mathieu Trudel , +for the Debian and Ubuntu projects (but may be used by others). +