diff options
Diffstat (limited to 'debian')
34 files changed, 1002 insertions, 981 deletions
diff --git a/debian/changelog b/debian/changelog index 52bd7a87..bc870f99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,123 @@ +network-manager (0.7.0-2) UNRELEASED; urgency=low + + * debian/control + - Add ${misc:Depends} to all binary packages. + - Let network-manager depend on dhcp3-client directly, as the dependency + on dhcdbd has been removed. (Closes: #509655) + * debian/rules + - Include debhelper.mk before any other files as recommended by the cdbs + documentation. + + -- Michael Biebl <biebl@debian.org> Tue, 13 Jan 2009 08:10:22 +0100 + +network-manager (0.7.0-1) experimental; urgency=low + + * New upstream release. (Closes: #446098) + - Allow connections before login (system connections). (Closes: #461831) + - Storing system connections via PolicyKit is working. (Closes: #504443) + - The nm-vpn-properties tool has been obsoleted by nm-connection-editor + from the network-manager-gnome package and thus removed from the + tarball. (Closes: #497108) + - Removed dependency on dhcdbd. (Closes: #478469) + - Improved communication between NM and wpasupplicant (over D-Bus) for + faster wireless connections. (Closes: #385647) + + [ Sjoerd Simons ] + * debian/libnm-util0.symbols: Updated + * debian/libnm-glib0.symbols: Updated + * debian/patches/03-F3507g.patch + - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards + * debian/control: Recommend ppp (Closes: #507842) + + [ Michael Biebl ] + * debian/patches/04-ltversioning.patch + - Bump soname of libnm-util due to an ABI break between 0.6.6 and 0.7. + (Closes: #503682) + * Update control, install and symbols file for the new libnm-util library + name (libnm-util0 -> libnm-util1). + * debian/control + - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd + plugin is now shipped by this package. + - Add Breaks (<< 0.7~~) for the network-manager-* packages as the 0.6 + versions of those packages do not work with network-manager 0.7. + * debian/patches/05-dhclient_lease_files.patch + - Change the location of the dhclient lease files to /var/lib/dhcp3. + * debian/network-manager.README.Debian + - Merge README.Debian from Ubuntu which describes the new + managed/unmanaged modes. + * debian/nm-system-settings.conf + - Set default mode to unmanaged. + * debian/copyright + - Revised and updated. libnm-glib and libnm-util are licensed under the + LGPL v2 or later. + + -- Michael Biebl <biebl@debian.org> Tue, 16 Dec 2008 09:56:14 +0100 + +network-manager (0.7.0~svn4191-1) experimental; urgency=low + + * SVN snapshot of the upcoming 0.7 release. + + [ Sjoerd Simons ] + * Split out libnm-glib-vpn from libnm-glib + * debian/rules: Use list-missing + + [ Michael Biebl ] + * Drop obsolete patches + - debian/patches/01-supplicant_timeout.patch (obsolete) + - debian/patches/05-debian_backend.patch (obsolete, relevant changes + merged upstream) + - debian/patches/06-dispatch_more_events.patch (no longer applies) + - debian/patches/07-domain_search.patch (merged upstream) + - debian/patches/08-hal_deprecated_keys.patch( merged upstream) + - debian/patches/13-validate_mac_addr.patch (merged upstream) + * debian/patches/02-dbus_access_network_manager.patch + - Updated for 0.7. + * debian/control: + - Add Build-Depends on uuid-dev, libgnutls-dev, libpolkit-dbus-dev, + ppp-dev and quilt. + - Drop Build-Depends on libgnome-keyring-dev, libgnomeui-dev, + libglade2-dev, libgconf2-dev, libnotify-dev, docbook-to-man and iproute. + - Bump Build-Depends on libdbus-glib-1-dev to (>= 0.75). + - Drop Depends on dhcdbd (dhcdbd is dead) and iproute. + - Bump Depends on lsb-base to (>= 3.2-14) which provides status_of_proc(). + - Bump Depends on dbus to (>= 1.1.2) for system bus activation support. + - Add Recommends on policykit, which is required if you want to manage + system connections. + - Add Suggests avahi-autoipd for IPv4LL support. + * Switch to quilt patch management system. + * debian/rules: + - Set libexecdir to /usr/lib/NetworkManager, so NetworkManager can + automatically find the VPN plugins. + - Add support for resolvconf. + - Enable GnuTLS crypto support. + - Remove nm-vpn-properties bits. + * debian/nm-vpn-properties.sgml: Dropped, obsolete + * debian/copyright: Revised and updated + * debian/network-manager.postrm: Relevant code moved to preinst + * debian/network-manager.preinst: + - Stop old network-manager-dispatcher on upgrades and remove the init + script and the start symlinks. + * debian/network-manager.network-manager-dispatcher.init: + - Dropped, obsolete. (Closes: #500085) + The dispatcher functionality is now provided by a D-Bus activated system + service which is started on demand. + * debian/network-manager.init + - Remove dhdbd from Required-Start and Required-Stop in the LSB header. + - Remove check for /sbin/ip. + - Add "status" action. + * debian/*.install: Updated + * debian/*.symbols: + - Add symbols files for all libraries for improved shlibs handling. + * debian/nm-system-settings.conf: + - Ship a default configuration for the system settings service. Enable the + ifupdown (legacy ro support) and keyfile (rw) plugin. + + [ Sjoerd Simons ] + * Update the various symbols files + * Update to current svn + + -- Sjoerd Simons <sjoerd@debian.org> Sat, 18 Oct 2008 21:28:05 +0100 + network-manager (0.6.6-3) unstable; urgency=low * debian/network-manager.network-manager-dispatcher.init diff --git a/debian/control b/debian/control index 54ce327f..573414c9 100644 --- a/debian/control +++ b/debian/control @@ -3,18 +3,23 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> Uploaders: Riccardo Setti <giskard@debian.org>, Michael Biebl <biebl@debian.org> -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0~pre8), libnotify-dev (>= 0.3), docbook-to-man, iproute -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config, + intltool, quilt, libdbus-glib-1-dev (>= 0.75), libiw-dev(>= 27+28pre9), + libglib2.0-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0~pre8), ppp-dev, + libpolkit-dbus-dev, libgnutls-dev, uuid-dev +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, dhcdbd (>=1.12-2), lsb-base (>= 3.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.7.1), ifupdown, adduser -Recommends: network-manager-gnome | network-manager-kde -Conflicts: network-manager-gnome (<< 0.6.5-1) -Replaces: network-manager-gnome (<< 0.6.5-1) +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser, dhcp3-client +Recommends: network-manager-gnome | network-manager-kde, policykit, ppp +Suggests: avahi-autoipd +Conflicts: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~) +Replaces: network-manager-gnome (<< 0.6.5-1), network-manager-pptp (<< 0.7~~) +Breaks: network-manager-gnome (<< 0.7~~), network-manager-kde (<< 1:0.7~~), network-manager-openvpn (<< 0.7~~), network-manager-vpnc (<< 0.7~~), network-manager-pptp (<< 0.7~~) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -28,6 +33,7 @@ Description: network management framework daemon Package: network-manager-dev Architecture: any Section: devel +Depends: ${misc:Depends} Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. @@ -35,7 +41,7 @@ Description: network management framework (development files) Package: libnm-glib0 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: network management framework (GLib shared library) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -50,7 +56,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${binary:Version}), libglib2.0-dev +Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) Description: network management framework (GLib interface) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -62,10 +68,40 @@ Description: network management framework (GLib interface) This package provides the interface that applications can use to query connection status via NetworkManager. -Package: libnm-util0 +Package: libnm-glib-vpn0 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: network management framework (GLib VPN shared library) + NetworkManager attempts to keep an active network connection available at all + times. It is intended only for the desktop use-case, and is not intended for + usage on servers. The point of NetworkManager is to make networking + configuration and setup as painless and automatic as possible. If using DHCP, + NetworkManager is _intended_ to replace default routes, obtain IP addresses + from a DHCP server, and change nameservers whenever it sees fit. + . + This package provides the shared library that applications can use for + creating VPN connections via NetworkManager. + +Package: libnm-glib-vpn-dev +Section: libdevel +Architecture: any +Depends: libnm-glib-vpn0 (= ${binary:Version}), ${misc:Depends}, libnm-glib-dev +Description: network management framework (GLib interface) + NetworkManager attempts to keep an active network connection available at all + times. It is intended only for the desktop use-case, and is not intended for + usage on servers. The point of NetworkManager is to make networking + configuration and setup as painless and automatic as possible. If using DHCP, + NetworkManager is _intended_ to replace default routes, obtain IP addresses + from a DHCP server, and change nameservers whenever it sees fit. + . + This package provides the shared library that applications can use for + creating VPN connections via NetworkManager. + +Package: libnm-util1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} Description: network management framework (shared library) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -80,7 +116,7 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util0 (= ${binary:Version}), libdbus-1-dev +Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev Description: network management framework (development files) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/copyright b/debian/copyright index 8813c529..681bb9b2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,91 +3,85 @@ Sun, 3 Oct 2004 11:54:56 +0100. It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager -src/autoip.c, src/autoip.h are copyright of Arthur van Hoff (avh@strangeberry.com) -and are released under the terms of the GNU Lesser General Public + +All files if not specified otherwise are licensed under the following terms: + +Copyright: + + Copyright (C) 2006 - 2008 Red Hat, Inc. + Copyright (C) 2006 - 2008 Novell, Inc. + +License: + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + + +gfilemonitor/*.[ch]: + +Copyright: + + Copyright (C) 2007 John McCutchan + Copyright (C) 2006 - 2008 Red Hat, Inc. License: - This package is free software; you can redistribute it and/or + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This package is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with this package; if not, write to the Free Software + You should have received a copy of the GNU Lesser General Public License + along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -libnm-util/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb. -This code is in the public domain; do with it what you wish. +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. -src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, <david@fubar.dk> and -Novell, Inc. and it's released under the terms of the GNU General Public License. -(see below). -src/nm-netlink-monitor.h is copyright of Ray Strode and it's released under the terms of the -GNU General Public License. (see below) -src/backends/interface_parser.c, is copyright of Tom Parker <palfrey@tevp.net> -and it's released under the terms of the GNU General Public License. (see below). +libnm-util/*.[ch], libnm-glib/*.[ch]: -src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett <mjg59@srcf.ucam.org> -and it's released under the terms of the GNU General Public License. (see below) +Copyright: -src/backends/NetworkManagerGentoo.c is copyright of Dan Williams <dcbw@redhat.com>, -Dan Willemsen <dan@willemsen.us>, Robert Paskowitz and it's released under the terms -of the GNU General Public License. (see below). - -src/backends/NetworkManagerSlackware.c, is copyright of -Narayan Newton <narayan_newton@yahoo.com> and it's released under the terms of -the GNU General Public License. (see below). - -src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams <dcbw@redhat.com>, -Kay Sievers <kay.sievers@suse.de>, Robert Love <rml@novell.com> and it's released -under the terms of the GNU General Public License. (see below). - -src/backends/shvar.c, shvar.h, are copyright of Red Hat Inc and are released under the terms -of the GNU General Public License. (see below). - -src/named-manager/nm-named-manager.c, nm-named-manager.h, are copyright of -Colin Walters <walters@redhat.com> and are released under the terms -of the GNU General Public License. (see below). - -utils/nm-utils.c, nm-utils.h are copyright of Ray Strode <rstrode@redhat.com> and -are released under the terms of the GNU General Public License. (see below). - -initscript/Debian/NetworkManager is copyright of <j@bootlab.org>, -Mark Roach <mrroach@okmaybe.com>, Thom May <thom@debian.org> - -gnome/nm-vpn-properties.c, nm-vpn-properties.h are copyright of -David Zeuthen, <davidz@redhat.com> and are licensed to you -under your choice of the Academic Free License version 2.0, or the -GNU General Public License version 2. (see below) - -The rest of the source (what it's not mentioned here) -is copyright of Dan Williams <dcbw@redhat.com> and it's released under -the terms of the GNU General Public License. + Copyright (C) 2005 - 2008 Red Hat, Inc. + Copyright (C) 2005 - 2008 Novell, Inc. License: - This package 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. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. + You should have received a copy of the GNU Lesser General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index 624f7a5a..ddf3366a 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -1,4 +1,13 @@ debian/tmp/usr/lib/pkgconfig/libnm_glib.pc -debian/tmp/usr/lib/libnm_glib*.a -debian/tmp/usr/lib/libnm_glib*.so -debian/tmp/usr/include/NetworkManager/libnm_glib.h +debian/tmp/usr/lib/libnm_glib.a +debian/tmp/usr/lib/libnm_glib.so +debian/tmp/usr/include/libnm-glib/libnm_glib.h +debian/tmp/usr/include/libnm-glib/nm-object.h +debian/tmp/usr/include/libnm-glib/nm-client.h +debian/tmp/usr/include/libnm-glib/nm*device* +debian/tmp/usr/include/libnm-glib/nm-access-point.h +debian/tmp/usr/include/libnm-glib/nm-ip4-config.h +debian/tmp/usr/include/libnm-glib/nm-dhcp4-config.h +debian/tmp/usr/include/libnm-glib/nm*settings*.h +debian/tmp/usr/include/libnm-glib/nm*connection.h +debian/tmp/usr/include/libnm-glib/nm-types.h diff --git a/debian/libnm-glib-vpn-dev.install b/debian/libnm-glib-vpn-dev.install new file mode 100644 index 00000000..22d858b9 --- /dev/null +++ b/debian/libnm-glib-vpn-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/pkgconfig/libnm_glib_vpn.pc +debian/tmp/usr/lib/libnm_glib_vpn.a +debian/tmp/usr/lib/libnm_glib_vpn.so +debian/tmp/usr/include/libnm-glib/nm-vpn-plugin* diff --git a/debian/libnm-glib-vpn0.install b/debian/libnm-glib-vpn0.install new file mode 100644 index 00000000..ff687642 --- /dev/null +++ b/debian/libnm-glib-vpn0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm_glib_vpn.so.* diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols new file mode 100644 index 00000000..0fd8a139 --- /dev/null +++ b/debian/libnm-glib-vpn0.symbols @@ -0,0 +1,22 @@ +libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# + nm_vpn_plugin_disconnect@Base 0.7.0 + nm_vpn_plugin_error_get_type@Base 0.7.0 + nm_vpn_plugin_error_quark@Base 0.7.0 + nm_vpn_plugin_failure@Base 0.7.0 + nm_vpn_plugin_get_connection@Base 0.7.0 + nm_vpn_plugin_get_state@Base 0.7.0 + nm_vpn_plugin_get_type@Base 0.7.0 + nm_vpn_plugin_set_ip4_config@Base 0.7.0 + nm_vpn_plugin_set_login_banner@Base 0.7.0 + nm_vpn_plugin_set_state@Base 0.7.0 + nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.0 + nm_vpn_plugin_ui_interface_export@Base 0.7.0 + nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0 + nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0 + nm_vpn_plugin_ui_interface_get_type@Base 0.7.0 + nm_vpn_plugin_ui_interface_import@Base 0.7.0 + nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0 + nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0 + nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0 + nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.0 + nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0 diff --git a/debian/libnm-glib0.install b/debian/libnm-glib0.install index 51ab95e3..58f7295e 100644 --- a/debian/libnm-glib0.install +++ b/debian/libnm-glib0.install @@ -1 +1 @@ -debian/tmp/usr/lib/libnm_glib*.so.* +debian/tmp/usr/lib/libnm_glib.so.* diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols new file mode 100644 index 00000000..aed61ada --- /dev/null +++ b/debian/libnm-glib0.symbols @@ -0,0 +1,116 @@ +libnm_glib.so.0 libnm-glib0 #MINVER# + libnm_glib_get_network_state@Base 0.6.4 + libnm_glib_init@Base 0.6.4 + libnm_glib_register_callback@Base 0.6.4 + libnm_glib_shutdown@Base 0.6.4 + libnm_glib_unregister_callback@Base 0.6.4 + nm_access_point_get_flags@Base 0.7.0 + nm_access_point_get_frequency@Base 0.7.0 + nm_access_point_get_hw_address@Base 0.7.0 + nm_access_point_get_max_bitrate@Base 0.7.0 + nm_access_point_get_mode@Base 0.7.0 + nm_access_point_get_rsn_flags@Base 0.7.0 + nm_access_point_get_ssid@Base 0.7.0 + nm_access_point_get_strength@Base 0.7.0 + nm_access_point_get_type@Base 0.7.0 + nm_access_point_get_wpa_flags@Base 0.7.0 + nm_access_point_new@Base 0.7.0 + nm_active_connection_get_connection@Base 0.7.0 + nm_active_connection_get_default@Base 0.7.0 + nm_active_connection_get_devices@Base 0.7.0 + nm_active_connection_get_scope@Base 0.7.0 + nm_active_connection_get_service_name@Base 0.7.0 + nm_active_connection_get_specific_object@Base 0.7.0 + nm_active_connection_get_state@Base 0.7.0 + nm_active_connection_get_type@Base 0.7.0 + nm_active_connection_new@Base 0.7.0 + nm_cdma_device_get_type@Base 0.7.0 + nm_cdma_device_new@Base 0.7.0 + nm_client_activate_connection@Base 0.7.0 + nm_client_deactivate_connection@Base 0.7.0 + nm_client_get_active_connections@Base 0.7.0 + nm_client_get_device_by_path@Base 0.7.0 + nm_client_get_devices@Base 0.7.0 + nm_client_get_manager_running@Base 0.7.0 + nm_client_get_state@Base 0.7.0 + nm_client_get_type@Base 0.7.0 + nm_client_new@Base 0.7.0 + nm_client_sleep@Base 0.7.0 + nm_client_wireless_get_enabled@Base 0.7.0 + nm_client_wireless_hardware_get_enabled@Base 0.7.0 + nm_client_wireless_set_enabled@Base 0.7.0 + nm_dbus_connection_get_type@Base 0.7.0 + nm_dbus_connection_new@Base 0.7.0 + nm_dbus_settings_get_connection_by_path@Base 0.7.0 + nm_dbus_settings_get_type@Base 0.7.0 + nm_dbus_settings_new@Base 0.7.0 + nm_dbus_settings_system_add_connection@Base 0.7.0 + nm_dbus_settings_system_get_can_modify@Base 0.7.0 + nm_dbus_settings_system_get_type@Base 0.7.0 + nm_dbus_settings_system_get_unmanaged_devices@Base 0.7.0 + nm_dbus_settings_system_new@Base 0.7.0 + nm_device_ethernet_get_carrier@Base 0.7.0 + nm_device_ethernet_get_hw_address@Base 0.7.0 + nm_device_ethernet_get_speed@Base 0.7.0 + nm_device_ethernet_get_type@Base 0.7.0 + nm_device_ethernet_new@Base 0.7.0 + nm_device_get_capabilities@Base 0.7.0 + nm_device_get_dhcp4_config@Base 0.7.0 + nm_device_get_driver@Base 0.7.0 + nm_device_get_iface@Base 0.7.0 + nm_device_get_ip4_config@Base 0.7.0 + nm_device_get_managed@Base 0.7.0 + nm_device_get_product@Base 0.7.0 + nm_device_get_state@Base 0.7.0 + nm_device_get_type@Base 0.7.0 + nm_device_get_udi@Base 0.7.0 + nm_device_get_vendor@Base 0.7.0 + nm_device_new@Base 0.7.0 + nm_device_wifi_get_access_point_by_path@Base 0.7.0 + nm_device_wifi_get_access_points@Base 0.7.0 + nm_device_wifi_get_active_access_point@Base 0.7.0 + nm_device_wifi_get_bitrate@Base 0.7.0 + nm_device_wifi_get_capabilities@Base 0.7.0 + nm_device_wifi_get_hw_address@Base 0.7.0 + nm_device_wifi_get_mode@Base 0.7.0 + nm_device_wifi_get_type@Base 0.7.0 + nm_device_wifi_new@Base 0.7.0 + nm_dhcp4_config_get_one_option@Base 0.7.0 + nm_dhcp4_config_get_options@Base 0.7.0 + nm_dhcp4_config_get_type@Base 0.7.0 + nm_dhcp4_config_new@Base 0.7.0 + nm_exported_connection_delete@Base 0.7.0 + nm_exported_connection_get_connection@Base 0.7.0 + nm_exported_connection_get_type@Base 0.7.0 + nm_exported_connection_new@Base 0.7.0 + nm_exported_connection_register_object@Base 0.7.0 + nm_exported_connection_signal_removed@Base 0.7.0 + nm_exported_connection_signal_updated@Base 0.7.0 + nm_exported_connection_update@Base 0.7.0 + nm_gsm_device_get_type@Base 0.7.0 + nm_gsm_device_new@Base 0.7.0 + nm_ip4_config_get_addresses@Base 0.7.0 + nm_ip4_config_get_domains@Base 0.7.0 + nm_ip4_config_get_hostname@Base 0.7.0 + nm_ip4_config_get_nameservers@Base 0.7.0 + nm_ip4_config_get_routes@Base 0.7.0 + nm_ip4_config_get_type@Base 0.7.0 + nm_ip4_config_new@Base 0.7.0 + nm_object_array_get_type@Base 0.7.0 + nm_object_get_connection@Base 0.7.0 + nm_object_get_path@Base 0.7.0 + nm_object_get_type@Base 0.7.0 + nm_serial_device_get_bytes_received@Base 0.7.0 + nm_serial_device_get_bytes_sent@Base 0.7.0 + nm_serial_device_get_type@Base 0.7.0 + nm_settings_error_quark@Base 0.7.0 + nm_settings_get_type@Base 0.7.0 + nm_settings_list_connections@Base 0.7.0 + nm_settings_signal_new_connection@Base 0.7.0 + nm_ssid_get_type@Base 0.7.0 + nm_string_array_get_type@Base 0.7.0 + nm_uint_array_get_type@Base 0.7.0 + nm_vpn_connection_get_banner@Base 0.7.0 + nm_vpn_connection_get_type@Base 0.7.0 + nm_vpn_connection_get_vpn_state@Base 0.7.0 + nm_vpn_connection_new@Base 0.7.0 diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install index 66abe57e..8a8e5486 100644 --- a/debian/libnm-util-dev.install +++ b/debian/libnm-util-dev.install @@ -1,11 +1,7 @@ debian/tmp/usr/lib/pkgconfig/libnm-util.pc debian/tmp/usr/lib/libnm-util.a debian/tmp/usr/lib/libnm-util.so -debian/tmp/usr/include/NetworkManager/cipher.h -debian/tmp/usr/include/NetworkManager/cipher-wep-hex.h -debian/tmp/usr/include/NetworkManager/cipher-wep-passphrase.h -debian/tmp/usr/include/NetworkManager/cipher-wep-ascii.h -debian/tmp/usr/include/NetworkManager/cipher-wpa-psk-hex.h -debian/tmp/usr/include/NetworkManager/cipher-wpa-psk-passphrase.h -debian/tmp/usr/include/NetworkManager/dbus-helpers.h -debian/tmp/usr/include/NetworkManager/dbus-method-dispatcher.h +debian/tmp/usr/include/NetworkManager/nm-connection.h +debian/tmp/usr/include/NetworkManager/nm-utils.h +debian/tmp/usr/include/NetworkManager/nm-setting.h +debian/tmp/usr/include/NetworkManager/nm-setting-*.h diff --git a/debian/libnm-util0.install b/debian/libnm-util1.install index 051d4901..051d4901 100644 --- a/debian/libnm-util0.install +++ b/debian/libnm-util1.install diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols new file mode 100644 index 00000000..94922a5e --- /dev/null +++ b/debian/libnm-util1.symbols @@ -0,0 +1,286 @@ +libnm-util.so.1 libnm-util1 #MINVER# + nm_connection_add_setting@Base 0.7.0 + nm_connection_clear_secrets@Base 0.7.0 + nm_connection_compare@Base 0.7.0 + nm_connection_create_setting@Base 0.7.0 + nm_connection_dump@Base 0.7.0 + nm_connection_duplicate@Base 0.7.0 + nm_connection_error_get_type@Base 0.7.0 + nm_connection_error_quark@Base 0.7.0 + nm_connection_for_each_setting_value@Base 0.7.0 + nm_connection_get_path@Base 0.7.0 + nm_connection_get_scope@Base 0.7.0 + nm_connection_get_setting@Base 0.7.0 + nm_connection_get_setting_by_name@Base 0.7.0 + nm_connection_get_type@Base 0.7.0 + nm_connection_lookup_setting_type@Base 0.7.0 + nm_connection_lookup_setting_type_by_quark@Base 0.7.0 + nm_connection_need_secrets@Base 0.7.0 + nm_connection_new@Base 0.7.0 + nm_connection_new_from_hash@Base 0.7.0 + nm_connection_remove_setting@Base 0.7.0 + nm_connection_replace_settings@Base 0.7.0 + nm_connection_set_path@Base 0.7.0 + nm_connection_set_scope@Base 0.7.0 + nm_connection_to_hash@Base 0.7.0 + nm_connection_update_secrets@Base 0.7.0 + nm_connection_verify@Base 0.7.0 + nm_ip4_address_compare@Base 0.7.0 + nm_ip4_address_dup@Base 0.7.0 + nm_ip4_address_get_address@Base 0.7.0 + nm_ip4_address_get_gateway@Base 0.7.0 + nm_ip4_address_get_prefix@Base 0.7.0 + nm_ip4_address_new@Base 0.7.0 + nm_ip4_address_ref@Base 0.7.0 + nm_ip4_address_set_address@Base 0.7.0 + nm_ip4_address_set_gateway@Base 0.7.0 + nm_ip4_address_set_prefix@Base 0.7.0 + nm_ip4_address_unref@Base 0.7.0 + nm_ip4_route_compare@Base 0.7.0 + nm_ip4_route_dup@Base 0.7.0 + nm_ip4_route_get_dest@Base 0.7.0 + nm_ip4_route_get_metric@Base 0.7.0 + nm_ip4_route_get_next_hop@Base 0.7.0 + nm_ip4_route_get_prefix@Base 0.7.0 + nm_ip4_route_new@Base 0.7.0 + nm_ip4_route_ref@Base 0.7.0 + nm_ip4_route_set_dest@Base 0.7.0 + nm_ip4_route_set_metric@Base 0.7.0 + nm_ip4_route_set_next_hop@Base 0.7.0 + nm_ip4_route_set_prefix@Base 0.7.0 + nm_ip4_route_unref@Base 0.7.0 + nm_setting_802_1x_add_eap_method@Base 0.7.0 + nm_setting_802_1x_clear_eap_methods@Base 0.7.0 + nm_setting_802_1x_error_get_type@Base 0.7.0 + nm_setting_802_1x_error_quark@Base 0.7.0 + nm_setting_802_1x_get_anonymous_identity@Base 0.7.0 + nm_setting_802_1x_get_ca_cert@Base 0.7.0 + nm_setting_802_1x_get_ca_path@Base 0.7.0 + nm_setting_802_1x_get_client_cert@Base 0.7.0 + nm_setting_802_1x_get_eap_method@Base 0.7.0 + nm_setting_802_1x_get_identity@Base 0.7.0 + nm_setting_802_1x_get_num_eap_methods@Base 0.7.0 + nm_setting_802_1x_get_password@Base 0.7.0 + nm_setting_802_1x_get_phase1_fast_provisioning@Base 0.7.0 + nm_setting_802_1x_get_phase1_peaplabel@Base 0.7.0 + nm_setting_802_1x_get_phase1_peapver@Base 0.7.0 + nm_setting_802_1x_get_phase2_auth@Base 0.7.0 + nm_setting_802_1x_get_phase2_autheap@Base 0.7.0 + nm_setting_802_1x_get_phase2_ca_cert@Base 0.7.0 + nm_setting_802_1x_get_phase2_ca_path@Base 0.7.0 + nm_setting_802_1x_get_phase2_client_cert@Base 0.7.0 + nm_setting_802_1x_get_phase2_private_key@Base 0.7.0 + nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0 + nm_setting_802_1x_get_phase2_private_key_type@Base 0.7.0 + nm_setting_802_1x_get_pin@Base 0.7.0 + nm_setting_802_1x_get_private_key@Base 0.7.0 + nm_setting_802_1x_get_private_key_password@Base 0.7.0 + nm_setting_802_1x_get_private_key_type@Base 0.7.0 + nm_setting_802_1x_get_psk@Base 0.7.0 + nm_setting_802_1x_get_system_ca_certs@Base 0.7.0 + nm_setting_802_1x_get_type@Base 0.7.0 + nm_setting_802_1x_new@Base 0.7.0 + nm_setting_802_1x_remove_eap_method@Base 0.7.0 + nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0 + nm_setting_802_1x_set_private_key_from_file@Base 0.7.0 + nm_setting_cdma_error_get_type@Base 0.7.0 + nm_setting_cdma_error_quark@Base 0.7.0 + nm_setting_cdma_get_number@Base 0.7.0 + nm_setting_cdma_get_password@Base 0.7.0 + nm_setting_cdma_get_type@Base 0.7.0 + nm_setting_cdma_get_username@Base 0.7.0 + nm_setting_cdma_new@Base 0.7.0 + nm_setting_clear_secrets@Base 0.7.0 + nm_setting_compare@Base 0.7.0 + nm_setting_connection_error_get_type@Base 0.7.0 + nm_setting_connection_error_quark@Base 0.7.0 + nm_setting_connection_get_autoconnect@Base 0.7.0 + nm_setting_connection_get_connection_type@Base 0.7.0 + nm_setting_connection_get_id@Base 0.7.0 + nm_setting_connection_get_read_only@Base 0.7.0 + nm_setting_connection_get_timestamp@Base 0.7.0 + nm_setting_connection_get_type@Base 0.7.0 + nm_setting_connection_get_uuid@Base 0.7.0 + nm_setting_connection_new@Base 0.7.0 + nm_setting_duplicate@Base 0.7.0 + nm_setting_enumerate_values@Base 0.7.0 + nm_setting_error_get_type@Base 0.7.0 + nm_setting_error_quark@Base 0.7.0 + nm_setting_get_name@Base 0.7.0 + nm_setting_get_type@Base 0.7.0 + nm_setting_gsm_error_get_type@Base 0.7.0 + nm_setting_gsm_error_quark@Base 0.7.0 + nm_setting_gsm_get_apn@Base 0.7.0 + nm_setting_gsm_get_band@Base 0.7.0 + nm_setting_gsm_get_network_id@Base 0.7.0 + nm_setting_gsm_get_network_type@Base 0.7.0 + nm_setting_gsm_get_number@Base 0.7.0 + nm_setting_gsm_get_password@Base 0.7.0 + nm_setting_gsm_get_pin@Base 0.7.0 + nm_setting_gsm_get_puk@Base 0.7.0 + nm_setting_gsm_get_type@Base 0.7.0 + nm_setting_gsm_get_username@Base 0.7.0 + nm_setting_gsm_new@Base 0.7.0 + nm_setting_ip4_config_add_address@Base 0.7.0 + nm_setting_ip4_config_add_dns@Base 0.7.0 + nm_setting_ip4_config_add_dns_search@Base 0.7.0 + nm_setting_ip4_config_add_route@Base 0.7.0 + nm_setting_ip4_config_clear_addresses@Base 0.7.0 + nm_setting_ip4_config_clear_dns@Base 0.7.0 + nm_setting_ip4_config_clear_dns_searches@Base 0.7.0 + nm_setting_ip4_config_clear_routes@Base 0.7.0 + nm_setting_ip4_config_error_get_type@Base 0.7.0 + nm_setting_ip4_config_error_quark@Base 0.7.0 + nm_setting_ip4_config_get_address@Base 0.7.0 + nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.0 + nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.0 + nm_setting_ip4_config_get_dns@Base 0.7.0 + nm_setting_ip4_config_get_dns_search@Base 0.7.0 + nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.0 + nm_setting_ip4_config_get_ignore_auto_routes@Base 0.7.0 + nm_setting_ip4_config_get_method@Base 0.7.0 + nm_setting_ip4_config_get_num_addresses@Base 0.7.0 + nm_setting_ip4_config_get_num_dns@Base 0.7.0 + nm_setting_ip4_config_get_num_dns_searches@Base 0.7.0 + nm_setting_ip4_config_get_num_routes@Base 0.7.0 + nm_setting_ip4_config_get_route@Base 0.7.0 + nm_setting_ip4_config_get_type@Base 0.7.0 + nm_setting_ip4_config_new@Base 0.7.0 + nm_setting_ip4_config_remove_address@Base 0.7.0 + nm_setting_ip4_config_remove_dns@Base 0.7.0 + nm_setting_ip4_config_remove_dns_search@Base 0.7.0 + nm_setting_ip4_config_remove_route@Base 0.7.0 + nm_setting_need_secrets@Base 0.7.0 + nm_setting_new_from_hash@Base 0.7.0 + nm_setting_ppp_error_get_type@Base 0.7.0 + nm_setting_ppp_error_quark@Base 0.7.0 + nm_setting_ppp_get_baud@Base 0.7.0 + nm_setting_ppp_get_crtscts@Base 0.7.0 + nm_setting_ppp_get_lcp_echo_failure@Base 0.7.0 + nm_setting_ppp_get_lcp_echo_interval@Base 0.7.0 + nm_setting_ppp_get_mppe_stateful@Base 0.7.0 + nm_setting_ppp_get_mru@Base 0.7.0 + nm_setting_ppp_get_mtu@Base 0.7.0 + nm_setting_ppp_get_no_vj_comp@Base 0.7.0 + nm_setting_ppp_get_noauth@Base 0.7.0 + nm_setting_ppp_get_nobsdcomp@Base 0.7.0 + nm_setting_ppp_get_nodeflate@Base 0.7.0 + nm_setting_ppp_get_refuse_chap@Base 0.7.0 + nm_setting_ppp_get_refuse_eap@Base 0.7.0 + nm_setting_ppp_get_refuse_mschap@Base 0.7.0 + nm_setting_ppp_get_refuse_mschapv2@Base 0.7.0 + nm_setting_ppp_get_refuse_pap@Base 0.7.0 + nm_setting_ppp_get_require_mppe@Base 0.7.0 + nm_setting_ppp_get_require_mppe_128@Base 0.7.0 + nm_setting_ppp_get_type@Base 0.7.0 + nm_setting_ppp_new@Base 0.7.0 + nm_setting_pppoe_error_get_type@Base 0.7.0 + nm_setting_pppoe_error_quark@Base 0.7.0 + nm_setting_pppoe_get_password@Base 0.7.0 + nm_setting_pppoe_get_service@Base 0.7.0 + nm_setting_pppoe_get_type@Base 0.7.0 + nm_setting_pppoe_get_username@Base 0.7.0 + nm_setting_pppoe_new@Base 0.7.0 + nm_setting_serial_error_get_type@Base 0.7.0 + nm_setting_serial_error_quark@Base 0.7.0 + nm_setting_serial_get_baud@Base 0.7.0 + nm_setting_serial_get_bits@Base 0.7.0 + nm_setting_serial_get_parity@Base 0.7.0 + nm_setting_serial_get_send_delay@Base 0.7.0 + nm_setting_serial_get_stopbits@Base 0.7.0 + nm_setting_serial_get_type@Base 0.7.0 + nm_setting_serial_new@Base 0.7.0 + nm_setting_to_hash@Base 0.7.0 + nm_setting_to_string@Base 0.7.0 + nm_setting_update_secrets@Base 0.7.0 + nm_setting_verify@Base 0.7.0 + nm_setting_vpn_add_data_item@Base 0.7.0 + nm_setting_vpn_add_secret@Base 0.7.0 + nm_setting_vpn_error_get_type@Base 0.7.0 + nm_setting_vpn_error_quark@Base 0.7.0 + nm_setting_vpn_foreach_data_item@Base 0.7.0 + nm_setting_vpn_foreach_secret@Base 0.7.0 + nm_setting_vpn_get_data_item@Base 0.7.0 + nm_setting_vpn_get_secret@Base 0.7.0 + nm_setting_vpn_get_service_type@Base 0.7.0 + nm_setting_vpn_get_type@Base 0.7.0 + nm_setting_vpn_get_user_name@Base 0.7.0 + nm_setting_vpn_new@Base 0.7.0 + nm_setting_vpn_remove_data_item@Base 0.7.0 + nm_setting_vpn_remove_secret@Base 0.7.0 + nm_setting_wired_error_get_type@Base 0.7.0 + nm_setting_wired_error_quark@Base 0.7.0 + nm_setting_wired_get_auto_negotiate@Base 0.7.0 + nm_setting_wired_get_duplex@Base 0.7.0 + nm_setting_wired_get_mac_address@Base 0.7.0 + nm_setting_wired_get_mtu@Base 0.7.0 + nm_setting_wired_get_port@Base 0.7.0 + nm_setting_wired_get_speed@Base 0.7.0 + nm_setting_wired_get_type@Base 0.7.0 + nm_setting_wired_new@Base 0.7.0 + nm_setting_wireless_add_seen_bssid@Base 0.7.0 + nm_setting_wireless_ap_security_compatible@Base 0.7.0 + nm_setting_wireless_error_get_type@Base 0.7.0 + nm_setting_wireless_error_quark@Base 0.7.0 + nm_setting_wireless_get_band@Base 0.7.0 + nm_setting_wireless_get_bssid@Base 0.7.0 + nm_setting_wireless_get_channel@Base 0.7.0 + nm_setting_wireless_get_mac_address@Base 0.7.0 + nm_setting_wireless_get_mode@Base 0.7.0 + nm_setting_wireless_get_mtu@Base 0.7.0 + nm_setting_wireless_get_num_seen_bssids@Base 0.7.0 + nm_setting_wireless_get_rate@Base 0.7.0 + nm_setting_wireless_get_security@Base 0.7.0 + nm_setting_wireless_get_seen_bssid@Base 0.7.0 + nm_setting_wireless_get_ssid@Base 0.7.0 + nm_setting_wireless_get_tx_power@Base 0.7.0 + nm_setting_wireless_get_type@Base 0.7.0 + nm_setting_wireless_new@Base 0.7.0 + nm_setting_wireless_security_add_group@Base 0.7.0 + nm_setting_wireless_security_add_pairwise@Base 0.7.0 + nm_setting_wireless_security_add_proto@Base 0.7.0 + nm_setting_wireless_security_clear_groups@Base 0.7.0 + nm_setting_wireless_security_clear_pairwise@Base 0.7.0 + nm_setting_wireless_security_clear_protos@Base 0.7.0 + nm_setting_wireless_security_error_get_type@Base 0.7.0 + nm_setting_wireless_security_error_quark@Base 0.7.0 + nm_setting_wireless_security_get_auth_alg@Base 0.7.0 + nm_setting_wireless_security_get_group@Base 0.7.0 + nm_setting_wireless_security_get_key_mgmt@Base 0.7.0 + nm_setting_wireless_security_get_leap_password@Base 0.7.0 + nm_setting_wireless_security_get_leap_username@Base 0.7.0 + nm_setting_wireless_security_get_num_groups@Base 0.7.0 + nm_setting_wireless_security_get_num_pairwise@Base 0.7.0 + nm_setting_wireless_security_get_num_protos@Base 0.7.0 + nm_setting_wireless_security_get_pairwise@Base 0.7.0 + nm_setting_wireless_security_get_proto@Base 0.7.0 + nm_setting_wireless_security_get_psk@Base 0.7.0 + nm_setting_wireless_security_get_type@Base 0.7.0 + nm_setting_wireless_security_get_wep_key@Base 0.7.0 + nm_setting_wireless_security_get_wep_tx_keyidx@Base 0.7.0 + nm_setting_wireless_security_new@Base 0.7.0 + nm_setting_wireless_security_remove_group@Base 0.7.0 + nm_setting_wireless_security_remove_pairwise@Base 0.7.0 + nm_setting_wireless_security_remove_proto@Base 0.7.0 + nm_setting_wireless_security_set_wep_key@Base 0.7.0 + nm_utils_deinit@Base 0.7.0 + nm_utils_escape_ssid@Base 0.7.0 + nm_utils_gvalue_hash_dup@Base 0.7.0 + nm_utils_init@Base 0.7.0 + nm_utils_ip4_addresses_from_gvalue@Base 0.7.0 + nm_utils_ip4_addresses_to_gvalue@Base 0.7.0 + nm_utils_ip4_netmask_to_prefix@Base 0.7.0 + nm_utils_ip4_prefix_to_netmask@Base 0.7.0 + nm_utils_ip4_routes_from_gvalue@Base 0.7.0 + nm_utils_ip4_routes_to_gvalue@Base 0.7.0 + nm_utils_is_empty_ssid@Base 0.7.0 + nm_utils_same_ssid@Base 0.7.0 + nm_utils_security_valid@Base 0.7.0 + nm_utils_slist_free@Base 0.7.0 + nm_utils_ssid_to_utf8@Base 0.7.0 + nm_utils_uuid_generate@Base 0.7.0 + nm_utils_uuid_generate_from_string@Base 0.7.0 diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install index 97a00409..21a43882 100644 --- a/debian/network-manager-dev.install +++ b/debian/network-manager-dev.install @@ -1,4 +1,3 @@ debian/tmp/usr/lib/pkgconfig/NetworkManager.pc debian/tmp/usr/include/NetworkManager/NetworkManager.h debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h -debian/tmp/usr/include/NetworkManager/nm-vpn-ui-interface.h diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index c59c7f9b..0f52b41e 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -10,67 +10,48 @@ group "netdev". If you want to add a user to group "netdev" use the command "adduser username netdev" or one of the graphical user management frontends. After that you have to reload D-Bus with the command "/etc/init.d/dbus reload". -Configuration of wireless and ethernet interfaces -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Only devices that are *not* listed in /etc/network/interfaces or which have -been configured "auto" and "dhcp" (with no other options) are managed by NM. - -This way you can setup a custom (static) configuration for a device and NM -will not try to override this setting. - -After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/init.d/network-manager restart". - -Examples: - -1.) -auto wlan0 -iface wlan0 inet dhcp --> This device is managed by NM. - -1.a) -allow-hotplug eth0 -iface eth0 inet dhcp --> This device is managed by NM - -2.) -auto wlan0 -iface wlan0 inet dhcp - wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf --> This devices is *not* managed by NM because it has additional options. - -3.) -iface wlan0 inet dhcp --> This device is *not* managed by NM because it is not set to "auto". - -4.) -iface eth0 inet static - address 192.168.1.10 - netmask 255.255.255.0 - gateway 192.168.1.1 --> This device is *not* managed by NM because it is configured as "static" and - has additional options. - -5.) -Device is not listed in /etc/network/interfaces. --> Device is managed by NM. +Alternatively you can install the "consolekit" package which will grant access +for all locally logged in users. + + +Managed vs. Unmanaged mode and /etc/network/interfaces +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Devices listed in /etc/network/interfaces _will_ be managed by NetworkManager +unless the ifupdown system-config-setting is enabled and is setup to run +in "Unmanaged mode". + +The config to select unmanaged/managed mode is in +/etc/NetworkManager/nm-system-settings.conf: + + [ifupdown] + managed=true/false + +Unmanaged mode will make NetworkManager not touch any wired/wireless device +matching an interface name configured in /etc/network/interfaces. + +Managed mode will make NetworkManager manage all devices and will make +NetworkManager honour all dhcp and static configurations for wired and +wireless devices. + + +After modifying /etc/NetworkManager/nm-systems-settings.conf _or_ +/etc/network/interfaces you may want to restart the system-settings daemon +using the command: +"sudo killall nm-system-settings" to apply those changes. + Dial-up configuration ~~~~~~~~~~~~~~~~~~~~~ -After configuring your PPP interface (either manually or by using a tool like -"pppconfig") to work with a peer called "myisp" you should edit -/etc/network/interfaces and add a stanza like this: - -iface ppp0 inet ppp - provider myisp -NM will then make it possible to dial this connection. -If you want to set up multiple internet service providers simply create a new -stanza as listed above specifying the provider and a different iface, e.g. ppp1. +Your dialup configurations can now be done in nm-connection-editor. +Because of that /etc/network/interfaces configurations are considered "legacy" +from a network manager point of view. -After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/init.d/network-manager restart". +However, if you want to use your /etc/network/interfaces configuration make +sure that you have the ifupdown plugin in "Unmanaged mode" and take care that +the used wired/wireless device is also configured in /etc/network/interfaces. -Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" -man page for further information. +Note that NetworkManager 0.7 will not provide UI hooks to up and down ppp +connections managed outside of NetworkManager itself (not that it ever worked +nicely before). diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 231b4756..35ce9986 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,3 +1,2 @@ -etc/NetworkManager/dispatcher.d var/lib/NetworkManager var/run/NetworkManager diff --git a/debian/network-manager.init b/debian/network-manager.init index 9e6fcf0b..18797994 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,8 +1,8 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManager -# Required-Start: $remote_fs dbus dhcdbd hal -# Required-Stop: $remote_fs dbus dhcdbd hal +# Required-Start: $remote_fs dbus hal +# Required-Stop: $remote_fs dbus hal # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 @@ -29,9 +29,6 @@ USER=root # Gracefully exit if the package has been removed. test -x $DAEMON || exit 0 -# We need /sbin/ip -[ -x /sbin/ip ] || exit 1 - . /lib/lsb/init-functions test -f /etc/default/NetworkManager && . /etc/default/NetworkManager @@ -77,8 +74,11 @@ case "$1" in d_start log_end_msg $? ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + ;; *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 exit 1 ;; esac diff --git a/debian/network-manager.install b/debian/network-manager.install index 90422942..f861ce48 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,8 +1,21 @@ debian/tmp/usr/sbin/NetworkManager -debian/tmp/usr/sbin/NetworkManagerDispatcher -debian/tmp/usr/lib/network-manager -debian/tmp/usr/share/locale +debian/tmp/usr/sbin/nm-system-settings +debian/tmp/usr/bin/nm-tool +debian/tmp/usr/lib/NetworkManager/nm-crash-logger +debian/tmp/usr/lib/NetworkManager/nm-dhcp-client.action +debian/tmp/usr/lib/NetworkManager/nm-dispatcher.action +debian/tmp/usr/lib/NetworkManager/nm-avahi-autoipd.action +debian/tmp/usr/lib/NetworkManager/libnm-settings-plugin-keyfile.so +debian/tmp/usr/lib/NetworkManager/libnm-settings-plugin-ifupdown.so +debian/tmp/usr/lib/pppd/*/*.so +debian/tmp/usr/share/locale/ +debian/tmp/usr/share/dbus-1/system-services/ +debian/tmp//usr/share/PolicyKit/ debian/tmp/etc/dbus-1/system.d/NetworkManager.conf -test/nm-tool /usr/bin/ -debian/tmp/usr/bin/nm-vpn-properties -debian/tmp/usr/share/gnome-vpn-properties/nm-vpn-properties.glade +debian/tmp/etc/dbus-1/system.d/nm-dhcp-client.conf +debian/tmp/etc/dbus-1/system.d/nm-system-settings.conf +debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf +debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf +debian/tmp/etc/NetworkManager/dispatcher.d/ +debian/tmp/etc/NetworkManager/system-connections/ +debian/nm-system-settings.conf etc/NetworkManager/ diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 2228d957..7f4f19b0 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,4 +1,2 @@ -man/NetworkManagerDispatcher.8 -man/nm-tool.1 man/NetworkManager.8 -debian/nm-vpn-properties.1 +man/nm-tool.1 diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init deleted file mode 100644 index 34a44c35..00000000 --- a/debian/network-manager.network-manager-dispatcher.init +++ /dev/null @@ -1,79 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: NetworkManagerDispatcher -# Required-Start: $remote_fs dbus -# Required-Stop: $remote_fs dbus -# Should-Start: $syslog -# Should-Stop: $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: network events dispatcher -# Description: This daemon automatically runs scripts when -# NetworkManager changes the network state. -### END INIT INFO - -set -e - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="network events dispatcher" -NAME="NetworkManagerDispatcher" -DAEMON=/usr/sbin/$NAME -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid -SCRIPTNAME=/etc/init.d/network-manager-dispatcher -USER=root - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher - -# -# Function that starts the daemon/service. -# -d_start() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $USER:$USER $PIDDIR - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - -} - -# -# Function that stops the daemon/service. -# -d_stop() { - start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON -} - - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - d_start - log_end_msg $? - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - d_stop - log_end_msg $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - d_stop - d_start - log_end_msg $? - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 4d7cb755..c7694427 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -16,25 +16,8 @@ # <postinst> abort-remove in-favour <new-package> <version> -# Remove a no-longer used conffile -rm_conffile() -{ - CONFFILE="$1" - - if [ -e "$CONFFILE".dpkg-remove ]; then - echo "Removing obsolete conffile $CONFFILE" - rm -f "$CONFFILE".dpkg-remove - fi -} - - case "$1" in configure) - # Upgrade from previous versions - if dpkg --compare-versions "$2" lt "0.6.4-8"; then - rm_conffile /etc/dbus-1/event.d/25NetworkManager - rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher - fi if ! getent group netdev > /dev/null; then addgroup --quiet --system netdev @@ -50,9 +33,6 @@ case "$1" in if [ -x "/etc/init.d/network-manager" ]; then invoke-rc.d network-manager stop || true fi - if [ -x "/etc/init.d/network-manager-dispatcher" ]; then - invoke-rc.d network-manager-dispatcher stop || true - fi fi ;; diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm deleted file mode 100644 index 812369bd..00000000 --- a/debian/network-manager.postrm +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -e -# This script can be called in the following ways: -# -# After the package was removed: -# <postrm> remove -# -# After the package was purged: -# <postrm> purge -# -# After the package was upgraded: -# <old-postrm> upgrade <new-version> -# if that fails: -# <new-postrm> failed-upgrade <old-version> -# -# -# After all of the packages files have been replaced: -# <postrm> disappear <overwriting-package> <version> -# -# -# If preinst fails during install: -# <new-postrm> abort-install -# -# If preinst fails during upgrade of removed package: -# <new-postrm> abort-install <old-version> -# -# If preinst fails during upgrade: -# <new-postrm> abort-upgrade <old-version> - - -# Undo removal of a no-longer used conffile -undo_rm_conffile() -{ - CONFFILE="$1" - - if [ ! -e "$CONFFILE" ]; then - if [ -e "$CONFFILE".dpkg-bak ]; then - echo "Restoring modified conffile $CONFFILE" - mv -f "$CONFFILE".dpkg-bak "$CONFFILE" - elif [ -e "$CONFFILE".dpkg-remove ]; then - echo "Restoring conffile $CONFFILE" - mv -f "$CONFFILE".dpkg-remove "$CONFFILE" - fi - fi -} - - -# Purge backup conffile -rm_backup_conffile() -{ - CONFFILE="$1" - if [ -e "$CONFFILE".dpkg-bak ]; then - echo "Purging backup of conffile $CONFFILE" - rm -f "$CONFFILE".dpkg-bak - fi -} - - -case "$1" in - remove) - ;; - - purge) - rm_backup_conffile /etc/dbus-1/event.d/25NetworkManager - rm_backup_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher - ;; - - upgrade|failed-upgrade|disappear) - ;; - - abort-install|abort-upgrade) - # Abort upgrade from previous versions - if dpkg --compare-versions "$2" lt "0.6.4-8"; then - undo_rm_conffile /etc/dbus-1/event.d/25NetworkManager - undo_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher - fi - ;; - - *) - echo "$0 called with unknown argument \`$1'" 1>&2 - exit 1 - ;; -esac - -#DEBHELPER# -exit 0 diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index c3cc480e..8b64b293 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -15,8 +15,8 @@ # <old-preinst> abort-upgrade <new-version> -# Prepare to remove a no-longer used conffile -prep_rm_conffile() +# remove a no-longer used conffile +rm_conffile() { PKGNAME="$1" CONFFILE="$2" @@ -25,10 +25,12 @@ prep_rm_conffile() md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" 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, renaming to .dpkg-bak" + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." mv -f "$CONFFILE" "$CONFFILE".dpkg-bak else - mv -f "$CONFFILE" "$CONFFILE".dpkg-remove + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" fi fi } @@ -44,8 +46,15 @@ case "$1" in if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi - prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager - prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher + rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager + rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher + fi + if dpkg --compare-versions "$2" lt "0.7.0~svn3624-1"; then + if [ -x "/etc/init.d/network-manager-dispatcher" ]; then + invoke-rc.d network-manager-dispatcher stop + fi + rm_conffile network-manager /etc/init.d/network-manager-dispatcher + update-rc.d network-manager-dispatcher remove >/dev/null fi ;; diff --git a/debian/nm-system-settings.conf b/debian/nm-system-settings.conf new file mode 100644 index 00000000..d8b33d91 --- /dev/null +++ b/debian/nm-system-settings.conf @@ -0,0 +1,5 @@ +[main] +plugins=ifupdown,keyfile + +[ifupdown] +managed=false diff --git a/debian/nm-vpn-properties.sgml b/debian/nm-vpn-properties.sgml deleted file mode 100644 index 7b42239e..00000000 --- a/debian/nm-vpn-properties.sgml +++ /dev/null @@ -1,95 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - -<!-- Process this file with docbook-to-man to generate an nroff manual - page: `docbook-to-man manpage.sgml > manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - <!-- Please adjust the date whenever revising the manpage. --> - <!ENTITY date "<date>8 February, 2006</date>"> - <!-- SECTION should be 1-8, maybe w/ subsection other parameters are - allowed: see man(7), man(1). --> - <!ENTITY package "nm-vpn-properties"> - <!ENTITY gnu "<acronym>GNU</acronym>"> - <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - <email>giskard@autistici.org</email>; - </address> - <author> - <firstname>Riccardo</firstname> - <surname>Setti</surname> - </author> - <copyright> - <year>2006</year> - <holder>Riccardo Setti</holder> - </copyright> - &date; - </refentryinfo> - <refmeta> - <refentrytitle>nm-vpn-properties</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>&package;</refname> - - <refpurpose>Network management framework</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&package;</command> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para><command>&package;</command> is the gnome front-end for the NetworkManager VPN handler</para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - - <para>NetworkManager (1), nm-applet (1)</para> - - <para>More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ .</para> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by Riccardo Setti <email>giskard@autistici.org</email> for - the <productname>Debian</productname> system. - </para> - - </refsect1> -</refentry> - -<!-- Keep this comment at the end of the file -Local variables: -mode: sgml -sgml-omittag:t -sgml-shorttag:t -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:2 -sgml-indent-data:t -sgml-parent-document:nil -sgml-default-dtd-file:nil -sgml-exposed-tags:nil -sgml-local-catalogs:nil -sgml-local-ecat-files:nil -End: ---> diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch deleted file mode 100644 index 45060db4..00000000 --- a/debian/patches/01-supplicant_timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nm-device-802-11-wireless.c 2006-06-20 20:15:45.000000000 +0200 -+++ src/nm-device-802-11-wireless.c.new 2006-08-13 22:32:13.000000000 +0200 -@@ -2329,7 +2329,7 @@ - } - - --#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ -+#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ - - static unsigned int - get_supplicant_timeout (NMDevice80211Wireless *self) diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index ced5effe..ad1ed08f 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,10 +1,10 @@ -Index: src/NetworkManager.conf +Index: NetworkManager/src/NetworkManager.conf =================================================================== ---- src/NetworkManager.conf (Revision 2735) -+++ src/NetworkManager.conf (Arbeitskopie) -@@ -8,6 +8,14 @@ - <allow send_destination="org.freedesktop.NetworkManager"/> - <allow send_interface="org.freedesktop.NetworkManager"/> +--- NetworkManager.orig/src/NetworkManager.conf 2008-06-11 12:28:11.000000000 +0200 ++++ NetworkManager/src/NetworkManager.conf 2008-06-11 12:32:33.000000000 +0200 +@@ -11,6 +11,14 @@ + <allow send_destination="org.freedesktop.NetworkManager.PPP"/> + <allow send_interface="org.freedesktop.NetworkManager.PPP"/> </policy> + <policy user="haldaemon"> + <allow send_destination="org.freedesktop.NetworkManager"/> diff --git a/debian/patches/03-F3507g.patch b/debian/patches/03-F3507g.patch new file mode 100644 index 00000000..d475a874 --- /dev/null +++ b/debian/patches/03-F3507g.patch @@ -0,0 +1,128 @@ +Index: network-manager-0.7.0/src/nm-gsm-device.c +=================================================================== +--- network-manager-0.7.0.orig/src/nm-gsm-device.c 2008-11-12 22:29:43.000000000 +0100 ++++ network-manager-0.7.0/src/nm-gsm-device.c 2008-12-16 10:03:48.000000000 +0100 +@@ -51,6 +51,15 @@ + guint init_tries; + } NMGsmDevicePrivate; + ++/* Various possible init sequences */ ++const gchar *modem_init_sequences[] = { ++ "ATZ E0 V1 X4 &C1 +FCLASS=0", ++ "ATZ E0 V1 &C1", ++ "AT&F E0 V1", ++ NULL ++}; ++ ++ + enum { + PROP_0, + PROP_MONITOR_IFACE, +@@ -69,7 +78,7 @@ + static void enter_pin (NMGsmDevice *device, NMGsmSecret secret_type, gboolean retry); + static void manual_registration (NMGsmDevice *device); + static void automatic_registration (NMGsmDevice *device); +-static void init_modem (NMSerialDevice *device, gpointer user_data); ++static void init_modem (NMSerialDevice *device); + + NMGsmDevice * + nm_gsm_device_new (const char *udi, +@@ -431,7 +440,7 @@ + const char *responses[] = { "+CREG: 0,0", "+CREG: 0,1", "+CREG: 0,2", "+CREG: 0,3", "+CREG: 0,5", NULL }; + const char *terminators[] = { "OK", "ERROR", "ERR", NULL }; + +- modem_wait_for_reply (device, "AT+CREG?", 15, responses, terminators, automatic_registration_response, NULL); ++ modem_wait_for_reply (device, "AT+CREG?", 25, responses, terminators, automatic_registration_response, NULL); + } + + static void +@@ -496,13 +505,14 @@ + static void + init_modem_full (NMGsmDevice *device) + { ++ NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device); + const char *responses[] = { "OK", "ERROR", "ERR", NULL }; + + /* Send E0 too because some devices turn echo back on after CPIN which + * just breaks stuff since echo-ed commands are interpreted as replies. + * rh #456770 + */ +- modem_wait_for_reply (device, "ATZ E0 V1 X4 &C1 +FCLASS=0", 10, responses, responses, init_full_done, NULL); ++ modem_wait_for_reply (device, modem_init_sequences[priv->init_tries], 10, responses, responses, init_full_done, NULL); + } + + static void +@@ -647,7 +657,6 @@ + + switch (reply_index) { + case 0: +- priv->init_tries = 0; + check_pin (NM_GSM_DEVICE (device)); + break; + case -1: +@@ -657,35 +666,26 @@ + NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); + break; + default: +- switch (priv->init_tries) { +- case 0: +- nm_warning ("Trying alternate modem initialization"); +- init_modem (device, "ATZ E0 V1 &C1"); +- break; +- case 1: +- nm_warning ("Trying second alternate modem initialization"); +- init_modem (device, "AT&F E0 V1"); +- break; +- default: ++ priv->init_tries++; ++ if (modem_init_sequences[priv->init_tries] != NULL) { ++ nm_warning ("Trying alternate modem initialization (%d)", ++ priv->init_tries); ++ init_modem (device); ++ } else { + nm_warning ("Modem initialization failed"); + nm_device_state_changed (NM_DEVICE (device), + NM_DEVICE_STATE_FAILED, + NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); +- break; + } +- priv->init_tries++; +- return; + } + } + + static void +-init_modem (NMSerialDevice *device, gpointer user_data) ++init_modem (NMSerialDevice *device) + { ++ NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device); + const char *responses[] = { "OK", "ERROR", "ERR", NULL }; +- const char *init_string = user_data; +- +- if (!init_string) +- init_string = "ATZ E0 V1 X4 &C1 +FCLASS=0"; ++ const char *init_string = modem_init_sequences[priv->init_tries]; + + modem_wait_for_reply (NM_GSM_DEVICE (device), init_string, 10, responses, responses, init_done, NULL); + } +@@ -706,7 +706,7 @@ + + NM_GSM_DEVICE_GET_PRIVATE (device)->init_tries = 0; + +- id = nm_serial_device_flash (serial_device, 100, init_modem, NULL); ++ id = nm_serial_device_flash (serial_device, 100, (NMSerialFlashFn) init_modem, NULL); + if (!id) + *reason = NM_DEVICE_STATE_REASON_UNKNOWN; + +Index: network-manager-0.7.0/src/nm-serial-device.c +=================================================================== +--- network-manager-0.7.0.orig/src/nm-serial-device.c 2008-11-20 18:12:16.000000000 +0100 ++++ network-manager-0.7.0/src/nm-serial-device.c 2008-12-16 10:03:48.000000000 +0100 +@@ -415,6 +415,7 @@ + } + + priv->channel = g_io_channel_unix_new (priv->fd); ++ g_io_channel_set_encoding (priv->channel, NULL, NULL); + + return TRUE; + } diff --git a/debian/patches/04-ltversioning.patch b/debian/patches/04-ltversioning.patch new file mode 100644 index 00000000..e88f8750 --- /dev/null +++ b/debian/patches/04-ltversioning.patch @@ -0,0 +1,78 @@ +Index: network-manager-0.7.0/libnm-glib/Makefile.am +=================================================================== +--- network-manager-0.7.0.orig/libnm-glib/Makefile.am 2008-12-06 00:35:11.000000000 +0100 ++++ network-manager-0.7.0/libnm-glib/Makefile.am 2008-12-06 00:35:23.000000000 +0100 +@@ -91,7 +91,8 @@ + $(GCONF_LIBS) \ + $(GNOME_KEYRING_LIBS) + +-libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver ++libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \ ++ -version-info "1:0:1" + + noinst_PROGRAMS = libnm-glib-test + +@@ -103,7 +104,8 @@ + libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c + libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) + libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) +-libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver ++libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \ ++ -version-info "0:0:0" + + + nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml +Index: network-manager-0.7.0/libnm-glib/Makefile.in +=================================================================== +--- network-manager-0.7.0.orig/libnm-glib/Makefile.in 2008-12-06 00:35:14.000000000 +0100 ++++ network-manager-0.7.0/libnm-glib/Makefile.in 2008-12-06 00:36:06.000000000 +0100 +@@ -405,14 +405,18 @@ + $(GCONF_LIBS) \ + $(GNOME_KEYRING_LIBS) + +-libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver ++libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \ ++ -version-info "1:0:1" ++ + libnm_glib_test_SOURCES = libnm-glib-test.c + libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) + libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) + libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c + libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) + libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) +-libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver ++libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \ ++ -version-info "0:0:0" ++ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc + DISTCLEANFILES = libnm_glib.pc libnm_glib.pc +Index: network-manager-0.7.0/libnm-util/Makefile.am +=================================================================== +--- network-manager-0.7.0.orig/libnm-util/Makefile.am 2008-12-06 00:34:59.000000000 +0100 ++++ network-manager-0.7.0/libnm-util/Makefile.am 2008-12-06 00:35:23.000000000 +0100 +@@ -52,7 +52,8 @@ + + libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) + +-libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver ++libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \ ++ -version-info "1:0:0" + + if WITH_GNUTLS + libnm_util_la_SOURCES += crypto_gnutls.c +Index: network-manager-0.7.0/libnm-util/Makefile.in +=================================================================== +--- network-manager-0.7.0.orig/libnm-util/Makefile.in 2008-12-06 00:35:02.000000000 +0100 ++++ network-manager-0.7.0/libnm-util/Makefile.in 2008-12-06 00:35:39.000000000 +0100 +@@ -367,7 +367,9 @@ + $(libnm_util_include_HEADERS) $(am__append_1) $(am__append_4) + libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \ + $(am__append_3) $(am__append_6) +-libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver ++libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \ ++ -version-info "1:0:0" ++ + libnm_util_includedir = $(includedir)/NetworkManager + test_crypto_SOURCES = test-crypto.c crypto.c $(am__append_7) \ + $(am__append_10) diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch deleted file mode 100644 index 931a2063..00000000 --- a/debian/patches/05-debian_backend.patch +++ /dev/null @@ -1,371 +0,0 @@ -diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..4e3e44a 100644 ---- a/src/backends/NetworkManagerDebian.c -+++ b/src/backends/NetworkManagerDebian.c -@@ -37,6 +37,7 @@ - #include "nm-utils.h" - - #define ARPING "/usr/sbin/arping" -+#define RESOLVCONF "resolvconf" - - /* - * nm_system_init -@@ -238,14 +239,16 @@ void nm_system_kill_all_dhcp_daemons (void) - /* - * nm_system_update_dns - * -- * Make glibc/nscd aware of any changes to the resolv.conf file by -- * restarting nscd. -+ * Invalidate the nscd host cache, if it exists, since -+ * we changed resolv.conf. - * - */ - void nm_system_update_dns (void) - { -- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); -- -+ if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { -+ nm_info ("Clearing nscd hosts cache."); -+ nm_spawn_process ("/usr/sbin/nscd -i hosts"); -+ } - } - - -@@ -257,8 +260,7 @@ void nm_system_update_dns (void) - * - */ - void nm_system_restart_mdns_responder (void) --{ -- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder"); -+{ - } - - -@@ -514,13 +516,60 @@ gboolean nm_system_device_get_use_dhcp (NMDevice *dev) - /* - * nm_system_device_get_disabled - * -- * Return whether the distro-specific system config tells us to use -- * dhcp for this device. -+ * Return whether the distro-specific system config tells us to disable -+ * this device. - * - */ - gboolean nm_system_device_get_disabled (NMDevice *dev) - { -- return FALSE; -+ const char *iface; -+ if_block *curr_device, *curr_b; -+ if_data *curr_d; -+ gboolean blacklist = TRUE; -+ -+ g_return_val_if_fail (dev != NULL, TRUE); -+ -+ iface = nm_device_get_iface (dev); -+ -+ ifparser_init (); -+ -+ /* If the device is listed in a mapping, do not control it */ -+ if (ifparser_getmapping (iface) != NULL) { -+ blacklist = TRUE; -+ goto out; -+ } -+ -+ /* If the interface isn't listed in /etc/network/interfaces then -+ * it's considered okay to control it. -+ */ -+ curr_device = ifparser_getif (iface); -+ if (curr_device == NULL) { -+ blacklist = FALSE; -+ goto out; -+ } -+ -+ /* If the interface is listed and isn't marked "auto" then it's -+ * definitely not okay to control it. -+ */ -+ for (curr_b = ifparser_getfirst (); curr_b; curr_b = curr_b->next) { -+ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")) -+ && strstr (curr_b->name, iface)) -+ blacklist = FALSE; -+ } -+ -+ /* If the interface has no options other than just "inet dhcp" -+ * it's probably ok to fiddle with it. -+ */ -+ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { -+ if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp" )) -+ blacklist = TRUE; -+ } -+ -+out: -+ ifparser_destroy (); -+ -+ return blacklist; - } - - -@@ -563,12 +612,18 @@ gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) - if (strcmp (dialup, config->name) == 0) - { - char *cmd; -+ int status; - - nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data); - cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data); -- nm_spawn_process (cmd); -+ status = nm_spawn_process (cmd); - g_free (cmd); -- ret = TRUE; -+ if (status == 0) { -+ ret = TRUE; -+ } else { -+ nm_warning ("Couldn't deactivate dialup device %s (%s) - %d", dialup, (char *) config->data, status); -+ ret = FALSE; -+ } - break; - } - } -@@ -587,12 +642,18 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) - if (strcmp (dialup, config->name) == 0) - { - char *cmd; -+ int status; - - nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data); - cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data); -- nm_spawn_process (cmd); -+ status = nm_spawn_process (cmd); - g_free (cmd); -- ret = TRUE; -+ if (status == 0) { -+ ret = TRUE; -+ } else { -+ nm_warning ("Couldn't activate dialup device %s (%s) - %d", dialup, (char *) config->data, status); -+ ret = FALSE; -+ } - break; - } - } -@@ -603,23 +664,26 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) - GSList * nm_system_get_dialup_config (void) - { - const char *buf; -- unsigned int i = 0; -+ const char *provider; - GSList *list = NULL; - if_block *curr; - ifparser_init(); - - /* FIXME: get all ppp(and others?) lines from /e/n/i here */ - curr = ifparser_getfirst(); -- while(curr!=NULL) -+ while (curr != NULL) - { - NMDialUpConfig *config; -- if (strcmp(curr->type,"iface")==0) -+ if (strcmp(curr->type, "iface") == 0) - { -- buf = ifparser_getkey(curr,"inet"); -- if (buf && strcmp (buf, "ppp")==0) -+ buf = ifparser_getkey(curr, "inet"); -+ if (buf && strcmp (buf, "ppp") == 0) - { -+ provider = ifparser_getkey(curr, "provider"); -+ if (!provider) -+ provider = "default provider"; - config = g_malloc (sizeof (NMDialUpConfig)); -- config->name = g_strdup_printf ("Modem (#%d)", i++); -+ config->name = g_strdup_printf ("%s via Modem", provider); - config->data = g_strdup (curr->name); /* interface name */ - - list = g_slist_append (list, config); -@@ -631,14 +695,6 @@ GSList * nm_system_get_dialup_config (void) - } - ifparser_destroy(); - -- /* Hack: Go back and remove the "(#0)" if there is only one device */ -- if (i == 1) -- { -- NMDialUpConfig *config = (NMDialUpConfig *) list->data; -- g_free (config->name); -- config->name = g_strdup ("Modem"); -- } -- - return list; - } - -@@ -679,7 +735,10 @@ void nm_system_set_hostname (NMIP4Config *config) - */ - gboolean nm_system_should_modify_resolv_conf (void) - { -- return TRUE; -+ if (g_find_program_in_path(RESOLVCONF) != NULL) -+ return FALSE; -+ else -+ return TRUE; - } - - -diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c -index 53d6487..b3ad300 100644 ---- a/src/backends/interface_parser.c -+++ b/src/backends/interface_parser.c -@@ -71,14 +73,18 @@ void add_data(const char *key,const char *data) - //printf("added data '%s' with key '%s'\n",data,key); - } - --#define SPACE_OR_TAB(string,ret) {ret = strchr(string,' ');ret=(ret == NULL?strchr(string,'\t'):ret);} -+// define what we consider a whitespace -+#define WS " \t" - - void ifparser_init(void) - { - FILE *inp = fopen(INTERFACES,"r"); - int ret = 0; -+ int pos; -+ int len; - char *line; -- char *space; -+ char *key; -+ char *data; - char rline[255]; - - if (inp == NULL) -@@ -89,7 +95,7 @@ void ifparser_init(void) - first = last = NULL; - while(1) - { -- line = space = NULL; -+ line = NULL; - ret = fscanf(inp,"%255[^\n]\n",rline); - if (ret == EOF) - break; -@@ -102,50 +108,71 @@ void ifparser_init(void) - line = rline; - while(line[0] == ' ') - line++; -- if (line[0]=='#' || line[0]=='\0') -+ if (line[0] == '#' || line[0] == '\0') - continue; - -- SPACE_OR_TAB(line,space) -- if (space == NULL) -+ len = strlen(line); -+ pos = 0; -+ while (!strchr(WS, line[pos]) && pos < len) pos++; -+ -+ // terminate key string and skip further whitespaces -+ line[pos++] = '\0'; -+ while (strchr(WS, line[pos]) && pos < len) pos++; -+ -+ if (pos >= len) - { -- nm_warning ("Error: Can't parse interface line '%s'\n",line); -+ nm_warning ("Error: Can't parse line '%s'\n", line); - continue; - } -- space[0] = '\0'; -- -+ key = &line[0]; -+ data = &line[pos]; -+ - // There are four different stanzas: - // iface, mapping, auto and allow-*. Create a block for each of them. -- if (strcmp(line,"iface")==0) -+ if (strcmp(key, "iface") == 0) - { -- char *space2 = strchr(space+1,' '); -- if (space2 == NULL) -+ char *key2; -+ -+ while (!strchr(WS, line[pos]) && pos < len ) pos++; -+ -+ // terminate first data string and skip further whitespaces -+ line[pos++] = '\0'; -+ while (strchr(WS, line[pos]) && pos < len) pos++; -+ if (pos >= len) - { -- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); -+ nm_warning ("Error: Can't parse iface line '%s'\n", data); - continue; - } -- space2[0]='\0'; -- add_block(line,space+1); -+ key2 = &line[pos]; -+ -+ add_block(key, data); - -- if (space2[1]!='\0') -+ if (pos < len) - { -- space = strchr(space2+1,' '); -- if (space == NULL) -+ -+ while (!strchr(WS, line[pos]) && pos < len ) pos++; -+ -+ // terminate key2 string and skip further whitespaces -+ line[pos++] = '\0'; -+ while (strchr(WS, line[pos]) && pos < len) pos++; -+ if (pos >= len) - { -- nm_warning ("Error: Can't parse data '%s'\n",space2+1); -+ nm_warning ("Error: Can't parse inet line '%s'\n", key2); - continue; - } -- space[0] = '\0'; -- add_data(space2+1,space+1); -+ data = &line[pos]; -+ -+ add_data(key2, data); - } - } -- else if (strcmp(line,"auto")==0) -- add_block(line,space+1); -- else if (strcmp(line,"mapping")==0) -- add_block(line,space+1); -- else if (strncmp(line,"allow-",6)==0) -- add_block(line,space+1); -+ else if (strcmp(key, "auto") == 0) -+ add_block(key, data); -+ else if (strcmp(key, "mapping") == 0) -+ add_block(key, data); -+ else if (strncmp(key, "allow-", 6) == 0) -+ add_block(key, data); - else -- add_data(line,space+1); -+ add_data(key, data); - - //printf("line: '%s' ret=%d\n",rline,ret); - } -@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* iface) - return NULL; - } - -+if_block *ifparser_getmapping(const char* iface) -+{ -+ if_block *curr = first; -+ while(curr!=NULL) -+ { -+ if (strcmp(curr->type,"mapping")==0 && strcmp(curr->name,iface)==0) -+ return curr; -+ curr = curr->next; -+ } -+ return NULL; -+} -+ - const char *ifparser_getkey(if_block* iface, const char *key) - { - if_data *curr = iface->info; -diff --git a/src/backends/interface_parser.h b/src/backends/interface_parser.h -index 075f454..8914283 100644 ---- a/src/backends/interface_parser.h -+++ b/src/backends/interface_parser.h -@@ -44,6 +44,7 @@ void ifparser_init(void); - void ifparser_destroy(void); - - if_block *ifparser_getif(const char* iface); -+if_block *ifparser_getmapping(const char* iface); - if_block *ifparser_getfirst(void); - const char *ifparser_getkey(if_block* iface, const char *key); - diff --git a/debian/patches/05-dhclient_lease_files.patch b/debian/patches/05-dhclient_lease_files.patch new file mode 100644 index 00000000..8f0597f3 --- /dev/null +++ b/debian/patches/05-dhclient_lease_files.patch @@ -0,0 +1,16 @@ +Index: network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c +=================================================================== +--- network-manager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c 2008-12-06 01:09:52.000000000 +0100 ++++ network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c 2008-12-06 01:10:29.000000000 +0100 +@@ -36,7 +36,11 @@ + #define NM_DHCP_MANAGER_PID_FILENAME "dhclient" + #define NM_DHCP_MANAGER_PID_FILE_EXT "pid" + ++#if defined (TARGET_DEBIAN) ++#define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" ++#else + #define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" ++#endif + #define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient" + #define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease" + diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch deleted file mode 100644 index 8ef4b176..00000000 --- a/debian/patches/06-dispatch_more_events.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- dispatcher-daemon/NetworkManagerDispatcher.c.old 2006-08-13 22:40:18.000000000 +0200 -+++ dispatcher-daemon/NetworkManagerDispatcher.c 2006-08-13 22:40:27.000000000 +0200 -@@ -44,6 +44,8 @@ - NMD_DEVICE_DONT_KNOW, - NMD_DEVICE_NOW_INACTIVE, - NMD_DEVICE_NOW_ACTIVE, -+ NMD_DEVICE_GOING_INACTIVE, -+ NMD_DEVICE_GOING_ACTIVE, - }; - typedef enum NMDAction NMDAction; - -@@ -95,6 +97,10 @@ - if (action == NMD_DEVICE_NOW_ACTIVE) - char_act = "up"; - else if (action == NMD_DEVICE_NOW_INACTIVE) -+ char_act = "post-down"; -+ else if (action == NMD_DEVICE_GOING_ACTIVE) -+ char_act = "pre-up"; -+ else if (action == NMD_DEVICE_GOING_INACTIVE) - char_act = "down"; - else - return; -@@ -217,9 +223,13 @@ - } - - if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) -- action = NMD_DEVICE_NOW_INACTIVE; -+ action = NMD_DEVICE_GOING_INACTIVE; - else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) - action = NMD_DEVICE_NOW_ACTIVE; -+ else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceActivating")) -+ action = NMD_DEVICE_GOING_ACTIVE; -+ else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceDeactivated")) -+ action = NMD_DEVICE_NOW_INACTIVE; - - if (action != NMD_DEVICE_DONT_KNOW) - { -@@ -234,8 +244,10 @@ - if (dev_object_path && dev_iface_name) - { - nm_info ("Device %s (%s) is now %s.", dev_object_path, dev_iface_name, -- (action == NMD_DEVICE_NOW_INACTIVE ? "down" : -- (action == NMD_DEVICE_NOW_ACTIVE ? "up" : "error"))); -+ (action == NMD_DEVICE_NOW_INACTIVE ? "going down" : -+ (action == NMD_DEVICE_NOW_ACTIVE ? "up" : -+ (action == NMD_DEVICE_GOING_INACTIVE ? "going down" : -+ (action == NMD_DEVICE_GOING_ACTIVE ? "going up" : "error"))))); - - nmd_execute_scripts (action, dev_iface_name); - } ---- man/NetworkManagerDispatcher.8.in 2006-02-01 19:14:15.000000000 +0100 -+++ man/NetworkManagerDispatcher.8.in.new 2006-08-15 20:13:00.000000000 +0200 -@@ -12,10 +12,14 @@ - directory in response to interfaces coming up and down. The scripts are run - alphabetically. The first parameter is the network interface name. The second - parameter is -+.I pre\-up -+before bringing the interface up, - .I up --if the interface is now up and -+after bringing the interface up, - .I down --if the interface is now down. -+before taking the interface down and -+.I post\-down -+after taking the interface down. - .SH OPTIONS - The following options are supported: - .TP ---- src/NetworkManagerDbus.c 2006-05-21 19:28:02.000000000 +0200 -+++ src/NetworkManagerDbus.c.new 2006-08-15 20:15:18.000000000 +0200 -@@ -191,6 +191,7 @@ - { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, - { DEVICE_ACTIVATING, "DeviceActivating" }, - { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, -+ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, - { DEVICE_ADDED, "DeviceAdded" }, - { DEVICE_REMOVED, "DeviceRemoved" }, - { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, ---- src/NetworkManagerDbus.h 2006-05-21 19:28:02.000000000 +0200 -+++ src/NetworkManagerDbus.h.new 2006-08-15 20:15:39.000000000 +0200 -@@ -40,6 +40,7 @@ - DEVICE_ACTIVATING, - DEVICE_ACTIVATION_FAILED, - DEVICE_ACTIVATION_CANCELED, -+ DEVICE_DEACTIVATED, - DEVICE_ADDED, - DEVICE_REMOVED, - DEVICE_CARRIER_ON, ---- src/nm-device.c 2006-07-10 22:30:49.000000000 +0200 -+++ src/nm-device.c.new 2006-08-15 20:16:11.000000000 +0200 -@@ -1436,6 +1436,7 @@ - NM_DEVICE_GET_CLASS (self)->deactivate (self); - - nm_schedule_state_change_signal_broadcast (self->priv->app_data); -+ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); - } - - diff --git a/debian/patches/13-validate_mac_addr.patch b/debian/patches/13-validate_mac_addr.patch deleted file mode 100644 index 47a81e19..00000000 --- a/debian/patches/13-validate_mac_addr.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- network-manager-0.6.5.orig/src/nm-device-802-11-wireless.c -+++ network-manager-0.6.5/src/nm-device-802-11-wireless.c -@@ -3439,6 +3439,20 @@ - } - - static gboolean -+has_valid_ether_addr (NMAccessPoint *ap) -+{ -+ struct ether_addr *addr; -+ int i; -+ -+ addr = nm_ap_get_address (ap); -+ for (i = 0 ; i < ETH_ALEN; i++) -+ if (addr->ether_addr_octet[i] != 0) -+ return TRUE; -+ -+ return FALSE; -+} -+ -+static gboolean - process_scan_results (NMDevice80211Wireless *dev, - const guint8 *res_buf, - guint32 res_buf_len) -@@ -3474,7 +3488,8 @@ - - /* Merge previous AP */ - if (ap) { -- add_new_ap_to_device_list (dev, ap); -+ if (has_valid_ether_addr (ap)) -+ add_new_ap_to_device_list (dev, ap); - nm_ap_unref (ap); - ap = NULL; - } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..c38d933a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +02-dbus_access_network_manager.patch +03-F3507g.patch +04-ltversioning.patch +05-dhclient_lease_files.patch diff --git a/debian/rules b/debian/rules index 9442c792..8e81f9b1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,31 +1,31 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +# List any files which are not installed +common-binary-post-install-arch:: list-missing + +DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager -X/usr/lib/pppd/ DEB_INSTALL_DOCS_ALL := README AUTHORS TODO +DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --with-wpa_supplicant=/sbin/wpa_supplicant \ - --with-dhcdbd=/usr/sbin/dhcdbd \ - --with-distro=debian + --with-distro=debian \ + --with-resolvconf=/sbin/resolvconf \ + --with-dhcp-client=/sbin/dhclient \ + --with-crypto=gnutls -DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 . - -DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties +DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . clean:: rm -f po/*.gmo - rm -f debian/*.1 - - -build/network-manager:: - /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 binary-install/network-manager:: - dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS) install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown - |