From 109a7976fe0363e22681d919258b3d9ce4b3bfb3 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 10 Jan 2006 15:31:05 +0000 Subject: first import of dhcbdb and networkmanager git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@440 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 135 +++++++++++++++ debian/NetworkManagerDispatcher.sgml | 97 +++++++++++ debian/README | 10 ++ debian/changelog | 210 +++++++++++++++++++++++ debian/compat | 1 + debian/control | 55 ++++++ debian/copyright | 12 ++ debian/dirs | 2 + debian/docs | 3 + debian/libnm-glib-0-dev.install | 5 + debian/libnm-glib-0.install | 1 + debian/network-manager-dev.install | 3 + debian/network-manager-dispatcher.dbus-event | 79 +++++++++ debian/network-manager.dbus-conf | 24 +++ debian/network-manager.dbus-event | 104 +++++++++++ debian/network-manager.dirs | 5 + debian/network-manager.docs | 1 + debian/network-manager.install | 10 ++ debian/network-manager.postinst | 19 ++ debian/nm-applet.conf | 24 +++ debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch | 11 ++ debian/rules | 26 +++ 22 files changed, 837 insertions(+) create mode 100644 debian/NetworkManager.sgml create mode 100644 debian/NetworkManagerDispatcher.sgml create mode 100644 debian/README create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/dirs create mode 100644 debian/docs create mode 100644 debian/libnm-glib-0-dev.install create mode 100644 debian/libnm-glib-0.install create mode 100644 debian/network-manager-dev.install create mode 100644 debian/network-manager-dispatcher.dbus-event create mode 100644 debian/network-manager.dbus-conf create mode 100644 debian/network-manager.dbus-event create mode 100644 debian/network-manager.dirs create mode 100644 debian/network-manager.docs create mode 100644 debian/network-manager.install create mode 100644 debian/network-manager.postinst create mode 100644 debian/nm-applet.conf create mode 100644 debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch create mode 100755 debian/rules diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml new file mode 100644 index 00000000..cc1fcd92 --- /dev/null +++ b/debian/NetworkManager.sgml @@ -0,0 +1,135 @@ + 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. + + --> + + + 30 August, 2005"> + + + GNU"> + GPL"> +]> + + + +
+ j@bootlab.org; +
+ + Jan + Gerber + + + 2005 + Jan Gerber + + &date; + + + NetworkManager + 1 + + + &package; + + Network management framework + + + + &package; + + + + + + + DESCRIPTION + + This manual page documents briefly the + &package; command. + + &package; monitors all network connections and automatically chooses the best connection to use. It is started as a system service by dbus. nm-applet allows you to specify wireless access points which wireless cards in the computer should associate with + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + Don't become a daemon, Messages will be logged to stdout + + + + + + + + Allow dummy devices to be created via DBUS methods [DEBUG] + + + + + + + + Show summary of options. + + + + + + SEE ALSO + + nm-applet (1), NetworkManagerDispatcher (1). + + More Information about NetworkManager can be found at + http://people.redhat.com/dcbw/NetworkManager/ . + + + AUTHOR + + This manual page was written by Jan Gerber j@bootlab.org for + the Ubuntu system. + + + + + + diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml new file mode 100644 index 00000000..c6a42105 --- /dev/null +++ b/debian/NetworkManagerDispatcher.sgml @@ -0,0 +1,97 @@ + 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. + + --> + + + 30 August, 2005"> + + + GNU"> + GPL"> +]> + + + +
+ j@bootlab.org; +
+ + Jan + Gerber + + + 2005 + Jan Gerber + + &date; + + + NetworkManagerDispatcher + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; calls scripts in +/etc/NetworkManager/dispatcher.d each time the network is broght up or down by NetworkManager. Arguments to these scripts are network device and up or down. so it will call something like /etc/NetworkManager/dispatcher.d/example eth0 up + + + + SEE ALSO + + NetworkManager (1), nm-applet (1). + + More Information about NetworkManager can be found at + http://people.redhat.com/dcbw/NetworkManager/ . + + + AUTHOR + + This manual page was written by Jan Gerber j@bootlab.org for + the Ubuntu system. + + + + + + diff --git a/debian/README b/debian/README new file mode 100644 index 00000000..768e12b9 --- /dev/null +++ b/debian/README @@ -0,0 +1,10 @@ +NetworkManger has two parts one is run on the system level to +manager connections and gather information. The other is an applet +the user can interact with. Since NetworkManager is not part of +main yet, you have to add nm-applet to your session once. + +(instructions for gnome only) +Go to System -> Preferences -> Sessions +In the Startup Programs tab, click Add +type "nm-applet", click OK. +log out of your gnome session, and log back in again. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..62b11114 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,210 @@ +network-manager (0.5.1-1) experimental; urgency=low + + * Inital upload to Debian (Closes #) + * work based on the ubuntu package + + -- Riccardo Setti Mon, 5 Jan 2006 17:09:29 +0100 + +network-manager (0.5.1-0ubuntu6) dapper; urgency=low + + * Really don't depend on bind9 being installed + + -- Matthew Garrett Mon, 26 Dec 2005 00:40:29 +0000 + +network-manager (0.5.1-0ubuntu5) dapper; urgency=low + + * debian/control: + - Version dep on dhcdbd to (>= 1.10-0ubuntu2). + + -- Christian Bjälevik Wed, 21 Dec 2005 19:08:53 +0100 + +network-manager (0.5.1-0ubuntu4) dapper; urgency=low + + * debian/control: + - Version all accurances of libdbus-glib-1-dev to (>= 0.60). + - Removed not needed Build-Dep on libxdcmp-dev, this is a dep + of libx11-dev now. + * debian/patches/01-STOLEN_FROM_HEAD-dbus-60: + - Add a patch from CVS HEAD to fix FTBFS. + No patchsystem, only applied it. + + -- Christian Bjälevik Wed, 21 Dec 2005 14:22:34 +0100 + +network-manager (0.5.1-0ubuntu3) dapper; urgency=low + + * debian/control: + - Changed versioned dep on wireless-tools to >= 28pre9 + (what upstream says in their .news). + - Removed commented out Conflicts-line. + - Do not depend on bind9 being installed. + - Added libxdmcp-dev as a Build-Dep. + * debian/*.dbus-event: + - Use "$NAME" instead of the incredible long "$DESC: ". + * debian/network-manager.postinst: + - Do not run gtk-update-icon-cache on configure cause + seb128 says it's a bad idea and explained why :-). + * debian/README: + - Fix typo (cann -> can). + * debian/rules: + - Removed named-support (we don't want bind9 for this) + - Added --with-distro=debian. + + -- Christian Bjälevik Thu, 15 Dec 2005 02:04:12 +0100 + +network-manager (0.5.1-0ubuntu2) dapper; urgency=low + + * remove .arch-ids traces + + -- Jan Gerber Sun, 13 Nov 2005 21:19:18 -0500 + +network-manager (0.5.1-0ubuntu1) dapper; urgency=low + + * New upstream version + + -- Jan Gerber Fri, 21 Oct 2005 08:33:25 -0400 + +network-manager (0.5.0-0ubuntu1) breezy; urgency=low + + * New upstream version + * split headers into network-manager-dev + + -- Jan Gerber Tue, 18 Oct 2005 17:43:56 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu5) breezy; urgency=low + + * fix postinst so its possible to install network-manager + in pbuilder + + -- Jan Gerber Tue, 11 Oct 2005 19:23:47 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu4) breezy; urgency=low + + * update postinst to restart dbus on install + + -- Jan Gerber Sat, 29 Aug 2005 13:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu3) breezy; urgency=low + + * this is NetworkManager CVS Tag NM_0_4_1_RELEASE + 3 patches + - make dhcdbd only a runtime dependency + - fix build due to one too many ,s + - fix debian backend to support static IP settings again + (all changes are upstream by now) + + -- Jan Gerber Sat, 27 Aug 2005 23:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu2) breezy; urgency=low + + * restructure build system to creat orig.tar.gz and diff.gz files + + -- Jan Gerber Sat, 27 Aug 2005 14:04:26 +0200 + +network-manager (0.4.1+cvs20050817-0unbuntu1) breezy; urgency=low + + * fix loading static IP settings from /etc/network/interfaces + + -- Jan Gerber Sun, 21 Aug 2005 19:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0) breezy; urgency=low + + * update to NM_0_4_1_RELEASE + + -- Jan Gerber Sun, 21 Aug 2005 15:27:26 +0200 + +network-manager (0.4.1+cvs20050813-0) breezy; urgency=low + + * change back to using BIND + * remove dependency on resolvconf and dnsmasq + + -- Jan Gerber Sat, 13 Aug 2005 19:37:26 +0200 + +network-manager (0.4.1+cvs20050618-3) breezy; urgency=low + + * Run resolvconf instead of messing with BIND. Dependencies + changed too. Unfortunately these changes are not properly + tested :-(. + + -- Ian Jackson Sat, 18 Jun 2005 13:33:26 +0100 + +network-manager (0.4.1+cvs20050618-2) breezy; urgency=low + + * Sort out chown of /var/lib/NetworkManager + + -- Thom May Sat, 18 Jun 2005 13:33:26 +0100 + +network-manager (0.4.1+cvs20050618-1) breezy; urgency=low + + * update from CVS + * Add configure magic to ensure we get the correct path for dhcdbd + (Ubuntu: #11905) + * Ensure /var/lib/NetworkManager is created with the correct permisions + (Ubuntu: #11904) + * Rename dbus event script to correct name and restart dbus in postinst + * Depend on lsb-base and use log_*_msg in event script + + -- Thom May Sat, 18 Jun 2005 11:22:49 +0100 + +network-manager (0.4.1+cvs20050616-1) breezy; urgency=low + + * New upstream. Fix descriptions. + + -- Thom May Thu, 16 Jun 2005 14:47:30 +0100 + +network-manager (0.4.1+cvs20050614-1) unstable; urgency=low + + * New upstream release. Move to 0.4 branch; use dhcdbd. + * Drop network-manager-gnome + * add libnm-glib-0 and libnm-glib-0-dev + + -- Thom May Tue, 14 Jun 2005 12:41:29 +0100 + +network-manager (0.3.1+cvs20041108-1) unstable; urgency=low + + * New upstream release + * Add dpatch + + -- Thom May Mon, 8 Nov 2004 13:49:15 +0000 + +network-manager (0.3.1+cvs20041101-2) unstable; urgency=low + + * Update dependencies, thanks to j@bootlab.org + + -- Thom May Tue, 2 Nov 2004 16:32:45 +0000 + +network-manager (0.3.1+cvs20041101-1) unstable; urgency=low + + * New upstream release + + -- Thom May Mon, 1 Nov 2004 13:08:32 +0000 + +network-manager (0.3.1+cvs20041028-1) unstable; urgency=low + + * New upstream release + + -- Thom May Thu, 28 Oct 2004 13:12:42 +0100 + +network-manager (0.3+cvs20041016-2) unstable; urgency=low + + * fix some minor problems in packaging; clean up for pkg-utopia entry + + -- Thom May Mon, 25 Oct 2004 13:43:07 +0100 + +network-manager (0.3+cvs20041016-1) unstable; urgency=low + + * New upstream release + * Clean up backend for debian + + -- Thom May Sat, 16 Oct 2004 21:32:43 +0100 + +network-manager (0.3-1) unstable; urgency=low + + * New upstream release + + -- Thom May Fri, 15 Oct 2004 13:55:46 +0100 + +network-manager (0.2+cvs20040928-1) unstable; urgency=low + + * Initial Release. + + -- Thom May Sun, 3 Oct 2004 11:54:56 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..3c59cfca --- /dev/null +++ b/debian/control @@ -0,0 +1,55 @@ +Source: network-manager +Section: net +Priority: optional +Maintainer: Riccardo Setti +Build-Depends: debhelper (>= 4.0.0), gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev +Standards-Version: 3.6.2 + +Package: network-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6) +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 + 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 userspace daemons and a notification applet to + control the system. + +Package: network-manager-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config +Description: network management framework daemon development + this package provides header files that are needed to + compile VPN Plugins for NetworManager. + +Package: libnm-glib-0 +Architecture: any +Depends: ${shlibs:Depends} +Description: network management framework daemon (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 + 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 to query + connection status via NetworkManager. + +Package: libnm-glib-0-dev +Architecture: any +Depends: libglib2.0-dev, libnm-glib-0, libdbus-glib-1-dev (>= 0.60) +Description: network management framework daemon (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 interface that applications can use to query + connection status via NetworkManager. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..099ed1c0 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Thom May on +Sun, 3 Oct 2004 11:54:56 +0100. + +It was downloaded from ftp.gnome.org + +Upstream Author: Dan Williams + +Copyright: + +This package is licensed under the GPL. For a description of the GPL, +see /usr/share/common-licenses/GPL on your Debian system. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 00000000..ca882bbb --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..5502ed8f --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/libnm-glib-0-dev.install b/debian/libnm-glib-0-dev.install new file mode 100644 index 00000000..754ac2e6 --- /dev/null +++ b/debian/libnm-glib-0-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/pkgconfig/libnm_glib.pc +debian/tmp/usr/lib/libnm_glib*.a +debian/tmp/usr/lib/libnm_glib*.la +debian/tmp/usr/lib/libnm_glib*.so +debian/tmp/usr/include/NetworkManager/libnm_glib.h diff --git a/debian/libnm-glib-0.install b/debian/libnm-glib-0.install new file mode 100644 index 00000000..51ab95e3 --- /dev/null +++ b/debian/libnm-glib-0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm_glib*.so.* diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install new file mode 100644 index 00000000..9287a6f6 --- /dev/null +++ b/debian/network-manager-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/pkgconfig/NetworkManager.pc +debian/tmp/usr/include/NetworkManager/NetworkManager.h +debian/tmp/usr/include/NetworkManager/nm-vpn-ui-interface.h diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event new file mode 100644 index 00000000..e8f5b94c --- /dev/null +++ b/debian/network-manager-dispatcher.dbus-event @@ -0,0 +1,79 @@ +#! /bin/sh +# +# NetworkManager NetworkManagerDispatcher daemon +# Daemon for automatically switching network +# connections to the best available connection. +# This file should be placed in /etc/init.d. +# +# Authors: Jan Gerber +# Mark Roach +# Thom May +# +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="Network connection manager dispatcher daemon" +NAME="NetworkManagerDispatcher" +DAEMON=/usr/sbin/$NAME +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid +SCRIPTNAME=/etc/dbus-1/event.d/25$NAME +USER=root + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher + +# +# Function that starts the daemon/service. +# +d_start() { + log_begin_msg "Starting $NAME" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS + RETVAL=$? + log_end_msg $RETVAL + [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE +} + +# +# Function that stops the daemon/service. +# +d_stop() { + log_begin_msg "Stopping $NAME" + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON + log_end_msg $? +} + + +case "$1" in + start) + d_start + ;; + stop) + d_stop + ;; + restart|force-reload) + d_stop + sleep 1 + d_start + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf new file mode 100644 index 00000000..bdf362ff --- /dev/null +++ b/debian/network-manager.dbus-conf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event new file mode 100644 index 00000000..25717d6a --- /dev/null +++ b/debian/network-manager.dbus-event @@ -0,0 +1,104 @@ +#! /bin/sh +# +# NetworkManager NetworkManager daemon +# Daemon for automatically switching network +# connections to the best available connection. +# This file should be placed in /etc/init.d. +# +# Authors: Jan Gerber +# Mark Roach +# Thom May +# +# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="Network connection manager daemon" +NAME="NetworkManager" + +DAEMON=/usr/sbin/$NAME + +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid +NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named + +SCRIPTNAME=/etc/dbus-1/event.d/25$NAME +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/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManager && . /etc/default/NetworkManager + +# +# Function that starts the daemon/service. +# +d_start() { + log_begin_msg "Starting $NAME" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + modprobe capability >/dev/null 2>&1 || true + + test -d /var/lib/NetworkManager || mkdir -p /var/lib/NetworkManager + chmod 755 /var/lib/NetworkManager + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS + RETVAL=$? + log_end_msg $RETVAL + [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE + + +} + +# +# Function that stops the daemon/service. +# +d_stop() { + log_begin_msg "Stopping $NAME" + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON + log_end_msg $? + + # if NetworkManager does not want to die, apply some more force + if [ -e $PIDFILE ]; then + kill -9 $(< $PIDFILE) || true + rm -f $PIDFILE + fi + if [ -e $NAMED_PIDFILE ]; then + kill -9 $(< $NAMED_PIDFILE) || true + rm -f $NAMED_PIDFILE + fi + +} + + +case "$1" in + start) + d_start + ;; + stop) + d_stop + ;; + restart|force-reload) + d_stop + sleep 1 + d_start + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs new file mode 100644 index 00000000..86847abc --- /dev/null +++ b/debian/network-manager.dirs @@ -0,0 +1,5 @@ +etc/dbus-1/event.d +etc/dbus-1/system.d +usr/bin +usr/share/locale +var/lib/NetworkManager diff --git a/debian/network-manager.docs b/debian/network-manager.docs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/debian/network-manager.docs @@ -0,0 +1 @@ + diff --git a/debian/network-manager.install b/debian/network-manager.install new file mode 100644 index 00000000..d1771b07 --- /dev/null +++ b/debian/network-manager.install @@ -0,0 +1,10 @@ +debian/tmp/usr/bin/NetworkManager usr/sbin/ +debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ +debian/tmp/usr/bin/nm-vpn-properties +debian/tmp/usr/bin/nm-applet +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/NetworkManager/* +debian/tmp/usr/share/NetworkManagerNotification/* +debian/tmp/usr/share/nm-applet/* +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/gnome-vpn-properties diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst new file mode 100644 index 00000000..302e4bf7 --- /dev/null +++ b/debian/network-manager.postinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +case "$1" in + configure) + if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then + mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled + fi + + if [ -x /usr/bin/dbus-send ]; then + /usr/bin/dbus-send --system --type=method_call \ + --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig + /etc/dbus-1/event.d/25NetworkManager restart + /etc/dbus-1/event.d/25NetworkManagerDispatcher restart + fi + ;; +esac + +#DEBHELPER# diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf new file mode 100644 index 00000000..69bc7aee --- /dev/null +++ b/debian/nm-applet.conf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch new file mode 100644 index 00000000..9b6b3aad --- /dev/null +++ b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch @@ -0,0 +1,11 @@ +--- gnome/applet/applet-dbus.c.old 2005-12-21 14:19:38.000000000 +0100 ++++ gnome/applet/applet-dbus.c 2005-12-21 14:20:12.000000000 +0100 +@@ -388,7 +388,7 @@ + } + + dbus_error_init (&error); +- acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error); ++ acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &error); + if (dbus_error_is_set (&error)) + { + nm_warning ("nmwa_dbus_init() could not acquire its service. dbus_bus_acquire_service() says: '%s'", error.message); diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..b8337510 --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/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 + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-dbus-sys=/etc/dbus-1/system.d \ + --libexecdir=/usr/bin \ + --localstatedir=/var/run \ + --without-named \ + --with-dhcdbd=/sbin/dhcdbd \ + --with-distro=debian + +clean:: + + rm -f po/*.gmo + +install_arch:: + + install -m 755 debian/network-manager.dbus-event debian/network-manager/etc/dbus-1/event.d/25NetworkManager + install -m 755 debian/network-manager-dispatcher.dbus-event debian/network-manager/etc/dbus-1/event.d/25NetworkManagerDispatcher + mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d + install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf + install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + -- cgit 1.3.0-6-gf8a5 From 458df599ae436a2324590d61624aa7489da15cfd Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 11 Jan 2006 11:24:14 +0000 Subject: added patches that fix the problem of NMDevice.c withlinux-kernel-headers >2.6.11 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@441 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01_NMDevice.c.patch | 23 +++++++++++++++++++++++ debian/patches/02_nm-netlink-monitor.patch | 11 +++++++++++ 2 files changed, 34 insertions(+) create mode 100644 debian/patches/01_NMDevice.c.patch create mode 100644 debian/patches/02_nm-netlink-monitor.patch diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch new file mode 100644 index 00000000..79c72dd2 --- /dev/null +++ b/debian/patches/01_NMDevice.c.patch @@ -0,0 +1,23 @@ +--- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 ++++ ../../NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 +@@ -4283,7 +4283,7 @@ + + strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); + edata.cmd = ETHTOOL_GLINK; +- ifr.ifr_data = (char *) &edata; ++ ifr.ifr_data = (void __user *) &edata; + #ifdef IOCTL_DEBUG + nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev)); + #endif +@@ -4305,8 +4305,9 @@ + /**************************************/ + /* MII capability detection */ + /**************************************/ +-#include +- ++#define _LINUX_IF_H ++ #include ++#undef _LINUX_IF_ + static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location) + { + struct mii_ioctl_data *mii; diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch new file mode 100644 index 00000000..bdc71a26 --- /dev/null +++ b/debian/patches/02_nm-netlink-monitor.patch @@ -0,0 +1,11 @@ +--- nm-netlink-monitor.c 2005-08-12 21:06:09.000000000 +0200 ++++ prova.c 2006-01-11 12:18:52.000000000 +0100 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + -- cgit 1.3.0-6-gf8a5 From b6debc23e216af94479a56386e0e13baa2c51a5b Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 11 Jan 2006 11:39:48 +0000 Subject: now changelog reflects patches addition git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@442 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 62b11114..f46ff437 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ network-manager (0.5.1-1) experimental; urgency=low * Inital upload to Debian (Closes #) * work based on the ubuntu package - + * Added 01.patch and 02.patch for fix the problem with recente linux + kernel-headers + -- Riccardo Setti Mon, 5 Jan 2006 17:09:29 +0100 network-manager (0.5.1-0ubuntu6) dapper; urgency=low -- cgit 1.3.0-6-gf8a5 From 28122824cbf0a8b612e9432c2dbccfaf99bc5fc7 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 11 Jan 2006 11:42:38 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@443 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f46ff437..6d1ff3b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.5.1-1) experimental; urgency=low +NetworkManager (0.5.1-1) experimental; urgency=low * Inital upload to Debian (Closes #) * work based on the ubuntu package -- cgit 1.3.0-6-gf8a5 From e12d9c21275fac1f6989155fbdb54267820e2ae3 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 11 Jan 2006 11:45:25 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@444 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6d1ff3b5..f46ff437 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -NetworkManager (0.5.1-1) experimental; urgency=low +network-manager (0.5.1-1) experimental; urgency=low * Inital upload to Debian (Closes #) * work based on the ubuntu package -- cgit 1.3.0-6-gf8a5 From f4bc4612f5c1a48017d6bda3cbb21df2bf6ba550 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 11 Jan 2006 11:57:48 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@445 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01_NMDevice.c.patch | 2 +- debian/patches/02_nm-netlink-monitor.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch index 79c72dd2..a776d3ec 100644 --- a/debian/patches/01_NMDevice.c.patch +++ b/debian/patches/01_NMDevice.c.patch @@ -1,5 +1,5 @@ --- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 -+++ ../../NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 ++++ src/NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 @@ -4283,7 +4283,7 @@ strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch index bdc71a26..4389059d 100644 --- a/debian/patches/02_nm-netlink-monitor.patch +++ b/debian/patches/02_nm-netlink-monitor.patch @@ -1,5 +1,5 @@ --- nm-netlink-monitor.c 2005-08-12 21:06:09.000000000 +0200 -+++ prova.c 2006-01-11 12:18:52.000000000 +0100 ++++ src/nm-netlink-monitor.c 2006-01-11 12:18:52.000000000 +0100 @@ -30,7 +30,7 @@ #include #include -- cgit 1.3.0-6-gf8a5 From 735ec145a851e75ce4a090979a41a0299fc46bed Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 13 Jan 2006 19:38:19 +0000 Subject: addedd dhcdbd.dhcp3 script and some minor changes in rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@472 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/dhcdbd.dhcp3 | 13 +++++++++++++ debian/rules | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 debian/dhcdbd.dhcp3 diff --git a/debian/dhcdbd.dhcp3 b/debian/dhcdbd.dhcp3 new file mode 100644 index 00000000..010842f3 --- /dev/null +++ b/debian/dhcdbd.dhcp3 @@ -0,0 +1,13 @@ +if [ -n "${dhc_dbus}" ]; then + /usr/bin/dbus-send \ + --system \ + --dest=com.redhat.dhcp \ + --type=method_call \ + /com/redhat/dhcp/$interface \ + com.redhat.dhcp.set \ + 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; + if (( ( dhc_dbus & 31 ) == 31 )); then + exit 0; + fi; +fi; + diff --git a/debian/rules b/debian/rules index b8337510..03108f91 100755 --- a/debian/rules +++ b/debian/rules @@ -16,11 +16,15 @@ clean:: rm -f po/*.gmo -install_arch:: +binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event debian/network-manager/etc/dbus-1/event.d/25NetworkManagerDispatcher + mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - + + mkdir -p debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/ + cp debian/dhcdbd.dhcp3 debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/dhcdbd + -- cgit 1.3.0-6-gf8a5 From 80fe10fbf699c270a96c7988bfb764fff1b71231 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 13 Jan 2006 20:18:47 +0000 Subject: addedd README.Debian git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@473 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README | 10 ---------- debian/README.Debian | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 debian/README create mode 100644 debian/README.Debian diff --git a/debian/README b/debian/README deleted file mode 100644 index 768e12b9..00000000 --- a/debian/README +++ /dev/null @@ -1,10 +0,0 @@ -NetworkManger has two parts one is run on the system level to -manager connections and gather information. The other is an applet -the user can interact with. Since NetworkManager is not part of -main yet, you have to add nm-applet to your session once. - -(instructions for gnome only) -Go to System -> Preferences -> Sessions -In the Startup Programs tab, click Add -type "nm-applet", click OK. -log out of your gnome session, and log back in again. diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000..20c9ed3d --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,11 @@ +NetworkManger has two parts one is run on the system level to +manager connections and gather information. The other is an applet +the user can interact with. Since NetworkManager is not part of +main yet, you have to add nm-applet to your session once. + +(instructions for gnome only) +First add yourself to the plugdev group +Go to System -> Preferences -> Sessions +In the Startup Programs tab, click Add +type "nm-applet", click OK. +log out of your gnome session, and log back in again. -- cgit 1.3.0-6-gf8a5 From 66d4cc2e4760d67230ae61fd9e87178d14c11456 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 08:48:43 +0000 Subject: some changes git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@475 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/rules b/debian/rules index 03108f91..83aaf28b 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,3 @@ binary-install/network-manager:: install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - mkdir -p debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/ - cp debian/dhcdbd.dhcp3 debian/network-manager/etc/dhcp3/dhclient-exit-hooks.d/dhcdbd - -- cgit 1.3.0-6-gf8a5 From e806203207aefa08f75eb009f36c0644bda9a2c4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 08:51:15 +0000 Subject: dhcdbd.dhcp3 must stay in the dhcdbd package git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@476 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/dhcdbd.dhcp3 | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 debian/dhcdbd.dhcp3 diff --git a/debian/dhcdbd.dhcp3 b/debian/dhcdbd.dhcp3 deleted file mode 100644 index 010842f3..00000000 --- a/debian/dhcdbd.dhcp3 +++ /dev/null @@ -1,13 +0,0 @@ -if [ -n "${dhc_dbus}" ]; then - /usr/bin/dbus-send \ - --system \ - --dest=com.redhat.dhcp \ - --type=method_call \ - /com/redhat/dhcp/$interface \ - com.redhat.dhcp.set \ - 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; - if (( ( dhc_dbus & 31 ) == 31 )); then - exit 0; - fi; -fi; - -- cgit 1.3.0-6-gf8a5 -- cgit 1.3.0-6-gf8a5 From 83d2953d053534e4098f39eeefc47362b59c4c07 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 10:29:50 +0000 Subject: addedd lintian-ovveride git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@482 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 83aaf28b..cc9180c5 100755 --- a/debian/rules +++ b/debian/rules @@ -25,3 +25,6 @@ binary-install/network-manager:: install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + install -d $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager + install -m 0644 debian/network-manager.lintian-override $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager + -- cgit 1.3.0-6-gf8a5 From 2b775e4e7330ce0401e31a2768f941d90caf1cbb Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 16:59:49 +0000 Subject: s/mkdir -p/install -d git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@484 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index cc9180c5..080fa11c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,13 +18,18 @@ clean:: binary-install/network-manager:: - install -m 755 debian/network-manager.dbus-event debian/network-manager/etc/dbus-1/event.d/25NetworkManager - install -m 755 debian/network-manager-dispatcher.dbus-event debian/network-manager/etc/dbus-1/event.d/25NetworkManagerDispatcher + install -m 755 debian/network-manager.dbus-event \ + debian/network-manager/etc/dbus-1/event.d/25NetworkManager + install -m 755 debian/network-manager-dispatcher.dbus-event \ + debian/network-manager/etc/dbus-1/event.d/25NetworkManagerDispatcher - mkdir -p -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/nm-applet.conf debian/network-manager/etc/dbus-1/system.d/nm-applet.conf - install -m 644 debian/network-manager.dbus-conf debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d + install -m 644 debian/nm-applet.conf \ + debian/network-manager/etc/dbus-1/system.d/nm-applet.conf + install -m 644 debian/network-manager.dbus-conf \ + debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf install -d $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager - install -m 0644 debian/network-manager.lintian-override $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager + install -m 0644 debian/network-manager.lintian-override \ + $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager -- cgit 1.3.0-6-gf8a5 From 58372fb0411db8eb28b5b8dac6ad0e0052399877 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 18:34:16 +0000 Subject: addedd a lintian ovveride for the missing manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@485 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manger.lintian-ovverride | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 debian/network-manger.lintian-ovverride diff --git a/debian/network-manger.lintian-ovverride b/debian/network-manger.lintian-ovverride new file mode 100644 index 00000000..8273764a --- /dev/null +++ b/debian/network-manger.lintian-ovverride @@ -0,0 +1,5 @@ +network-manager: binary-without-manpage NetworkManager +network-manager: binary-without-manpage NetworkManagerDispatcher +network-manager: binary-without-manpage nm-applet +network-manager: binary-without-manpage nm-vpn-properties + -- cgit 1.3.0-6-gf8a5 From b9899f438009c319de03939e052e122ae70beccd Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 18:48:39 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@486 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.lintian-ovverride | 5 +++++ debian/network-manger.lintian-ovverride | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 debian/network-manager.lintian-ovverride delete mode 100644 debian/network-manger.lintian-ovverride diff --git a/debian/network-manager.lintian-ovverride b/debian/network-manager.lintian-ovverride new file mode 100644 index 00000000..8273764a --- /dev/null +++ b/debian/network-manager.lintian-ovverride @@ -0,0 +1,5 @@ +network-manager: binary-without-manpage NetworkManager +network-manager: binary-without-manpage NetworkManagerDispatcher +network-manager: binary-without-manpage nm-applet +network-manager: binary-without-manpage nm-vpn-properties + diff --git a/debian/network-manger.lintian-ovverride b/debian/network-manger.lintian-ovverride deleted file mode 100644 index 8273764a..00000000 --- a/debian/network-manger.lintian-ovverride +++ /dev/null @@ -1,5 +0,0 @@ -network-manager: binary-without-manpage NetworkManager -network-manager: binary-without-manpage NetworkManagerDispatcher -network-manager: binary-without-manpage nm-applet -network-manager: binary-without-manpage nm-vpn-properties - -- cgit 1.3.0-6-gf8a5 From fbe48f0f7dc58794e6a3fc84eb5688aba515851a Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 16 Jan 2006 18:53:22 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@487 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.lintian-override | 5 +++++ debian/network-manager.lintian-ovverride | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 debian/network-manager.lintian-override delete mode 100644 debian/network-manager.lintian-ovverride diff --git a/debian/network-manager.lintian-override b/debian/network-manager.lintian-override new file mode 100644 index 00000000..8273764a --- /dev/null +++ b/debian/network-manager.lintian-override @@ -0,0 +1,5 @@ +network-manager: binary-without-manpage NetworkManager +network-manager: binary-without-manpage NetworkManagerDispatcher +network-manager: binary-without-manpage nm-applet +network-manager: binary-without-manpage nm-vpn-properties + diff --git a/debian/network-manager.lintian-ovverride b/debian/network-manager.lintian-ovverride deleted file mode 100644 index 8273764a..00000000 --- a/debian/network-manager.lintian-ovverride +++ /dev/null @@ -1,5 +0,0 @@ -network-manager: binary-without-manpage NetworkManager -network-manager: binary-without-manpage NetworkManagerDispatcher -network-manager: binary-without-manpage nm-applet -network-manager: binary-without-manpage nm-vpn-properties - -- cgit 1.3.0-6-gf8a5 From 1f81d46b3670e8fcadd3ea8d926cb07601d483ff Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 23 Jan 2006 16:47:35 +0000 Subject: changed the default path of dhcdbd git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@519 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 080fa11c..c3d89853 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --libexecdir=/usr/bin \ --localstatedir=/var/run \ --without-named \ - --with-dhcdbd=/sbin/dhcdbd \ + --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian clean:: -- cgit 1.3.0-6-gf8a5 From 7f2046277c083ddfc70394044c8b5ba049beabed Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 26 Jan 2006 18:49:59 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@521 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/network-manager-dispatcher.dbus-event | 11 ++++++----- debian/network-manager.dbus-event | 9 +++++---- debian/network-manager.lintian-override | 2 -- debian/network-manager.postinst | 5 ++--- debian/rules | 8 ++++++-- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index f46ff437..ed1853e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.5.1-2) experimental; urgency=low + + * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because + first we need to start NetworkManager and then NetworkManagerDispatcher + * added networkmanger and networkmanaferdispatcher manpages. + + -- Riccardo Setti Wed, 25 Jan 2006 22:54:01 +0100 + network-manager (0.5.1-1) experimental; urgency=low * Inital upload to Debian (Closes #) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index e8f5b94c..e8c216f2 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -5,7 +5,8 @@ # connections to the best available connection. # This file should be placed in /etc/init.d. # -# Authors: Jan Gerber +# Authors: Christian Bjälevik +# Jan Gerber # Mark Roach # Thom May # @@ -14,12 +15,12 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="Network connection manager dispatcher daemon" +DESC="NetworkManager dispatcher" NAME="NetworkManagerDispatcher" DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager PIDFILE=$PIDDIR/$NAME.pid -SCRIPTNAME=/etc/dbus-1/event.d/25$NAME +SCRIPTNAME=/etc/dbus-1/event.d/26$NAME USER=root # Gracefully exit if the package has been removed. @@ -34,7 +35,7 @@ test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDi # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $NAME" + log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR @@ -51,7 +52,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $NAME" + log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 25717d6a..2a59a08e 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -5,7 +5,8 @@ # connections to the best available connection. # This file should be placed in /etc/init.d. # -# Authors: Jan Gerber +# Authors: Christian Bjälevik +# Jan Gerber # Mark Roach # Thom May # @@ -15,7 +16,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="Network connection manager daemon" +DESC="NetworkManager daemon" NAME="NetworkManager" DAEMON=/usr/sbin/$NAME @@ -42,7 +43,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $NAME" + log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR @@ -65,7 +66,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $NAME" + log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? diff --git a/debian/network-manager.lintian-override b/debian/network-manager.lintian-override index 8273764a..ef60f34b 100644 --- a/debian/network-manager.lintian-override +++ b/debian/network-manager.lintian-override @@ -1,5 +1,3 @@ -network-manager: binary-without-manpage NetworkManager -network-manager: binary-without-manpage NetworkManagerDispatcher network-manager: binary-without-manpage nm-applet network-manager: binary-without-manpage nm-vpn-properties diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 302e4bf7..849dec1c 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -6,12 +6,11 @@ case "$1" in if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled fi - - if [ -x /usr/bin/dbus-send ]; then + if [ -x /usr/bin/dbus-send ]; then /usr/bin/dbus-send --system --type=method_call \ --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/25NetworkManagerDispatcher restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart fi ;; esac diff --git a/debian/rules b/debian/rules index c3d89853..2df6896e 100755 --- a/debian/rules +++ b/debian/rules @@ -11,17 +11,21 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --without-named \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian - + clean:: rm -f po/*.gmo + rm debian/*.1 binary-install/network-manager:: + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.1 + install -m 755 debian/network-manager.dbus-event \ debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/25NetworkManagerDispatcher + debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d install -m 644 debian/nm-applet.conf \ -- cgit 1.3.0-6-gf8a5 From 2465d0812de9650867e4ed00cc15d5423abf90c0 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 21:58:08 +0000 Subject: added networkmanage{prerm,manpages} git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@523 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.manpages | 2 ++ debian/network-manager.prerm | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 debian/network-manager.manpages create mode 100644 debian/network-manager.prerm diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages new file mode 100644 index 00000000..9ac2586b --- /dev/null +++ b/debian/network-manager.manpages @@ -0,0 +1,2 @@ +debian/NetworkManagerDispatcher.1 +debian/NetworkManager.1 diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm new file mode 100644 index 00000000..d11dd4c9 --- /dev/null +++ b/debian/network-manager.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +case "$1" in + configure) + if [ -f /etc/dbus-1/event.d/25NetworkManagerDispatcher ]; then + rm /etc/dbus-1/event.d/25NetworkManagerDispatcher + fi + ;; +esac + +#DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 49469a123b5bb6d4cf6b1e496b90cb911769badf Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 22:06:51 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@524 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2df6896e..e8eabe07 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ clean:: rm -f po/*.gmo - rm debian/*.1 + rm -f debian/*.1 binary-install/network-manager:: -- cgit 1.3.0-6-gf8a5 From e9ef4cc747f5723870a56186a8e34e6590b256e2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 22:17:34 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@525 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index e8eabe07..7ac3795e 100755 --- a/debian/rules +++ b/debian/rules @@ -17,11 +17,13 @@ clean:: rm -f po/*.gmo rm -f debian/*.1 -binary-install/network-manager:: + +build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.1 +binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 6a37f9bc488a9a376e0cf97c1caf26e69faa7058 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 30 Jan 2006 22:22:58 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@526 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 7ac3795e..2bf8470d 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManager.sgml > NetworkManager.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 2e97c9da8b83cf8fed9331273abee63ca5badbe8 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 18:25:08 +0000 Subject: removed *.lintian-override git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@528 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 +++-------- debian/control | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed1853e0..d3d488a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,11 @@ -network-manager (0.5.1-2) experimental; urgency=low +network-manager (0.5.1-1) experimental; urgency=low * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because first we need to start NetworkManager and then NetworkManagerDispatcher * added networkmanger and networkmanaferdispatcher manpages. - - -- Riccardo Setti Wed, 25 Jan 2006 22:54:01 +0100 - -network-manager (0.5.1-1) experimental; urgency=low - - * Inital upload to Debian (Closes #) + * Inital upload to Debian (Closes: #270538) * work based on the ubuntu package - * Added 01.patch and 02.patch for fix the problem with recente linux + * Added 01.patch and 02.patch for fix the problem with recent linux kernel-headers -- Riccardo Setti Mon, 5 Jan 2006 17:09:29 +0100 diff --git a/debian/control b/debian/control index 3c59cfca..1e369834 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 4.0.0), gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 3b87fe22f5a3e5f7be23cf78bf85839b663bd7e9 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 20:19:10 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@529 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.lintian-override | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 debian/network-manager.lintian-override diff --git a/debian/network-manager.lintian-override b/debian/network-manager.lintian-override deleted file mode 100644 index ef60f34b..00000000 --- a/debian/network-manager.lintian-override +++ /dev/null @@ -1,3 +0,0 @@ -network-manager: binary-without-manpage nm-applet -network-manager: binary-without-manpage nm-vpn-properties - -- cgit 1.3.0-6-gf8a5 From 7e2868fd44ae27b210035b41723862f0545127b6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 20:29:10 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@530 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/rules b/debian/rules index 2bf8470d..50c9a2f6 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,3 @@ binary-install/network-manager:: install -m 644 debian/network-manager.dbus-conf \ debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - install -d $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager - install -m 0644 debian/network-manager.lintian-override \ - $(CURDIR)/debian/network-manager/usr/share/lintian/overrides/network-manager - -- cgit 1.3.0-6-gf8a5 From 6e19d0b79255448d9fdb17cf8ed408def4b921b5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 21:14:20 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@533 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 16 ++++++++++++++-- debian/network-manager-gnome.dirs | 1 + debian/network-manager-gnome.install | 6 ++++++ debian/network-manager.install | 8 -------- debian/rules | 9 +++++---- 5 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 debian/network-manager-gnome.dirs create mode 100644 debian/network-manager-gnome.install diff --git a/debian/control b/debian/control index 1e369834..96a664d2 100644 --- a/debian/control +++ b/debian/control @@ -16,9 +16,21 @@ Description: network management framework daemon 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 userspace daemons and a notification applet to - control the system. + This package provides the userspace daemons. +Package: network-manager-gnome +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager +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 + 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 notification applet to the control system. + Package: network-manager-dev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs new file mode 100644 index 00000000..e628b1eb --- /dev/null +++ b/debian/network-manager-gnome.dirs @@ -0,0 +1 @@ +etc/dbus-1/system.d/ diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install new file mode 100644 index 00000000..c7b30983 --- /dev/null +++ b/debian/network-manager-gnome.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/nm-vpn-properties +debian/tmp/usr/bin/nm-applet +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/nm-applet/* +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/gnome-vpn-properties diff --git a/debian/network-manager.install b/debian/network-manager.install index d1771b07..b0c7b38b 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,10 +1,2 @@ debian/tmp/usr/bin/NetworkManager usr/sbin/ debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ -debian/tmp/usr/bin/nm-vpn-properties -debian/tmp/usr/bin/nm-applet -debian/tmp/usr/share/locale/* -debian/tmp/usr/share/NetworkManager/* -debian/tmp/usr/share/NetworkManagerNotification/* -debian/tmp/usr/share/nm-applet/* -debian/tmp/usr/share/icons/hicolor -debian/tmp/usr/share/gnome-vpn-properties diff --git a/debian/rules b/debian/rules index 50c9a2f6..65c6dc90 100755 --- a/debian/rules +++ b/debian/rules @@ -28,10 +28,11 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/nm-applet.conf \ - debian/network-manager/etc/dbus-1/system.d/nm-applet.conf install -m 644 debian/network-manager.dbus-conf \ debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - + +binary-install/network-manager-gnome:: + install -m 644 debian/nm-applet.conf \ + debian/network-manager/etc/dbus-1/system.d/nm-applet.conf + -- cgit 1.3.0-6-gf8a5 From b88ca59bf1735517f8498c41c3b3f3add089a064 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 21:25:19 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@534 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 96a664d2..7f184361 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Description: network management framework daemon development this package provides header files that are needed to compile VPN Plugins for NetworManager. -Package: libnm-glib-0 +Package: libnm-glib0 Architecture: any Depends: ${shlibs:Depends} Description: network management framework daemon (GLib shared library) @@ -52,9 +52,9 @@ Description: network management framework daemon (GLib shared library) This package provides the shared library that applications can use to query connection status via NetworkManager. -Package: libnm-glib-0-dev +Package: libnm-glib-dev Architecture: any -Depends: libglib2.0-dev, libnm-glib-0, libdbus-glib-1-dev (>= 0.60) +Depends: libglib2.0-dev, libnm-glib0, libdbus-glib-1-dev (>= 0.60) Description: network management framework daemon (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 -- cgit 1.3.0-6-gf8a5 From 0f6ce59d76c366f6103e83340d2747b10fe4448c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 21:41:08 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@535 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-0-dev.install | 5 ----- debian/libnm-glib-0.install | 1 - debian/libnm-glib-dev.install | 5 +++++ debian/libnm-glib0.install | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 debian/libnm-glib-0-dev.install delete mode 100644 debian/libnm-glib-0.install create mode 100644 debian/libnm-glib-dev.install create mode 100644 debian/libnm-glib0.install diff --git a/debian/libnm-glib-0-dev.install b/debian/libnm-glib-0-dev.install deleted file mode 100644 index 754ac2e6..00000000 --- a/debian/libnm-glib-0-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmp/usr/lib/pkgconfig/libnm_glib.pc -debian/tmp/usr/lib/libnm_glib*.a -debian/tmp/usr/lib/libnm_glib*.la -debian/tmp/usr/lib/libnm_glib*.so -debian/tmp/usr/include/NetworkManager/libnm_glib.h diff --git a/debian/libnm-glib-0.install b/debian/libnm-glib-0.install deleted file mode 100644 index 51ab95e3..00000000 --- a/debian/libnm-glib-0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libnm_glib*.so.* diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install new file mode 100644 index 00000000..754ac2e6 --- /dev/null +++ b/debian/libnm-glib-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/pkgconfig/libnm_glib.pc +debian/tmp/usr/lib/libnm_glib*.a +debian/tmp/usr/lib/libnm_glib*.la +debian/tmp/usr/lib/libnm_glib*.so +debian/tmp/usr/include/NetworkManager/libnm_glib.h diff --git a/debian/libnm-glib0.install b/debian/libnm-glib0.install new file mode 100644 index 00000000..51ab95e3 --- /dev/null +++ b/debian/libnm-glib0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm_glib*.so.* -- cgit 1.3.0-6-gf8a5 From 5c20cd2ab52e12e9089c173284efc2ad773a4aa4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 22:39:37 +0000 Subject: added libhal build-dep git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@537 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 7f184361..28b0c87f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev Standards-Version: 3.6.2 Package: network-manager @@ -54,7 +54,7 @@ Description: network management framework daemon (GLib shared library) Package: libnm-glib-dev Architecture: any -Depends: libglib2.0-dev, libnm-glib0, libdbus-glib-1-dev (>= 0.60) +Depends: libglib2.0-dev, libnm-glib0 (= ${Source-Version}), libdbus-glib-1-dev (>= 0.60) Description: network management framework daemon (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 -- cgit 1.3.0-6-gf8a5 From c28abc0bc37969731d7004d534994c66ff1f8ea4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 1 Feb 2006 22:46:02 +0000 Subject: added docbook-to-man build-dep git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@538 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 28b0c87f..44cbdf4a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 1e3f6da9b2c2cb2826c2ee46162d28bd6395be96 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 2 Feb 2006 17:28:31 +0000 Subject: added a properly 'Section' to some packages and removed a bashism in network-manager.dbus-event git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@542 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 3 +++ debian/network-manager.dbus-event | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 44cbdf4a..d58df198 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Description: network management framework daemon Package: network-manager-gnome Architecture: any +Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all @@ -39,6 +40,7 @@ Description: network management framework daemon development compile VPN Plugins for NetworManager. Package: libnm-glib0 +Section: libs Architecture: any Depends: ${shlibs:Depends} Description: network management framework daemon (GLib shared library) @@ -53,6 +55,7 @@ Description: network management framework daemon (GLib shared library) connection status via NetworkManager. Package: libnm-glib-dev +Section: libdevel Architecture: any Depends: libglib2.0-dev, libnm-glib0 (= ${Source-Version}), libdbus-glib-1-dev (>= 0.60) Description: network management framework daemon (GLib interface) diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 2a59a08e..f18ea28e 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -73,11 +73,11 @@ d_stop() { # if NetworkManager does not want to die, apply some more force if [ -e $PIDFILE ]; then - kill -9 $(< $PIDFILE) || true + kill -9 $(cat $PIDFILE) || true rm -f $PIDFILE fi if [ -e $NAMED_PIDFILE ]; then - kill -9 $(< $NAMED_PIDFILE) || true + kill -9 $(cat $NAMED_PIDFILE) || true rm -f $NAMED_PIDFILE fi -- cgit 1.3.0-6-gf8a5 From c4c110d7cfbb4ff0c4e96e3c239d1a6d3b6277c6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 2 Feb 2006 18:01:29 +0000 Subject: changed network-manager-dev section to Section: devel git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@543 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index d58df198..09660b61 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,7 @@ Description: network management framework daemon Package: network-manager-dev Architecture: any +Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config Description: network management framework daemon development this package provides header files that are needed to -- cgit 1.3.0-6-gf8a5 From f0662ea5fc7fa5d8e0ddd3ad8ac6bef0e44ed13d Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 2 Feb 2006 21:57:47 +0000 Subject: now NM will be stopped when prerm script is invoked git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@547 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.prerm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm index d11dd4c9..26c664c4 100644 --- a/debian/network-manager.prerm +++ b/debian/network-manager.prerm @@ -7,6 +7,14 @@ case "$1" in rm /etc/dbus-1/event.d/25NetworkManagerDispatcher fi ;; + remove) + if [ -x /usr/bin/dbus-send ]; then + /usr/bin/dbus-send --system --type=method_call \ + --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig + /etc/dbus-1/event.d/25NetworkManager stop + /etc/dbus-1/event.d/26NetworkManagerDispatcher stop + fi + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From f00cfa3bb0502467f35ca255da387e8451b335ae Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 2 Feb 2006 22:42:00 +0000 Subject: NM and NMDispatcher will be stopped through the event script instead of manually via dbus-send git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@548 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.prerm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm index 26c664c4..ef45f761 100644 --- a/debian/network-manager.prerm +++ b/debian/network-manager.prerm @@ -8,13 +8,9 @@ case "$1" in fi ;; remove) - if [ -x /usr/bin/dbus-send ]; then - /usr/bin/dbus-send --system --type=method_call \ - --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - /etc/dbus-1/event.d/25NetworkManager stop + /etc/dbus-1/event.d/25NetworkManager stop /etc/dbus-1/event.d/26NetworkManagerDispatcher stop - fi - ;; + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 039d1307dc96f41b4738c8a6a8219da36f3b3391 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 2 Feb 2006 22:58:12 +0000 Subject: indentation, indentation, indentatio ;) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@549 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.prerm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm index ef45f761..356a8b8c 100644 --- a/debian/network-manager.prerm +++ b/debian/network-manager.prerm @@ -3,12 +3,12 @@ set -e case "$1" in configure) - if [ -f /etc/dbus-1/event.d/25NetworkManagerDispatcher ]; then - rm /etc/dbus-1/event.d/25NetworkManagerDispatcher - fi + if [ -f /etc/dbus-1/event.d/25NetworkManagerDispatcher ]; then + rm /etc/dbus-1/event.d/25NetworkManagerDispatcher + fi ;; remove) - /etc/dbus-1/event.d/25NetworkManager stop + /etc/dbus-1/event.d/25NetworkManager stop /etc/dbus-1/event.d/26NetworkManagerDispatcher stop ;; esac -- cgit 1.3.0-6-gf8a5 From c307eecde1b4f2c9284606a357a934aadd5160f0 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 16:41:06 +0000 Subject: removed useless configure switch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@555 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 65c6dc90..8c8bfe3e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --libexecdir=/usr/bin \ - --localstatedir=/var/run \ --without-named \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 -- cgit 1.3.0-6-gf8a5 From 1bf71e3d28c83b4c1f8eed47f5159b903402ea44 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 19:30:55 +0000 Subject: Set the correct copyright holder git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@557 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/copyright | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 099ed1c0..891767dc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,9 +3,11 @@ Sun, 3 Oct 2004 11:54:56 +0100. It was downloaded from ftp.gnome.org -Upstream Author: Dan Williams +Upstream Author: + Dan Williams -Copyright: +Copyright: + 2004, 2005 Red Hat, Inc. This package is licensed under the GPL. For a description of the GPL, see /usr/share/common-licenses/GPL on your Debian system. -- cgit 1.3.0-6-gf8a5 From a9dd8a1292c4570dc3213e694f9ddeee5f5154ba Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 19:54:26 +0000 Subject: Add a separate binary package for libnm-util. Added build dependency on libnl and tightened the build-dep on libhal according to configure.in Added myself to Uploaders. Set dh_compat to 5 (recommended version) and tightended the build-dep on debhelper accourdingly. Added a Recommeds: wpasupplicant (>= 0.5.1) to network-manager git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@558 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/compat | 2 +- debian/control | 43 +++++++++++++++++++++++++++++++++++++------ debian/libnm-util-dev.install | 12 ++++++++++++ debian/libnm-util0.install | 1 + 4 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 debian/libnm-util-dev.install create mode 100644 debian/libnm-util0.install diff --git a/debian/compat b/debian/compat index b8626c4c..7ed6ff82 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 09660b61..3d8f7cdb 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,15 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man +Uploaders: Michael Biebl +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0pre6), docbook-to-man Standards-Version: 3.6.2 Package: network-manager Architecture: any +Section: net Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6) +Recommends: wpasupplicant (>= 0.5.1) 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 @@ -22,7 +25,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager -Description: network management framework daemon +Description: network management framework (GNOME frontend) 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 @@ -36,7 +39,7 @@ Package: network-manager-dev Architecture: any Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config -Description: network management framework daemon development +Description: network management framework daemon (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. @@ -44,7 +47,7 @@ Package: libnm-glib0 Section: libs Architecture: any Depends: ${shlibs:Depends} -Description: network management framework daemon (GLib shared library) +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 usage on servers. The point of NetworkManager is to make networking @@ -58,8 +61,8 @@ Description: network management framework daemon (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libglib2.0-dev, libnm-glib0 (= ${Source-Version}), libdbus-glib-1-dev (>= 0.60) -Description: network management framework daemon (GLib interface) +Depends: libnm-glib0 (= ${Source-Version}), 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 usage on servers. The point of NetworkManager is to make networking @@ -69,3 +72,31 @@ Description: network management framework daemon (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. + +Package: libnm-util0 +Section: libs +Architecture: any +Depends: ${shlibs: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 + 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 contains a convenience library to ease the access to NetworkManager. + +Package: libnm-util-dev +Section: libdevel +Architecture: any +Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +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 + 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 contains header and development files. diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install new file mode 100644 index 00000000..c6b4a027 --- /dev/null +++ b/debian/libnm-util-dev.install @@ -0,0 +1,12 @@ +debian/tmp/usr/lib/pkgconfig/libnm-util.pc +debian/tmp/usr/lib/libnm-util.a +debian/tmp/usr/lib/libnm-util.la +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 diff --git a/debian/libnm-util0.install b/debian/libnm-util0.install new file mode 100644 index 00000000..051d4901 --- /dev/null +++ b/debian/libnm-util0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-util.so.* -- cgit 1.3.0-6-gf8a5 From 8ed381f07ffca8445390df3ffb3e82e6f114d4b3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 20:12:00 +0000 Subject: - Do not ship our own DBUS access files. Use the upstream version and replace at_console="true" with group="plugdev" (patches/dbus_access*.patch). TODO: Find and use a better group for this!!! This makes the diff.gz smaller and better tracks upstream changes. Removed the install commands from debian/rules and added the *.conf files to the corresponding install files. - Removed the creation of the /etc/NetworkManager/dispatcher.d directory from debian/rules. This is better handled by network-manager.dirs. - Removed useless dirs file - Fixed some *.install files (location of binaries have changed, additional files etc.) - Removed configure switch --without-named, seems to be unused, added configure switch --with-wpa_supplicant git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@559 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/dirs | 2 -- debian/network-manager-dev.install | 1 + debian/network-manager-gnome.install | 4 +++- debian/network-manager.dbus-conf | 24 ------------------------ debian/network-manager.dirs | 3 +-- debian/network-manager.install | 5 +++-- debian/nm-applet.conf | 24 ------------------------ debian/patches/dbus_access_network_manager.patch | 11 +++++++++++ debian/patches/dbus_access_nm_applet.patch | 11 +++++++++++ debian/rules | 10 +--------- 10 files changed, 31 insertions(+), 64 deletions(-) delete mode 100644 debian/dirs delete mode 100644 debian/network-manager.dbus-conf delete mode 100644 debian/nm-applet.conf create mode 100644 debian/patches/dbus_access_network_manager.patch create mode 100644 debian/patches/dbus_access_nm_applet.patch diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bbb..00000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install index 9287a6f6..97a00409 100644 --- a/debian/network-manager-dev.install +++ b/debian/network-manager-dev.install @@ -1,3 +1,4 @@ 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-gnome.install b/debian/network-manager-gnome.install index c7b30983..fb749241 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -2,5 +2,7 @@ debian/tmp/usr/bin/nm-vpn-properties debian/tmp/usr/bin/nm-applet debian/tmp/usr/share/locale/* debian/tmp/usr/share/nm-applet/* -debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties +debian/tmp/usr/share/autostart +debian/tmp/etc/dbus-1/system.d/nm-applet.conf diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf deleted file mode 100644 index bdf362ff..00000000 --- a/debian/network-manager.dbus-conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 86847abc..19c18e1e 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,5 +1,4 @@ etc/dbus-1/event.d etc/dbus-1/system.d -usr/bin -usr/share/locale +etc/NetworkManager/dispatcher.d var/lib/NetworkManager diff --git a/debian/network-manager.install b/debian/network-manager.install index b0c7b38b..0f9b1179 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,2 +1,3 @@ -debian/tmp/usr/bin/NetworkManager usr/sbin/ -debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ +debian/tmp/usr/sbin/NetworkManager +debian/tmp/usr/sbin/NetworkManagerDispatcher +debian/tmp/etc/dbus-1/system.d/NetworkManager.conf diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf deleted file mode 100644 index 69bc7aee..00000000 --- a/debian/nm-applet.conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch new file mode 100644 index 00000000..c164190e --- /dev/null +++ b/debian/patches/dbus_access_network_manager.patch @@ -0,0 +1,11 @@ +--- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 ++++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch new file mode 100644 index 00000000..0f84f7dd --- /dev/null +++ b/debian/patches/dbus_access_nm_applet.patch @@ -0,0 +1,11 @@ +--- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 ++++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/rules b/debian/rules index 8c8bfe3e..3fe0113d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --without-named \ --with-dhcdbd=/usr/sbin/dhcdbd \ + --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-distro=debian clean:: @@ -26,11 +26,3 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/network-manager.dbus-conf \ - debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - -binary-install/network-manager-gnome:: - install -m 644 debian/nm-applet.conf \ - debian/network-manager/etc/dbus-1/system.d/nm-applet.conf - -- cgit 1.3.0-6-gf8a5 From 30c2c8dc0129c00b8b6b496a7fa10cb344ca4b3b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 20:21:21 +0000 Subject: - Removed 01-STOLEN_FROM_HEAD-dbus60.patch, fixed upstream. - Removed 01_NMDevice.c.patch, does not apply cleanly anymore. - Removed 02_nm-netlink-monitor.patch, instead added if_fix.patch which merges the changes regarding if.h from 01_NMDevice.c.patch and 02_nm-netlink-monitor.patch into one patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@560 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch | 11 -------- debian/patches/01_NMDevice.c.patch | 23 ----------------- debian/patches/02_nm-netlink-monitor.patch | 11 -------- debian/patches/if_fix.patch | 33 ++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 45 deletions(-) delete mode 100644 debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch delete mode 100644 debian/patches/01_NMDevice.c.patch delete mode 100644 debian/patches/02_nm-netlink-monitor.patch create mode 100644 debian/patches/if_fix.patch diff --git a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch deleted file mode 100644 index 9b6b3aad..00000000 --- a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/applet-dbus.c.old 2005-12-21 14:19:38.000000000 +0100 -+++ gnome/applet/applet-dbus.c 2005-12-21 14:20:12.000000000 +0100 -@@ -388,7 +388,7 @@ - } - - dbus_error_init (&error); -- acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error); -+ acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &error); - if (dbus_error_is_set (&error)) - { - nm_warning ("nmwa_dbus_init() could not acquire its service. dbus_bus_acquire_service() says: '%s'", error.message); diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch deleted file mode 100644 index a776d3ec..00000000 --- a/debian/patches/01_NMDevice.c.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 -+++ src/NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 -@@ -4283,7 +4283,7 @@ - - strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); - edata.cmd = ETHTOOL_GLINK; -- ifr.ifr_data = (char *) &edata; -+ ifr.ifr_data = (void __user *) &edata; - #ifdef IOCTL_DEBUG - nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev)); - #endif -@@ -4305,8 +4305,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ --#include -- -+#define _LINUX_IF_H -+ #include -+#undef _LINUX_IF_ - static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location) - { - struct mii_ioctl_data *mii; diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch deleted file mode 100644 index 4389059d..00000000 --- a/debian/patches/02_nm-netlink-monitor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nm-netlink-monitor.c 2005-08-12 21:06:09.000000000 +0200 -+++ src/nm-netlink-monitor.c 2006-01-11 12:18:52.000000000 +0100 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch new file mode 100644 index 00000000..379e9b38 --- /dev/null +++ b/debian/patches/if_fix.patch @@ -0,0 +1,33 @@ +Index: src/nm-device-802-3-ethernet.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.3 +diff -u -r1.3 nm-device-802-3-ethernet.c +--- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 ++++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 +@@ -328,7 +328,9 @@ + /**************************************/ + /* MII capability detection */ + /**************************************/ ++#define _LINUX_IF_H + #include ++#undef _LINUX_IF_H + + static int + mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) +Index: src/nm-netlink-monitor.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v +retrieving revision 1.17 +diff -u -r1.17 nm-netlink-monitor.c +--- src/nm-netlink-monitor.c 12 Aug 2005 19:06:09 -0000 1.17 ++++ src/nm-netlink-monitor.c 4 Jan 2006 17:13:33 -0000 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + -- cgit 1.3.0-6-gf8a5 From d484cfa24776ad532e3c0b4a077c70b659a8ae86 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 20:58:18 +0000 Subject: Argh, line has to be less than 80 chars, otherwise lintian complains. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@561 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3d8f7cdb..4197d537 100644 --- a/debian/control +++ b/debian/control @@ -85,7 +85,8 @@ Description: network management framework (shared library) NetworkManager is _intended_ to replace default routes, obtain IP addresses from a DHCP server, and change nameservers whenever it sees fit. . - This package contains a convenience library to ease the access to NetworkManager. + This package contains a convenience library to ease the access to + NetworkManager. Package: libnm-util-dev Section: libdevel -- cgit 1.3.0-6-gf8a5 From 6c5e16595db9bf334eccc81e9ca974be2b673e4f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:12:53 +0000 Subject: * improved manpages. - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages * uploaded to unstable. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@562 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 9 ++++ debian/nm-applet.manpages | 2 + debian/nm-applet.sgml | 97 +++++++++++++++++++++++++++++++++++++++++++ debian/nm-vpn-properties.sgml | 95 ++++++++++++++++++++++++++++++++++++++++++ debian/rules | 4 +- 5 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 debian/nm-applet.manpages create mode 100644 debian/nm-applet.sgml create mode 100644 debian/nm-vpn-properties.sgml diff --git a/debian/changelog b/debian/changelog index d3d488a4..ae89ee9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (0.5.1-2) unstable; urgency=low + + * improved manpages. + - added nm-vpn-properties, nm-applet manpages + - added debian/nm-applet.manpages + * uploaded to unstable. + + -- Riccardo Setti Wed, 8 Feb 2006 22:08:42 +0100 + network-manager (0.5.1-1) experimental; urgency=low * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because diff --git a/debian/nm-applet.manpages b/debian/nm-applet.manpages new file mode 100644 index 00000000..15a34e96 --- /dev/null +++ b/debian/nm-applet.manpages @@ -0,0 +1,2 @@ +debian/nm-vpn-properties.1 +debian/nm-applet.1 diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml new file mode 100644 index 00000000..0194d70b --- /dev/null +++ b/debian/nm-applet.sgml @@ -0,0 +1,97 @@ + 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. + + --> + + + 8 February, 2006"> + + + GNU"> + GPL"> +]> + + + +
+ giskard@autistici.org; +
+ + Riccardo + Setti + + + 2006 + Riccardo Setti + + &date; + + + nm-applet + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; is the gnome front-end for NetworkManager + If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian + in /usr/share/common/&package; + + + SEE ALSO + + NetworkManager (1). nm-vpn-properties (1) + + More Information about NetworkManager can be found at + http://www.gnome.org/projects/NetworkManager/ . + + + AUTHOR + + This manual page was written by Riccardo Setti giskard@autistici.org for + the Debian system. + + + + + + diff --git a/debian/nm-vpn-properties.sgml b/debian/nm-vpn-properties.sgml new file mode 100644 index 00000000..7b42239e --- /dev/null +++ b/debian/nm-vpn-properties.sgml @@ -0,0 +1,95 @@ + 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. + + --> + + + 8 February, 2006"> + + + GNU"> + GPL"> +]> + + + +
+ giskard@autistici.org; +
+ + Riccardo + Setti + + + 2006 + Riccardo Setti + + &date; + + + nm-vpn-properties + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; is the gnome front-end for the NetworkManager VPN handler + + + SEE ALSO + + NetworkManager (1), nm-applet (1) + + More Information about NetworkManager can be found at + http://www.gnome.org/projects/NetworkManager/ . + + + AUTHOR + + This manual page was written by Riccardo Setti giskard@autistici.org for + the Debian system. + + + + + + diff --git a/debian/rules b/debian/rules index 8c8bfe3e..e140634f 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,9 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 10b296365fa34676434a91c7061740cb03ebb497 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:20:00 +0000 Subject: - modifyed NetworManager*.sgml for reflect the correct website. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@563 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 7 ++++--- debian/NetworkManagerDispatcher.sgml | 6 +++--- debian/changelog | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml index cc1fcd92..61ea2121 100644 --- a/debian/NetworkManager.sgml +++ b/debian/NetworkManager.sgml @@ -105,13 +105,14 @@ manpage.1: manpage.sgml nm-applet (1), NetworkManagerDispatcher (1). More Information about NetworkManager can be found at - http://people.redhat.com/dcbw/NetworkManager/ . + http://www.gnome.org/projects/NetworkManager/ . AUTHOR - This manual page was written by Jan Gerber j@bootlab.org for - the Ubuntu system. + This manual page was written by Jan Gerber j@bootlab.org and by + Riccardo Setti giskard@autistici.org for + the Debian/Ubuntu system. diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml index c6a42105..d42b2903 100644 --- a/debian/NetworkManagerDispatcher.sgml +++ b/debian/NetworkManagerDispatcher.sgml @@ -67,13 +67,13 @@ manpage.1: manpage.sgml NetworkManager (1), nm-applet (1). More Information about NetworkManager can be found at - http://people.redhat.com/dcbw/NetworkManager/ . + http://www.gnome.org/projects/NetworkManager/ . AUTHOR - This manual page was written by Jan Gerber j@bootlab.org for - the Ubuntu system. + This manual page was written by Jan Gerber j@bootlab.org and by Riccardo Setti + giskard@autistici.org for the Debian/Ubuntu system. diff --git a/debian/changelog b/debian/changelog index ae89ee9f..dbc1bf33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,10 @@ network-manager (0.5.1-2) unstable; urgency=low * improved manpages. - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages + - modifyed NetworManager*.sgml for reflect the correct website. * uploaded to unstable. - -- Riccardo Setti Wed, 8 Feb 2006 22:08:42 +0100 + -- Riccardo Setti Wed, 8 Feb 2006 22:16:34 +0100 network-manager (0.5.1-1) experimental; urgency=low -- cgit 1.3.0-6-gf8a5 From bb6d8522f4b4f65c095a9fef86fffde4dc9438ba Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:34:39 +0000 Subject: /me should create manpages in debian/ and not in the toplevel dir git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@566 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbc1bf33..eabebc0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,9 @@ network-manager (0.5.1-2) unstable; urgency=low - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages - modifyed NetworManager*.sgml for reflect the correct website. - * uploaded to unstable. + * uploaded to unstable. - -- Riccardo Setti Wed, 8 Feb 2006 22:16:34 +0100 + -- Riccardo Setti Wed, 8 Feb 2006 22:32:05 +0100 network-manager (0.5.1-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index e140634f..8c9ca76f 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > nm-applet.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From a3f22a606cc42593ba8e27f6da938c9e85056026 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:35:42 +0000 Subject: - added debian/network-manager-gnome.manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@567 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- debian/network-manager-gnome.manpages | 2 ++ debian/nm-applet.manpages | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 debian/network-manager-gnome.manpages delete mode 100644 debian/nm-applet.manpages diff --git a/debian/changelog b/debian/changelog index eabebc0b..b04ef708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ network-manager (0.5.1-2) unstable; urgency=low * improved manpages. - added nm-vpn-properties, nm-applet manpages - - added debian/nm-applet.manpages + - added debian/network-manager-gnome.manpages - modifyed NetworManager*.sgml for reflect the correct website. * uploaded to unstable. diff --git a/debian/network-manager-gnome.manpages b/debian/network-manager-gnome.manpages new file mode 100644 index 00000000..15a34e96 --- /dev/null +++ b/debian/network-manager-gnome.manpages @@ -0,0 +1,2 @@ +debian/nm-vpn-properties.1 +debian/nm-applet.1 diff --git a/debian/nm-applet.manpages b/debian/nm-applet.manpages deleted file mode 100644 index 15a34e96..00000000 --- a/debian/nm-applet.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/nm-vpn-properties.1 -debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 421d5484e4c5fd487b727b8a1241b72633fefd2f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 23:09:57 +0000 Subject: Fixed some paths and typos when creating manpages from sgml. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@568 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/nm-applet.sgml | 2 +- debian/rules | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml index 0194d70b..b027f8a0 100644 --- a/debian/nm-applet.sgml +++ b/debian/nm-applet.sgml @@ -59,7 +59,7 @@ manpage.1: manpage.sgml &package; is the gnome front-end for NetworkManager If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian - in /usr/share/common/&package; + in /usr/share/doc/network-manager SEE ALSO diff --git a/debian/rules b/debian/rules index 8c9ca76f..ba334f02 100755 --- a/debian/rules +++ b/debian/rules @@ -19,9 +19,9 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 2b0e6d9c6ecaf94143962fb5c1c59009b69ac09c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 23:29:16 +0000 Subject: [Merged 556:568 from unstable] These changes are mostly manpage related git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@569 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 7 +-- debian/NetworkManagerDispatcher.sgml | 6 +-- debian/changelog | 10 ++++ debian/network-manager-gnome.manpages | 2 + debian/nm-applet.sgml | 97 +++++++++++++++++++++++++++++++++++ debian/nm-vpn-properties.sgml | 95 ++++++++++++++++++++++++++++++++++ debian/rules | 2 + 7 files changed, 213 insertions(+), 6 deletions(-) create mode 100644 debian/network-manager-gnome.manpages create mode 100644 debian/nm-applet.sgml create mode 100644 debian/nm-vpn-properties.sgml diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml index cc1fcd92..61ea2121 100644 --- a/debian/NetworkManager.sgml +++ b/debian/NetworkManager.sgml @@ -105,13 +105,14 @@ manpage.1: manpage.sgml nm-applet (1), NetworkManagerDispatcher (1). More Information about NetworkManager can be found at - http://people.redhat.com/dcbw/NetworkManager/ . + http://www.gnome.org/projects/NetworkManager/ . AUTHOR - This manual page was written by Jan Gerber j@bootlab.org for - the Ubuntu system. + This manual page was written by Jan Gerber j@bootlab.org and by + Riccardo Setti giskard@autistici.org for + the Debian/Ubuntu system. diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml index c6a42105..d42b2903 100644 --- a/debian/NetworkManagerDispatcher.sgml +++ b/debian/NetworkManagerDispatcher.sgml @@ -67,13 +67,13 @@ manpage.1: manpage.sgml NetworkManager (1), nm-applet (1). More Information about NetworkManager can be found at - http://people.redhat.com/dcbw/NetworkManager/ . + http://www.gnome.org/projects/NetworkManager/ . AUTHOR - This manual page was written by Jan Gerber j@bootlab.org for - the Ubuntu system. + This manual page was written by Jan Gerber j@bootlab.org and by Riccardo Setti + giskard@autistici.org for the Debian/Ubuntu system. diff --git a/debian/changelog b/debian/changelog index d3d488a4..b04ef708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (0.5.1-2) unstable; urgency=low + + * improved manpages. + - added nm-vpn-properties, nm-applet manpages + - added debian/network-manager-gnome.manpages + - modifyed NetworManager*.sgml for reflect the correct website. + * uploaded to unstable. + + -- Riccardo Setti Wed, 8 Feb 2006 22:32:05 +0100 + network-manager (0.5.1-1) experimental; urgency=low * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because diff --git a/debian/network-manager-gnome.manpages b/debian/network-manager-gnome.manpages new file mode 100644 index 00000000..15a34e96 --- /dev/null +++ b/debian/network-manager-gnome.manpages @@ -0,0 +1,2 @@ +debian/nm-vpn-properties.1 +debian/nm-applet.1 diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml new file mode 100644 index 00000000..b027f8a0 --- /dev/null +++ b/debian/nm-applet.sgml @@ -0,0 +1,97 @@ + 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. + + --> + + + 8 February, 2006"> + + + GNU"> + GPL"> +]> + + + +
+ giskard@autistici.org; +
+ + Riccardo + Setti + + + 2006 + Riccardo Setti + + &date; + + + nm-applet + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; is the gnome front-end for NetworkManager + If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian + in /usr/share/doc/network-manager + + + SEE ALSO + + NetworkManager (1). nm-vpn-properties (1) + + More Information about NetworkManager can be found at + http://www.gnome.org/projects/NetworkManager/ . + + + AUTHOR + + This manual page was written by Riccardo Setti giskard@autistici.org for + the Debian system. + + + + + + diff --git a/debian/nm-vpn-properties.sgml b/debian/nm-vpn-properties.sgml new file mode 100644 index 00000000..7b42239e --- /dev/null +++ b/debian/nm-vpn-properties.sgml @@ -0,0 +1,95 @@ + 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. + + --> + + + 8 February, 2006"> + + + GNU"> + GPL"> +]> + + + +
+ giskard@autistici.org; +
+ + Riccardo + Setti + + + 2006 + Riccardo Setti + + &date; + + + nm-vpn-properties + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; is the gnome front-end for the NetworkManager VPN handler + + + SEE ALSO + + NetworkManager (1), nm-applet (1) + + More Information about NetworkManager can be found at + http://www.gnome.org/projects/NetworkManager/ . + + + AUTHOR + + This manual page was written by Riccardo Setti giskard@autistici.org for + the Debian system. + + + + + + diff --git a/debian/rules b/debian/rules index 3fe0113d..55f1b30c 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 1ca553446c1acb38aae5f114cb9b0e505b07a98c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 09:24:40 +0000 Subject: * uploaded to unstable. * removed network-manager.doc as it was empty. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@571 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- debian/network-manager.docs | 1 - debian/rules | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 debian/network-manager.docs diff --git a/debian/changelog b/debian/changelog index b04ef708..7fbf3992 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,10 @@ network-manager (0.5.1-2) unstable; urgency=low - added nm-vpn-properties, nm-applet manpages - added debian/network-manager-gnome.manpages - modifyed NetworManager*.sgml for reflect the correct website. - * uploaded to unstable. + * uploaded to unstable. + * removed network-manager.doc as it was empty. - -- Riccardo Setti Wed, 8 Feb 2006 22:32:05 +0100 + -- Riccardo Setti Thu, 9 Feb 2006 10:18:13 +0100 network-manager (0.5.1-1) experimental; urgency=low diff --git a/debian/network-manager.docs b/debian/network-manager.docs deleted file mode 100644 index 8b137891..00000000 --- a/debian/network-manager.docs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/rules b/debian/rules index ba334f02..fd5c101c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,10 +18,10 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From b5e16541a22dd3b41ea52bbd3aefb0cb21318ccb Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 15:08:23 +0000 Subject: now manpages are built correctly git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@572 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index fd5c101c..eec349aa 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 074add86a595038fe99e9cd5294435db3621588a Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 20:14:52 +0000 Subject: * added nm-vpn-properties.desktop, nm-logo.xpm * added dbus_access_network_manager and dbus_access_nm_applet patches: - switched to group netdev - updated the dep on dhcdbd * removed network-manager.doc as it was empty. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@574 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 2 +- debian/changelog | 6 +- debian/control | 2 +- debian/network-manager-gnome.dirs | 1 + debian/nm-logo.xpm | 182 ++++++++++++++++++++++++++++++++++++++ debian/nm-vpn-properties.desktop | 9 ++ debian/rules | 10 +-- 7 files changed, 202 insertions(+), 10 deletions(-) create mode 100644 debian/nm-logo.xpm create mode 100644 debian/nm-vpn-properties.desktop diff --git a/debian/README.Debian b/debian/README.Debian index 20c9ed3d..a34d88d8 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,7 +4,7 @@ the user can interact with. Since NetworkManager is not part of main yet, you have to add nm-applet to your session once. (instructions for gnome only) -First add yourself to the plugdev group +First add yourself to the netdev group Go to System -> Preferences -> Sessions In the Startup Programs tab, click Add type "nm-applet", click OK. diff --git a/debian/changelog b/debian/changelog index 7fbf3992..f1e3703c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ network-manager (0.5.1-2) unstable; urgency=low - added nm-vpn-properties, nm-applet manpages - added debian/network-manager-gnome.manpages - modifyed NetworManager*.sgml for reflect the correct website. - * uploaded to unstable. + * added nm-vpn-properties.desktop, nm-logo.xpm + * added dbus_access_network_manager and dbus_access_nm_applet patches: + - switched to group netdev + - updated the dep on dhcdbd * removed network-manager.doc as it was empty. + * uploaded to unstable. -- Riccardo Setti Thu, 9 Feb 2006 10:18:13 +0100 diff --git a/debian/control b/debian/control index 09660b61..ec8fa06d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-2), lsb-base (>= 2.0-6) 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 diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index e628b1eb..92c4831a 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1 +1,2 @@ etc/dbus-1/system.d/ +usr/share/pixmaps diff --git a/debian/nm-logo.xpm b/debian/nm-logo.xpm new file mode 100644 index 00000000..20e4f020 --- /dev/null +++ b/debian/nm-logo.xpm @@ -0,0 +1,182 @@ +/* XPM */ +static char *nm-logo[] = { +/* columns rows colors chars-per-pixel */ +"31 32 144 2", +" c #697677FB7FB8", +". c #15175FC087FE", +"X c #14835FFE88A6", +"o c #09C560CC8FD9", +"O c #0694613C9241", +"+ c #028067169DEF", +"@ c #04906949A025", +"# c #093E62AC9307", +"$ c #153262348BBC", +"% c #1B9F660C8E34", +"& c #1186680C96CE", +"* c #16976A2597A0", +"= c #03E1696AA0B1", +"- c #00C16F4DABB9", +"; c #0C756DE3A2EE", +": c #034B71FBAD4D", +"> c #09437623B01E", +", c #028C76FFB4C0", +"< c #0137795DB8AD", +"1 c #005C79D4B9E5", +"2 c #08FF7AB6B729", +"3 c #09877E53BBAE", +"4 c #15B67262A3D0", +"5 c #136577DAACCF", +"6 c #14907892AD2C", +"7 c #22A0630985BE", +"8 c #2CBB67CA879A", +"9 c #2F1C6B888C07", +"0 c #2DF175349ABB", +"q c #348968258401", +"w c #32B96E2E8E29", +"e c #39E47AAF9CD3", +"r c #4FF675EE8A6F", +"t c #502779EB9088", +"y c #502F7A3990FA", +"u c #65C47ECF8C0C", +"i c #6E487F9D88CD", +"p c #72D3800F873E", +"a c #108080CFBBC7", +"s c #2598838DB523", +"d c #57C781DC9893", +"f c #57CE81FA98CC", +"g c #5BBA80B49439", +"h c #5B9284F59B6B", +"j c #4ADC8C5EAFB8", +"k c #44E68F61B7E9", +"l c #4238922EBC42", +"z c #536A8C9EAB7A", +"x c #59E9895DA2FF", +"c c #59368F8CACD6", +"v c #52DB9191B37B", +"b c #511396CDBCBF", +"n c #661981A0903C", +"m c #640F8A749F3A", +"M c #6AE288009783", +"N c #6BD9898C9958", +"B c #78608D169801", +"V c #7BD08FE89A8C", +"C c #7E2992ED9DF4", +"Z c #6A0E8FFCA424", +"A c #67569352AB01", +"S c #6BF492F2A7F4", +"D c #74DF9316A33E", +"F c #7C51974DA5BE", +"G c #7ED79AD6A9AC", +"H c #7FFB9FF9B13E", +"J c #4F1F9BCEC542", +"K c #54D59F6BC7AA", +"L c #6264A477C75A", +"P c #62B3ABE1D27B", +"I c #7853AF66CC76", +"U c #816895259FA8", +"Y c #8D93976F9CF7", +"T c #8A3D98B9A077", +"R c #85BC9BE7A7D7", +"E c #82F79DAEAC35", +"W c #8BF69E05A7D8", +"Q c #8C069F78A9E1", +"! c #91A09C60A23B", +"~ c #8EF9A31AADAF", +"^ c #84F6A213B1CF", +"/ c #8E61A84AB617", +"( c #88D6AB50BD96", +") c #9562A30CAA87", +"_ c #9EA2A871ADF8", +"` c #9FF9A966AEA7", +"' c #94ECA827B245", +"] c #974AAA2FB40E", +"[ c #96EEAE5DBADF", +"{ c #9D23AAC4B227", +"} c #9DE0B130BB6E", +"| c #A150A586A81F", +" . c #A229A817ABAD", +".. c #A492AA51ADD7", +"X. c #A33CAD55B2E1", +"o. c #A6BFB3D4BAD3", +"O. c #AB67B1DAB56B", +"+. c #AC4EB6ACBC49", +"@. c #B391BB15BF57", +"#. c #BA39BE37C071", +"$. c #834DBC15DA10", +"%. c #AF0CBCC4C429", +"&. c #B549BDB4C24E", +"*. c #B988C064C419", +"=. c #B7F4C2D6C8A5", +"-. c #BFC1C595C8C4", +";. c #BED9C7C6CC94", +":. c #C06CD4B7DF9A", +">. c #BCFBD5EDE356", +",. c #BC9FDB03EB09", +"<. c #C2B1C52AC6BD", +"1. c #C1F9C6ABC934", +"2. c #C7A7CB4DCD71", +"3. c #CCF4CDE3CEAD", +"4. c #C568CE82D373", +"5. c #C4F1D554DE16", +"6. c #CD69D25CD522", +"7. c #CB6DD60CDBCC", +"8. c #D582D693D77A", +"9. c #D89ED89AD921", +"0. c #D77AD948DA67", +"q. c #DC43DD4ADE07", +"w. c #C282D667E0FB", +"e. c #D5B3DFEDE56A", +"r. c #CF2FE41FEF10", +"t. c #D190E603F0AF", +"y. c #DF33E38BE600", +"u. c #DA32E4DAEA53", +"i. c #DDB0E9E8F066", +"p. c #D43CE848F2FB", +"a. c #D85EEA77F3FB", +"s. c #DCEBEBECF3BB", +"d. c #E5BAE5C4E5FA", +"f. c #E5C7EAD9EDB0", +"g. c #ECBAED9DEE40", +"h. c #E511EECAF447", +"j. c #ED4EF03AF211", +"k. c #ED61F2C1F5EE", +"l. c #ED5BF579F9CD", +"z. c #F3BDF4FCF604", +"x. c #F5C2F810F986", +"c. c #F7EEF9D8FAF4", +"v. c #F9B0F7FCF723", +"b. c #FE77FE8FFE9D", +/* pixels */ +"b.b.b.b.b.b.b.b.z.9.3.8.d.x.8.8.8.8.0.q.g.b.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.e.X. .....| @. .Y . . . . .2.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.g.X.+.&.@.@.@. .X. .+.@.@.@.@.! q.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.6.{ +.o.X.o.o.o.T .] o.o.+.+.T *.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.&.~ ' B U ' ] V @.! n n ~ ' C X.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.[ F G n @.%.D F M +.v.d.=.V G M .b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.H f h r 1.f.m h t ` b.b.7.d h t ) b.b.b.b.b.b.b.b.", +"b.b.b.b.b.c.A 9 w q 1.x.x w 8 Q b.b.5.w w 8 W b.b.b.b.b.b.b.b.", +"b.b.b.b.b.c.c $ $ % -.c.z $ X F b.b.5.% $ $ R b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.v O # % -.b.j O O D v.b.>.& # o R v.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b = = * -.c.k + + S v.b.>.; @ + E b.b.b.b.b.b.b.b.", +"b.b.b.b.b.c.K , : 4 ;.b.J - - z z.b.,., : ; ^ b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.P 3 1 5 ;.b.$.1 < s y.b.,.3 < > / b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.I 1 1 6 ;.b.s.l , , L k.,.3 1 > } b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.w.a 1 6 ;.b.b.y.[ S S 4.,.3 < 4 =.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.I 2 6 ;.b.b.b.b.v.z.c.,.3 > g d.b.b.b.b.b.b.b.b.", +"b.b.b.v.v.x.x.f.( e @.x.z.j.j.j.j.z.>.0 n 3.v.v.v.c.v.b.b.b.b.", +"x.v.j.g.g.g.d.d.6.o.<.q.9.9.9.8.9.9.8.X.*.9.d.g.g.j.j.x.c.c.b.", +"c.c.v.x.z.j.g.u.>.5.q.d.d.d.d.q.q.d.y.5.>.7.d.k.z.z.v.c.c.b.b.", +"b.b.b.b.b.b.x.r.t.t.g.b.v.j.h.u.u.k.x.r.r.r.g.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.l.p.t.t.z.b.c.s.p.p.h.b.c.a.p.p.j.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.l.a.a.s.z.b.l.a.a.s.c.b.c.s.a.a.h.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.k.a.s.s.x.b.k.s.s.h.b.b.b.s.s.s.k.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.k.h.h.h.x.b.k.s.h.k.b.b.c.h.h.h.k.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.z.h.h.h.c.b.z.h.h.k.b.b.c.k.h.h.z.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.z.l.k.k.c.b.z.k.k.z.b.b.b.k.k.k.z.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.c.z.z.z.c.b.x.l.z.x.b.b.c.z.z.l.c.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.c.c.c.c.v.b.c.c.c.c.b.b.b.c.c.x.c.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.c.c.c.b.c.c.c.c.c.b.b.b.c.c.c.c.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.b.b.c.c.b.b.b.b.c.b.c.b.c.b.b.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b." +}; diff --git a/debian/nm-vpn-properties.desktop b/debian/nm-vpn-properties.desktop new file mode 100644 index 00000000..18647fc9 --- /dev/null +++ b/debian/nm-vpn-properties.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=NetworkManager VPN Manager +Name[it]=Gestore di VPN +Exec=nm-vpn-properties +Icon=nm-logo.xpm +Terminal=false +Type=Application +Categories=Application;System;Settings; diff --git a/debian/rules b/debian/rules index eec349aa..e860e29a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,11 +28,7 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/network-manager.dbus-conf \ - debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - -binary-install/network-manager-gnome:: - install -m 644 debian/nm-applet.conf \ - debian/network-manager/etc/dbus-1/system.d/nm-applet.conf +binary-install/network-manger-gnome:: + install -m 644 debian/nm-logo.xpm \ + debian/network-manager-gnome/usr/share/pixmaps -- cgit 1.3.0-6-gf8a5 From 0ef63b77db31f41895c4335e4c54d6684d7aa1ac Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 20:16:17 +0000 Subject: - removed debian/network-manager.dbus-conf debian/nm-applet.conf git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@575 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/network-manager.dbus-conf | 24 ------------------------ debian/nm-applet.conf | 24 ------------------------ debian/patches/dbus_access_network_manager.patch | 11 +++++++++++ debian/patches/dbus_access_nm_applet.patch | 11 +++++++++++ 5 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 debian/network-manager.dbus-conf delete mode 100644 debian/nm-applet.conf create mode 100644 debian/patches/dbus_access_network_manager.patch create mode 100644 debian/patches/dbus_access_nm_applet.patch diff --git a/debian/changelog b/debian/changelog index f1e3703c..f3a58002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ network-manager (0.5.1-2) unstable; urgency=low * added dbus_access_network_manager and dbus_access_nm_applet patches: - switched to group netdev - updated the dep on dhcdbd + - removed debian/network-manager.dbus-conf debian/nm-applet.conf * removed network-manager.doc as it was empty. * uploaded to unstable. diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf deleted file mode 100644 index bdf362ff..00000000 --- a/debian/network-manager.dbus-conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf deleted file mode 100644 index 69bc7aee..00000000 --- a/debian/nm-applet.conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch new file mode 100644 index 00000000..06886be3 --- /dev/null +++ b/debian/patches/dbus_access_network_manager.patch @@ -0,0 +1,11 @@ +--- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 ++++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch new file mode 100644 index 00000000..94053ea2 --- /dev/null +++ b/debian/patches/dbus_access_nm_applet.patch @@ -0,0 +1,11 @@ +--- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 ++++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + -- cgit 1.3.0-6-gf8a5 From fc515aae591e54242e81e019690b2745785e88c6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 17 Feb 2006 21:06:05 +0000 Subject: dep on the latest dhcdbd and now we install .conf files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@605 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/network-manager.install b/debian/network-manager.install index b0c7b38b..d2cbee63 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,2 +1,3 @@ debian/tmp/usr/bin/NetworkManager usr/sbin/ debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ +debian/tmp/etc/dbus-1/system.d/* -- cgit 1.3.0-6-gf8a5 From 72f8e32d346062dc259ba238817d362e5635d052 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 18 Feb 2006 13:22:46 +0000 Subject: added by default -lm flag git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@609 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index e860e29a..93930f8d 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ 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 +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-z,defs -Wl,-O1" + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --without-named \ -- cgit 1.3.0-6-gf8a5 From d7759dd3f052a151b3a2e3d85a430e331068e031 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 18 Feb 2006 13:25:24 +0000 Subject: really added -lm flag git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@610 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 93930f8d..09657a86 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ 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 -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-z,defs -Wl,-O1" +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ -- cgit 1.3.0-6-gf8a5 From 659f9d07446c3e80cd438bfe8653cf1789063267 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 26 Feb 2006 20:56:30 +0000 Subject: improved the copyright file of nm git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@662 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/copyright | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/debian/copyright b/debian/copyright index 099ed1c0..2cc573e8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,101 @@ This package was debianized by Thom May on Sun, 3 Oct 2004 11:54:56 +0100. -It was downloaded from ftp.gnome.org +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager -Upstream Author: Dan Williams +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 -Copyright: +License: -This package is licensed under the GPL. For a description of the GPL, -see /usr/share/common-licenses/GPL on your Debian system. + This package 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, + 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 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +src/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. + +gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of +Anders Carlsson and are released under the terms of +the GNU Lesser General Public. (see above). + +src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, 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 +and it's released under the terms of the GNU General Public License. (see below). + +src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett +and it's released under the terms of the GNU General Public License. (see below) + +src/backends/NetworkManagerGentoo.c is copyright of Dan Williams , +Dan Willemsen , 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 and it's released under the terms of +the GNU General Public License. (see below). + +src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams , +Kay Sievers , Robert Love 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 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 and +are released under the terms of the GNU General Public License. (see below). + +initscript/Debian/NetworkManager is copyright of , +Mark Roach , Thom May + +gnome/applet/menu-info.c, menu-info.h are copyright of +Jonathan Blandford and are released under the term of +the GNU General Public License. (see below). + +gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of +David Zeuthen, 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 and it's released under +the terms of the GNU General Public License. + +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. + + 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 + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. -- cgit 1.3.0-6-gf8a5 From 1720003c86221c60ad00ee3657100c365baf9adf Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 26 Feb 2006 21:03:32 +0000 Subject: * improved debian/copyright . I hope this time it will be good enough to pass the ftp-master check. Thanks to Joerg Jaspert who has pointed me to the problem. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@663 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index f3a58002..bc352781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.5.1-3) unstable; urgency=low + + * improved debian/copyright . I hope this time it will be + good enough to pass the ftp-master check. Thanks to Joerg Jaspert who + has pointed me to the problem. + + -- Riccardo Setti Sun, 26 Feb 2006 21:57:29 +0100 + network-manager (0.5.1-2) unstable; urgency=low * improved manpages. -- cgit 1.3.0-6-gf8a5 From 9ffe88ccb8fea3213f90fb530b2e955645c78e6f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 27 Feb 2006 21:54:08 +0000 Subject: nm deps on dhcdbd -1 and not -2 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@671 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ec8fa06d..d88aed84 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-2), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-1), lsb-base (>= 2.0-6) 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 -- cgit 1.3.0-6-gf8a5 From 335f7e7902d01bea249e95b8fe6e7b4105491da4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 27 Feb 2006 21:59:39 +0000 Subject: nm deps on dhcdbd 1.12-1 and not on 1.10-1 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@673 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d88aed84..191f713b 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-1), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) 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 -- cgit 1.3.0-6-gf8a5 From a138a696dc7a66feabed8f796ecc4b333cd0262e Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 27 Feb 2006 22:41:17 +0000 Subject: nm deps on debhelper >= 5 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@677 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 191f713b..c45529cc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 87ba917c89a8921aebc2b64ba935d3c88709c576 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 Feb 2006 18:43:34 +0000 Subject: NM now has a pid-file option. So let's use it. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@681 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 7 +++---- debian/network-manager.dbus-event | 15 +++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index e8c216f2..70747683 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -42,10 +42,9 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index f18ea28e..5556f018 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager PIDFILE=$PIDDIR/$NAME.pid -NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named SCRIPTNAME=/etc/dbus-1/event.d/25$NAME USER=root @@ -54,12 +53,9 @@ d_start() { chmod 755 /var/lib/NetworkManager start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE - - + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # @@ -76,11 +72,6 @@ d_stop() { kill -9 $(cat $PIDFILE) || true rm -f $PIDFILE fi - if [ -e $NAMED_PIDFILE ]; then - kill -9 $(cat $NAMED_PIDFILE) || true - rm -f $NAMED_PIDFILE - fi - } -- cgit 1.3.0-6-gf8a5 From 28c7a549e99aa2fe3ffcbde69ed537131d6f455e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 Feb 2006 18:53:55 +0000 Subject: Merged back changes from unstable branch (copyrigh and usage of group netdev) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@682 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 2 +- debian/copyright | 101 +++++++++++++++++++++-- debian/patches/dbus_access_network_manager.patch | 2 +- debian/patches/dbus_access_nm_applet.patch | 2 +- 4 files changed, 97 insertions(+), 10 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 20c9ed3d..a34d88d8 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,7 +4,7 @@ the user can interact with. Since NetworkManager is not part of main yet, you have to add nm-applet to your session once. (instructions for gnome only) -First add yourself to the plugdev group +First add yourself to the netdev group Go to System -> Preferences -> Sessions In the Startup Programs tab, click Add type "nm-applet", click OK. diff --git a/debian/copyright b/debian/copyright index 891767dc..2cc573e8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,101 @@ This package was debianized by Thom May on Sun, 3 Oct 2004 11:54:56 +0100. -It was downloaded from ftp.gnome.org +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager -Upstream Author: - Dan Williams +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 -Copyright: - 2004, 2005 Red Hat, Inc. +License: -This package is licensed under the GPL. For a description of the GPL, -see /usr/share/common-licenses/GPL on your Debian system. + This package 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, + 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 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +src/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. + +gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of +Anders Carlsson and are released under the terms of +the GNU Lesser General Public. (see above). + +src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, 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 +and it's released under the terms of the GNU General Public License. (see below). + +src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett +and it's released under the terms of the GNU General Public License. (see below) + +src/backends/NetworkManagerGentoo.c is copyright of Dan Williams , +Dan Willemsen , 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 and it's released under the terms of +the GNU General Public License. (see below). + +src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams , +Kay Sievers , Robert Love 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 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 and +are released under the terms of the GNU General Public License. (see below). + +initscript/Debian/NetworkManager is copyright of , +Mark Roach , Thom May + +gnome/applet/menu-info.c, menu-info.h are copyright of +Jonathan Blandford and are released under the term of +the GNU General Public License. (see below). + +gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of +David Zeuthen, 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 and it's released under +the terms of the GNU General Public License. + +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. + + 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 + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch index c164190e..06886be3 100644 --- a/debian/patches/dbus_access_network_manager.patch +++ b/debian/patches/dbus_access_network_manager.patch @@ -5,7 +5,7 @@ - -+ ++ diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch index 0f84f7dd..94053ea2 100644 --- a/debian/patches/dbus_access_nm_applet.patch +++ b/debian/patches/dbus_access_nm_applet.patch @@ -5,7 +5,7 @@ - -+ ++ -- cgit 1.3.0-6-gf8a5 From c1cffd3cc3bad85d1e28a2a8f4cc0fd0e1359bbd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 Feb 2006 20:43:53 +0000 Subject: Do not kill NM prematurely. NM needs some time to shutdown. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@683 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- debian/network-manager-gnome.install | 1 - debian/network-manager.dbus-event | 7 +------ debian/patches/timeout.patch | 11 +++++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 debian/patches/timeout.patch diff --git a/debian/control b/debian/control index 4197d537..91b77181 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0pre6), docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index fb749241..dfa048ea 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -4,5 +4,4 @@ debian/tmp/usr/share/locale/* debian/tmp/usr/share/nm-applet/* debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties -debian/tmp/usr/share/autostart debian/tmp/etc/dbus-1/system.d/nm-applet.conf diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 5556f018..d26d18f4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -65,13 +65,8 @@ d_stop() { log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON + log_end_msg $? - - # if NetworkManager does not want to die, apply some more force - if [ -e $PIDFILE ]; then - kill -9 $(cat $PIDFILE) || true - rm -f $PIDFILE - fi } diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/timeout.patch @@ -0,0 +1,11 @@ +--- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 ++++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 +@@ -2205,7 +2205,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) -- cgit 1.3.0-6-gf8a5 From cf23b879dff37054f6b1404eb1d902da765bc765 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:07:31 +0000 Subject: first debian release of NM 0.6 (taken from the experimental branch) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@710 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/compat | 2 +- debian/control | 32 +++++++++++++++++++++++++++- debian/dirs | 2 -- debian/network-manager-dev.install | 1 + debian/network-manager-dispatcher.dbus-event | 7 +++--- debian/network-manager-gnome.dirs | 1 - debian/network-manager-gnome.install | 3 ++- debian/network-manager.dbus-event | 22 ++++--------------- debian/network-manager.dirs | 3 +-- debian/network-manager.install | 6 +++--- debian/rules | 1 + 11 files changed, 47 insertions(+), 33 deletions(-) delete mode 100644 debian/dirs diff --git a/debian/compat b/debian/compat index b8626c4c..7ed6ff82 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index c45529cc..85f29f25 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant 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 @@ -69,3 +69,33 @@ Description: network management framework daemon (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. + +Package: libnm-util0 +Section: libs +Architecture: any +Depends: ${shlibs: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 + 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 contains a convenience library to ease the access to + NetworkManager. + +Package: libnm-util-dev +Section: libdevel +Architecture: any +Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +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 + 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 contains header and development files. + diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bbb..00000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install index 9287a6f6..97a00409 100644 --- a/debian/network-manager-dev.install +++ b/debian/network-manager-dev.install @@ -1,3 +1,4 @@ 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-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index e8c216f2..70747683 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -42,10 +42,9 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index 92c4831a..e628b1eb 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1,2 +1 @@ etc/dbus-1/system.d/ -usr/share/pixmaps diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index c7b30983..dfa048ea 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -2,5 +2,6 @@ debian/tmp/usr/bin/nm-vpn-properties debian/tmp/usr/bin/nm-applet debian/tmp/usr/share/locale/* debian/tmp/usr/share/nm-applet/* -debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties +debian/tmp/etc/dbus-1/system.d/nm-applet.conf diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index f18ea28e..d26d18f4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager PIDFILE=$PIDDIR/$NAME.pid -NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named SCRIPTNAME=/etc/dbus-1/event.d/25$NAME USER=root @@ -54,12 +53,9 @@ d_start() { chmod 755 /var/lib/NetworkManager start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE - - + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # @@ -69,18 +65,8 @@ d_stop() { log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON + log_end_msg $? - - # if NetworkManager does not want to die, apply some more force - if [ -e $PIDFILE ]; then - kill -9 $(cat $PIDFILE) || true - rm -f $PIDFILE - fi - if [ -e $NAMED_PIDFILE ]; then - kill -9 $(cat $NAMED_PIDFILE) || true - rm -f $NAMED_PIDFILE - fi - } diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 86847abc..19c18e1e 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,5 +1,4 @@ etc/dbus-1/event.d etc/dbus-1/system.d -usr/bin -usr/share/locale +etc/NetworkManager/dispatcher.d var/lib/NetworkManager diff --git a/debian/network-manager.install b/debian/network-manager.install index d2cbee63..0f9b1179 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,3 +1,3 @@ -debian/tmp/usr/bin/NetworkManager usr/sbin/ -debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ -debian/tmp/etc/dbus-1/system.d/* +debian/tmp/usr/sbin/NetworkManager +debian/tmp/usr/sbin/NetworkManagerDispatcher +debian/tmp/etc/dbus-1/system.d/NetworkManager.conf diff --git a/debian/rules b/debian/rules index 09657a86..6c5a5ce9 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --without-named \ + --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 From d6d9212e009400e0160d2c0ceb3a620e53804a26 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:18:05 +0000 Subject: updated changelog and some build deps git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@711 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 12 ++++++++++++ debian/control | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bc352781..89fb3357 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +network-manager (0.6.0-1) unstable; urgency=low + + * New upstream release. + - most of the work is taken from the experimental branch of NM. + Thanks goes to Michael Biebl. + * switched to debhelper5. + * added libnl-util0, libnl-util-dev packages. + - added debian/libnl-util0.install , debian/libnl-util-dev.install + * removed debian/dirs as it was useless. + + -- Riccardo Setti Sat, 4 Mar 2006 20:48:58 +0100 + network-manager (0.5.1-3) unstable; urgency=low * improved debian/copyright . I hope this time it will be diff --git a/debian/control b/debian/control index 85f29f25..939b5dd2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-devi (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 71890c14a8bacfaf817264e5f7845354014a7351 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:20:20 +0000 Subject: removed useless patches git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@712 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-util-dev.install | 12 +++++++++ debian/libnm-util0.install | 1 + debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch | 11 -------- debian/patches/01_NMDevice.c.patch | 23 ----------------- debian/patches/02_nm-netlink-monitor.patch | 11 -------- debian/patches/if_fix.patch | 33 ++++++++++++++++++++++++ debian/patches/timeout.patch | 11 ++++++++ 7 files changed, 57 insertions(+), 45 deletions(-) create mode 100644 debian/libnm-util-dev.install create mode 100644 debian/libnm-util0.install delete mode 100644 debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch delete mode 100644 debian/patches/01_NMDevice.c.patch delete mode 100644 debian/patches/02_nm-netlink-monitor.patch create mode 100644 debian/patches/if_fix.patch create mode 100644 debian/patches/timeout.patch diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install new file mode 100644 index 00000000..c6b4a027 --- /dev/null +++ b/debian/libnm-util-dev.install @@ -0,0 +1,12 @@ +debian/tmp/usr/lib/pkgconfig/libnm-util.pc +debian/tmp/usr/lib/libnm-util.a +debian/tmp/usr/lib/libnm-util.la +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 diff --git a/debian/libnm-util0.install b/debian/libnm-util0.install new file mode 100644 index 00000000..051d4901 --- /dev/null +++ b/debian/libnm-util0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-util.so.* diff --git a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch deleted file mode 100644 index 9b6b3aad..00000000 --- a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/applet-dbus.c.old 2005-12-21 14:19:38.000000000 +0100 -+++ gnome/applet/applet-dbus.c 2005-12-21 14:20:12.000000000 +0100 -@@ -388,7 +388,7 @@ - } - - dbus_error_init (&error); -- acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error); -+ acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &error); - if (dbus_error_is_set (&error)) - { - nm_warning ("nmwa_dbus_init() could not acquire its service. dbus_bus_acquire_service() says: '%s'", error.message); diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch deleted file mode 100644 index a776d3ec..00000000 --- a/debian/patches/01_NMDevice.c.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 -+++ src/NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 -@@ -4283,7 +4283,7 @@ - - strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); - edata.cmd = ETHTOOL_GLINK; -- ifr.ifr_data = (char *) &edata; -+ ifr.ifr_data = (void __user *) &edata; - #ifdef IOCTL_DEBUG - nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev)); - #endif -@@ -4305,8 +4305,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ --#include -- -+#define _LINUX_IF_H -+ #include -+#undef _LINUX_IF_ - static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location) - { - struct mii_ioctl_data *mii; diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch deleted file mode 100644 index 4389059d..00000000 --- a/debian/patches/02_nm-netlink-monitor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nm-netlink-monitor.c 2005-08-12 21:06:09.000000000 +0200 -+++ src/nm-netlink-monitor.c 2006-01-11 12:18:52.000000000 +0100 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch new file mode 100644 index 00000000..379e9b38 --- /dev/null +++ b/debian/patches/if_fix.patch @@ -0,0 +1,33 @@ +Index: src/nm-device-802-3-ethernet.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.3 +diff -u -r1.3 nm-device-802-3-ethernet.c +--- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 ++++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 +@@ -328,7 +328,9 @@ + /**************************************/ + /* MII capability detection */ + /**************************************/ ++#define _LINUX_IF_H + #include ++#undef _LINUX_IF_H + + static int + mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) +Index: src/nm-netlink-monitor.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v +retrieving revision 1.17 +diff -u -r1.17 nm-netlink-monitor.c +--- src/nm-netlink-monitor.c 12 Aug 2005 19:06:09 -0000 1.17 ++++ src/nm-netlink-monitor.c 4 Jan 2006 17:13:33 -0000 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/timeout.patch @@ -0,0 +1,11 @@ +--- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 ++++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 +@@ -2205,7 +2205,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) -- cgit 1.3.0-6-gf8a5 From d7f3580e90b2835376d3bb3ba5dd941a1c0a6f1a Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:22:53 +0000 Subject: removed a typo in debian/control git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@713 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 939b5dd2..246e1ec3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-devi (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 2f1a307248f079badf3f68b2c0770a94ccafdfc2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 21:38:14 +0000 Subject: installed nm-vpn-properties.desktop git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@721 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 1 + debian/network-manager-gnome.dirs | 1 + debian/rules | 2 ++ 3 files changed, 4 insertions(+) diff --git a/debian/control b/debian/control index 246e1ec3..e38fc7a5 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant +Suggests: openvpn, pptpd 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 diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index e628b1eb..ccc07a87 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1 +1,2 @@ etc/dbus-1/system.d/ +usr/share/applications/ diff --git a/debian/rules b/debian/rules index 6c5a5ce9..17ec095f 100755 --- a/debian/rules +++ b/debian/rules @@ -35,3 +35,5 @@ binary-install/network-manager:: binary-install/network-manger-gnome:: install -m 644 debian/nm-logo.xpm \ debian/network-manager-gnome/usr/share/pixmaps + install -m 644 debian/nm-vpn-properties.desktop + debian/network-manager-gnome/usr/share/applications -- cgit 1.3.0-6-gf8a5 From 79ca1e2e63391e2a9657167f5d66517b06e8de3f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 21:48:28 +0000 Subject: improved .postinst file git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@722 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 849dec1c..5b2fb40f 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -3,16 +3,11 @@ set -e case "$1" in configure) - if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then - mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled - fi - if [ -x /usr/bin/dbus-send ]; then - /usr/bin/dbus-send --system --type=method_call \ - --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From a7f7a3ada1f631ac0947c75a37196a97d1855c2c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 22:01:58 +0000 Subject: really install desktop+xpm files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@723 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 17ec095f..4425220c 100755 --- a/debian/rules +++ b/debian/rules @@ -32,8 +32,9 @@ binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher -binary-install/network-manger-gnome:: +binary-install/network-manager-gnome:: install -m 644 debian/nm-logo.xpm \ - debian/network-manager-gnome/usr/share/pixmaps - install -m 644 debian/nm-vpn-properties.desktop - debian/network-manager-gnome/usr/share/applications + debian/network-manager-gnome/usr/share/pixmaps/nm-logo.xpm + install -m 644 debian/nm-vpn-properties.desktop \ + debian/network-manager-gnome/usr/share/applications/nm-vpn-properties.desktop + -- cgit 1.3.0-6-gf8a5 From 54ad5606353a0afa2c98e1d0c0f30580e365fa8d Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 22:02:53 +0000 Subject: n-m-g.dirs should create usr/share/pixmaps/ git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@724 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-gnome.dirs | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index ccc07a87..ab3de1b3 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1,2 +1,3 @@ etc/dbus-1/system.d/ +usr/share/pixmaps/ usr/share/applications/ -- cgit 1.3.0-6-gf8a5 From 3f267ef00a8daaab6b966484a592032d5671d25d Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 5 Mar 2006 12:35:00 +0000 Subject: wpasupplicant should be versioned git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@725 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e38fc7a5..b56bbc5a 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) +Recommends: wpasupplicant (>= 0.4.8) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From c310525c658f899c47520f8aa5d2c9cb49cd53b7 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 5 Mar 2006 15:06:46 +0000 Subject: switched to the latest wpa_supplicat git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@727 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b56bbc5a..b89b2973 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) -Recommends: wpasupplicant (>= 0.4.8) +Recommends: wpasupplicant (>= 0.5.1) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From e0225a101acf158a95bc2ac9a41ed73a896ee23f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 6 Mar 2006 11:27:34 +0000 Subject: added NMDebian.patch which add the support for resolvconf git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@736 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- debian/patches/NetworkManagerDebian.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 debian/patches/NetworkManagerDebian.patch diff --git a/debian/changelog b/debian/changelog index 89fb3357..155d6f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,13 @@ network-manager (0.6.0-1) unstable; urgency=low * New upstream release. - most of the work is taken from the experimental branch of NM. Thanks goes to Michael Biebl. + - Added NetworkManagerDebian.patch which...(closes: ) * switched to debhelper5. * added libnl-util0, libnl-util-dev packages. - added debian/libnl-util0.install , debian/libnl-util-dev.install * removed debian/dirs as it was useless. - - -- Riccardo Setti Sat, 4 Mar 2006 20:48:58 +0100 + + -- Riccardo Setti Mon, 6 Mar 2006 12:23:23 +0100 network-manager (0.5.1-3) unstable; urgency=low diff --git a/debian/patches/NetworkManagerDebian.patch b/debian/patches/NetworkManagerDebian.patch new file mode 100644 index 00000000..8e55c8fa --- /dev/null +++ b/debian/patches/NetworkManagerDebian.patch @@ -0,0 +1,20 @@ +--- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 ++++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 +@@ -37,6 +37,7 @@ + #include "nm-utils.h" + + #define ARPING "/usr/sbin/arping" ++#define RESOLVCONF "resolvconf" + + /* + * nm_system_init +@@ -679,5 +680,8 @@ + */ + gboolean nm_system_should_modify_resolv_conf (void) + { +- return TRUE; ++ if (g_find_program_in_path(RESOLVCONF) != NULL) ++ return FALSE; ++ else ++ return TRUE; + } -- cgit 1.3.0-6-gf8a5 From b751f5821a594667e333c0d984e985625e671676 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 6 Mar 2006 12:43:20 +0000 Subject: NM and NMDispatcher must be restarted in .postinst git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@737 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 5b2fb40f..c24034b5 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -6,7 +6,10 @@ case "$1" in if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true fi - + + /etc/dbus-1/event.d/25NetworkManager restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + ;; esac -- cgit 1.3.0-6-gf8a5 From 912f26326946676b99051279bfdcc5e9a48bcad8 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Mar 2006 16:53:01 +0000 Subject: - Added NetworkManagerDebian.patch which introduce supports for resolvconf * added a Dep on wpasupplicant as it's necessary for all encrypted connections. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@742 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/control | 3 +-- debian/network-manager.postinst | 10 +++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 155d6f1d..b8daf888 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,13 +3,15 @@ network-manager (0.6.0-1) unstable; urgency=low * New upstream release. - most of the work is taken from the experimental branch of NM. Thanks goes to Michael Biebl. - - Added NetworkManagerDebian.patch which...(closes: ) + - Added NetworkManagerDebian.patch which introduce supports for resolvconf * switched to debhelper5. * added libnl-util0, libnl-util-dev packages. - added debian/libnl-util0.install , debian/libnl-util-dev.install * removed debian/dirs as it was useless. + * added a Dep on wpasupplicant as it's necessary for all encrypted + connections. - -- Riccardo Setti Mon, 6 Mar 2006 12:23:23 +0100 + -- Riccardo Setti Thu, 9 Mar 2006 15:38:01 +0100 network-manager (0.5.1-3) unstable; urgency=low diff --git a/debian/control b/debian/control index b89b2973..e8603e99 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) -Recommends: wpasupplicant (>= 0.5.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.5.1) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c24034b5..ac127e03 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -7,9 +7,13 @@ case "$1" in invoke-rc.d dbus force-reload || true fi - /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager restart + fi + + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + fi ;; esac -- cgit 1.3.0-6-gf8a5 From 96f4bb63e1aea9d7428205b05a0cd007ce01ca79 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Mar 2006 16:50:45 +0000 Subject: * New upstream release. * Added myself to uploaders. * Reformatted changelog, always indent - bullet points. * Added dependency on dbus (>= 0.60) * Fixed a small typo in network-manager.postinst * Downgraded dependency of wpasupplicant to 0.4.8. Given that the wpasupplicant includes my patch, this should be enough. If not, we will raise this dependency to 0.5.1 again. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@745 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 40 ++++++++++++++++++++++++---------------- debian/control | 13 +++++++------ debian/network-manager.postinst | 4 ++-- debian/rules | 3 --- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8daf888..eef4d367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,37 +1,45 @@ +network-manager (0.6.1-1) unstable; urgency=low + + * New upstream release. + * Added myself to uploaders. + * Added a dependency on dbus. + + -- Michael Biebl Tue, 14 Mar 2006 15:48:41 +0100 + network-manager (0.6.0-1) unstable; urgency=low * New upstream release. - - most of the work is taken from the experimental branch of NM. - Thanks goes to Michael Biebl. - - Added NetworkManagerDebian.patch which introduce supports for resolvconf + - most of the work is taken from the experimental branch of NM. + Thanks goes to Michael Biebl. + - Added NetworkManagerDebian.patch which introduce supports for resolvconf * switched to debhelper5. * added libnl-util0, libnl-util-dev packages. - - added debian/libnl-util0.install , debian/libnl-util-dev.install + - added debian/libnl-util0.install , debian/libnl-util-dev.install * removed debian/dirs as it was useless. - * added a Dep on wpasupplicant as it's necessary for all encrypted - connections. + * added a dependency on wpasupplicant as it's necessary for all encrypted + connections. -- Riccardo Setti Thu, 9 Mar 2006 15:38:01 +0100 network-manager (0.5.1-3) unstable; urgency=low * improved debian/copyright . I hope this time it will be - good enough to pass the ftp-master check. Thanks to Joerg Jaspert who - has pointed me to the problem. + good enough to pass the ftp-master check. Thanks to Joerg Jaspert who + has pointed me to the problem. -- Riccardo Setti Sun, 26 Feb 2006 21:57:29 +0100 network-manager (0.5.1-2) unstable; urgency=low * improved manpages. - - added nm-vpn-properties, nm-applet manpages - - added debian/network-manager-gnome.manpages - - modifyed NetworManager*.sgml for reflect the correct website. + - added nm-vpn-properties, nm-applet manpages + - added debian/network-manager-gnome.manpages + - modifyed NetworManager*.sgml for reflect the correct website. * added nm-vpn-properties.desktop, nm-logo.xpm * added dbus_access_network_manager and dbus_access_nm_applet patches: - - switched to group netdev - - updated the dep on dhcdbd - - removed debian/network-manager.dbus-conf debian/nm-applet.conf + - switched to group netdev + - updated the dep on dhcdbd + - removed debian/network-manager.dbus-conf debian/nm-applet.conf * removed network-manager.doc as it was empty. * uploaded to unstable. @@ -40,12 +48,12 @@ network-manager (0.5.1-2) unstable; urgency=low network-manager (0.5.1-1) experimental; urgency=low * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because - first we need to start NetworkManager and then NetworkManagerDispatcher + first we need to start NetworkManager and then NetworkManagerDispatcher * added networkmanger and networkmanaferdispatcher manpages. * Inital upload to Debian (Closes: #270538) * work based on the ubuntu package * Added 01.patch and 02.patch for fix the problem with recent linux - kernel-headers + kernel-headers -- Riccardo Setti Mon, 5 Jan 2006 17:09:29 +0100 diff --git a/debian/control b/debian/control index e8603e99..97f084d1 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,13 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti +Uploaders: Michael Biebl Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.5.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all @@ -23,7 +24,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager -Description: network management framework daemon +Description: network management framework (GNOME frontend) 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 @@ -37,7 +38,7 @@ Package: network-manager-dev Architecture: any Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config -Description: network management framework daemon development +Description: network management framework daemon (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. @@ -45,7 +46,7 @@ Package: libnm-glib0 Section: libs Architecture: any Depends: ${shlibs:Depends} -Description: network management framework daemon (GLib shared library) +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 usage on servers. The point of NetworkManager is to make networking @@ -59,8 +60,8 @@ Description: network management framework daemon (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libglib2.0-dev, libnm-glib0 (= ${Source-Version}), libdbus-glib-1-dev (>= 0.60) -Description: network management framework daemon (GLib interface) +Depends: libnm-glib0 (= ${Source-Version}), 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 usage on servers. The point of NetworkManager is to make networking diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index ac127e03..9460b596 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -11,10 +11,10 @@ case "$1" in /etc/dbus-1/event.d/25NetworkManager restart fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher restart fi - ;; + ;; esac #DEBHELPER# diff --git a/debian/rules b/debian/rules index 4425220c..c0ba849a 100755 --- a/debian/rules +++ b/debian/rules @@ -8,19 +8,16 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --without-named \ --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian clean:: - rm -f po/*.gmo rm -f debian/*.1 build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 -- cgit 1.3.0-6-gf8a5 From 23ad753bcd5c3f1d7206be0d55816b6a7f76cf60 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:29:12 +0000 Subject: New upstream release. Updated if_fix.patch and removed unnecessary lines. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@764 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/patches/if_fix.patch | 16 ---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index eef4d367..430b45f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.2-1) unstable; urgency=low + + * New upstream release. + * Updated if_fix.patch, parts of it have been fixed upstream. + + -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 + network-manager (0.6.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch index 379e9b38..b5667c53 100644 --- a/debian/patches/if_fix.patch +++ b/debian/patches/if_fix.patch @@ -15,19 +15,3 @@ diff -u -r1.3 nm-device-802-3-ethernet.c static int mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) -Index: src/nm-netlink-monitor.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v -retrieving revision 1.17 -diff -u -r1.17 nm-netlink-monitor.c ---- src/nm-netlink-monitor.c 12 Aug 2005 19:06:09 -0000 1.17 -+++ src/nm-netlink-monitor.c 4 Jan 2006 17:13:33 -0000 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -- cgit 1.3.0-6-gf8a5 From 0ce16ea08527212be9efe0969d7a210b8a4187ac Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:47:52 +0000 Subject: - Lowered dependeny on dhcbd to 1.10. We don't absolutely need 1.12. - Removed vpn-properties desktop and icon file. Without VPN plugins these menu entries are rather useless and misleading. As soon as we have VPN plugins in unstable, we can readd these file, but we should look for a better icon then. The current scales badly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@765 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 2 +- debian/nm-logo.xpm | 182 --------------------------------------- debian/nm-vpn-properties.desktop | 9 -- 4 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 debian/nm-logo.xpm delete mode 100644 debian/nm-vpn-properties.desktop diff --git a/debian/changelog b/debian/changelog index 430b45f5..1a974d5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ network-manager (0.6.2-1) unstable; urgency=low * New upstream release. * Updated if_fix.patch, parts of it have been fixed upstream. + * Lowered dependency on dhcbd to (>= 1.10). We don't necessarily need 1.12. -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 diff --git a/debian/control b/debian/control index 97f084d1..1309b4de 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all diff --git a/debian/nm-logo.xpm b/debian/nm-logo.xpm deleted file mode 100644 index 20e4f020..00000000 --- a/debian/nm-logo.xpm +++ /dev/null @@ -1,182 +0,0 @@ -/* XPM */ -static char *nm-logo[] = { -/* columns rows colors chars-per-pixel */ -"31 32 144 2", -" c #697677FB7FB8", -". c #15175FC087FE", -"X c #14835FFE88A6", -"o c #09C560CC8FD9", -"O c #0694613C9241", -"+ c #028067169DEF", -"@ c #04906949A025", -"# c #093E62AC9307", -"$ c #153262348BBC", -"% c #1B9F660C8E34", -"& c #1186680C96CE", -"* c #16976A2597A0", -"= c #03E1696AA0B1", -"- c #00C16F4DABB9", -"; c #0C756DE3A2EE", -": c #034B71FBAD4D", -"> c #09437623B01E", -", c #028C76FFB4C0", -"< c #0137795DB8AD", -"1 c #005C79D4B9E5", -"2 c #08FF7AB6B729", -"3 c #09877E53BBAE", -"4 c #15B67262A3D0", -"5 c #136577DAACCF", -"6 c #14907892AD2C", -"7 c #22A0630985BE", -"8 c #2CBB67CA879A", -"9 c #2F1C6B888C07", -"0 c #2DF175349ABB", -"q c #348968258401", -"w c #32B96E2E8E29", -"e c #39E47AAF9CD3", -"r c #4FF675EE8A6F", -"t c #502779EB9088", -"y c #502F7A3990FA", -"u c #65C47ECF8C0C", -"i c #6E487F9D88CD", -"p c #72D3800F873E", -"a c #108080CFBBC7", -"s c #2598838DB523", -"d c #57C781DC9893", -"f c #57CE81FA98CC", -"g c #5BBA80B49439", -"h c #5B9284F59B6B", -"j c #4ADC8C5EAFB8", -"k c #44E68F61B7E9", -"l c #4238922EBC42", -"z c #536A8C9EAB7A", -"x c #59E9895DA2FF", -"c c #59368F8CACD6", -"v c #52DB9191B37B", -"b c #511396CDBCBF", -"n c #661981A0903C", -"m c #640F8A749F3A", -"M c #6AE288009783", -"N c #6BD9898C9958", -"B c #78608D169801", -"V c #7BD08FE89A8C", -"C c #7E2992ED9DF4", -"Z c #6A0E8FFCA424", -"A c #67569352AB01", -"S c #6BF492F2A7F4", -"D c #74DF9316A33E", -"F c #7C51974DA5BE", -"G c #7ED79AD6A9AC", -"H c #7FFB9FF9B13E", -"J c #4F1F9BCEC542", -"K c #54D59F6BC7AA", -"L c #6264A477C75A", -"P c #62B3ABE1D27B", -"I c #7853AF66CC76", -"U c #816895259FA8", -"Y c #8D93976F9CF7", -"T c #8A3D98B9A077", -"R c #85BC9BE7A7D7", -"E c #82F79DAEAC35", -"W c #8BF69E05A7D8", -"Q c #8C069F78A9E1", -"! c #91A09C60A23B", -"~ c #8EF9A31AADAF", -"^ c #84F6A213B1CF", -"/ c #8E61A84AB617", -"( c #88D6AB50BD96", -") c #9562A30CAA87", -"_ c #9EA2A871ADF8", -"` c #9FF9A966AEA7", -"' c #94ECA827B245", -"] c #974AAA2FB40E", -"[ c #96EEAE5DBADF", -"{ c #9D23AAC4B227", -"} c #9DE0B130BB6E", -"| c #A150A586A81F", -" . c #A229A817ABAD", -".. c #A492AA51ADD7", -"X. c #A33CAD55B2E1", -"o. c #A6BFB3D4BAD3", -"O. c #AB67B1DAB56B", -"+. c #AC4EB6ACBC49", -"@. c #B391BB15BF57", -"#. c #BA39BE37C071", -"$. c #834DBC15DA10", -"%. c #AF0CBCC4C429", -"&. c #B549BDB4C24E", -"*. c #B988C064C419", -"=. c #B7F4C2D6C8A5", -"-. c #BFC1C595C8C4", -";. c #BED9C7C6CC94", -":. c #C06CD4B7DF9A", -">. c #BCFBD5EDE356", -",. c #BC9FDB03EB09", -"<. c #C2B1C52AC6BD", -"1. c #C1F9C6ABC934", -"2. c #C7A7CB4DCD71", -"3. c #CCF4CDE3CEAD", -"4. c #C568CE82D373", -"5. c #C4F1D554DE16", -"6. c #CD69D25CD522", -"7. c #CB6DD60CDBCC", -"8. c #D582D693D77A", -"9. c #D89ED89AD921", -"0. c #D77AD948DA67", -"q. c #DC43DD4ADE07", -"w. c #C282D667E0FB", -"e. c #D5B3DFEDE56A", -"r. c #CF2FE41FEF10", -"t. c #D190E603F0AF", -"y. c #DF33E38BE600", -"u. c #DA32E4DAEA53", -"i. c #DDB0E9E8F066", -"p. c #D43CE848F2FB", -"a. c #D85EEA77F3FB", -"s. c #DCEBEBECF3BB", -"d. c #E5BAE5C4E5FA", -"f. c #E5C7EAD9EDB0", -"g. c #ECBAED9DEE40", -"h. c #E511EECAF447", -"j. c #ED4EF03AF211", -"k. c #ED61F2C1F5EE", -"l. c #ED5BF579F9CD", -"z. c #F3BDF4FCF604", -"x. c #F5C2F810F986", -"c. c #F7EEF9D8FAF4", -"v. c #F9B0F7FCF723", -"b. c #FE77FE8FFE9D", -/* pixels */ -"b.b.b.b.b.b.b.b.z.9.3.8.d.x.8.8.8.8.0.q.g.b.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.e.X. .....| @. .Y . . . . .2.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.g.X.+.&.@.@.@. .X. .+.@.@.@.@.! q.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.6.{ +.o.X.o.o.o.T .] o.o.+.+.T *.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.&.~ ' B U ' ] V @.! n n ~ ' C X.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.[ F G n @.%.D F M +.v.d.=.V G M .b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.H f h r 1.f.m h t ` b.b.7.d h t ) b.b.b.b.b.b.b.b.", -"b.b.b.b.b.c.A 9 w q 1.x.x w 8 Q b.b.5.w w 8 W b.b.b.b.b.b.b.b.", -"b.b.b.b.b.c.c $ $ % -.c.z $ X F b.b.5.% $ $ R b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.v O # % -.b.j O O D v.b.>.& # o R v.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b = = * -.c.k + + S v.b.>.; @ + E b.b.b.b.b.b.b.b.", -"b.b.b.b.b.c.K , : 4 ;.b.J - - z z.b.,., : ; ^ b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.P 3 1 5 ;.b.$.1 < s y.b.,.3 < > / b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.I 1 1 6 ;.b.s.l , , L k.,.3 1 > } b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.w.a 1 6 ;.b.b.y.[ S S 4.,.3 < 4 =.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.I 2 6 ;.b.b.b.b.v.z.c.,.3 > g d.b.b.b.b.b.b.b.b.", -"b.b.b.v.v.x.x.f.( e @.x.z.j.j.j.j.z.>.0 n 3.v.v.v.c.v.b.b.b.b.", -"x.v.j.g.g.g.d.d.6.o.<.q.9.9.9.8.9.9.8.X.*.9.d.g.g.j.j.x.c.c.b.", -"c.c.v.x.z.j.g.u.>.5.q.d.d.d.d.q.q.d.y.5.>.7.d.k.z.z.v.c.c.b.b.", -"b.b.b.b.b.b.x.r.t.t.g.b.v.j.h.u.u.k.x.r.r.r.g.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.l.p.t.t.z.b.c.s.p.p.h.b.c.a.p.p.j.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.l.a.a.s.z.b.l.a.a.s.c.b.c.s.a.a.h.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.k.a.s.s.x.b.k.s.s.h.b.b.b.s.s.s.k.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.k.h.h.h.x.b.k.s.h.k.b.b.c.h.h.h.k.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.z.h.h.h.c.b.z.h.h.k.b.b.c.k.h.h.z.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.z.l.k.k.c.b.z.k.k.z.b.b.b.k.k.k.z.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.c.z.z.z.c.b.x.l.z.x.b.b.c.z.z.l.c.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.c.c.c.c.v.b.c.c.c.c.b.b.b.c.c.x.c.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.c.c.c.b.c.c.c.c.c.b.b.b.c.c.c.c.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.b.b.c.c.b.b.b.b.c.b.c.b.c.b.b.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b." -}; diff --git a/debian/nm-vpn-properties.desktop b/debian/nm-vpn-properties.desktop deleted file mode 100644 index 18647fc9..00000000 --- a/debian/nm-vpn-properties.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=NetworkManager VPN Manager -Name[it]=Gestore di VPN -Exec=nm-vpn-properties -Icon=nm-logo.xpm -Terminal=false -Type=Application -Categories=Application;System;Settings; -- cgit 1.3.0-6-gf8a5 From c1e970a529ac74c9c31a295e134e2f8d554da783 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:58:37 +0000 Subject: Forgot to remove the installation of the icon and desktop file from debian/rules... git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@766 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/rules b/debian/rules index c0ba849a..ee921281 100755 --- a/debian/rules +++ b/debian/rules @@ -29,9 +29,3 @@ binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher -binary-install/network-manager-gnome:: - install -m 644 debian/nm-logo.xpm \ - debian/network-manager-gnome/usr/share/pixmaps/nm-logo.xpm - install -m 644 debian/nm-vpn-properties.desktop \ - debian/network-manager-gnome/usr/share/applications/nm-vpn-properties.desktop - -- cgit 1.3.0-6-gf8a5 From 1d1d99bcad79fe607bcf628990cae1ca2947f264 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 Mar 2006 13:25:16 +0000 Subject: Update NM 0.6.2 to use the new dhcdbd revision which starts on its own. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@768 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a974d5a..5ff810fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ network-manager (0.6.2-1) unstable; urgency=low * New upstream release. * Updated if_fix.patch, parts of it have been fixed upstream. - * Lowered dependency on dhcbd to (>= 1.10). We don't necessarily need 1.12. + * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself + anymore. -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 diff --git a/debian/control b/debian/control index 1309b4de..8a743162 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From 5e7af6f6f819143869be8728cfeed8a55e535d51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Mar 2006 23:21:51 +0000 Subject: Removed "Suggests: openvpn, pptpd" from network-manager. They don't make that much sense. As soon as we have working VPN plugins, we should add them to Suggests. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@769 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 8a743162..9de165ea 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) -Suggests: openvpn, pptpd 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 @@ -38,7 +37,7 @@ Package: network-manager-dev Architecture: any Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config -Description: network management framework daemon (development files) +Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. -- cgit 1.3.0-6-gf8a5 From 573354e6c4a37cb9de06a29eb2ad4d01889c87d6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Apr 2006 12:46:47 +0000 Subject: The wpa_supplicant binary was moved from /usr/sbin to /sbin. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@771 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5ff810fc..61cdf819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ network-manager (0.6.2-1) unstable; urgency=low * Updated if_fix.patch, parts of it have been fixed upstream. * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself anymore. + * The wpa_supplicant binary was moved from /usr/sbin to /sbin. Updated + debian/rules accordingly. -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 diff --git a/debian/rules b/debian/rules index ee921281..d8813abe 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ + --with-wpa_supplicant=/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 From 15792ef7e8756e253133524a47e255c65cd6e768 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Apr 2006 13:31:41 +0000 Subject: Apply an ordering for the packages and choose better names where applicable. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@775 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01-supplicant_timeout.patch | 11 +++++++++++ debian/patches/02-dbus_access_network_manager.patch | 11 +++++++++++ debian/patches/03-dbus_access_nm_applet.patch | 11 +++++++++++ debian/patches/04-if_fix.patch | 17 +++++++++++++++++ debian/patches/05-resolvconf.patch | 20 ++++++++++++++++++++ debian/patches/NetworkManagerDebian.patch | 20 -------------------- debian/patches/dbus_access_network_manager.patch | 11 ----------- debian/patches/dbus_access_nm_applet.patch | 11 ----------- debian/patches/if_fix.patch | 17 ----------------- debian/patches/timeout.patch | 11 ----------- 10 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 debian/patches/01-supplicant_timeout.patch create mode 100644 debian/patches/02-dbus_access_network_manager.patch create mode 100644 debian/patches/03-dbus_access_nm_applet.patch create mode 100644 debian/patches/04-if_fix.patch create mode 100644 debian/patches/05-resolvconf.patch delete mode 100644 debian/patches/NetworkManagerDebian.patch delete mode 100644 debian/patches/dbus_access_network_manager.patch delete mode 100644 debian/patches/dbus_access_nm_applet.patch delete mode 100644 debian/patches/if_fix.patch delete mode 100644 debian/patches/timeout.patch diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/01-supplicant_timeout.patch @@ -0,0 +1,11 @@ +--- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 ++++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 +@@ -2205,7 +2205,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 new file mode 100644 index 00000000..06886be3 --- /dev/null +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -0,0 +1,11 @@ +--- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 ++++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch new file mode 100644 index 00000000..94053ea2 --- /dev/null +++ b/debian/patches/03-dbus_access_nm_applet.patch @@ -0,0 +1,11 @@ +--- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 ++++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch new file mode 100644 index 00000000..b5667c53 --- /dev/null +++ b/debian/patches/04-if_fix.patch @@ -0,0 +1,17 @@ +Index: src/nm-device-802-3-ethernet.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.3 +diff -u -r1.3 nm-device-802-3-ethernet.c +--- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 ++++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 +@@ -328,7 +328,9 @@ + /**************************************/ + /* MII capability detection */ + /**************************************/ ++#define _LINUX_IF_H + #include ++#undef _LINUX_IF_H + + static int + mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/05-resolvconf.patch b/debian/patches/05-resolvconf.patch new file mode 100644 index 00000000..8e55c8fa --- /dev/null +++ b/debian/patches/05-resolvconf.patch @@ -0,0 +1,20 @@ +--- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 ++++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 +@@ -37,6 +37,7 @@ + #include "nm-utils.h" + + #define ARPING "/usr/sbin/arping" ++#define RESOLVCONF "resolvconf" + + /* + * nm_system_init +@@ -679,5 +680,8 @@ + */ + 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/debian/patches/NetworkManagerDebian.patch b/debian/patches/NetworkManagerDebian.patch deleted file mode 100644 index 8e55c8fa..00000000 --- a/debian/patches/NetworkManagerDebian.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 -+++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 -@@ -37,6 +37,7 @@ - #include "nm-utils.h" - - #define ARPING "/usr/sbin/arping" -+#define RESOLVCONF "resolvconf" - - /* - * nm_system_init -@@ -679,5 +680,8 @@ - */ - 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/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch deleted file mode 100644 index 06886be3..00000000 --- a/debian/patches/dbus_access_network_manager.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 -+++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 -@@ -8,7 +8,7 @@ - - - -- -+ - - - diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch deleted file mode 100644 index 94053ea2..00000000 --- a/debian/patches/dbus_access_nm_applet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 -+++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 -@@ -8,7 +8,7 @@ - - - -- -+ - - - diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch deleted file mode 100644 index b5667c53..00000000 --- a/debian/patches/if_fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/nm-device-802-3-ethernet.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.3 -diff -u -r1.3 nm-device-802-3-ethernet.c ---- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 -+++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 -@@ -328,7 +328,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ -+#define _LINUX_IF_H - #include -+#undef _LINUX_IF_H - - static int - mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch deleted file mode 100644 index 0723c83a..00000000 --- a/debian/patches/timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 -+++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 -@@ -2205,7 +2205,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) -- cgit 1.3.0-6-gf8a5 From ab79d32b92a7c7c479af685ce345956344a4b5e4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 2 Apr 2006 18:02:09 +0000 Subject: - Close some bugs in the changelog. - Added autostart file for nm-applet. Updated README.Debian correspondingly. - Added dependency on hal to network-manager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@778 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 17 +++++++---------- debian/changelog | 10 +++++++--- debian/control | 4 ++-- debian/network-manager-gnome.install | 1 + 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index a34d88d8..0fad5552 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,11 +1,8 @@ -NetworkManger has two parts one is run on the system level to -manager connections and gather information. The other is an applet -the user can interact with. Since NetworkManager is not part of -main yet, you have to add nm-applet to your session once. +NetworkManger consists of two parts: one is on the system level daemon that +manages the connections and gathers information about new networks. The other +is an applet that users can use to interact with the NetworkManager daemon. -(instructions for gnome only) -First add yourself to the netdev group -Go to System -> Preferences -> Sessions -In the Startup Programs tab, click Add -type "nm-applet", click OK. -log out of your gnome session, and log back in again. +To allow users to connect to the NetworkManager daemon they have to be in the +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 dbus with the command "/etc/init.d/dbus reload". diff --git a/debian/changelog b/debian/changelog index 61cdf819..454b61aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ network-manager (0.6.2-1) unstable; urgency=low - * New upstream release. + * New upstream release. * Updated if_fix.patch, parts of it have been fixed upstream. + * Renamed patches to use a more consistent naming scheme. * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself anymore. * The wpa_supplicant binary was moved from /usr/sbin to /sbin. Updated debian/rules accordingly. + * Added dependency on hal (Closes: #356622) + * Added autostart file to network-manager-gnome. This way nm-applet is + started automatically on login. - -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 + -- Michael Biebl Sun, 2 Apr 2006 19:48:28 +0200 network-manager (0.6.1-1) unstable; urgency=low @@ -19,7 +23,7 @@ network-manager (0.6.1-1) unstable; urgency=low network-manager (0.6.0-1) unstable; urgency=low - * New upstream release. + * New upstream release (Closes: #355246) - most of the work is taken from the experimental branch of NM. Thanks goes to Michael Biebl. - Added NetworkManagerDebian.patch which introduce supports for resolvconf diff --git a/debian/control b/debian/control index 9de165ea..fa9886d4 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0) 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 @@ -22,7 +22,7 @@ Description: network management framework daemon Package: network-manager-gnome Architecture: any Section: gnome -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) Description: network management framework (GNOME frontend) 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/network-manager-gnome.install b/debian/network-manager-gnome.install index dfa048ea..88214a99 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -5,3 +5,4 @@ debian/tmp/usr/share/nm-applet/* debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties debian/tmp/etc/dbus-1/system.d/nm-applet.conf +debian/tmp/usr/share/gnome/autostart/nm-applet.desktop -- cgit 1.3.0-6-gf8a5 From f7e18eab4786f1e1be4b25c7231074d66d3e430a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 5 Apr 2006 17:29:39 +0000 Subject: Integration work. Scripts in /etc/network/if-*.d/ are now called properly by NetworkManagerDispatcher. Thanks to the Ubuntu guys for this works. It's mostly copied from their package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@790 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 10 +++ debian/network-manager-dispatcher.script | 44 ++++++++++++ debian/patches/06-dispatch_more_events.patch | 104 +++++++++++++++++++++++++++ debian/rules | 4 +- 4 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 debian/network-manager-dispatcher.script create mode 100644 debian/patches/06-dispatch_more_events.patch diff --git a/debian/changelog b/debian/changelog index 454b61aa..a69ea7bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (0.6.2-2) unstable; urgency=low + + * More integration work. + Added network-manager-dispatcher.script and 06-dispatch_more_events.patch. + This way the scripts in /etc/networks/if-*.d/ are called properly by + NetworkManagerDispatcher. + Thanks to the Ubuntu devs for this work! + + -- Michael Biebl Wed, 5 Apr 2006 18:52:57 +0200 + network-manager (0.6.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script new file mode 100644 index 00000000..abc6e4d5 --- /dev/null +++ b/debian/network-manager-dispatcher.script @@ -0,0 +1,44 @@ +#!/bin/sh -e +# Script to dispatch NetworkManager events +# +# Runs ifupdown scripts when NetworkManager fiddles with interfaces. + +if [ -z "$1" ]; then + echo "$0: called with no interface" 1>&2 + exit 1; +fi + +# Fake ifupdown environment +export IFACE="$1" +export LOGICAL="$1" +export ADDRFAM="NetworkManager" +export METHOD="NetworkManager" +export VERBOSITY="0" + +# Run the right scripts +case "$2" in + up) + export MODE="start" + export PHASE="up" + exec run-parts /etc/network/if-up.d + ;; + down) + export MODE="stop" + export PHASE="down" + exec run-parts /etc/network/if-down.d + ;; + pre-up) + export MODE="start" + export PHASE="pre-up" + exec run-parts /etc/network/if-pre-up.d + ;; + post-down) + export MODE="stop" + export PHASE="post-down" + exec run-parts /etc/network/if-post-down.d + ;; + *) + echo "$0: called with unknown action \`$2'" 1>&2 + exit 1 + ;; +esac diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch new file mode 100644 index 00000000..e8b30810 --- /dev/null +++ b/debian/patches/06-dispatch_more_events.patch @@ -0,0 +1,104 @@ +diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c +--- network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-13 16:51:57.000000000 +0000 ++++ network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c 2006-04-03 18:14:06.000000000 +0100 +@@ -44,6 +44,8 @@ enum NMDAction + 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 @@ static void nmd_execute_scripts (NMDActi + 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 @@ static DBusHandlerResult nmd_dbus_filter + } + + 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 @@ static DBusHandlerResult nmd_dbus_filter + 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); + } +diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in +--- network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 ++++ network-manager-0.6.2/man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 +@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo + 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 +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c +--- network-manager-0.6.2~/src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 ++++ network-manager-0.6.2/src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 +@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si + { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, + { DEVICE_ACTIVATING, "DeviceActivating" }, + { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, ++ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, + { DEVICE_ADDED, "DeviceAdded" }, + { DEVICE_REMOVED, "DeviceRemoved" }, + { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h +--- network-manager-0.6.2~/src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 ++++ network-manager-0.6.2/src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 +@@ -40,6 +40,7 @@ typedef enum + DEVICE_ACTIVATING, + DEVICE_ACTIVATION_FAILED, + DEVICE_ACTIVATION_CANCELED, ++ DEVICE_DEACTIVATED, + DEVICE_ADDED, + DEVICE_REMOVED, + DEVICE_CARRIER_ON, +diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c +--- network-manager-0.6.2~/src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 ++++ network-manager-0.6.2/src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 +@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) + 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/rules b/debian/rules index d8813abe..121f42b8 100755 --- a/debian/rules +++ b/debian/rules @@ -28,4 +28,6 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - + install -m 755 debian/network-manager-dispatcher.script \ + debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown + -- cgit 1.3.0-6-gf8a5 From 44a31b5773ec83522ba8047b0cd19ef975808e42 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 5 May 2006 16:59:12 +0000 Subject: - Standards-Version 3.7.2 - Make libnm_glib wait between connection attempts to dbus (07-libnm_glib_reconnect_dbus.patch) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@811 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++- debian/control | 2 +- debian/patches/07-libnm_glib_reconnect_dbus.patch | 65 +++++++++++++++++++++++ 3 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 debian/patches/07-libnm_glib_reconnect_dbus.patch diff --git a/debian/changelog b/debian/changelog index a69ea7bc..17be6e9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ network-manager (0.6.2-2) unstable; urgency=low - * More integration work. + * More integration work. Added network-manager-dispatcher.script and 06-dispatch_more_events.patch. This way the scripts in /etc/networks/if-*.d/ are called properly by NetworkManagerDispatcher. Thanks to the Ubuntu devs for this work! + * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between + unsuccessful connection attempts to dbus. (Closes: #366010) + * Bumped Standards-Version to 3.7.2, no further changes required. - -- Michael Biebl Wed, 5 Apr 2006 18:52:57 +0200 + -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 network-manager (0.6.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index fa9886d4..4c9457bf 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 Package: network-manager Architecture: any diff --git a/debian/patches/07-libnm_glib_reconnect_dbus.patch b/debian/patches/07-libnm_glib_reconnect_dbus.patch new file mode 100644 index 00000000..371813b2 --- /dev/null +++ b/debian/patches/07-libnm_glib_reconnect_dbus.patch @@ -0,0 +1,65 @@ +Index: gnome/libnm_glib/libnm_glib.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/gnome/libnm_glib/libnm_glib.c,v +retrieving revision 1.11 +diff -u -p -r1.11 libnm_glib.c +--- gnome/libnm_glib/libnm_glib.c 21 Feb 2006 06:25:50 -0000 1.11 ++++ gnome/libnm_glib/libnm_glib.c 5 May 2006 15:35:55 -0000 +@@ -39,6 +39,7 @@ struct libnm_glib_ctx + GMainLoop * g_main_loop; + DBusConnection * dbus_con; + guint dbus_watcher; ++ guint dbus_watch_interval; + gboolean thread_done; + gboolean thread_inited; + +@@ -347,14 +348,29 @@ libnm_glib_dbus_watcher (gpointer user_d + + g_return_val_if_fail (ctx != NULL, FALSE); + ++ ctx->dbus_watcher = 0; ++ + if (!ctx->dbus_con) + ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx); + + if (ctx->dbus_con) +- return (FALSE); /* Don't reschedule ourselves if we have a connection to dbus */ ++ { ++ /* Get NM's state right away after we reconnect */ ++ libnm_glib_get_nm_state (ctx); ++ ctx->dbus_watch_interval = 1000; ++ } ++ else ++ { ++ /* Wait 3 seconds longer each time we fail to reconnect to dbus, ++ * with a maximum wait of one minute. ++ */ ++ ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); + +- /* Reschule ourselves if we _still_ don't have a connection to dbus */ +- return (TRUE); ++ /* Reschule ourselves if we _still_ don't have a connection to dbus */ ++ libnm_glib_schedule_dbus_watcher (ctx); ++ } ++ ++ return FALSE; + } + + +@@ -372,7 +388,7 @@ libnm_glib_schedule_dbus_watcher (libnm_ + + if (ctx->dbus_watcher == 0) + { +- GSource *source = g_idle_source_new (); ++ GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); + g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL); + ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); + g_source_unref (source); +@@ -453,6 +469,7 @@ libnm_glib_ctx_new (void) + goto error; + if (!(ctx->callbacks_lock = g_mutex_new ())) + goto error; ++ ctx->dbus_watch_interval = 1000; + + return ctx; + -- cgit 1.3.0-6-gf8a5 From 5e049c924e41f2099c65be0cf9e6e441bdd84dc2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 5 May 2006 21:40:48 +0000 Subject: Lots of integration work. NM behaves like a good citizen now and is ready for "testing". git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@815 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 38 ++++++++++++++++- debian/changelog | 22 ++++++---- debian/patches/08-disabled_devices.patch | 52 +++++++++++++++++++++++ debian/patches/09-nm_bad_mutex_free.patch | 69 +++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 8 deletions(-) create mode 100644 debian/patches/08-disabled_devices.patch create mode 100644 debian/patches/09-nm_bad_mutex_free.patch diff --git a/debian/README.Debian b/debian/README.Debian index 0fad5552..537f1c83 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,8 +1,44 @@ -NetworkManger consists of two parts: one is on the system level daemon that +NetworkManager consists of two parts: one is on the system level daemon that manages the connections and gathers information about new networks. The other is an applet that users can use to interact with the NetworkManager daemon. +Security +~~~~~~~~ To allow users to connect to the NetworkManager daemon they have to be in the 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 dbus with the command "/etc/init.d/dbus reload". + +Configuration +~~~~~~~~~~~~~ +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. + +Examples: + +1.) +auto wlan0 +iface wlan0 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. diff --git a/debian/changelog b/debian/changelog index 17be6e9b..6874f9fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,20 @@ network-manager (0.6.2-2) unstable; urgency=low - * More integration work. - Added network-manager-dispatcher.script and 06-dispatch_more_events.patch. - This way the scripts in /etc/networks/if-*.d/ are called properly by - NetworkManagerDispatcher. - Thanks to the Ubuntu devs for this work! - * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between - unsuccessful connection attempts to dbus. (Closes: #366010) + * More integration work. (Closes: #355244) + - Added network-manager-dispatcher.script and + 06-dispatch_more_events.patch. + This way the scripts in /etc/networks/if-*.d/ are called properly by + NetworkManagerDispatcher. + Thanks to the Ubuntu devs for this work! + - Added 08-disabled_devices.patch. Network interfaces listed in + /etc/network/interfaces which are not configured "auto" and "dhcp" are + not handled by NM. This makes it possible to configure interfaces + statically and have NM not messing with them. + Updated README.Debian to reflect these changes. + - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if devices are + listed in /etc/network/interfaces. + * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep + between unsuccessful connection attempts to dbus. (Closes: #366010) * Bumped Standards-Version to 3.7.2, no further changes required. -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch new file mode 100644 index 00000000..9ffe22ce --- /dev/null +++ b/debian/patches/08-disabled_devices.patch @@ -0,0 +1,52 @@ +--- src/backends/NetworkManagerDebian.c.orig 2006-05-05 19:59:18.000000000 +0200 ++++ src/backends/NetworkManagerDebian.c 2006-05-05 20:04:34.000000000 +0200 +@@ -521,7 +521,48 @@ + */ + 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 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->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; + } + + diff --git a/debian/patches/09-nm_bad_mutex_free.patch b/debian/patches/09-nm_bad_mutex_free.patch new file mode 100644 index 00000000..9da4cce0 --- /dev/null +++ b/debian/patches/09-nm_bad_mutex_free.patch @@ -0,0 +1,69 @@ +--- network-manager-0.6.2.orig/src/nm-device-802-11-wireless.c 2006-05-05 02:13:37.000000000 -0500 ++++ network-manager-0.6.2/src/nm-device-802-11-wireless.c 2006-05-05 02:20:23.000000000 -0500 +@@ -60,7 +60,7 @@ + + struct _NMDevice80211WirelessPrivate + { +- gboolean dispose_has_run; ++ gboolean is_initialized; + + struct ether_addr hw_addr; + +@@ -242,7 +242,7 @@ + nm_device_802_11_wireless_init (NMDevice80211Wireless * self) + { + self->priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self); +- self->priv->dispose_has_run = FALSE; ++ self->priv->is_initialized = FALSE; + + memset (&(self->priv->hw_addr), 0, sizeof (struct ether_addr)); + self->priv->supplicant.pid = -1; +@@ -256,6 +256,7 @@ + guint32 caps; + NMSock * sk; + ++ self->priv->is_initialized = TRUE; + self->priv->scan_mutex = g_mutex_new (); + nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex"); + +@@ -2988,24 +2989,22 @@ + NMDevice80211WirelessClass * klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object); + NMDeviceClass * parent_class; + +- if (self->priv->dispose_has_run) +- /* If dispose did already run, return. */ +- return; +- +- /* Make sure dispose does not run twice. */ +- self->priv->dispose_has_run = TRUE; +- +- /* +- * In dispose, you are supposed to free all types referenced from this +- * object which might themselves hold a reference to self. Generally, +- * the most simple solution is to unref all members on which you own a +- * reference. +- */ +- +- nm_device_802_11_wireless_ap_list_clear (self); +- if (self->priv->ap_list) +- nm_ap_list_unref (self->priv->ap_list); +- g_mutex_free (self->priv->scan_mutex); ++ /* Only do this part of the cleanup if the object is initialized */ ++ if (self->priv->is_initialized) { ++ self->priv->is_initialized = FALSE; ++ ++ /* ++ * In dispose, you are supposed to free all types referenced from this ++ * object which might themselves hold a reference to self. Generally, ++ * the most simple solution is to unref all members on which you own a ++ * reference. ++ */ ++ ++ nm_device_802_11_wireless_ap_list_clear (self); ++ if (self->priv->ap_list) ++ nm_ap_list_unref (self->priv->ap_list); ++ g_mutex_free (self->priv->scan_mutex); ++ } + + /* Chain up to the parent class */ + parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); -- cgit 1.3.0-6-gf8a5 From da7733f04f25edbf724a14568f14a351099a32f3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 May 2006 20:56:35 +0000 Subject: Remove *.la files from -dev packages. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@817 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/libnm-glib-dev.install | 1 - debian/libnm-util-dev.install | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6874f9fb..ee66008a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ network-manager (0.6.2-2) unstable; urgency=low * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between unsuccessful connection attempts to dbus. (Closes: #366010) * Bumped Standards-Version to 3.7.2, no further changes required. + * Removed *.la files from the dev packages as we also ship pkg-config files + which are a better alternative. -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index 754ac2e6..624f7a5a 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -1,5 +1,4 @@ debian/tmp/usr/lib/pkgconfig/libnm_glib.pc debian/tmp/usr/lib/libnm_glib*.a -debian/tmp/usr/lib/libnm_glib*.la debian/tmp/usr/lib/libnm_glib*.so debian/tmp/usr/include/NetworkManager/libnm_glib.h diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install index c6b4a027..66abe57e 100644 --- a/debian/libnm-util-dev.install +++ b/debian/libnm-util-dev.install @@ -1,6 +1,5 @@ debian/tmp/usr/lib/pkgconfig/libnm-util.pc debian/tmp/usr/lib/libnm-util.a -debian/tmp/usr/lib/libnm-util.la debian/tmp/usr/lib/libnm-util.so debian/tmp/usr/include/NetworkManager/cipher.h debian/tmp/usr/include/NetworkManager/cipher-wep-hex.h -- cgit 1.3.0-6-gf8a5 From f9ec882bec72c776c55aee51f2e299f6af2e52ce Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 9 May 2006 19:27:53 +0000 Subject: We don't need LDFLAGS="-lm". It builds fine without it, even with -Wl,--as-needed git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@818 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 121f42b8..28d9dab5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,6 @@ 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 -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" - DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-wpa_supplicant=/sbin/wpa_supplicant \ -- cgit 1.3.0-6-gf8a5 From 63b3f3f48fb827a50b82d46c358dbedea4060770 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 May 2006 00:33:27 +0000 Subject: Use strstr, because auto can have multiple interfaces, e.g. auto lo eth0 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@819 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/08-disabled_devices.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index 9ffe22ce..d5392c9f 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -30,7 +30,7 @@ + */ + for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { + if (!strcmp (curr_b->type, "auto") -+ && !strcmp (curr_b->name, iface)) ++ && strstr (curr_b->name, iface)) + blacklist = FALSE; + } + -- cgit 1.3.0-6-gf8a5 From a5a5d5671a0c793b4d45373947178fa77fec9a16 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 May 2006 00:36:14 +0000 Subject: Fix the /etc/network/interfaces parser: - Only add data to an existing block (prevents segfault) - Support mapping and allow-* stanzas. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@820 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 7 +- debian/changelog | 6 +- debian/patches/10-interface_parser_fixes.patch | 90 ++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 debian/patches/10-interface_parser_fixes.patch diff --git a/debian/README.Debian b/debian/README.Debian index 537f1c83..4694c299 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -11,8 +11,11 @@ After that you have to reload dbus with the command "/etc/init.d/dbus reload". Configuration ~~~~~~~~~~~~~ -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. +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. Examples: diff --git a/debian/changelog b/debian/changelog index ee66008a..9f2cdaf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,13 +11,15 @@ network-manager (0.6.2-2) unstable; urgency=low not handled by NM. This makes it possible to configure interfaces statically and have NM not messing with them. Updated README.Debian to reflect these changes. - - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if devices are - listed in /etc/network/interfaces. + - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if a device is + disabled. * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between unsuccessful connection attempts to dbus. (Closes: #366010) * Bumped Standards-Version to 3.7.2, no further changes required. * Removed *.la files from the dev packages as we also ship pkg-config files which are a better alternative. + * Added 10-interface_parser_fixes.patch which fixes several problems with + the /etc/network/interfaces parser. (Closes: #355564) -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 diff --git a/debian/patches/10-interface_parser_fixes.patch b/debian/patches/10-interface_parser_fixes.patch new file mode 100644 index 00000000..e751e359 --- /dev/null +++ b/debian/patches/10-interface_parser_fixes.patch @@ -0,0 +1,90 @@ +Index: src/backends/interface_parser.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/backends/interface_parser.c,v +retrieving revision 1.6 +diff -u -3 -p -r1.6 interface_parser.c +--- src/backends/interface_parser.c 24 Oct 2005 15:04:28 -0000 1.6 ++++ src/backends/interface_parser.c 9 May 2006 23:06:35 -0000 +@@ -50,6 +50,10 @@ void add_block(const char *type, const c + + void add_data(const char *key,const char *data) + { ++ // Check if there is a block where we can attach our data ++ if (first == NULL) ++ return; ++ + if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); + ret->key = g_strdup(key); + ret->data = g_strdup(data); +@@ -73,6 +77,10 @@ void ifparser_init(void) + { + FILE *inp = fopen(INTERFACES,"r"); + int ret = 0; ++ char *line; ++ char *space; ++ char rline[255]; ++ + if (inp == NULL) + { + nm_warning ("Error: Can't open %s\n",INTERFACES); +@@ -81,10 +89,16 @@ void ifparser_init(void) + first = last = NULL; + while(1) + { +- char *line,rline[255],*space; ++ line = space = NULL; + ret = fscanf(inp,"%255[^\n]\n",rline); + if (ret == EOF) + break; ++ // If the line did not match, skip it ++ if (ret == 0) { ++ fgets(rline, 255, inp); ++ continue; ++ } ++ + line = rline; + while(line[0] == ' ') + line++; +@@ -94,18 +108,19 @@ void ifparser_init(void) + SPACE_OR_TAB(line,space) + if (space == NULL) + { +- nm_warning ("Error: Can't parse interface line '%s'\n",line); ++ nm_warning ("Error: Can't parse interface line '%s'\n",line); + continue; + } + space[0] = '\0'; + +- ++ // There are four different stanzas: ++ // iface, mapping, auto and allow-*. Create a block for each of them. + if (strcmp(line,"iface")==0) + { + char *space2 = strchr(space+1,' '); + if (space2 == NULL) + { +- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); ++ nm_warning ("Error: Can't parse iface line '%s'\n",space+1); + continue; + } + space2[0]='\0'; +@@ -116,7 +131,7 @@ void ifparser_init(void) + space = strchr(space2+1,' '); + if (space == NULL) + { +- nm_warning ("Error: Can't parse data '%s'\n",space2+1); ++ nm_warning ("Error: Can't parse data '%s'\n",space2+1); + continue; + } + space[0] = '\0'; +@@ -124,6 +139,10 @@ void ifparser_init(void) + } + } + 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 + add_data(line,space+1); -- cgit 1.3.0-6-gf8a5 From caaa00c14e74b82528bde834cbfd1216dc339696 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 May 2006 21:15:52 +0000 Subject: Wrote a NEWS file explaining the changes (handling of devices listed in /e/n/i) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@836 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..0c0f4d7a --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,17 @@ +network-manager (0.6.2-2) unstable; urgency=low + + * NetworkManager now reads the network interface configuration specified in + /etc/network/interfaces. Devices that are listed there and match certain + criteria are *not* managed by NetworkManager anymore. + For more on information on what these criteria are please read + /usr/share/doc/network-manager/README.Debian, section "Configuration". + This means that if NetworkManager stops to manage one of your network + devices with this release but you want NetworkManager to take care of this + device, simply remove the device configuration from + /etc/network/interfaces. + This also means that you can now setup a custom configuration without + NetworkManager overriding this setting. E.g. you might setup your wired + network interface eth0 statically in /etc/network/interfaces and for your + wireless network device wlan0 you can let NetworkManager handle it. + + -- Michael Biebl Wed, 10 May 2006 22:51:18 +0200 -- cgit 1.3.0-6-gf8a5 From 35c2556dbd2c86a6adbf1657cb7c54de20aea56b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 May 2006 22:12:13 +0000 Subject: Add the NEWS.Debian file only to the network-manager package git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@840 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NEWS | 17 ----------------- debian/changelog | 7 +++++++ debian/docs | 3 --- debian/network-manager.NEWS | 17 +++++++++++++++++ debian/rules | 2 ++ 5 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 debian/NEWS delete mode 100644 debian/docs create mode 100644 debian/network-manager.NEWS diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index 0c0f4d7a..00000000 --- a/debian/NEWS +++ /dev/null @@ -1,17 +0,0 @@ -network-manager (0.6.2-2) unstable; urgency=low - - * NetworkManager now reads the network interface configuration specified in - /etc/network/interfaces. Devices that are listed there and match certain - criteria are *not* managed by NetworkManager anymore. - For more on information on what these criteria are please read - /usr/share/doc/network-manager/README.Debian, section "Configuration". - This means that if NetworkManager stops to manage one of your network - devices with this release but you want NetworkManager to take care of this - device, simply remove the device configuration from - /etc/network/interfaces. - This also means that you can now setup a custom configuration without - NetworkManager overriding this setting. E.g. you might setup your wired - network interface eth0 statically in /etc/network/interfaces and for your - wireless network device wlan0 you can let NetworkManager handle it. - - -- Michael Biebl Wed, 10 May 2006 22:51:18 +0200 diff --git a/debian/changelog b/debian/changelog index 9f2cdaf0..f6501cb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.2-3) unstable; urgency=low + + * Ship the NEWS.Debian file only for the network-manager package. + (Closes: #367063) + + -- Michael Biebl Sat, 13 May 2006 12:35:03 +0200 + network-manager (0.6.2-2) unstable; urgency=low * More integration work. (Closes: #355244) diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 5502ed8f..00000000 --- a/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -NEWS -README -TODO diff --git a/debian/network-manager.NEWS b/debian/network-manager.NEWS new file mode 100644 index 00000000..0c0f4d7a --- /dev/null +++ b/debian/network-manager.NEWS @@ -0,0 +1,17 @@ +network-manager (0.6.2-2) unstable; urgency=low + + * NetworkManager now reads the network interface configuration specified in + /etc/network/interfaces. Devices that are listed there and match certain + criteria are *not* managed by NetworkManager anymore. + For more on information on what these criteria are please read + /usr/share/doc/network-manager/README.Debian, section "Configuration". + This means that if NetworkManager stops to manage one of your network + devices with this release but you want NetworkManager to take care of this + device, simply remove the device configuration from + /etc/network/interfaces. + This also means that you can now setup a custom configuration without + NetworkManager overriding this setting. E.g. you might setup your wired + network interface eth0 statically in /etc/network/interfaces and for your + wireless network device wlan0 you can let NetworkManager handle it. + + -- Michael Biebl Wed, 10 May 2006 22:51:18 +0200 diff --git a/debian/rules b/debian/rules index 28d9dab5..ebbeb317 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ 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 +DEB_INSTALL_DOCS_ALL := README AUTHORS TODO + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-wpa_supplicant=/sbin/wpa_supplicant \ -- cgit 1.3.0-6-gf8a5 From c1a83915903d35e1e6296359c2b194de213a78d5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 May 2006 22:32:59 +0000 Subject: Support cards which can't do carrier detect. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@841 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/11-carrier_detection.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian/patches/11-carrier_detection.patch diff --git a/debian/changelog b/debian/changelog index f6501cb9..b42cddfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.2-3) unstable; urgency=low - * Ship the NEWS.Debian file only for the network-manager package. + * Ship the NEWS.Debian file only for the network-manager package. (Closes: #367063) + * Added 11-carrier_detection.patch to support network cards which can't do + carrier detection. (Closes: #366373) - -- Michael Biebl Sat, 13 May 2006 12:35:03 +0200 + -- Michael Biebl Tue, 16 May 2006 00:16:43 +0200 network-manager (0.6.2-2) unstable; urgency=low diff --git a/debian/patches/11-carrier_detection.patch b/debian/patches/11-carrier_detection.patch new file mode 100644 index 00000000..ff7d1ecf --- /dev/null +++ b/debian/patches/11-carrier_detection.patch @@ -0,0 +1,17 @@ +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.13.2.1 +retrieving revision 1.13.2.2 +diff -u -r1.13.2.1 -r1.13.2.2 +--- src/nm-device-802-3-ethernet.c 2006/03/09 21:39:15 1.13.2.1 ++++ src/nm-device-802-3-ethernet.c 2006/05/13 19:06:05 1.13.2.2 +@@ -207,8 +207,7 @@ + if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self)) + caps |= NM_DEVICE_CAP_CARRIER_DETECT; + +- if (caps) +- caps |= NM_DEVICE_CAP_NM_SUPPORTED; ++ caps |= NM_DEVICE_CAP_NM_SUPPORTED; + + return caps; + } -- cgit 1.3.0-6-gf8a5 From 622f751812d193facaa79f10421f5950a558c389 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 13:43:48 +0000 Subject: - New upstream (bugfix) release 0.6.3 - Removed patches which were merged upstream: 07-libnm_glib_reconnect_dbus.patch 09-nm_bad_mutex_free.patch 10-interface_parser_fixes.patch. 11-carrier_detection.patch - Added watch file. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@846 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 +++ debian/control | 2 +- debian/patches/07-libnm_glib_reconnect_dbus.patch | 65 ---------------- debian/patches/09-nm_bad_mutex_free.patch | 69 ----------------- debian/patches/10-interface_parser_fixes.patch | 90 ----------------------- debian/patches/11-carrier_detection.patch | 17 ----- debian/watch | 3 + 7 files changed, 15 insertions(+), 242 deletions(-) delete mode 100644 debian/patches/07-libnm_glib_reconnect_dbus.patch delete mode 100644 debian/patches/09-nm_bad_mutex_free.patch delete mode 100644 debian/patches/10-interface_parser_fixes.patch delete mode 100644 debian/patches/11-carrier_detection.patch create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index b42cddfe..12717637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +network-manager (0.6.3-1) unstable; urgency=low + + * New upstream release. + - Removed 07-libnm_glib_reconnect_dbus.patch, merged upstream. + - Removed 09-nm_bad_mutex_free.patch, fixed upstream. + - Removed 10-interface_parser_fixes.patch, merged upstream. + - Removed 11-carrier_detection.patch, merged upstream. + * Added a watch file. + + -- Michael Biebl Thu, 8 Jun 2006 13:53:33 +0200 + network-manager (0.6.2-3) unstable; urgency=low * Ship the NEWS.Debian file only for the network-manager package. diff --git a/debian/control b/debian/control index 4c9457bf..b1fae970 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager diff --git a/debian/patches/07-libnm_glib_reconnect_dbus.patch b/debian/patches/07-libnm_glib_reconnect_dbus.patch deleted file mode 100644 index 371813b2..00000000 --- a/debian/patches/07-libnm_glib_reconnect_dbus.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: gnome/libnm_glib/libnm_glib.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/gnome/libnm_glib/libnm_glib.c,v -retrieving revision 1.11 -diff -u -p -r1.11 libnm_glib.c ---- gnome/libnm_glib/libnm_glib.c 21 Feb 2006 06:25:50 -0000 1.11 -+++ gnome/libnm_glib/libnm_glib.c 5 May 2006 15:35:55 -0000 -@@ -39,6 +39,7 @@ struct libnm_glib_ctx - GMainLoop * g_main_loop; - DBusConnection * dbus_con; - guint dbus_watcher; -+ guint dbus_watch_interval; - gboolean thread_done; - gboolean thread_inited; - -@@ -347,14 +348,29 @@ libnm_glib_dbus_watcher (gpointer user_d - - g_return_val_if_fail (ctx != NULL, FALSE); - -+ ctx->dbus_watcher = 0; -+ - if (!ctx->dbus_con) - ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx); - - if (ctx->dbus_con) -- return (FALSE); /* Don't reschedule ourselves if we have a connection to dbus */ -+ { -+ /* Get NM's state right away after we reconnect */ -+ libnm_glib_get_nm_state (ctx); -+ ctx->dbus_watch_interval = 1000; -+ } -+ else -+ { -+ /* Wait 3 seconds longer each time we fail to reconnect to dbus, -+ * with a maximum wait of one minute. -+ */ -+ ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); - -- /* Reschule ourselves if we _still_ don't have a connection to dbus */ -- return (TRUE); -+ /* Reschule ourselves if we _still_ don't have a connection to dbus */ -+ libnm_glib_schedule_dbus_watcher (ctx); -+ } -+ -+ return FALSE; - } - - -@@ -372,7 +388,7 @@ libnm_glib_schedule_dbus_watcher (libnm_ - - if (ctx->dbus_watcher == 0) - { -- GSource *source = g_idle_source_new (); -+ GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); - g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL); - ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); - g_source_unref (source); -@@ -453,6 +469,7 @@ libnm_glib_ctx_new (void) - goto error; - if (!(ctx->callbacks_lock = g_mutex_new ())) - goto error; -+ ctx->dbus_watch_interval = 1000; - - return ctx; - diff --git a/debian/patches/09-nm_bad_mutex_free.patch b/debian/patches/09-nm_bad_mutex_free.patch deleted file mode 100644 index 9da4cce0..00000000 --- a/debian/patches/09-nm_bad_mutex_free.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- network-manager-0.6.2.orig/src/nm-device-802-11-wireless.c 2006-05-05 02:13:37.000000000 -0500 -+++ network-manager-0.6.2/src/nm-device-802-11-wireless.c 2006-05-05 02:20:23.000000000 -0500 -@@ -60,7 +60,7 @@ - - struct _NMDevice80211WirelessPrivate - { -- gboolean dispose_has_run; -+ gboolean is_initialized; - - struct ether_addr hw_addr; - -@@ -242,7 +242,7 @@ - nm_device_802_11_wireless_init (NMDevice80211Wireless * self) - { - self->priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self); -- self->priv->dispose_has_run = FALSE; -+ self->priv->is_initialized = FALSE; - - memset (&(self->priv->hw_addr), 0, sizeof (struct ether_addr)); - self->priv->supplicant.pid = -1; -@@ -256,6 +256,7 @@ - guint32 caps; - NMSock * sk; - -+ self->priv->is_initialized = TRUE; - self->priv->scan_mutex = g_mutex_new (); - nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex"); - -@@ -2988,24 +2989,22 @@ - NMDevice80211WirelessClass * klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object); - NMDeviceClass * parent_class; - -- if (self->priv->dispose_has_run) -- /* If dispose did already run, return. */ -- return; -- -- /* Make sure dispose does not run twice. */ -- self->priv->dispose_has_run = TRUE; -- -- /* -- * In dispose, you are supposed to free all types referenced from this -- * object which might themselves hold a reference to self. Generally, -- * the most simple solution is to unref all members on which you own a -- * reference. -- */ -- -- nm_device_802_11_wireless_ap_list_clear (self); -- if (self->priv->ap_list) -- nm_ap_list_unref (self->priv->ap_list); -- g_mutex_free (self->priv->scan_mutex); -+ /* Only do this part of the cleanup if the object is initialized */ -+ if (self->priv->is_initialized) { -+ self->priv->is_initialized = FALSE; -+ -+ /* -+ * In dispose, you are supposed to free all types referenced from this -+ * object which might themselves hold a reference to self. Generally, -+ * the most simple solution is to unref all members on which you own a -+ * reference. -+ */ -+ -+ nm_device_802_11_wireless_ap_list_clear (self); -+ if (self->priv->ap_list) -+ nm_ap_list_unref (self->priv->ap_list); -+ g_mutex_free (self->priv->scan_mutex); -+ } - - /* Chain up to the parent class */ - parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); diff --git a/debian/patches/10-interface_parser_fixes.patch b/debian/patches/10-interface_parser_fixes.patch deleted file mode 100644 index e751e359..00000000 --- a/debian/patches/10-interface_parser_fixes.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: src/backends/interface_parser.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/backends/interface_parser.c,v -retrieving revision 1.6 -diff -u -3 -p -r1.6 interface_parser.c ---- src/backends/interface_parser.c 24 Oct 2005 15:04:28 -0000 1.6 -+++ src/backends/interface_parser.c 9 May 2006 23:06:35 -0000 -@@ -50,6 +50,10 @@ void add_block(const char *type, const c - - void add_data(const char *key,const char *data) - { -+ // Check if there is a block where we can attach our data -+ if (first == NULL) -+ return; -+ - if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); - ret->key = g_strdup(key); - ret->data = g_strdup(data); -@@ -73,6 +77,10 @@ void ifparser_init(void) - { - FILE *inp = fopen(INTERFACES,"r"); - int ret = 0; -+ char *line; -+ char *space; -+ char rline[255]; -+ - if (inp == NULL) - { - nm_warning ("Error: Can't open %s\n",INTERFACES); -@@ -81,10 +89,16 @@ void ifparser_init(void) - first = last = NULL; - while(1) - { -- char *line,rline[255],*space; -+ line = space = NULL; - ret = fscanf(inp,"%255[^\n]\n",rline); - if (ret == EOF) - break; -+ // If the line did not match, skip it -+ if (ret == 0) { -+ fgets(rline, 255, inp); -+ continue; -+ } -+ - line = rline; - while(line[0] == ' ') - line++; -@@ -94,18 +108,19 @@ void ifparser_init(void) - SPACE_OR_TAB(line,space) - if (space == NULL) - { -- nm_warning ("Error: Can't parse interface line '%s'\n",line); -+ nm_warning ("Error: Can't parse interface line '%s'\n",line); - continue; - } - space[0] = '\0'; - -- -+ // There are four different stanzas: -+ // iface, mapping, auto and allow-*. Create a block for each of them. - if (strcmp(line,"iface")==0) - { - char *space2 = strchr(space+1,' '); - if (space2 == NULL) - { -- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); -+ nm_warning ("Error: Can't parse iface line '%s'\n",space+1); - continue; - } - space2[0]='\0'; -@@ -116,7 +131,7 @@ void ifparser_init(void) - space = strchr(space2+1,' '); - if (space == NULL) - { -- nm_warning ("Error: Can't parse data '%s'\n",space2+1); -+ nm_warning ("Error: Can't parse data '%s'\n",space2+1); - continue; - } - space[0] = '\0'; -@@ -124,6 +139,10 @@ void ifparser_init(void) - } - } - 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 - add_data(line,space+1); diff --git a/debian/patches/11-carrier_detection.patch b/debian/patches/11-carrier_detection.patch deleted file mode 100644 index ff7d1ecf..00000000 --- a/debian/patches/11-carrier_detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.13.2.1 -retrieving revision 1.13.2.2 -diff -u -r1.13.2.1 -r1.13.2.2 ---- src/nm-device-802-3-ethernet.c 2006/03/09 21:39:15 1.13.2.1 -+++ src/nm-device-802-3-ethernet.c 2006/05/13 19:06:05 1.13.2.2 -@@ -207,8 +207,7 @@ - if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self)) - caps |= NM_DEVICE_CAP_CARRIER_DETECT; - -- if (caps) -- caps |= NM_DEVICE_CAP_NM_SUPPORTED; -+ caps |= NM_DEVICE_CAP_NM_SUPPORTED; - - return caps; - } diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..c7e07a46 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz -- cgit 1.3.0-6-gf8a5 From 55b7fe04569b2d0b9ed1576a00f56c1995fa83c4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 14:33:43 +0000 Subject: Added homepage URL to package description. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@847 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12717637..e84a729e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ network-manager (0.6.3-1) unstable; urgency=low - Removed 10-interface_parser_fixes.patch, merged upstream. - Removed 11-carrier_detection.patch, merged upstream. * Added a watch file. + * Added homepage URL to package description. - -- Michael Biebl Thu, 8 Jun 2006 13:53:33 +0200 + -- Michael Biebl Thu, 8 Jun 2006 16:21:43 +0200 network-manager (0.6.2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index b1fae970..4df76836 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,8 @@ Description: network management framework daemon from a DHCP server, and change nameservers whenever it sees fit. . This package provides the userspace daemons. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-gnome Architecture: any @@ -32,6 +34,8 @@ Description: network management framework (GNOME frontend) from a DHCP server, and change nameservers whenever it sees fit. . This package provides the notification applet to the control system. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-dev Architecture: any @@ -40,6 +44,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib0 Section: libs @@ -55,6 +61,8 @@ Description: network management framework (GLib shared library) . This package provides the shared library that applications can use to query connection status via NetworkManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib-dev Section: libdevel @@ -70,6 +78,8 @@ Description: network management framework (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util0 Section: libs @@ -85,6 +95,8 @@ Description: network management framework (shared library) . This package contains a convenience library to ease the access to NetworkManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util-dev Section: libdevel @@ -99,4 +111,6 @@ Description: network management framework (development files) from a DHCP server, and change nameservers whenever it sees fit. . This package contains header and development files. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From c8ce7ee97a4cda637265432f17dc91abc6924bec Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 21:21:31 +0000 Subject: download.gnome.org seems to be preferred by the Gnome people... git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@850 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index c7e07a46..f2d66b4c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz +http://download.gnome.org/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz -- cgit 1.3.0-6-gf8a5 From 8a3aa7b73917d56ea69452dc9d76aa53aac0267d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 22:21:30 +0000 Subject: The NetworkManager daemon needs some time to shutdown. Pass --retry 60 to s-s-d, 60 secs should be enough. Do the same for NetworkManagerDispatcher. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@851 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 2 +- debian/network-manager.dbus-event | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index 70747683..4b70eea1 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -52,7 +52,7 @@ d_start() { # d_stop() { log_begin_msg "Stopping $DESC" - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? } diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index d26d18f4..8d35dfe4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -63,7 +63,7 @@ d_start() { # d_stop() { log_begin_msg "Stopping $DESC" - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? -- cgit 1.3.0-6-gf8a5 From 62f9aab052015becba3184d4c2e7b01dea1dbe8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 22:32:03 +0000 Subject: Removed "sleep 1" in restart between stop and start, because s-s-d --stop --retry 60 is a much better solution. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@853 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 1 - debian/network-manager.dbus-event | 1 - 2 files changed, 2 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index 4b70eea1..18f6beb6 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -67,7 +67,6 @@ case "$1" in ;; restart|force-reload) d_stop - sleep 1 d_start ;; *) diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 8d35dfe4..4009e84d 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -79,7 +79,6 @@ case "$1" in ;; restart|force-reload) d_stop - sleep 1 d_start ;; *) -- cgit 1.3.0-6-gf8a5 From 676c97361205d04db307bf9350fe372e69499904 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 14 Jun 2006 01:04:14 +0000 Subject: hal must be able to send events about hotplugged devices to NM. Added user hal to /etc/dbus-1/system.d/NetworkManager.conf. Should git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@854 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/patches/02-dbus_access_network_manager.patch | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e84a729e..406dc2ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.6.3-2) unstable; urgency=low + + * Updated 02-dbus_access_network_manager.patch to allow the hal daemon + (running as user "hal") to send events about hotplugged devices to the + NetworkManager daemon. (Closes: 355785) + + -- Michael Biebl Wed, 14 Jun 2006 02:53:13 +0200 + network-manager (0.6.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index 06886be3..afa3bc3b 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,10 +1,14 @@ ---- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 -+++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 -@@ -8,7 +8,7 @@ +--- src/NetworkManager.conf.orig 2006-06-14 02:47:10.000000000 +0200 ++++ src/NetworkManager.conf 2006-06-14 02:48:31.000000000 +0200 +@@ -8,7 +8,11 @@ - ++ ++ ++ ++ + -- cgit 1.3.0-6-gf8a5 From 2d050cf0d49b7179871631290e37a91fb879a3a3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 20 Jun 2006 16:01:54 +0000 Subject: Added a Recommends: notification-daemon to network-manager-gnome. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@859 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 406dc2ba..c445491e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ network-manager (0.6.3-2) unstable; urgency=low * Updated 02-dbus_access_network_manager.patch to allow the hal daemon (running as user "hal") to send events about hotplugged devices to the NetworkManager daemon. (Closes: 355785) + * Added a Recommends: notification-daemon to network-manager-gnome. - -- Michael Biebl Wed, 14 Jun 2006 02:53:13 +0200 + -- Michael Biebl Wed, 14 Jun 2006 14:00:15 +0200 network-manager (0.6.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4df76836..9288b533 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) +Recommends: notification-daemon Description: network management framework (GNOME frontend) 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 -- cgit 1.3.0-6-gf8a5 From e2bb2da74742a9c731492f0c83bf004c7fc8fe46 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 20 Jun 2006 21:43:19 +0000 Subject: Improved the package description and the manpage of network-manager-gnome to make it clear that nm-applet is a systray applet and not a gnome-panel applet. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@862 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 3 ++- debian/changelog | 4 +++- debian/control | 7 ++++++- debian/nm-applet.sgml | 9 ++++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 4694c299..8fa5e314 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,6 +1,7 @@ NetworkManager consists of two parts: one is on the system level daemon that manages the connections and gathers information about new networks. The other -is an applet that users can use to interact with the NetworkManager daemon. +is a systray applet that users can use to interact with the NetworkManager +daemon. Security ~~~~~~~~ diff --git a/debian/changelog b/debian/changelog index c445491e..c0ced1cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ network-manager (0.6.3-2) unstable; urgency=low (running as user "hal") to send events about hotplugged devices to the NetworkManager daemon. (Closes: 355785) * Added a Recommends: notification-daemon to network-manager-gnome. + * Improved the package description and the manpage of network-manager-gnome. + (Closes: #362962) - -- Michael Biebl Wed, 14 Jun 2006 14:00:15 +0200 + -- Michael Biebl Tue, 20 Jun 2006 23:22:11 +0200 network-manager (0.6.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9288b533..2ac3103d 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,12 @@ Description: network management framework (GNOME frontend) 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 notification applet to the control system. + This package contains a systray applet for GNOME's notification area but it + also works for other desktop environments which provide a systray like KDE + or XFCE. + It displays the available networks and allows to easily switch between them. + For encrypted networks it will prompt the user for the key/passphrase and it + can optionally store them in the gnome-keyring. . Homepage: http://www.gnome.org/projects/NetworkManager/ diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml index b027f8a0..f457fd93 100644 --- a/debian/nm-applet.sgml +++ b/debian/nm-applet.sgml @@ -57,9 +57,12 @@ manpage.1: manpage.sgml DESCRIPTION - &package; is the gnome front-end for NetworkManager - If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian - in /usr/share/doc/network-manager + &package; is the GNOME front-end for NetworkManager + It is a systray applet which will display an icon in GNOME's notification area but it + also works for other desktop environments which provide a systray like KDE or XFCE. + &package; shows a list of available networks and allows you to easily switch between them. For encrypted networks it + will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to + type them again. SEE ALSO -- cgit 1.3.0-6-gf8a5 From 0cf95b63fb5cf6aa9856bd1ad527f4896d76d719 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 23 Jul 2006 09:49:09 +0000 Subject: * New upstream release. (closes: #379163) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@886 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c0ced1cf..1265705c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-1) unstable; urgency=low + + * New upstream release. (closes: #379163) + + -- Riccardo Setti Sun, 23 Jul 2006 11:47:10 +0200 + network-manager (0.6.3-2) unstable; urgency=low * Updated 02-dbus_access_network_manager.patch to allow the hal daemon -- cgit 1.3.0-6-gf8a5 From a449bc5835aeca913c8ccc5e378ec3b06fcdde2f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 2 Aug 2006 17:56:24 +0000 Subject: - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@910 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 2 +- debian/patches/08-disabled_devices.patch | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1265705c..cd7f013b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) + - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) - -- Riccardo Setti Sun, 23 Jul 2006 11:47:10 +0200 + -- Riccardo Setti Wed, 2 Aug 2006 19:51:48 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 2ac3103d..9f16c586 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: network-manager Section: net Priority: optional -Maintainer: Riccardo Setti +Maintainer: Riccardo Setti Uploaders: Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index d5392c9f..37e2d727 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -29,17 +29,17 @@ + * definitely not okay to control it. + */ + for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { -+ if (!strcmp (curr_b->type, "auto") ++ 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. ++ * 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")) ++ || strcmp (curr_d->data, "dhcp" )|| strcmp ( currd->key, "iface")) + blacklist = TRUE; + } + -- cgit 1.3.0-6-gf8a5 From 420f5e82421755940f3d1b3f3145e7bf9da20299 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 2 Aug 2006 18:04:11 +0000 Subject: fixed an error in debian/patch/08.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@911 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/08-disabled_devices.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index 37e2d727..50a4e4c2 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -29,7 +29,7 @@ + * 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") ++ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")) + && strstr (curr_b->name, iface)) + blacklist = FALSE; + } @@ -39,7 +39,7 @@ + */ + for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { + if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp" )|| strcmp ( currd->key, "iface")) ++ || strcmp (curr_d->data, "dhcp" )|| strcmp ( curr_d->key, "iface")) + blacklist = TRUE; + } + -- cgit 1.3.0-6-gf8a5 From b5c7402310a94300f20924523d5cd0d8b63816d6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 4 Aug 2006 22:39:28 +0000 Subject: updated README.Debian git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@912 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian index 8fa5e314..f52a031f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -25,6 +25,11 @@ auto wlan0 iface wlan0 inet dhcp -> This device is managed by NM. +1.a) +allow-hotplug eth1 +iface eth0 ined dhcp +-> This device is manager by NM + 2.) auto wlan0 iface wlan0 inet dhcp -- cgit 1.3.0-6-gf8a5 From 28d56c2421a32c149cc62a7ab14ab18f05bd042e Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 7 Aug 2006 08:36:38 +0000 Subject: - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) * Added 09_fix_bigendian_sha1.patch wich will fix the WPA+plaint text pw auth method on powerpc (and in other bigendian arch) (closes: #381464) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@913 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/09_fix_bigendian_sha1.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 debian/patches/09_fix_bigendian_sha1.patch diff --git a/debian/changelog b/debian/changelog index cd7f013b..cd19f05b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) - - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) + - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) + * Added 09_fix_bigendian_sha1.patch wich will fix the WPA+plaint text pw + auth method on powerpc (and in other bigendian arch) (closes: #381464) - -- Riccardo Setti Wed, 2 Aug 2006 19:51:48 +0200 + -- Riccardo Setti Mon, 7 Aug 2006 10:32:52 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/patches/09_fix_bigendian_sha1.patch b/debian/patches/09_fix_bigendian_sha1.patch new file mode 100644 index 00000000..07d2f2ae --- /dev/null +++ b/debian/patches/09_fix_bigendian_sha1.patch @@ -0,0 +1,14 @@ +--- configure.old 2006-08-07 10:31:07.000000000 +0200 ++++ configure 2006-08-07 10:31:14.000000000 +0200 +@@ -25440,6 +25440,11 @@ + echo "${ECHO_T}no" >&6; } + fi + ++## Enable bigendian stuff for sha1 hash code ++if "$target_cpu" = "powerpc"; then ++ CPU_CFLAGS="-DWORDS_BIGENDIAN $CPU_CFLAGS" ++fi ++ + ac_config_files="$ac_config_files Makefile include/Makefile utils/Makefile src/Makefile src/named-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile dispatcher-daemon/Makefile gnome/Makefile gnome/applet/Makefile gnome/applet/icons/Makefile gnome/libnm_glib/libnm_glib.pc gnome/libnm_glib/Makefile gnome/vpn-properties/Makefile test/Makefile test/test-common/Makefile test/libnm-util/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/RedHat/NetworkManagerDispatcher initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/Slackware/rc.networkmanager-dispatcher initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/SUSE/networkmanager-dispatcher initscript/Arch/Makefile initscript/Arch/networkmanager initscript/Arch/networkmanager-dispatcher man/Makefile man/NetworkManager.1 man/NetworkManagerDispatcher.1 man/nm-tool.1 po/Makefile.in NetworkManager.pc" + + cat >confcache <<\_ACEOF -- cgit 1.3.0-6-gf8a5 From 0eca7a8c9c4bafc2cb977306aa0d6c1b4774b315 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 7 Aug 2006 11:22:31 +0000 Subject: fixed some typo in README.Debian, removed 09.patch (better solution are coming), fixed 08.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@914 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 4 ++-- debian/patches/08-disabled_devices.patch | 2 +- debian/patches/09_fix_bigendian_sha1.patch | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 debian/patches/09_fix_bigendian_sha1.patch diff --git a/debian/README.Debian b/debian/README.Debian index f52a031f..0e20e53e 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -26,8 +26,8 @@ iface wlan0 inet dhcp -> This device is managed by NM. 1.a) -allow-hotplug eth1 -iface eth0 ined dhcp +allow-hotplug eth0 +iface eth0 inet dhcp -> This device is manager by NM 2.) diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index 50a4e4c2..07b87d9a 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -39,7 +39,7 @@ + */ + for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { + if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp" )|| strcmp ( curr_d->key, "iface")) ++ || strcmp (curr_d->data, "dhcp" )) + blacklist = TRUE; + } + diff --git a/debian/patches/09_fix_bigendian_sha1.patch b/debian/patches/09_fix_bigendian_sha1.patch deleted file mode 100644 index 07d2f2ae..00000000 --- a/debian/patches/09_fix_bigendian_sha1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.old 2006-08-07 10:31:07.000000000 +0200 -+++ configure 2006-08-07 10:31:14.000000000 +0200 -@@ -25440,6 +25440,11 @@ - echo "${ECHO_T}no" >&6; } - fi - -+## Enable bigendian stuff for sha1 hash code -+if "$target_cpu" = "powerpc"; then -+ CPU_CFLAGS="-DWORDS_BIGENDIAN $CPU_CFLAGS" -+fi -+ - ac_config_files="$ac_config_files Makefile include/Makefile utils/Makefile src/Makefile src/named-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile dispatcher-daemon/Makefile gnome/Makefile gnome/applet/Makefile gnome/applet/icons/Makefile gnome/libnm_glib/libnm_glib.pc gnome/libnm_glib/Makefile gnome/vpn-properties/Makefile test/Makefile test/test-common/Makefile test/libnm-util/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/RedHat/NetworkManagerDispatcher initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/Slackware/rc.networkmanager-dispatcher initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/SUSE/networkmanager-dispatcher initscript/Arch/Makefile initscript/Arch/networkmanager initscript/Arch/networkmanager-dispatcher man/Makefile man/NetworkManager.1 man/NetworkManagerDispatcher.1 man/nm-tool.1 po/Makefile.in NetworkManager.pc" - - cat >confcache <<\_ACEOF -- cgit 1.3.0-6-gf8a5 From a67dce3c363667f5efea4519b9b1178a5597a266 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 7 Aug 2006 15:07:07 +0000 Subject: * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@915 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +- debian/patches/09_fix_bigendian_words.patch | 310 ++++++++++++++++++++++++++++ 2 files changed, 312 insertions(+), 2 deletions(-) create mode 100644 debian/patches/09_fix_bigendian_words.patch diff --git a/debian/changelog b/debian/changelog index cd19f05b..3ea54527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,10 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) - * Added 09_fix_bigendian_sha1.patch wich will fix the WPA+plaint text pw + * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw auth method on powerpc (and in other bigendian arch) (closes: #381464) - -- Riccardo Setti Mon, 7 Aug 2006 10:32:52 +0200 + -- Riccardo Setti Mon, 7 Aug 2006 17:06:47 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/patches/09_fix_bigendian_words.patch b/debian/patches/09_fix_bigendian_words.patch new file mode 100644 index 00000000..736103b9 --- /dev/null +++ b/debian/patches/09_fix_bigendian_words.patch @@ -0,0 +1,310 @@ +--- configure.orig 2006-08-07 17:02:37.000000000 +0200 ++++ configure 2006-08-07 17:03:56.000000000 +0200 +@@ -23030,6 +23030,293 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + ++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 ++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } ++if test "${ac_cv_c_bigendian+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # See if sys/param.h defines the BYTE_ORDER macro. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN ++ bogus endian macros ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ # It does; now see whether it defined to BIG_ENDIAN or not. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if BYTE_ORDER != BIG_ENDIAN ++ not big endian ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_bigendian=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # It does not; compile a test program. ++if test "$cross_compiling" = yes; then ++ # try to guess the endianness by grepping values into an object file ++ ac_cv_c_bigendian=unknown ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } ++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } ++int ++main () ++{ ++ _ascii (); _ebcdic (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ++ ac_cv_c_bigendian=yes ++fi ++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then ++ if test "$ac_cv_c_bigendian" = unknown; then ++ ac_cv_c_bigendian=no ++ else ++ # finding both strings is unlikely to happen, but who knows? ++ ac_cv_c_bigendian=unknown ++ fi ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++ ++ /* Are we little or big endian? From Harbison&Steele. */ ++ union ++ { ++ long int l; ++ char c[sizeof (long int)]; ++ } u; ++ u.l = 1; ++ return u.c[sizeof (long int) - 1] == 1; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=no ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_c_bigendian=yes ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 ++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } ++case $ac_cv_c_bigendian in ++ yes) ++ ++cat >>confdefs.h <<\_ACEOF ++#define WORDS_BIGENDIAN 1 ++_ACEOF ++ ;; ++ no) ++ ;; ++ *) ++ { { echo "$as_me:$LINENO: error: unknown endianness ++presetting ac_cv_c_bigendian=no (or yes) will help" >&5 ++echo "$as_me: error: unknown endianness ++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} ++ { (exit 1); exit 1; }; } ;; ++esac ++ ++ + + # Check whether --with-distro was given. + if test "${with_distro+set}" = set; then +--- configure.in.org 2006-08-07 17:02:45.000000000 +0200 ++++ configure.in 2006-08-07 17:03:37.000000000 +0200 +@@ -50,6 +50,11 @@ + AC_PROG_INTLTOOL([0.27.2]) + AM_GLIB_GNU_GETTEXT + ++dnl ++dnl Make sha1.c happy on big endian systems ++dnl ++AC_C_BIGENDIAN ++ + AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware])) + if test "z$with_distro" = "z"; then + AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") -- cgit 1.3.0-6-gf8a5 From 321063053e273062a758eba1a2754c4209b8f023 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 7 Aug 2006 22:18:00 +0000 Subject: As NetworkManager uses ifup/ifdown in the backend, add an explicit dependency on ifupdown package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@920 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9f16c586..a528d1ce 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0), ifupdown 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 -- cgit 1.3.0-6-gf8a5 From 55de205b9e6260d5c0580a92670f680218f9ac3a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 7 Aug 2006 22:27:21 +0000 Subject: - Use the term "D-Bus" in favor of dbus, upstream recommends this spelling. - Proper line breaks in changelog. - Fix for a minor typo in README.Debian. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@922 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 10 +++++----- debian/changelog | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 0e20e53e..59a789e4 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -8,7 +8,7 @@ Security To allow users to connect to the NetworkManager daemon they have to be in the 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 dbus with the command "/etc/init.d/dbus reload". +After that you have to reload D-Bus with the command "/etc/init.d/dbus reload". Configuration ~~~~~~~~~~~~~ @@ -28,7 +28,7 @@ iface wlan0 inet dhcp 1.a) allow-hotplug eth0 iface eth0 inet dhcp --> This device is manager by NM +-> This device is managed by NM 2.) auto wlan0 @@ -42,9 +42,9 @@ iface wlan0 inet dhcp 4.) iface eth0 inet static -address 192.168.1.10 -netmask 255.255.255.0 -gateway 192.168.1.1 + 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. diff --git a/debian/changelog b/debian/changelog index 3ea54527..e653d562 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ network-manager (0.6.4-1) unstable; urgency=low - * New upstream release. (closes: #379163) - - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) + * New upstream release. (Closes: #379163) + * Allow interfaces marked "auto-hotplug" to be managed by NM. + (Closes: #381017) * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw - auth method on powerpc (and in other bigendian arch) (closes: #381464) + auth method on powerpc (and on other bigendian arch). (Closes: #381464) -- Riccardo Setti Mon, 7 Aug 2006 17:06:47 +0200 -- cgit 1.3.0-6-gf8a5 From 369c275e40eb385976eecd781b5d2c1a1b640443 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 8 Aug 2006 02:10:36 +0000 Subject: - Merge the patches resolvonf+disabled_devices into a single patch debian_backend. This one patch should hold all modifications to the Debian backend. - Do not handle mapped devices. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@924 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 ++- debian/patches/05-debian_backend.patch | 123 +++++++++++++++++++++++++++++++ debian/patches/05-resolvconf.patch | 20 ----- debian/patches/08-disabled_devices.patch | 52 ------------- 4 files changed, 132 insertions(+), 74 deletions(-) create mode 100644 debian/patches/05-debian_backend.patch delete mode 100644 debian/patches/05-resolvconf.patch delete mode 100644 debian/patches/08-disabled_devices.patch diff --git a/debian/changelog b/debian/changelog index e653d562..4ca14491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,19 @@ network-manager (0.6.4-1) unstable; urgency=low + [ Riccardo Setti ] * New upstream release. (Closes: #379163) - * Allow interfaces marked "auto-hotplug" to be managed by NM. + * Allow interfaces marked "auto-hotplug" to be managed by NM. (Closes: #381017) * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw auth method on powerpc (and on other bigendian arch). (Closes: #381464) - -- Riccardo Setti Mon, 7 Aug 2006 17:06:47 +0200 + [ Michael Biebl ] + * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into + a single patch called 05-debian_backend.patch. + * Updated 05-debian_backend.patch to not control mapped interfaces. + (Closes: #377498) + + -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch new file mode 100644 index 00000000..84c7238e --- /dev/null +++ b/debian/patches/05-debian_backend.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c +index 740572a..8090696 100644 +--- a/src/backends/NetworkManagerDebian.c ++++ b/src/backends/NetworkManagerDebian.c +@@ -37,6 +37,7 @@ #include "interface_parser.h" + #include "nm-utils.h" + + #define ARPING "/usr/sbin/arping" ++#define RESOLVCONF "resolvconf" + + /* + * nm_system_init +@@ -514,13 +515,60 @@ gboolean nm_system_device_get_use_dhcp ( + /* + * 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; + } + + +@@ -679,7 +727,10 @@ void nm_system_set_hostname (NMIP4Config + */ + 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..aa81134 100644 +--- a/src/backends/interface_parser.c ++++ b/src/backends/interface_parser.c +@@ -198,6 +198,18 @@ if_block *ifparser_getif(const char* ifa + 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-resolvconf.patch b/debian/patches/05-resolvconf.patch deleted file mode 100644 index 8e55c8fa..00000000 --- a/debian/patches/05-resolvconf.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 -+++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 -@@ -37,6 +37,7 @@ - #include "nm-utils.h" - - #define ARPING "/usr/sbin/arping" -+#define RESOLVCONF "resolvconf" - - /* - * nm_system_init -@@ -679,5 +680,8 @@ - */ - 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/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch deleted file mode 100644 index 07b87d9a..00000000 --- a/debian/patches/08-disabled_devices.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- src/backends/NetworkManagerDebian.c.orig 2006-05-05 19:59:18.000000000 +0200 -+++ src/backends/NetworkManagerDebian.c 2006-05-05 20:04:34.000000000 +0200 -@@ -521,7 +521,48 @@ - */ - 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 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; - } - - -- cgit 1.3.0-6-gf8a5 From 0d83a8843f0157a1fba8753d4cef1a10e69e4f8b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 8 Aug 2006 02:28:35 +0000 Subject: Fix small typo in changelog. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@925 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ca14491..d58cff56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,8 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (Closes: #379163) * Allow interfaces marked "auto-hotplug" to be managed by NM. (Closes: #381017) - * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw - auth method on powerpc (and on other bigendian arch). (Closes: #381464) + * Added 09_fix_bigendian_words.patch which will fix the WPA+plain text pw + auth method on powerpc (and on other bigendian archs). (Closes: #381464) [ Michael Biebl ] * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into -- cgit 1.3.0-6-gf8a5 From 911c1f8ef6f9eb7f52f5bdf7c973f8f528549726 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 12 Aug 2006 15:37:12 +0000 Subject: Improve the dial-up configuration handling: - Display the provider name instead of a cryptic number - Check the return value of ifupdown - Add a new section to README.Debian about how to set up a dial-up connection git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@927 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 20 +++++++- debian/patches/05-debian_backend.patch | 92 +++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 4 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 59a789e4..621518cd 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -10,8 +10,8 @@ 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 -~~~~~~~~~~~~~ +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. @@ -51,3 +51,19 @@ iface eth0 inet static 5.) Device is not listed in /etc/network/interfaces. -> Device is managed by NM. + +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. + +Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" +man page for further information. diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 84c7238e..c8006623 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,5 +1,5 @@ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..8090696 100644 +index 740572a..3a2fdd6 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -37,6 +37,7 @@ #include "interface_parser.h" @@ -74,7 +74,95 @@ index 740572a..8090696 100644 } -@@ -679,7 +727,10 @@ void nm_system_set_hostname (NMIP4Config +@@ -563,12 +611,18 @@ gboolean nm_system_deactivate_dialup (GS + 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); + 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 +641,18 @@ gboolean nm_system_activate_dialup (GSLi + 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); + 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 +663,26 @@ gboolean nm_system_activate_dialup (GSLi + 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 +694,6 @@ GSList * nm_system_get_dialup_config (vo + } + 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 +734,10 @@ void nm_system_set_hostname (NMIP4Config */ gboolean nm_system_should_modify_resolv_conf (void) { -- cgit 1.3.0-6-gf8a5 From ef8b63010b80cb4024f46bd8d702318d665435a4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 13 Aug 2006 20:44:48 +0000 Subject: updated some patches git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@932 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01-supplicant_timeout.patch | 6 +-- debian/patches/04-if_fix.patch | 11 ++--- debian/patches/06-dispatch_more_events.patch | 66 +++------------------------- 3 files changed, 12 insertions(+), 71 deletions(-) diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch index 0723c83a..45060db4 100644 --- a/debian/patches/01-supplicant_timeout.patch +++ b/debian/patches/01-supplicant_timeout.patch @@ -1,6 +1,6 @@ ---- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 -+++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 -@@ -2205,7 +2205,7 @@ +--- 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 @@ } diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch index b5667c53..ca0b1574 100644 --- a/debian/patches/04-if_fix.patch +++ b/debian/patches/04-if_fix.patch @@ -1,11 +1,6 @@ -Index: src/nm-device-802-3-ethernet.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.3 -diff -u -r1.3 nm-device-802-3-ethernet.c ---- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 -+++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 -@@ -328,7 +328,9 @@ +--- src/nm-device-802-3-ethernet.c 2006-05-13 21:06:05.000000000 +0200 ++++ src/nm-device-802-3-ethernet.c.new 2006-08-13 22:34:56.000000000 +0200 +@@ -376,7 +376,9 @@ /**************************************/ /* MII capability detection */ /**************************************/ diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index e8b30810..8b85f49a 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -1,7 +1,6 @@ -diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c ---- network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-13 16:51:57.000000000 +0000 -+++ network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c 2006-04-03 18:14:06.000000000 +0100 -@@ -44,6 +44,8 @@ enum NMDAction +--- 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, @@ -10,7 +9,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n }; typedef enum NMDAction NMDAction; -@@ -95,6 +97,10 @@ static void nmd_execute_scripts (NMDActi +@@ -95,6 +97,10 @@ if (action == NMD_DEVICE_NOW_ACTIVE) char_act = "up"; else if (action == NMD_DEVICE_NOW_INACTIVE) @@ -21,7 +20,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n char_act = "down"; else return; -@@ -217,9 +223,13 @@ static DBusHandlerResult nmd_dbus_filter +@@ -217,9 +223,13 @@ } if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) @@ -36,7 +35,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n if (action != NMD_DEVICE_DONT_KNOW) { -@@ -234,8 +244,10 @@ static DBusHandlerResult nmd_dbus_filter +@@ -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, @@ -49,56 +48,3 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n nmd_execute_scripts (action, dev_iface_name); } -diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in ---- network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 -+++ network-manager-0.6.2/man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 -@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo - 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 -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c ---- network-manager-0.6.2~/src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 -+++ network-manager-0.6.2/src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 -@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si - { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, - { DEVICE_ACTIVATING, "DeviceActivating" }, - { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, -+ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, - { DEVICE_ADDED, "DeviceAdded" }, - { DEVICE_REMOVED, "DeviceRemoved" }, - { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h ---- network-manager-0.6.2~/src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 -+++ network-manager-0.6.2/src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 -@@ -40,6 +40,7 @@ typedef enum - DEVICE_ACTIVATING, - DEVICE_ACTIVATION_FAILED, - DEVICE_ACTIVATION_CANCELED, -+ DEVICE_DEACTIVATED, - DEVICE_ADDED, - DEVICE_REMOVED, - DEVICE_CARRIER_ON, -diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c ---- network-manager-0.6.2~/src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 -+++ network-manager-0.6.2/src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 -@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) - 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); - } - - -- cgit 1.3.0-6-gf8a5 From 65dce1fd406fc96801d744b763608bd44cb536d5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 10:51:43 +0000 Subject: fixed debian/patches/06 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@941 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/06-dispatch_more_events.patch | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index 8b85f49a..adbae7ae 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -48,3 +48,55 @@ nmd_execute_scripts (action, dev_iface_name); } +diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in +--- man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 ++++ man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 +@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo + 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 +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c +--- src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 ++++ src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 +@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si + { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, + { DEVICE_ACTIVATING, "DeviceActivating" }, + { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, ++ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, + { DEVICE_ADDED, "DeviceAdded" }, + { DEVICE_REMOVED, "DeviceRemoved" }, + { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h +--- src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 ++++ src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 +@@ -40,6 +40,7 @@ typedef enum + DEVICE_ACTIVATING, + DEVICE_ACTIVATION_FAILED, + DEVICE_ACTIVATION_CANCELED, ++ DEVICE_DEACTIVATED, + DEVICE_ADDED, + DEVICE_REMOVED, + DEVICE_CARRIER_ON, +diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c +--- src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 ++++ src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 +@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) + 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); + } + -- cgit 1.3.0-6-gf8a5 From b05311797c4d27d5b905b12a36a87953b0ce56c6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 14:00:11 +0000 Subject: - Bumped hal deps to version 0.5.7.1. NM needs user haldaemon for dbus operations. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@946 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 4 ++-- debian/patches/02-dbus_access_network_manager.patch | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d58cff56..b906784a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ network-manager (0.6.4-1) unstable; urgency=low [ Riccardo Setti ] * New upstream release. (Closes: #379163) + - Bumped hal deps to version 0.5.7.1. NM needs user haldaemon for dbus + operations. * Allow interfaces marked "auto-hotplug" to be managed by NM. (Closes: #381017) * Added 09_fix_bigendian_words.patch which will fix the WPA+plain text pw diff --git a/debian/control b/debian/control index a528d1ce..aaa7846e 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.7.1), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0), ifupdown +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown 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 diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index afa3bc3b..139a3d87 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -5,7 +5,7 @@ - -+ ++ + + + -- cgit 1.3.0-6-gf8a5 From 09b3a71b898b0751530121dd7648d93b15b038aa Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 15 Aug 2006 16:16:46 +0000 Subject: Revert build-dep on new libhal-dev changes. Only a run-time depend on the new version is needed git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@948 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index aaa7846e..1f132a50 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.7.1), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 81542ea9555bbb0e31188705362622d2a99c5aa2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:17:46 +0000 Subject: (really) fixed debian/patches/06 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@949 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/06-dispatch_more_events.patch | 67 +++++++++++++--------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index adbae7ae..60d50432 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -48,10 +48,9 @@ nmd_execute_scripts (action, dev_iface_name); } -diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in ---- man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 -+++ man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 -@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo +--- man/NetworkManagerDispatcher.1.in 2006-02-01 19:14:15.000000000 +0100 ++++ man/NetworkManagerDispatcher.1.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 @@ -68,35 +67,33 @@ diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-mana .SH OPTIONS The following options are supported: .TP -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c ---- src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 -+++ src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 -@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si - { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, - { DEVICE_ACTIVATING, "DeviceActivating" }, - { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, -+ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, - { DEVICE_ADDED, "DeviceAdded" }, - { DEVICE_REMOVED, "DeviceRemoved" }, - { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h ---- src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 -+++ src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 -@@ -40,6 +40,7 @@ typedef enum - DEVICE_ACTIVATING, - DEVICE_ACTIVATION_FAILED, - DEVICE_ACTIVATION_CANCELED, -+ DEVICE_DEACTIVATED, - DEVICE_ADDED, - DEVICE_REMOVED, - DEVICE_CARRIER_ON, -diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c ---- src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 -+++ src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 -@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) - 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); +--- 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); } - + + -- cgit 1.3.0-6-gf8a5 From e1060c25e2b8dcf18a77886a13487c05544ff303 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:36:50 +0000 Subject: updated manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@950 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 4 +- debian/NetworkManagerDispatcher.sgml | 97 ------------------------------------ debian/network-manager.install | 1 + debian/network-manager.manpages | 3 +- debian/rules | 1 - 5 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 debian/NetworkManagerDispatcher.sgml diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml index 61ea2121..a7ab53a8 100644 --- a/debian/NetworkManager.sgml +++ b/debian/NetworkManager.sgml @@ -102,7 +102,7 @@ manpage.1: manpage.sgml SEE ALSO - nm-applet (1), NetworkManagerDispatcher (1). + nm-applet (1), NetworkManagerDispatcher (1), nm-tool (1). More Information about NetworkManager can be found at http://www.gnome.org/projects/NetworkManager/ . @@ -111,7 +111,7 @@ manpage.1: manpage.sgml AUTHOR This manual page was written by Jan Gerber j@bootlab.org and by - Riccardo Setti giskard@autistici.org for + Riccardo Setti giskard@debian.org for the Debian/Ubuntu system. diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml deleted file mode 100644 index d42b2903..00000000 --- a/debian/NetworkManagerDispatcher.sgml +++ /dev/null @@ -1,97 +0,0 @@ - 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. - - --> - - - 30 August, 2005"> - - - GNU"> - GPL"> -]> - - - -
- j@bootlab.org; -
- - Jan - Gerber - - - 2005 - Jan Gerber - - &date; - - - NetworkManagerDispatcher - 1 - - - &package; - - Network management framework - - - - &package; - - - - DESCRIPTION - - &package; calls scripts in -/etc/NetworkManager/dispatcher.d each time the network is broght up or down by NetworkManager. Arguments to these scripts are network device and up or down. so it will call something like /etc/NetworkManager/dispatcher.d/example eth0 up - - - - SEE ALSO - - NetworkManager (1), nm-applet (1). - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Jan Gerber j@bootlab.org and by Riccardo Setti - giskard@autistici.org for the Debian/Ubuntu system. - - - - - - diff --git a/debian/network-manager.install b/debian/network-manager.install index 0f9b1179..2fc8ba3f 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,3 +1,4 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher +debian/tmp/usr/lib/network-manager debian/tmp/etc/dbus-1/system.d/NetworkManager.conf diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 9ac2586b..907a2a3e 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,2 +1,3 @@ -debian/NetworkManagerDispatcher.1 +man/NetworkManagerDispatcher.1 +man/nm-tools.1 debian/NetworkManager.1 diff --git a/debian/rules b/debian/rules index ebbeb317..91f3f158 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From f87b0bbcf823d63a65fa22e9778daf18b2cbd5c0 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:39:52 +0000 Subject: fixed debian/network-manager.manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@951 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.manpages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 907a2a3e..4acdbf6f 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 -man/nm-tools.1 +man/nm-tool1 debian/NetworkManager.1 -- cgit 1.3.0-6-gf8a5 From bba78e24c6c3ce2a26782e97adbd045e22b7eb01 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:41:49 +0000 Subject: fixed debian/network-manager.manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@952 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.manpages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 4acdbf6f..7177493c 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 -man/nm-tool1 +man/nm-tool.1 debian/NetworkManager.1 -- cgit 1.3.0-6-gf8a5 From a4c7c6bcccfb407fc6f4c9746e295f8262206f38 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:44:14 +0000 Subject: fixed debian/rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@953 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 91f3f158..cf7bdef2 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 4ab5ad85236aa35dfbd2459d274e798c9f49d777 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 15 Aug 2006 21:00:45 +0000 Subject: - We already use the upstream man page for NetworkManagerDispatcher; do the same for the NetworkManager man page. - As the upstream man pages of NetworkManager and NetworkManagerDispatcher reference the nm-tool man page and we already install the nm-tool man page it makes sense to also install the corresponding nm-tool binary ;-) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@954 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 136 ---------------------------------------- debian/changelog | 5 +- debian/network-manager.install | 1 + debian/network-manager.manpages | 2 +- debian/rules | 1 - 5 files changed, 5 insertions(+), 140 deletions(-) delete mode 100644 debian/NetworkManager.sgml diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml deleted file mode 100644 index a7ab53a8..00000000 --- a/debian/NetworkManager.sgml +++ /dev/null @@ -1,136 +0,0 @@ - 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. - - --> - - - 30 August, 2005"> - - - GNU"> - GPL"> -]> - - - -
- j@bootlab.org; -
- - Jan - Gerber - - - 2005 - Jan Gerber - - &date; - - - NetworkManager - 1 - - - &package; - - Network management framework - - - - &package; - - - - - - - DESCRIPTION - - This manual page documents briefly the - &package; command. - - &package; monitors all network connections and automatically chooses the best connection to use. It is started as a system service by dbus. nm-applet allows you to specify wireless access points which wireless cards in the computer should associate with - - - OPTIONS - - This program follows the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. - - - - - - - - Don't become a daemon, Messages will be logged to stdout - - - - - - - - Allow dummy devices to be created via DBUS methods [DEBUG] - - - - - - - - Show summary of options. - - - - - - SEE ALSO - - nm-applet (1), NetworkManagerDispatcher (1), nm-tool (1). - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Jan Gerber j@bootlab.org and by - Riccardo Setti giskard@debian.org for - the Debian/Ubuntu system. - - - - - - diff --git a/debian/changelog b/debian/changelog index b906784a..77e4bf58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,10 +12,11 @@ network-manager (0.6.4-1) unstable; urgency=low [ Michael Biebl ] * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into a single patch called 05-debian_backend.patch. - * Updated 05-debian_backend.patch to not control mapped interfaces. + * Updated 05-debian_backend.patch to not control mapped interfaces. (Closes: #377498) + * Ship the nm-tool utility. - -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 + -- Michael Biebl Tue, 15 Aug 2006 22:52:30 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/network-manager.install b/debian/network-manager.install index 2fc8ba3f..f0327436 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -2,3 +2,4 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher debian/tmp/usr/lib/network-manager debian/tmp/etc/dbus-1/system.d/NetworkManager.conf +test/nm-tool /usr/bin/ diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 7177493c..153d1ce0 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 man/nm-tool.1 -debian/NetworkManager.1 +man/NetworkManager.1 diff --git a/debian/rules b/debian/rules index cf7bdef2..57cbedb3 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 714ad36a998c33fe3242d56f0597f50b43c9ad8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 15 Aug 2006 21:53:49 +0000 Subject: - Move the last changelog entry to the new revision 0.6.4-2 because it didn't make it into the 0.6.4-1 release. - Reset the changelog date signature of 0.6.4-1 to "Tue, 8 Aug 2006 01:51:13 +0200", which is the one of the official 0.6.4-1 release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@955 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77e4bf58..97ad34e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-2) unstable; urgency=low + + * Ship the nm-tool binary. + + -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 + network-manager (0.6.4-1) unstable; urgency=low [ Riccardo Setti ] @@ -14,9 +20,8 @@ network-manager (0.6.4-1) unstable; urgency=low a single patch called 05-debian_backend.patch. * Updated 05-debian_backend.patch to not control mapped interfaces. (Closes: #377498) - * Ship the nm-tool utility. - -- Michael Biebl Tue, 15 Aug 2006 22:52:30 +0200 + -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 network-manager (0.6.3-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 6ee72e595c622a051bf906ca46a20a8117a2fb33 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 27 Aug 2006 17:55:54 +0000 Subject: close 384891 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@976 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 97ad34e5..b8a7cd0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ network-manager (0.6.4-2) unstable; urgency=low - * Ship the nm-tool binary. + * Ship the nm-tool binary. (closes: #384891) -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 -- cgit 1.3.0-6-gf8a5 From 23a97e78c68fb99151de2bc640dfebf358794d43 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 5 Sep 2006 17:50:22 +0000 Subject: * Changed adeprecated dbus function (closes: 385380) - added 12_dbus0.9.patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@994 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/patches/12_dbus0.9.patch | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 debian/patches/12_dbus0.9.patch diff --git a/debian/changelog b/debian/changelog index b8a7cd0f..e23aacaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.4-3) unstable; urgency=low + + * Changed adeprecated dbus function (closes: 385380) + - added 12_dbus0.9.patch. + + -- Riccardo Setti Tue, 5 Sep 2006 19:48:00 +0200 + network-manager (0.6.4-2) unstable; urgency=low * Ship the nm-tool binary. (closes: #384891) diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus0.9.patch new file mode 100644 index 00000000..a3aa9e03 --- /dev/null +++ b/debian/patches/12_dbus0.9.patch @@ -0,0 +1,20 @@ +--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 ++++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 +@@ -230,7 +230,7 @@ + { + /* Try to reactivate our connection to dbus on the next pass through the event loop */ + ctx->nm_state = LIBNM_NO_DBUS; +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + libnm_glib_schedule_dbus_watcher (ctx); + } + else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) +@@ -444,7 +444,7 @@ + g_main_loop_unref (ctx->g_main_loop); + + if (ctx->dbus_con) +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + + if (ctx->callbacks_lock) + g_mutex_free (ctx->callbacks_lock); -- cgit 1.3.0-6-gf8a5 From 551c415f391d14698d0cf484f279c95c5be5cc9f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 5 Sep 2006 22:41:02 +0000 Subject: Cosmetic changes. Properly indent second line comments (2 white spaces). Looks more consistent. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@996 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e23aacaa..aee99fd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ network-manager (0.6.4-3) unstable; urgency=low - * Changed adeprecated dbus function (closes: 385380) - - added 12_dbus0.9.patch. + * Changed adeprecated dbus function. (Closes: 385380) + - Added 12_dbus0.9.patch. -- Riccardo Setti Tue, 5 Sep 2006 19:48:00 +0200 network-manager (0.6.4-2) unstable; urgency=low - * Ship the nm-tool binary. (closes: #384891) + * Ship the nm-tool binary. (Closes: #384891) -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 -- cgit 1.3.0-6-gf8a5 From 154e5b7e9dd6779e3a9f63fb9afb9e8b1b193dad Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 29 Sep 2006 11:22:39 +0000 Subject: Fix typo in package description. Closes: #390062 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1042 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index aee99fd7..305044f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-4) unstable; urgency=low + + * Correct typo in package description. (Closes: #390062) + + -- Michael Biebl Fri, 29 Sep 2006 13:18:02 +0200 + network-manager (0.6.4-3) unstable; urgency=low * Changed adeprecated dbus function. (Closes: 385380) diff --git a/debian/control b/debian/control index 1f132a50..710e055d 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,7 @@ Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config Description: network management framework (development files) this package provides header files that are needed to - compile VPN Plugins for NetworManager. + compile VPN Plugins for NetworkManager. . Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From fdd75c9d0feb0b1b6ca3e45bdb67ba53259c41d1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:31:37 +0000 Subject: * prerm has no configure target, so remove it. * properly indent it. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1096 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.prerm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm index 356a8b8c..8a010110 100644 --- a/debian/network-manager.prerm +++ b/debian/network-manager.prerm @@ -1,16 +1,14 @@ #!/bin/sh + set -e case "$1" in - configure) - if [ -f /etc/dbus-1/event.d/25NetworkManagerDispatcher ]; then - rm /etc/dbus-1/event.d/25NetworkManagerDispatcher - fi - ;; remove) /etc/dbus-1/event.d/25NetworkManager stop /etc/dbus-1/event.d/26NetworkManagerDispatcher stop - ;; + ;; esac #DEBHELPER# + +exit 0 -- cgit 1.3.0-6-gf8a5 From 0cdf500bc3cc1bf5f193c49f1804cdbfc24bd42e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:40:46 +0000 Subject: * Create group netdev in postinst and add a Depends on adduser. * Cleanup indentation. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1097 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/control | 2 +- debian/network-manager.postinst | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 305044f0..cfac8822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ network-manager (0.6.4-4) unstable; urgency=low * Correct typo in package description. (Closes: #390062) + * debian/network-manager.postinst + - Create group netdev if not yet existent. Add a Depends on adduser. - -- Michael Biebl Fri, 29 Sep 2006 13:18:02 +0200 + -- Michael Biebl Tue, 24 Oct 2006 14:32:54 +0200 network-manager (0.6.4-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 710e055d..4e2033b2 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser 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 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 9460b596..1e73dfa2 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,20 +1,27 @@ #!/bin/sh + set -e case "$1" in - configure) - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi + configure) + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi - if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager restart - fi + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager restart + fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + fi + ;; esac #DEBHELPER# + +exit 0 -- cgit 1.3.0-6-gf8a5 From 9a34fb19f4531455400f52b55b2c1449eaaa5827 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:41:57 +0000 Subject: Update my email address. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1098 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4e2033b2..d1a9c0c1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Uploaders: Michael Biebl +Uploaders: Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 -- cgit 1.3.0-6-gf8a5 From 62d4af9627d2368c88e2a8abca710f2923e824ed Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 13:09:47 +0000 Subject: Add instructions to README.Debian how to restart NM after changing /e/n/i. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1099 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 7 +++++++ debian/changelog | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index 621518cd..8fc8c455 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -18,6 +18,9 @@ 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/dbus-1/event.d/25NetworkManager restart". + Examples: 1.) @@ -65,5 +68,9 @@ 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. +After modifying /etc/network/interfaces you have to restart NM with the +command "/etc/dbus-1/event.d/25NetworkManager restart". + Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" man page for further information. + diff --git a/debian/changelog b/debian/changelog index cfac8822..eac0afbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ network-manager (0.6.4-4) unstable; urgency=low * Correct typo in package description. (Closes: #390062) * debian/network-manager.postinst - Create group netdev if not yet existent. Add a Depends on adduser. + * Add instructions to README.Debian how to restart NetworkManager after + modifying /etc/network/interfaces. (Closes: 384892) - -- Michael Biebl Tue, 24 Oct 2006 14:32:54 +0200 + -- Michael Biebl Tue, 24 Oct 2006 14:58:19 +0200 network-manager (0.6.4-3) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 8c51ad8783cedd385dcaea3d308e6e08389c9875 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 18:24:47 +0000 Subject: * Fix the parser for /etc/network/interfaces. The code is still shit, but at least now it accepts tabs or spaces (or combinations of both) as token separator. * On dns changes, do not restart nscd, only invalidate the hosts cache. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1100 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++- debian/patches/05-debian_backend.patch | 93 ++++++++++++++++++++++++++++++++-- 2 files changed, 95 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index eac0afbb..692c8c44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,12 @@ network-manager (0.6.4-4) unstable; urgency=low * debian/network-manager.postinst - Create group netdev if not yet existent. Add a Depends on adduser. * Add instructions to README.Debian how to restart NetworkManager after - modifying /etc/network/interfaces. (Closes: 384892) + modifying /etc/network/interfaces. (Closes: 384892) + * debian/patches/05-debian_backend.patch + - Fix the parser for /etc/network/interfaces. (Closes: #383765) + - Do not restart nscd on dns changes, only invalidate the hosts cache. - -- Michael Biebl Tue, 24 Oct 2006 14:58:19 +0200 + -- Michael Biebl Tue, 24 Oct 2006 20:18:18 +0200 network-manager (0.6.4-3) unstable; urgency=low diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index c8006623..8a54e68e 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,5 +1,5 @@ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..3a2fdd6 100644 +index 740572a..93c2914 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -37,6 +37,7 @@ #include "interface_parser.h" @@ -10,6 +10,25 @@ index 740572a..3a2fdd6 100644 /* * nm_system_init +@@ -238,14 +239,14 @@ void nm_system_kill_all_dhcp_daemons (vo + /* + * 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"); +- ++ nm_info ("Clearing nscd hosts cache."); ++ nm_spawn_process ("/usr/sbin/nscd -i hosts"); + } + + @@ -514,13 +515,60 @@ gboolean nm_system_device_get_use_dhcp ( /* * nm_system_device_get_disabled @@ -175,10 +194,78 @@ index 740572a..3a2fdd6 100644 diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c -index 53d6487..aa81134 100644 +index 53d6487..2fa559f 100644 --- a/src/backends/interface_parser.c +++ b/src/backends/interface_parser.c -@@ -198,6 +198,18 @@ if_block *ifparser_getif(const char* ifa +@@ -71,7 +71,8 @@ void add_data(const char *key,const char + //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) + { +@@ -105,36 +106,52 @@ void ifparser_init(void) + if (line[0]=='#' || line[0]=='\0') + continue; + +- SPACE_OR_TAB(line,space) ++ space = line; ++ while (!strchr(WS, space[0])) space++; ++ + if (space == NULL) + { +- nm_warning ("Error: Can't parse interface line '%s'\n",line); ++ nm_warning ("Error: Can't parse line '%s'\n",line); + continue; + } ++ ++ // terminate line string and skip further whitespaces + space[0] = '\0'; +- ++ while (isspace(space[1])) space++; ++ + // There are four different stanzas: + // iface, mapping, auto and allow-*. Create a block for each of them. + if (strcmp(line,"iface")==0) + { +- char *space2 = strchr(space+1,' '); ++ char *space2 = space+1; ++ while (!strchr(WS, space2[0])) space2++; ++ + if (space2 == NULL) + { + nm_warning ("Error: Can't parse iface line '%s'\n",space+1); + continue; + } ++ ++ // terminate space string and skip further whitespaces + space2[0]='\0'; ++ while (isspace(space2[1])) space2++; ++ + add_block(line,space+1); + + if (space2[1]!='\0') + { +- space = strchr(space2+1,' '); ++ space = space2+1; ++ while (!strchr(WS, space[0])) space++; ++ + if (space == NULL) + { + nm_warning ("Error: Can't parse data '%s'\n",space2+1); + continue; + } ++ // terminate space2 string and skip further whitespaces + space[0] = '\0'; ++ while (isspace(space[1])) space++; ++ + add_data(space2+1,space+1); + } + } +@@ -198,6 +215,18 @@ if_block *ifparser_getif(const char* ifa return NULL; } -- cgit 1.3.0-6-gf8a5 From 28a4b40856f34de9dc8f4d1ef8825cc943379d81 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 21:23:24 +0000 Subject: Make the /e/n/i a bit more robust and easier to read. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1104 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/05-debian_backend.patch | 140 +++++++++++++++++++++++++-------- 1 file changed, 107 insertions(+), 33 deletions(-) diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 8a54e68e..8882e749 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -194,10 +194,25 @@ index 740572a..93c2914 100644 diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c -index 53d6487..2fa559f 100644 +index 53d6487..b3ad300 100644 --- a/src/backends/interface_parser.c +++ b/src/backends/interface_parser.c -@@ -71,7 +71,8 @@ void add_data(const char *key,const char +@@ -50,11 +50,13 @@ void add_block(const char *type, const c + + void add_data(const char *key,const char *data) + { ++ if_data *ret; ++ + // Check if there is a block where we can attach our data + if (first == NULL) + return; + +- if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); ++ ret = (if_data*) calloc(1,sizeof(struct _if_data)); + ret->key = g_strdup(key); + ret->data = g_strdup(data); + +@@ -71,14 +73,18 @@ void add_data(const char *key,const char //printf("added data '%s' with key '%s'\n",data,key); } @@ -207,65 +222,124 @@ index 53d6487..2fa559f 100644 void ifparser_init(void) { -@@ -105,36 +106,52 @@ void ifparser_init(void) - if (line[0]=='#' || line[0]=='\0') + 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) -+ space = line; -+ while (!strchr(WS, space[0])) 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 (space == NULL) ++ if (pos >= len) { - nm_warning ("Error: Can't parse interface line '%s'\n",line); -+ nm_warning ("Error: Can't parse line '%s'\n",line); ++ nm_warning ("Error: Can't parse line '%s'\n", line); continue; } -+ -+ // terminate line string and skip further whitespaces - space[0] = '\0'; +- space[0] = '\0'; - -+ while (isspace(space[1])) space++; ++ 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(line,"iface")==0) ++ if (strcmp(key, "iface") == 0) { - char *space2 = strchr(space+1,' '); -+ char *space2 = space+1; -+ while (!strchr(WS, space2[0])) space2++; +- if (space2 == NULL) ++ char *key2; ++ ++ while (!strchr(WS, line[pos]) && pos < len ) pos++; + - if (space2 == NULL) ++ // 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",space+1); ++ nm_warning ("Error: Can't parse iface line '%s'\n", data); continue; } -+ -+ // terminate space string and skip further whitespaces - space2[0]='\0'; -+ while (isspace(space2[1])) space2++; -+ - add_block(line,space+1); +- space2[0]='\0'; +- add_block(line,space+1); ++ key2 = &line[pos]; ++ ++ add_block(key, data); - if (space2[1]!='\0') +- if (space2[1]!='\0') ++ if (pos < len) { - space = strchr(space2+1,' '); -+ space = space2+1; -+ while (!strchr(WS, space[0])) space++; +- if (space == NULL) ++ ++ while (!strchr(WS, line[pos]) && pos < len ) pos++; + - if (space == NULL) ++ // 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 data '%s'\n",space2+1); ++ nm_warning ("Error: Can't parse inet line '%s'\n", key2); continue; } -+ // terminate space2 string and skip further whitespaces - space[0] = '\0'; -+ while (isspace(space[1])) space++; +- space[0] = '\0'; +- add_data(space2+1,space+1); ++ data = &line[pos]; + - add_data(space2+1,space+1); ++ add_data(key2, data); } } -@@ -198,6 +215,18 @@ if_block *ifparser_getif(const char* ifa +- 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* ifa return NULL; } -- cgit 1.3.0-6-gf8a5 From 7a2fb80ff8ebf40b2182ecc5f24895cd2d92b7ef Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 21:37:23 +0000 Subject: Improve the start scripts a bit. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1105 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 12 ++++++------ debian/network-manager.dbus-event | 18 ++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index 18f6beb6..c9448e80 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -15,7 +15,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="NetworkManager dispatcher" +DESC="network events dispatcher" NAME="NetworkManagerDispatcher" DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager @@ -35,7 +35,6 @@ test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDi # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR @@ -44,33 +43,34 @@ d_start() { start-stop-daemon --start --quiet --pidfile $PIDFILE \ --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - log_end_msg $? } # # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $DESC" start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON - log_end_msg $? } case "$1" in start) + log_daemon_msg "Starting $DESC" "$NAME" d_start ;; stop) + log_daemon_msg "Stopping $DESC" "$NAME" d_stop ;; restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start + log_end_msg $? ;; *) - log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 exit 1 ;; esac diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 4009e84d..22dcc877 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -16,7 +16,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="NetworkManager daemon" +DESC="network connection manager" NAME="NetworkManager" DAEMON=/usr/sbin/$NAME @@ -42,47 +42,45 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR fi - modprobe capability >/dev/null 2>&1 || true - - test -d /var/lib/NetworkManager || mkdir -p /var/lib/NetworkManager - chmod 755 /var/lib/NetworkManager start-stop-daemon --start --quiet --pidfile $PIDFILE \ --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - log_end_msg $? } # # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $DESC" start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON - log_end_msg $? } 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 $? ;; *) - log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 exit 1 ;; esac -- cgit 1.3.0-6-gf8a5 From 13efdc9ecc8bd7c9d5576cc1d5c07d13c6c02ab1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Oct 2006 09:04:00 +0000 Subject: Fix a small bug in NetworkManagerDispatcher start script. Forgot to print a log_end_msg $? on start/stop. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1106 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ debian/network-manager-dispatcher.dbus-event | 10 ++++++---- debian/network-manager.dbus-event | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 692c8c44..abdfd212 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-5) unstable; urgency=low + + * Small fix for the NetworkManagerDispatcher init script. + + -- Michael Biebl Wed, 25 Oct 2006 11:00:34 +0200 + network-manager (0.6.4-4) unstable; urgency=low * Correct typo in package description. (Closes: #390062) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index c9448e80..53dbf24b 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -56,18 +56,20 @@ d_stop() { case "$1" in start) - log_daemon_msg "Starting $DESC" "$NAME" + log_daemon_msg "Starting $DESC" "$NAME" d_start + log_end_msg $? ;; stop) - log_daemon_msg "Stopping $DESC" "$NAME" + log_daemon_msg "Stopping $DESC" "$NAME" d_stop + log_end_msg $? ;; restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start - log_end_msg $? + log_end_msg $? ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 22dcc877..f69d7fd4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -69,12 +69,12 @@ case "$1" in log_end_msg $? ;; stop) - log_daemon_msg "Stopping $DESC" "$NAME" + log_daemon_msg "Stopping $DESC" "$NAME" d_stop log_end_msg $? ;; restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start log_end_msg $? -- cgit 1.3.0-6-gf8a5 From 87fb83553f69096efd8cae43f93025a6911563a5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 14 Nov 2006 20:50:36 +0000 Subject: added 12_dbus1.0.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1148 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/12_dbus0.9.patch | 20 -------------------- debian/patches/12_dbus1.0.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/12_dbus0.9.patch create mode 100644 debian/patches/12_dbus1.0.patch diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus0.9.patch deleted file mode 100644 index a3aa9e03..00000000 --- a/debian/patches/12_dbus0.9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 -+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 -@@ -230,7 +230,7 @@ - { - /* Try to reactivate our connection to dbus on the next pass through the event loop */ - ctx->nm_state = LIBNM_NO_DBUS; -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - libnm_glib_schedule_dbus_watcher (ctx); - } - else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +444,7 @@ - g_main_loop_unref (ctx->g_main_loop); - - if (ctx->dbus_con) -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - - if (ctx->callbacks_lock) - g_mutex_free (ctx->callbacks_lock); diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch new file mode 100644 index 00000000..85e0b5bc --- /dev/null +++ b/debian/patches/12_dbus1.0.patch @@ -0,0 +1,31 @@ +--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 ++++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 +@@ -230,7 +230,7 @@ + { + /* Try to reactivate our connection to dbus on the next pass through the event loop */ + ctx->nm_state = LIBNM_NO_DBUS; +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + libnm_glib_schedule_dbus_watcher (ctx); + } + else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) +@@ -444,7 +444,7 @@ + g_main_loop_unref (ctx->g_main_loop); + + if (ctx->dbus_con) +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + + if (ctx->callbacks_lock) + g_mutex_free (ctx->callbacks_lock); +--- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100 ++++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100 +@@ -832,7 +832,7 @@ + } + + dbus_error_init (&error); +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++#if (DBUS_VERSION_MAJOR == 1) || (DBUS_VERSION_MINOR >= 60) + flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ + #else + flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; -- cgit 1.3.0-6-gf8a5 From f6000fd2f8d83e5df7edcedf16e21cb376dbb125 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 17:32:36 +0000 Subject: Apply the patch from Cyril Brulebois, which fixes some typos in the french translation. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1177 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/patches/10-po_fr.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 debian/patches/10-po_fr.patch diff --git a/debian/changelog b/debian/changelog index abdfd212..f8d8323d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.6.4-6) unstable; urgency=low + + * debian/patches/10-po_fr.patch + - Added. Small fixes for the French translation. (Closes: #401060) + Thanks to Cyril Brulebois. + + -- Michael Biebl Thu, 30 Nov 2006 18:30:16 +0100 + network-manager (0.6.4-5) unstable; urgency=low * Small fix for the NetworkManagerDispatcher init script. diff --git a/debian/patches/10-po_fr.patch b/debian/patches/10-po_fr.patch new file mode 100644 index 00000000..e2c2b4f6 --- /dev/null +++ b/debian/patches/10-po_fr.patch @@ -0,0 +1,37 @@ +Index: po/fr.po +=================================================================== +RCS file: /cvs/gnome/NetworkManager/po/fr.po,v +retrieving revision 1.2.6.2 +diff -u -3 -p -r1.2.6.2 fr.po +--- po/fr.po 12 Jun 2006 15:47:57 -0000 1.2.6.2 ++++ po/fr.po 30 Nov 2006 17:29:17 -0000 +@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea + + #: ../gnome/applet/applet.c:1562 + msgid "Create _New Wireless Network..." +-msgstr "Créer_un nouveau réseau sans fil..." ++msgstr "Créer _un nouveau réseau sans fil..." + + #: ../gnome/applet/applet.c:1685 + msgid "_VPN Connections" +@@ -290,17 +290,17 @@ msgstr "NetworkManager n'est pas lancé. + #. 'Enable Networking' item + #: ../gnome/applet/applet.c:2170 + msgid "Enable _Networking" +-msgstr "Activer_le réseau" ++msgstr "Activer _le réseau" + + #. 'Enable Wireless' item + #: ../gnome/applet/applet.c:2176 + msgid "Enable _Wireless" +-msgstr "Activer la_connexion sans fil" ++msgstr "Activer la _connexion sans fil" + + #. 'Connection Information' item + #: ../gnome/applet/applet.c:2182 + msgid "Connection _Information" +-msgstr "Informations sur la_connexion" ++msgstr "Informations sur la _connexion" + + #. Help item + #: ../gnome/applet/applet.c:2193 -- cgit 1.3.0-6-gf8a5 From 9e6221b09d05a15bd1568896ec959ce65210a7e8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 19:05:17 +0000 Subject: Run dos2unix over 12_dbus1.0.patch to remove the unnecessary line-feeds. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1178 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/12_dbus1.0.patch | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch index 85e0b5bc..d9380526 100644 --- a/debian/patches/12_dbus1.0.patch +++ b/debian/patches/12_dbus1.0.patch @@ -1,23 +1,23 @@ ---- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 -+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 -@@ -230,7 +230,7 @@ - { - /* Try to reactivate our connection to dbus on the next pass through the event loop */ - ctx->nm_state = LIBNM_NO_DBUS; -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - libnm_glib_schedule_dbus_watcher (ctx); - } - else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +444,7 @@ - g_main_loop_unref (ctx->g_main_loop); - - if (ctx->dbus_con) -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - - if (ctx->callbacks_lock) - g_mutex_free (ctx->callbacks_lock); +--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 ++++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 +@@ -230,7 +230,7 @@ + { + /* Try to reactivate our connection to dbus on the next pass through the event loop */ + ctx->nm_state = LIBNM_NO_DBUS; +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + libnm_glib_schedule_dbus_watcher (ctx); + } + else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) +@@ -444,7 +444,7 @@ + g_main_loop_unref (ctx->g_main_loop); + + if (ctx->dbus_con) +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + + if (ctx->callbacks_lock) + g_mutex_free (ctx->callbacks_lock); --- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100 +++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100 @@ -832,7 +832,7 @@ -- cgit 1.3.0-6-gf8a5 From a268781a63a0289c63b0fc27372d431897411ca3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 19:20:04 +0000 Subject: Write the changelog for 0.6.4-6 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1179 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8d8323d..fbf95d5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -network-manager (0.6.4-6) unstable; urgency=low +network-manager (0.6.4-6) unstable; urgency=medium * debian/patches/10-po_fr.patch - Added. Small fixes for the French translation. (Closes: #401060) Thanks to Cyril Brulebois. + * debian/patches/12_dbus1.0.patch + - Updated 12_dbus0.9.patch for D-Bus 1.0 to pass the correct flags to + dbus_bus_request_name(). (Closes: #401039) + * Urgency medium, as it fixes a FTBFS bug. - -- Michael Biebl Thu, 30 Nov 2006 18:30:16 +0100 + -- Michael Biebl Thu, 30 Nov 2006 20:05:36 +0100 network-manager (0.6.4-5) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From afce5bd8bb8fef0a36c50fba66fc1acce8cafef0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 19:53:16 +0000 Subject: Add missing ".SH NAME" stanzas to man pages. Fixes linda/lintia warnings. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1180 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++- debian/patches/11-man_page_sh_name.patch | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 debian/patches/11-man_page_sh_name.patch diff --git a/debian/changelog b/debian/changelog index fbf95d5e..5971539e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,11 @@ network-manager (0.6.4-6) unstable; urgency=medium * debian/patches/12_dbus1.0.patch - Updated 12_dbus0.9.patch for D-Bus 1.0 to pass the correct flags to dbus_bus_request_name(). (Closes: #401039) + * debian/patches/11-man_page_sh_name.patch + - Add missing ".SH NAME" stanzas to man pages. * Urgency medium, as it fixes a FTBFS bug. - -- Michael Biebl Thu, 30 Nov 2006 20:05:36 +0100 + -- Michael Biebl Thu, 30 Nov 2006 20:50:44 +0100 network-manager (0.6.4-5) unstable; urgency=low diff --git a/debian/patches/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch new file mode 100644 index 00000000..344a3cb1 --- /dev/null +++ b/debian/patches/11-man_page_sh_name.patch @@ -0,0 +1,45 @@ +Index: man/NetworkManager.1.in +=================================================================== +RCS file: /cvs/gnome/NetworkManager/man/NetworkManager.1.in,v +retrieving revision 1.2 +diff -u -3 -p -r1.2 NetworkManager.1.in +--- man/NetworkManager.1.in 1 Feb 2006 18:14:15 -0000 1.2 ++++ man/NetworkManager.1.in 30 Nov 2006 19:33:39 -0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NETWORKMANAGER "1" ++.SH NAME + NetworkManager \- network management daemon + .SH SYNOPSIS + .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices] +Index: man/NetworkManagerDispatcher.1.in +=================================================================== +RCS file: /cvs/gnome/NetworkManager/man/NetworkManagerDispatcher.1.in,v +retrieving revision 1.2 +diff -u -3 -p -r1.2 NetworkManagerDispatcher.1.in +--- man/NetworkManagerDispatcher.1.in 1 Feb 2006 18:14:15 -0000 1.2 ++++ man/NetworkManagerDispatcher.1.in 30 Nov 2006 19:33:39 -0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NETWORKMANAGERDISPATCHER "1" ++.SH NAME + NetworkManagerDispatcher \- daemon that runs commands in response to off/online + .SH SYNOPSIS + .B NetworkManagerDispatcher [\-\-no-daemon] +Index: man/nm-tool.1.in +=================================================================== +RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v +retrieving revision 1.1 +diff -u -3 -p -r1.1 nm-tool.1.in +--- man/nm-tool.1.in 1 Feb 2006 18:14:15 -0000 1.1 ++++ man/nm-tool.1.in 30 Nov 2006 19:33:39 -0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NM-TOOL "1" ++.SH NAME + nm-tool \- utility to report NetworkManager state + .SH SYNOPSIS + .B nm-tool -- cgit 1.3.0-6-gf8a5 From 7565f96dd3b349b2b0a0435cb2190fdfb681393a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 20:35:33 +0000 Subject: Be compliant to the freedesktop.org autostart spec and install the nm-applet autostart file into /etc/xdg/autostart. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1181 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ++++- debian/network-manager-gnome.install | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5971539e..8e33fde6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,12 @@ network-manager (0.6.4-6) unstable; urgency=medium dbus_bus_request_name(). (Closes: #401039) * debian/patches/11-man_page_sh_name.patch - Add missing ".SH NAME" stanzas to man pages. + * debian/network-manager-gnome.install + - Install the nm-applet autostart file into /etc/xdg/autostart rather than + /usr/share/gnome/autostart to be compliant to the fd.o autostart spec. * Urgency medium, as it fixes a FTBFS bug. - -- Michael Biebl Thu, 30 Nov 2006 20:50:44 +0100 + -- Michael Biebl Thu, 30 Nov 2006 21:30:47 +0100 network-manager (0.6.4-5) unstable; urgency=low diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index 88214a99..d5e110c7 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -5,4 +5,4 @@ debian/tmp/usr/share/nm-applet/* debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties debian/tmp/etc/dbus-1/system.d/nm-applet.conf -debian/tmp/usr/share/gnome/autostart/nm-applet.desktop +debian/tmp/usr/share/gnome/autostart/nm-applet.desktop etc/xdg/autostart/ -- cgit 1.3.0-6-gf8a5 From e3fb5656a668b45d3b130a48db747c1716bb6fb5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 20:52:00 +0000 Subject: Remove unnecessary directory creations. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1182 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-gnome.dirs | 3 --- debian/network-manager.dirs | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 debian/network-manager-gnome.dirs diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs deleted file mode 100644 index ab3de1b3..00000000 --- a/debian/network-manager-gnome.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/dbus-1/system.d/ -usr/share/pixmaps/ -usr/share/applications/ diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 19c18e1e..c505972a 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,4 +1,2 @@ -etc/dbus-1/event.d -etc/dbus-1/system.d etc/NetworkManager/dispatcher.d var/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From eaeb8f7b5d9a195517226a494c5fa666309e5913 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 21:02:03 +0000 Subject: Deleted one line I shouldn't have, as it is still used. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1183 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.dirs | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index c505972a..2475d118 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,2 +1,3 @@ +etc/dbus-1/event.d etc/NetworkManager/dispatcher.d var/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From 0a6e3291d19221be9a51f480754f46b9f766fabc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 2 Jan 2007 18:19:38 +0000 Subject: Add recommends on network-manager-{gnome,kde} to network-manager package (taken from Ubuntu) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1197 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/control | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8e33fde6..37dbf5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.4-7) unstable; urgency=low + + * debian/control + - Add recommends on network-manager-gnome | network-manager-kde. + + -- Michael Biebl Tue, 2 Jan 2007 19:16:54 +0100 + network-manager (0.6.4-6) unstable; urgency=medium * debian/patches/10-po_fr.patch diff --git a/debian/control b/debian/control index d1a9c0c1..5e38891a 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Standards-Version: 3.7.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser +Recommends: network-manager-gnome | network-manager-kde 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 -- cgit 1.3.0-6-gf8a5 From 97e0f5b21486b4759830beb09f45c53db6c96b5f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 Jan 2007 21:05:48 +0000 Subject: Pull the dbus 1.0 changes from SVN, which uses unref rather than close. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1215 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/12_dbus1.0.patch | 35 +++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 37dbf5dc..760c0697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.4-7) unstable; urgency=low * debian/control - - Add recommends on network-manager-gnome | network-manager-kde. + - Add recommends on network-manager-gnome | network-manager-kde. + * debian/patches/12_dbus1.0.patch + - Updated to unref rather than close the connection. - -- Michael Biebl Tue, 2 Jan 2007 19:16:54 +0100 + -- Michael Biebl Wed, 10 Jan 2007 22:03:15 +0100 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch index d9380526..a8ce1422 100644 --- a/debian/patches/12_dbus1.0.patch +++ b/debian/patches/12_dbus1.0.patch @@ -1,31 +1,42 @@ ---- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 -+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 -@@ -230,7 +230,7 @@ +diff -urN NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c +--- NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c 2007-01-10 21:58:05.000000000 +0100 ++++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c 2007-01-10 22:00:00.000000000 +0100 +@@ -230,7 +230,8 @@ { /* Try to reactivate our connection to dbus on the next pass through the event loop */ ctx->nm_state = LIBNM_NO_DBUS; - dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); ++ dbus_connection_unref (ctx->dbus_con); ++ ctx->dbus_con = NULL; libnm_glib_schedule_dbus_watcher (ctx); } else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +444,7 @@ +@@ -444,7 +445,10 @@ g_main_loop_unref (ctx->g_main_loop); if (ctx->dbus_con) - dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); ++ { ++ dbus_connection_unref (ctx->dbus_con); ++ ctx->dbus_con = NULL; ++ } if (ctx->callbacks_lock) g_mutex_free (ctx->callbacks_lock); ---- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100 -+++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100 -@@ -832,7 +832,7 @@ +diff -urN NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c NetworkManager-0.6.4/src/NetworkManagerDbus.c +--- NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c 2007-01-10 21:58:05.000000000 +0100 ++++ NetworkManager-0.6.4/src/NetworkManagerDbus.c 2007-01-10 22:01:49.000000000 +0100 +@@ -831,10 +831,10 @@ } dbus_error_init (&error); -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) -+#if (DBUS_VERSION_MAJOR == 1) || (DBUS_VERSION_MINOR >= 60) - flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ +- flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ ++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) ++ flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; #else - flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; +- flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; ++ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; + #endif + ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error); + if (dbus_error_is_set (&error)) -- cgit 1.3.0-6-gf8a5 From b2f669e84c3cf0ab1ec1b9c29c877dcb80aa20b9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 3 Mar 2007 02:55:22 +0000 Subject: Add patch by Andy Whitcroft. "|" the wep capabilities instead of "&". git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1245 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++++- debian/control | 2 +- debian/patches/13-wep_capabilities.patch | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 debian/patches/13-wep_capabilities.patch diff --git a/debian/changelog b/debian/changelog index 760c0697..74e5c649 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ network-manager (0.6.4-7) unstable; urgency=low * debian/control - - Add recommends on network-manager-gnome | network-manager-kde. + - Add Recommends: network-manager-gnome | network-manager-kde to + network-manager. + - Add Recommends: libpam-keyring to network-manager-gnome. This allows to + unlock the gnome-keyring automatically upon login. * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the connection. + * debian/patches/13-wep_capabilities.patch + - Correctly set the available WEP capabilities. (Closes: #411867) + Thanks to Andy Whitcroft for the patch! -- Michael Biebl Wed, 10 Jan 2007 22:03:15 +0100 diff --git a/debian/control b/debian/control index 5e38891a..115d6f43 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) -Recommends: notification-daemon +Recommends: notification-daemon, libpam-keyring Description: network management framework (GNOME frontend) 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/patches/13-wep_capabilities.patch b/debian/patches/13-wep_capabilities.patch new file mode 100644 index 00000000..e69dcad6 --- /dev/null +++ b/debian/patches/13-wep_capabilities.patch @@ -0,0 +1,21 @@ +Index: src/NetworkManagerAP.c +=================================================================== +--- src/NetworkManagerAP.c (Revision 2356) ++++ src/NetworkManagerAP.c (Revision 2357) +@@ -572,12 +572,14 @@ + { + if (cipher & IW_AUTH_CIPHER_WEP40) + { +- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40); ++ caps |= NM_802_11_CAP_PROTO_WEP; ++ caps |= NM_802_11_CAP_CIPHER_WEP40; + caps &= ~NM_802_11_CAP_PROTO_NONE; + } + if (cipher & IW_AUTH_CIPHER_WEP104) + { +- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104); ++ caps |= NM_802_11_CAP_PROTO_WEP; ++ caps |= NM_802_11_CAP_CIPHER_WEP104; + caps &= ~NM_802_11_CAP_PROTO_NONE; + } + if (cipher & IW_AUTH_CIPHER_TKIP) -- cgit 1.3.0-6-gf8a5 From 815d2dc4af5bd9bb56c7c651c7b0cc4de983a567 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Mar 2007 21:28:10 +0000 Subject: Add XS-Vcs-* fields. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1254 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- debian/control | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74e5c649..8353c00d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,10 @@ network-manager (0.6.4-7) unstable; urgency=low - Add Recommends: network-manager-gnome | network-manager-kde to network-manager. - Add Recommends: libpam-keyring to network-manager-gnome. This allows to - unlock the gnome-keyring automatically upon login. + unlock the gnome-keyring automatically upon login. + - Add XS-Vcs-* fields. * debian/patches/12_dbus1.0.patch - - Updated to unref rather than close the connection. + - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch - Correctly set the available WEP capabilities. (Closes: #411867) Thanks to Andy Whitcroft for the patch! diff --git a/debian/control b/debian/control index 115d6f43..889c5279 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Riccardo Setti Uploaders: Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager +XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager Package: network-manager Architecture: any -- cgit 1.3.0-6-gf8a5 From 6b0da5e00a0a0a3649f757f55915fff6fb6ab932 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 19:35:02 +0000 Subject: network-manager-vpnc/network-manager-openvpn are now in the archive resp. NEW. Add Recommends to network-manager-gnome git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1316 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8353c00d..1c9c04b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ network-manager (0.6.4-7) unstable; urgency=low network-manager. - Add Recommends: libpam-keyring to network-manager-gnome. This allows to unlock the gnome-keyring automatically upon login. + - Add Recommends: network-manager-vpnc, network-manager-openvpn to + network-manager-gnome. (Closes: #406241) - Add XS-Vcs-* fields. * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. diff --git a/debian/control b/debian/control index 889c5279..25396769 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) -Recommends: notification-daemon, libpam-keyring +Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn Description: network management framework (GNOME frontend) 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 -- cgit 1.3.0-6-gf8a5 From 127e1fdd0a6c509536a81c662d388a9ceeecc900 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 22:09:39 +0000 Subject: Add dependency on gnome-icon-theme to network-manager-gnome. Closes: #372466 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1317 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1c9c04b7..49cccb3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ network-manager (0.6.4-7) unstable; urgency=low - Add Recommends: network-manager-vpnc, network-manager-openvpn to network-manager-gnome. (Closes: #406241) - Add XS-Vcs-* fields. + - Add Depends: gnome-icon-theme to network-manager-gnome, which fixes a + problem with nm-applet failing to start because of missing icons. + (Closes: #372466) * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch diff --git a/debian/control b/debian/control index 25396769..4b430eb9 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Description: network management framework daemon Package: network-manager-gnome Architecture: any Section: gnome -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}), gnome-icon-theme Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From 83d084c306ec01ea8160785bb9d5bf1c1b1f84a4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 23:39:35 +0000 Subject: Rename README.Debian to network-manager.README.Debian make it obvious that it is only installed for the network-manager binary package git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1318 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 76 ------------------------------------ debian/network-manager.README.Debian | 76 ++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 debian/README.Debian create mode 100644 debian/network-manager.README.Debian diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 8fc8c455..00000000 --- a/debian/README.Debian +++ /dev/null @@ -1,76 +0,0 @@ -NetworkManager consists of two parts: one is on the system level daemon that -manages the connections and gathers information about new networks. The other -is a systray applet that users can use to interact with the NetworkManager -daemon. - -Security -~~~~~~~~ -To allow users to connect to the NetworkManager daemon they have to be in the -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/dbus-1/event.d/25NetworkManager 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. - -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. - -After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/dbus-1/event.d/25NetworkManager restart". - -Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" -man page for further information. - diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian new file mode 100644 index 00000000..8fc8c455 --- /dev/null +++ b/debian/network-manager.README.Debian @@ -0,0 +1,76 @@ +NetworkManager consists of two parts: one is on the system level daemon that +manages the connections and gathers information about new networks. The other +is a systray applet that users can use to interact with the NetworkManager +daemon. + +Security +~~~~~~~~ +To allow users to connect to the NetworkManager daemon they have to be in the +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/dbus-1/event.d/25NetworkManager 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. + +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. + +After modifying /etc/network/interfaces you have to restart NM with the +command "/etc/dbus-1/event.d/25NetworkManager restart". + +Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" +man page for further information. + -- cgit 1.3.0-6-gf8a5 From 25e31482c0894d8884caf0ed3fa05662ef63d946 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 23:42:48 +0000 Subject: Add a README.Debian for network-manager-gnome http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414187 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1319 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/network-manager-gnome.README.Debian | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 debian/network-manager-gnome.README.Debian diff --git a/debian/changelog b/debian/changelog index 49cccb3b..d7068b7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,15 +9,17 @@ network-manager (0.6.4-7) unstable; urgency=low network-manager-gnome. (Closes: #406241) - Add XS-Vcs-* fields. - Add Depends: gnome-icon-theme to network-manager-gnome, which fixes a - problem with nm-applet failing to start because of missing icons. + problem with nm-applet failing to start because of missing icons. (Closes: #372466) * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch - Correctly set the available WEP capabilities. (Closes: #411867) Thanks to Andy Whitcroft for the patch! + * debian/network-manager-gnome.README.Debian + - Add a README.Debian file for network-manager-gnome. (Closes: #414187) - -- Michael Biebl Wed, 10 Jan 2007 22:03:15 +0100 + -- Michael Biebl Tue, 03 Apr 2007 01:39:48 +0200 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/network-manager-gnome.README.Debian b/debian/network-manager-gnome.README.Debian new file mode 100644 index 00000000..0af61464 --- /dev/null +++ b/debian/network-manager-gnome.README.Debian @@ -0,0 +1,11 @@ +network-manager-gnome provides a Notification Area applet called nm-applet for +conveniently choosing wired and wireless networks in GNOME, KDE and XFCE. + +network-manager-gnome (by virtue of the fact it uses network-manager) +requires users to be in the group 'netdev' for it to work. If users aren't +in the group 'netdev' then it won't automatically appear, and work, in the +Notification Area. + +network-manager-gnome uses network-manager. Please see the +network-mananger documentation in +/usr/share/doc/network-manager/README.Debian for further information. -- cgit 1.3.0-6-gf8a5 From 071455bd735a38e9df53ed9efe717f75003d2579 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 3 Apr 2007 00:19:08 +0000 Subject: Small fix for the German translation git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1320 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/patches/14-po_de.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 debian/patches/14-po_de.patch diff --git a/debian/changelog b/debian/changelog index d7068b7e..33c4c000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,10 @@ network-manager (0.6.4-7) unstable; urgency=low Thanks to Andy Whitcroft for the patch! * debian/network-manager-gnome.README.Debian - Add a README.Debian file for network-manager-gnome. (Closes: #414187) + * debian/patches/14-po_de.patch + - Added. Small fix for the German translation. - -- Michael Biebl Tue, 03 Apr 2007 01:39:48 +0200 + -- Michael Biebl Tue, 03 Apr 2007 02:18:28 +0200 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/patches/14-po_de.patch b/debian/patches/14-po_de.patch new file mode 100644 index 00000000..25ceff26 --- /dev/null +++ b/debian/patches/14-po_de.patch @@ -0,0 +1,13 @@ +Index: po/de.po +=================================================================== +--- po/de.po (Revision 2227) ++++ po/de.po (Arbeitskopie) +@@ -276,7 +276,7 @@ + #. 'Enable Networking' item + #: ../gnome/applet/applet.c:2170 + msgid "Enable _Networking" +-msgstr "Netzwerk_aktivieren" ++msgstr "Netzwerk _aktivieren" + + #. 'Enable Wireless' item + #: ../gnome/applet/applet.c:2176 -- cgit 1.3.0-6-gf8a5 From e91c21edc2b06e8b550d5565b6655a892dbbb8ea Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 3 Apr 2007 00:42:26 +0000 Subject: Update the Debian backend: - Only call nscd -i hosts when nscd is installed http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402436 - Set status variable to return code of ifup/ifdown http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415642 - Remove mDNSResponder restart. Obosoleted by Avahi which doesn't need that. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1321 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 ++++++-- debian/patches/05-debian_backend.patch | 46 ++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33c4c000..285a7ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,15 @@ network-manager (0.6.4-7) unstable; urgency=low - Add a README.Debian file for network-manager-gnome. (Closes: #414187) * debian/patches/14-po_de.patch - Added. Small fix for the German translation. - - -- Michael Biebl Tue, 03 Apr 2007 02:18:28 +0200 + * debian/patches/05-debian_backend.patch + - Updated. Set status variable to return code of ifup/ifdown. + (Closes: #415642) + - Only invalidate the nscd hosts cache when nscd is actually installed. + (Closes: #402436) + - Remove mDNSResponder restart from nm_system_restart_mdns_responder(). + mDNSResponder has been obsoleted by Avahi which does not need a restart. + + -- Michael Biebl Tue, 03 Apr 2007 02:21:57 +0200 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 8882e749..b8967be7 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,8 +1,8 @@ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..93c2914 100644 +index 740572a..4e3e44a 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c -@@ -37,6 +37,7 @@ #include "interface_parser.h" +@@ -37,6 +37,7 @@ #include "nm-utils.h" #define ARPING "/usr/sbin/arping" @@ -10,7 +10,7 @@ index 740572a..93c2914 100644 /* * nm_system_init -@@ -238,14 +239,14 @@ void nm_system_kill_all_dhcp_daemons (vo +@@ -238,14 +239,16 @@ void nm_system_kill_all_dhcp_daemons (void) /* * nm_system_update_dns * @@ -24,12 +24,24 @@ index 740572a..93c2914 100644 { - nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); - -+ nm_info ("Clearing nscd hosts cache."); -+ nm_spawn_process ("/usr/sbin/nscd -i hosts"); ++ 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 +515,60 @@ gboolean nm_system_device_get_use_dhcp ( +@@ -514,13 +516,60 @@ gboolean nm_system_device_get_use_dhcp (NMDevice *dev) /* * nm_system_device_get_disabled * @@ -93,7 +105,7 @@ index 740572a..93c2914 100644 } -@@ -563,12 +611,18 @@ gboolean nm_system_deactivate_dialup (GS +@@ -563,12 +612,18 @@ gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) if (strcmp (dialup, config->name) == 0) { char *cmd; @@ -101,7 +113,8 @@ index 740572a..93c2914 100644 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); +- nm_spawn_process (cmd); ++ status = nm_spawn_process (cmd); g_free (cmd); - ret = TRUE; + if (status == 0) { @@ -113,7 +126,7 @@ index 740572a..93c2914 100644 break; } } -@@ -587,12 +641,18 @@ gboolean nm_system_activate_dialup (GSLi +@@ -587,12 +642,18 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) if (strcmp (dialup, config->name) == 0) { char *cmd; @@ -121,7 +134,8 @@ index 740572a..93c2914 100644 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); +- nm_spawn_process (cmd); ++ status = nm_spawn_process (cmd); g_free (cmd); - ret = TRUE; + if (status == 0) { @@ -133,7 +147,7 @@ index 740572a..93c2914 100644 break; } } -@@ -603,23 +663,26 @@ gboolean nm_system_activate_dialup (GSLi +@@ -603,23 +664,26 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) GSList * nm_system_get_dialup_config (void) { const char *buf; @@ -166,7 +180,7 @@ index 740572a..93c2914 100644 config->data = g_strdup (curr->name); /* interface name */ list = g_slist_append (list, config); -@@ -631,14 +694,6 @@ GSList * nm_system_get_dialup_config (vo +@@ -631,14 +695,6 @@ GSList * nm_system_get_dialup_config (void) } ifparser_destroy(); @@ -181,7 +195,7 @@ index 740572a..93c2914 100644 return list; } -@@ -679,7 +734,10 @@ void nm_system_set_hostname (NMIP4Config +@@ -679,7 +735,10 @@ void nm_system_set_hostname (NMIP4Config *config) */ gboolean nm_system_should_modify_resolv_conf (void) { @@ -197,7 +211,7 @@ 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 -@@ -50,11 +50,13 @@ void add_block(const char *type, const c +@@ -50,11 +50,13 @@ void add_block(const char *type, const char* name) void add_data(const char *key,const char *data) { @@ -212,7 +226,7 @@ index 53d6487..b3ad300 100644 ret->key = g_strdup(key); ret->data = g_strdup(data); -@@ -71,14 +73,18 @@ void add_data(const char *key,const char +@@ -71,14 +73,18 @@ void add_data(const char *key,const char *data) //printf("added data '%s' with key '%s'\n",data,key); } @@ -339,7 +353,7 @@ index 53d6487..b3ad300 100644 //printf("line: '%s' ret=%d\n",rline,ret); } -@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* ifa +@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* iface) return NULL; } -- cgit 1.3.0-6-gf8a5 From 004fc7ded0534f3501f664c3c0f98f822ff7f155 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 3 Apr 2007 00:49:24 +0000 Subject: Change maintainer address to pkg-utopia-maintainers@lists.alioth.debian.org. Set Riccardo and myself as Uploaders. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1322 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 285a7ab7..c2867ad0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ network-manager (0.6.4-7) unstable; urgency=low - Add Depends: gnome-icon-theme to network-manager-gnome, which fixes a problem with nm-applet failing to start because of missing icons. (Closes: #372466) + - Change maintainer address to + pkg-utopia-maintainers@lists.alioth.debian.org. + Add Riccardo and myself to Uploaders. * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch diff --git a/debian/control b/debian/control index 4b430eb9..644e505a 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: network-manager Section: net Priority: optional -Maintainer: Riccardo Setti -Uploaders: Michael Biebl +Maintainer: Utopia Maintenance Team +Uploaders: Riccardo Setti , Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 -- cgit 1.3.0-6-gf8a5 From 4310bb5e2f9d9e56a0c1e544adf87d7c91d74c76 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Apr 2007 21:00:59 +0000 Subject: Switch to regular SysV init scripts - Rename the start script properly so they are picked up by dh_installinit - Start them at S26, stop them at K14 - preinst,postinst,postrm: Make sure, the old conffiles for NetworkManager(Dispatcher) are removed/renamed properly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1434 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 17 +++++ debian/network-manager-dispatcher.dbus-event | 80 -------------------- debian/network-manager.dbus-event | 88 ---------------------- debian/network-manager.init | 87 +++++++++++++++++++++ ...network-manager.network-manager-dispatcher.init | 80 ++++++++++++++++++++ debian/network-manager.postinst | 68 ++++++++++++----- debian/network-manager.postrm | 85 +++++++++++++++++++++ debian/network-manager.preinst | 64 ++++++++++++++++ debian/network-manager.prerm | 14 ---- debian/rules | 7 +- 10 files changed, 386 insertions(+), 204 deletions(-) delete mode 100644 debian/network-manager-dispatcher.dbus-event delete mode 100644 debian/network-manager.dbus-event create mode 100644 debian/network-manager.init create mode 100644 debian/network-manager.network-manager-dispatcher.init create mode 100644 debian/network-manager.postrm create mode 100644 debian/network-manager.preinst delete mode 100644 debian/network-manager.prerm diff --git a/debian/changelog b/debian/changelog index c2867ad0..38b9921a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +network-manager (0.6.4-8) unstable; urgency=low + + * Install the NetworkManager and NetworkManagerDispatcher start scripts as + regular SysV init scripts + - Rename debian/network-manager.dbus-event to debian/network-manager.init + and debian/network-manager-dispatcher.dbus-event to + debian/network-manager.network-manager-dispatcher.init. + - Add proper LSB headers to the init scripts. + - debian/rules + Call dh_installinit for network-manager and network-manager-dispatcher. + - debian/network-manager.{preinst,postinst,postrm} + Remove the old conffiles /etc/dbus-1/event.d/25NetworkManager and + /etc/dbus-1/event.d/26NetworkManagerDispatcher or rename them to + *.dpkg-bak if they were changed locally. + + -- Michael Biebl Tue, 24 Apr 2007 22:30:22 +0200 + network-manager (0.6.4-7) unstable; urgency=low * debian/control diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event deleted file mode 100644 index 53dbf24b..00000000 --- a/debian/network-manager-dispatcher.dbus-event +++ /dev/null @@ -1,80 +0,0 @@ -#! /bin/sh -# -# NetworkManager NetworkManagerDispatcher daemon -# Daemon for automatically switching network -# connections to the best available connection. -# This file should be placed in /etc/init.d. -# -# Authors: Christian Bjälevik -# Jan Gerber -# Mark Roach -# Thom May -# -# - -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/dbus-1/event.d/26$NAME -USER=root - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -test -f /etc/default/rcS && . /etc/default/rcS -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 \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - -} - -# -# Function that stops the daemon/service. -# -d_stop() { - start-stop-daemon --stop --retry 60 --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.dbus-event b/debian/network-manager.dbus-event deleted file mode 100644 index f69d7fd4..00000000 --- a/debian/network-manager.dbus-event +++ /dev/null @@ -1,88 +0,0 @@ -#! /bin/sh -# -# NetworkManager NetworkManager daemon -# Daemon for automatically switching network -# connections to the best available connection. -# This file should be placed in /etc/init.d. -# -# Authors: Christian Bjälevik -# Jan Gerber -# Mark Roach -# Thom May -# -# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl -# - -set -e - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="network connection manager" -NAME="NetworkManager" - -DAEMON=/usr/sbin/$NAME - -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid - -SCRIPTNAME=/etc/dbus-1/event.d/25$NAME -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/rcS && . /etc/default/rcS -test -f /etc/default/NetworkManager && . /etc/default/NetworkManager - -# -# 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 \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - -} - -# -# Function that stops the daemon/service. -# -d_stop() { - start-stop-daemon --stop --retry 60 --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.init b/debian/network-manager.init new file mode 100644 index 00000000..d096e950 --- /dev/null +++ b/debian/network-manager.init @@ -0,0 +1,87 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: NetworkManager +# Required-Start: $local_fs dbus dhcdbd hal +# Required-Stop: $local_fs dbus dhcdbd hal +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: network connection manager +# Description: Daemon for automatically switching network +# connections to the best available connection. +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="network connection manager" +NAME="NetworkManager" + +DAEMON=/usr/sbin/$NAME + +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid + +SCRIPTNAME=/etc/init.d/network-manager +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/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManager && . /etc/default/NetworkManager + +# +# 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 \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --retry 60 --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.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init new file mode 100644 index 00000000..2f386b2b --- /dev/null +++ b/debian/network-manager.network-manager-dispatcher.init @@ -0,0 +1,80 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: NetworkManagerDispatcher +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: S 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/rcS && . /etc/default/rcS +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 \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --retry 60 --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 1e73dfa2..c2a445c7 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,27 +1,59 @@ -#!/bin/sh +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was installed: +# configure +# +# +# If prerm fails during upgrade or fails on failed upgrade: +# abort-upgrade +# +# If prerm fails during deconfiguration of a package: +# abort-deconfigure in-favour +# removing +# +# If prerm fails during replacement due to conflict: +# abort-remove in-favour -set -e -case "$1" in - configure) - if ! getent group netdev > /dev/null; then - addgroup --quiet --system netdev - fi +# 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 +} + - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - 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 [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager restart - fi + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; + + abort-upgrade|abort-deconfigure|abort-remove) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; esac #DEBHELPER# - exit 0 + diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm new file mode 100644 index 00000000..812369bd --- /dev/null +++ b/debian/network-manager.postrm @@ -0,0 +1,85 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was removed: +# remove +# +# After the package was purged: +# purge +# +# After the package was upgraded: +# upgrade +# if that fails: +# failed-upgrade +# +# +# After all of the packages files have been replaced: +# disappear +# +# +# If preinst fails during install: +# abort-install +# +# If preinst fails during upgrade of removed package: +# abort-install +# +# If preinst fails during upgrade: +# abort-upgrade + + +# 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 new file mode 100644 index 00000000..60db6ae0 --- /dev/null +++ b/debian/network-manager.preinst @@ -0,0 +1,64 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# Before the package is installed: +# install +# +# Before removed package is upgraded: +# install +# +# Before the package is upgraded: +# upgrade +# +# +# If postrm fails during upgrade or fails on failed upgrade: +# abort-upgrade + + +# Prepare to remove a no-longer used conffile +prep_rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak" + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + mv -f "$CONFFILE" "$CONFFILE".dpkg-remove + fi + fi +} + + +case "$1" in + install) + ;; + + upgrade) + # Upgrade from previous versions + if dpkg --compare-versions "$2" lt "0.6.4-8"; then + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager stop + fi + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher stop + fi + prep_rm_conffile /etc/dbus-1/event.d/25NetworkManager + prep_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + fi + ;; + + abort-upgrade) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm deleted file mode 100644 index 8a010110..00000000 --- a/debian/network-manager.prerm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - remove) - /etc/dbus-1/event.d/25NetworkManager stop - /etc/dbus-1/event.d/26NetworkManagerDispatcher stop - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 57cbedb3..55dd9d1d 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian +DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . + clean:: rm -f po/*.gmo rm -f debian/*.1 @@ -22,10 +24,7 @@ build/network-manager:: /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: - install -m 755 debian/network-manager.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/25NetworkManager - install -m 755 debian/network-manager-dispatcher.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher + 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 -- cgit 1.3.0-6-gf8a5 From a0c0b9a690d4b91f5f0a1e6873fd9d5d29355cb6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Apr 2007 15:24:52 +0000 Subject: Clean up some remaining traces of /etc/dbus-1/event.d git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1438 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.README.Debian | 4 ++-- debian/network-manager.dirs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index 8fc8c455..c59c7f9b 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -19,7 +19,7 @@ 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/dbus-1/event.d/25NetworkManager restart". +command "/etc/init.d/network-manager restart". Examples: @@ -69,7 +69,7 @@ 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. After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/dbus-1/event.d/25NetworkManager restart". +command "/etc/init.d/network-manager restart". Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" man page for further information. diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 2475d118..c505972a 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,3 +1,2 @@ -etc/dbus-1/event.d etc/NetworkManager/dispatcher.d var/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From d6f0e556f983e13a380a1f0634cebd296d75b34d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:42:08 +0000 Subject: * New upstream release. (Closes: #420959, #431658) - Runs wpa_supplicant in less verbose mode. (Closes: #375302, #431562) - Adds support for LEAP and phase two authentication. (Closes: #420959, #402747) * Removed patches that were merged upstream - debian/patches/09_fix_bigendian_words.patch - debian/patches/12_dbus1.0.patch - debian/patches/13-wep_capabilities git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1672 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 13 ++ debian/patches/09_fix_bigendian_words.patch | 310 ---------------------------- debian/patches/12_dbus1.0.patch | 42 ---- debian/patches/13-wep_capabilities.patch | 21 -- 4 files changed, 13 insertions(+), 373 deletions(-) delete mode 100644 debian/patches/09_fix_bigendian_words.patch delete mode 100644 debian/patches/12_dbus1.0.patch delete mode 100644 debian/patches/13-wep_capabilities.patch diff --git a/debian/changelog b/debian/changelog index 38b9921a..41d31dec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +network-manager (0.6.5-1) unstable; urgency=low + + * New upstream release. (Closes: #420959, #431658) + - Runs wpa_supplicant in less verbose mode. (Closes: #375302, #431562) + - Adds support for LEAP and phase two authentication. + (Closes: #420959, #402747) + * Removed patches that were merged upstream + - debian/patches/09_fix_bigendian_words.patch + - debian/patches/12_dbus1.0.patch + - debian/patches/13-wep_capabilities + + -- Michael Biebl Sat, 25 Aug 2007 00:21:49 +0200 + network-manager (0.6.4-8) unstable; urgency=low * Install the NetworkManager and NetworkManagerDispatcher start scripts as diff --git a/debian/patches/09_fix_bigendian_words.patch b/debian/patches/09_fix_bigendian_words.patch deleted file mode 100644 index 736103b9..00000000 --- a/debian/patches/09_fix_bigendian_words.patch +++ /dev/null @@ -1,310 +0,0 @@ ---- configure.orig 2006-08-07 17:02:37.000000000 +0200 -+++ configure 2006-08-07 17:03:56.000000000 +0200 -@@ -23030,6 +23030,293 @@ - < $srcdir/po/POTFILES.in > po/POTFILES - - -+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } -+if test "${ac_cv_c_bigendian+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # See if sys/param.h defines the BYTE_ORDER macro. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+ -+int -+main () -+{ -+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN -+ bogus endian macros -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ # It does; now see whether it defined to BIG_ENDIAN or not. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+ -+int -+main () -+{ -+#if BYTE_ORDER != BIG_ENDIAN -+ not big endian -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_bigendian=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_c_bigendian=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # It does not; compile a test program. -+if test "$cross_compiling" = yes; then -+ # try to guess the endianness by grepping values into an object file -+ ac_cv_c_bigendian=unknown -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -+int -+main () -+{ -+ _ascii (); _ebcdic (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -+ ac_cv_c_bigendian=yes -+fi -+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -+ if test "$ac_cv_c_bigendian" = unknown; then -+ ac_cv_c_bigendian=no -+ else -+ # finding both strings is unlikely to happen, but who knows? -+ ac_cv_c_bigendian=unknown -+ fi -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+ -+ /* Are we little or big endian? From Harbison&Steele. */ -+ union -+ { -+ long int l; -+ char c[sizeof (long int)]; -+ } u; -+ u.l = 1; -+ return u.c[sizeof (long int) - 1] == 1; -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_bigendian=no -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_c_bigendian=yes -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -+case $ac_cv_c_bigendian in -+ yes) -+ -+cat >>confdefs.h <<\_ACEOF -+#define WORDS_BIGENDIAN 1 -+_ACEOF -+ ;; -+ no) -+ ;; -+ *) -+ { { echo "$as_me:$LINENO: error: unknown endianness -+presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -+echo "$as_me: error: unknown endianness -+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -+ { (exit 1); exit 1; }; } ;; -+esac -+ -+ - - # Check whether --with-distro was given. - if test "${with_distro+set}" = set; then ---- configure.in.org 2006-08-07 17:02:45.000000000 +0200 -+++ configure.in 2006-08-07 17:03:37.000000000 +0200 -@@ -50,6 +50,11 @@ - AC_PROG_INTLTOOL([0.27.2]) - AM_GLIB_GNU_GETTEXT - -+dnl -+dnl Make sha1.c happy on big endian systems -+dnl -+AC_C_BIGENDIAN -+ - AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware])) - if test "z$with_distro" = "z"; then - AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch deleted file mode 100644 index a8ce1422..00000000 --- a/debian/patches/12_dbus1.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urN NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c ---- NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c 2007-01-10 21:58:05.000000000 +0100 -+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c 2007-01-10 22:00:00.000000000 +0100 -@@ -230,7 +230,8 @@ - { - /* Try to reactivate our connection to dbus on the next pass through the event loop */ - ctx->nm_state = LIBNM_NO_DBUS; -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_unref (ctx->dbus_con); -+ ctx->dbus_con = NULL; - libnm_glib_schedule_dbus_watcher (ctx); - } - else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +445,10 @@ - g_main_loop_unref (ctx->g_main_loop); - - if (ctx->dbus_con) -- dbus_connection_disconnect (ctx->dbus_con); -+ { -+ dbus_connection_unref (ctx->dbus_con); -+ ctx->dbus_con = NULL; -+ } - - if (ctx->callbacks_lock) - g_mutex_free (ctx->callbacks_lock); -diff -urN NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c NetworkManager-0.6.4/src/NetworkManagerDbus.c ---- NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c 2007-01-10 21:58:05.000000000 +0100 -+++ NetworkManager-0.6.4/src/NetworkManagerDbus.c 2007-01-10 22:01:49.000000000 +0100 -@@ -831,10 +831,10 @@ - } - - dbus_error_init (&error); --#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) -- flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ -+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) -+ flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; - #else -- flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; -+ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; - #endif - ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error); - if (dbus_error_is_set (&error)) diff --git a/debian/patches/13-wep_capabilities.patch b/debian/patches/13-wep_capabilities.patch deleted file mode 100644 index e69dcad6..00000000 --- a/debian/patches/13-wep_capabilities.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: src/NetworkManagerAP.c -=================================================================== ---- src/NetworkManagerAP.c (Revision 2356) -+++ src/NetworkManagerAP.c (Revision 2357) -@@ -572,12 +572,14 @@ - { - if (cipher & IW_AUTH_CIPHER_WEP40) - { -- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40); -+ caps |= NM_802_11_CAP_PROTO_WEP; -+ caps |= NM_802_11_CAP_CIPHER_WEP40; - caps &= ~NM_802_11_CAP_PROTO_NONE; - } - if (cipher & IW_AUTH_CIPHER_WEP104) - { -- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104); -+ caps |= NM_802_11_CAP_PROTO_WEP; -+ caps |= NM_802_11_CAP_CIPHER_WEP104; - caps &= ~NM_802_11_CAP_PROTO_NONE; - } - if (cipher & IW_AUTH_CIPHER_TKIP) -- cgit 1.3.0-6-gf8a5 From 3d4e2b16578e14f89bb5f839904ccd756a06da73 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:46:25 +0000 Subject: * debian/network-manager.preinst - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1673 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/network-manager.preinst | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41d31dec..f6f99b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ network-manager (0.6.5-1) unstable; urgency=low - debian/patches/09_fix_bigendian_words.patch - debian/patches/12_dbus1.0.patch - debian/patches/13-wep_capabilities + * debian/network-manager.preinst + - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. - -- Michael Biebl Sat, 25 Aug 2007 00:21:49 +0200 + -- Michael Biebl Sun, 26 Aug 2007 20:46:05 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 60db6ae0..3f737448 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -18,11 +18,12 @@ # Prepare to remove a no-longer used conffile prep_rm_conffile() { - CONFFILE="$1" + PKGNAME="$1" + CONFFILE="$2" if [ -e "$CONFFILE" ]; then md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + 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" mv -f "$CONFFILE" "$CONFFILE".dpkg-bak @@ -46,8 +47,8 @@ case "$1" in if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi - prep_rm_conffile /etc/dbus-1/event.d/25NetworkManager - prep_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager + prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher fi ;; -- cgit 1.3.0-6-gf8a5 From 5b85762af7b4dd320c5b526a69dba9b9f380e285 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:55:09 +0000 Subject: * Rebased and updated patches for new release - debian/patches/11-man_page_sh_name.patch - debian/patches/05-debian_backend.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1674 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/patches/05-debian_backend.patch | 15 --------------- debian/patches/11-man_page_sh_name.patch | 30 ------------------------------ 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6f99b51..1199e0c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ network-manager (0.6.5-1) unstable; urgency=low - debian/patches/13-wep_capabilities * debian/network-manager.preinst - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. + * Rebased and updated patches for new release + - debian/patches/11-man_page_sh_name.patch + - debian/patches/05-debian_backend.patch -- Michael Biebl Sun, 26 Aug 2007 20:46:05 +0200 diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index b8967be7..931a2063 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -211,21 +211,6 @@ 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 -@@ -50,11 +50,13 @@ void add_block(const char *type, const char* name) - - void add_data(const char *key,const char *data) - { -+ if_data *ret; -+ - // Check if there is a block where we can attach our data - if (first == NULL) - return; - -- if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); -+ ret = (if_data*) calloc(1,sizeof(struct _if_data)); - ret->key = g_strdup(key); - ret->data = g_strdup(data); - @@ -71,14 +73,18 @@ void add_data(const char *key,const char *data) //printf("added data '%s' with key '%s'\n",data,key); } diff --git a/debian/patches/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch index 344a3cb1..b363268c 100644 --- a/debian/patches/11-man_page_sh_name.patch +++ b/debian/patches/11-man_page_sh_name.patch @@ -1,33 +1,3 @@ -Index: man/NetworkManager.1.in -=================================================================== -RCS file: /cvs/gnome/NetworkManager/man/NetworkManager.1.in,v -retrieving revision 1.2 -diff -u -3 -p -r1.2 NetworkManager.1.in ---- man/NetworkManager.1.in 1 Feb 2006 18:14:15 -0000 1.2 -+++ man/NetworkManager.1.in 30 Nov 2006 19:33:39 -0000 -@@ -3,6 +3,7 @@ - .\" Copyright (C) 2005 Robert Love - .\" - .TH NETWORKMANAGER "1" -+.SH NAME - NetworkManager \- network management daemon - .SH SYNOPSIS - .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices] -Index: man/NetworkManagerDispatcher.1.in -=================================================================== -RCS file: /cvs/gnome/NetworkManager/man/NetworkManagerDispatcher.1.in,v -retrieving revision 1.2 -diff -u -3 -p -r1.2 NetworkManagerDispatcher.1.in ---- man/NetworkManagerDispatcher.1.in 1 Feb 2006 18:14:15 -0000 1.2 -+++ man/NetworkManagerDispatcher.1.in 30 Nov 2006 19:33:39 -0000 -@@ -3,6 +3,7 @@ - .\" Copyright (C) 2005 Robert Love - .\" - .TH NETWORKMANAGERDISPATCHER "1" -+.SH NAME - NetworkManagerDispatcher \- daemon that runs commands in response to off/online - .SH SYNOPSIS - .B NetworkManagerDispatcher [\-\-no-daemon] Index: man/nm-tool.1.in =================================================================== RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v -- cgit 1.3.0-6-gf8a5 From 614e759115bb291136e155f2b37af80780ef0ab3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 22:17:40 +0000 Subject: * Upstream has split nm-applet into a separate package. This means we no longer build the network-manager-gnome binary package from this source package. - Removed files that are now part of the new nm-applet source package + debian/network-manager-gnome.README.Debian + debian/patches/10-po_fr.patch + debian/patches/14-po_de.patch + debian/patches/03-dbus_access_nm_applet.patch + debian/network-manager-gnome.manpages + debian/nm-applet.sgml + debian/network-manager.install + debian/network-manager-gnome.install - debian/control + Remove the binary package network-manager-gnome. + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as nm-vpn-properties is now part of the network-manager binary package. + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove libpanel-applet2-dev. - debian/rules + Do not build the nm-applet.1 manpage anymore. + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1675 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 25 ++++++- debian/control | 32 ++------- debian/network-manager-gnome.README.Debian | 11 --- debian/network-manager-gnome.install | 8 --- debian/network-manager-gnome.manpages | 2 - debian/network-manager.install | 3 + debian/nm-applet.sgml | 100 -------------------------- debian/patches/03-dbus_access_nm_applet.patch | 11 --- debian/patches/10-po_fr.patch | 37 ---------- debian/patches/14-po_de.patch | 13 ---- debian/rules | 3 +- 11 files changed, 35 insertions(+), 210 deletions(-) delete mode 100644 debian/network-manager-gnome.README.Debian delete mode 100644 debian/network-manager-gnome.install delete mode 100644 debian/network-manager-gnome.manpages delete mode 100644 debian/nm-applet.sgml delete mode 100644 debian/patches/03-dbus_access_nm_applet.patch delete mode 100644 debian/patches/10-po_fr.patch delete mode 100644 debian/patches/14-po_de.patch diff --git a/debian/changelog b/debian/changelog index 1199e0c9..121895f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,31 @@ network-manager (0.6.5-1) unstable; urgency=low * Rebased and updated patches for new release - debian/patches/11-man_page_sh_name.patch - debian/patches/05-debian_backend.patch + * Upstream has split nm-applet into a separate package. This means we no + longer build the network-manager-gnome binary package from this source + package. + - Removed files that are now part of the new nm-applet source package + + debian/network-manager-gnome.README.Debian + + debian/patches/10-po_fr.patch + + debian/patches/14-po_de.patch + + debian/patches/03-dbus_access_nm_applet.patch + + debian/network-manager-gnome.manpages + + debian/nm-applet.sgml + + debian/network-manager.install + + debian/network-manager-gnome.install + - debian/control + + Remove the binary package network-manager-gnome. + + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as + nm-vpn-properties is now part of the network-manager binary package. + + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove + libpanel-applet2-dev. + - debian/rules + + Do not build the nm-applet.1 manpage anymore. + + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary + workaround until this binary has also been moved into the nm-applet + source package. - -- Michael Biebl Sun, 26 Aug 2007 20:46:05 +0200 + -- Michael Biebl Sun, 26 Aug 2007 23:55:17 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/control b/debian/control index 644e505a..07df5c2a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager @@ -12,6 +12,8 @@ Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.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) 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 @@ -24,32 +26,10 @@ Description: network management framework daemon . Homepage: http://www.gnome.org/projects/NetworkManager/ -Package: network-manager-gnome -Architecture: any -Section: gnome -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}), gnome-icon-theme -Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn -Description: network management framework (GNOME frontend) - 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 contains a systray applet for GNOME's notification area but it - also works for other desktop environments which provide a systray like KDE - or XFCE. - It displays the available networks and allows to easily switch between them. - For encrypted networks it will prompt the user for the key/passphrase and it - can optionally store them in the gnome-keyring. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ - Package: network-manager-dev Architecture: any Section: devel -Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config +Depends: pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. @@ -76,7 +56,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-glib0 (= ${binary:Version}), 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 @@ -110,7 +90,7 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-util0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) 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/network-manager-gnome.README.Debian b/debian/network-manager-gnome.README.Debian deleted file mode 100644 index 0af61464..00000000 --- a/debian/network-manager-gnome.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -network-manager-gnome provides a Notification Area applet called nm-applet for -conveniently choosing wired and wireless networks in GNOME, KDE and XFCE. - -network-manager-gnome (by virtue of the fact it uses network-manager) -requires users to be in the group 'netdev' for it to work. If users aren't -in the group 'netdev' then it won't automatically appear, and work, in the -Notification Area. - -network-manager-gnome uses network-manager. Please see the -network-mananger documentation in -/usr/share/doc/network-manager/README.Debian for further information. diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install deleted file mode 100644 index d5e110c7..00000000 --- a/debian/network-manager-gnome.install +++ /dev/null @@ -1,8 +0,0 @@ -debian/tmp/usr/bin/nm-vpn-properties -debian/tmp/usr/bin/nm-applet -debian/tmp/usr/share/locale/* -debian/tmp/usr/share/nm-applet/* -debian/tmp/usr/share/icons -debian/tmp/usr/share/gnome-vpn-properties -debian/tmp/etc/dbus-1/system.d/nm-applet.conf -debian/tmp/usr/share/gnome/autostart/nm-applet.desktop etc/xdg/autostart/ diff --git a/debian/network-manager-gnome.manpages b/debian/network-manager-gnome.manpages deleted file mode 100644 index 15a34e96..00000000 --- a/debian/network-manager-gnome.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/nm-vpn-properties.1 -debian/nm-applet.1 diff --git a/debian/network-manager.install b/debian/network-manager.install index f0327436..90422942 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,5 +1,8 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher debian/tmp/usr/lib/network-manager +debian/tmp/usr/share/locale 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 diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml deleted file mode 100644 index f457fd93..00000000 --- a/debian/nm-applet.sgml +++ /dev/null @@ -1,100 +0,0 @@ - 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. - - --> - - - 8 February, 2006"> - - - GNU"> - GPL"> -]> - - - -
- giskard@autistici.org; -
- - Riccardo - Setti - - - 2006 - Riccardo Setti - - &date; - - - nm-applet - 1 - - - &package; - - Network management framework - - - - &package; - - - - DESCRIPTION - - &package; is the GNOME front-end for NetworkManager - It is a systray applet which will display an icon in GNOME's notification area but it - also works for other desktop environments which provide a systray like KDE or XFCE. - &package; shows a list of available networks and allows you to easily switch between them. For encrypted networks it - will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to - type them again. - - - SEE ALSO - - NetworkManager (1). nm-vpn-properties (1) - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Riccardo Setti giskard@autistici.org for - the Debian system. - - - - - - diff --git a/debian/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch deleted file mode 100644 index 94053ea2..00000000 --- a/debian/patches/03-dbus_access_nm_applet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 -+++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 -@@ -8,7 +8,7 @@ - - - -- -+ - - - diff --git a/debian/patches/10-po_fr.patch b/debian/patches/10-po_fr.patch deleted file mode 100644 index e2c2b4f6..00000000 --- a/debian/patches/10-po_fr.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: po/fr.po -=================================================================== -RCS file: /cvs/gnome/NetworkManager/po/fr.po,v -retrieving revision 1.2.6.2 -diff -u -3 -p -r1.2.6.2 fr.po ---- po/fr.po 12 Jun 2006 15:47:57 -0000 1.2.6.2 -+++ po/fr.po 30 Nov 2006 17:29:17 -0000 -@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea - - #: ../gnome/applet/applet.c:1562 - msgid "Create _New Wireless Network..." --msgstr "Créer_un nouveau réseau sans fil..." -+msgstr "Créer _un nouveau réseau sans fil..." - - #: ../gnome/applet/applet.c:1685 - msgid "_VPN Connections" -@@ -290,17 +290,17 @@ msgstr "NetworkManager n'est pas lancé. - #. 'Enable Networking' item - #: ../gnome/applet/applet.c:2170 - msgid "Enable _Networking" --msgstr "Activer_le réseau" -+msgstr "Activer _le réseau" - - #. 'Enable Wireless' item - #: ../gnome/applet/applet.c:2176 - msgid "Enable _Wireless" --msgstr "Activer la_connexion sans fil" -+msgstr "Activer la _connexion sans fil" - - #. 'Connection Information' item - #: ../gnome/applet/applet.c:2182 - msgid "Connection _Information" --msgstr "Informations sur la_connexion" -+msgstr "Informations sur la _connexion" - - #. Help item - #: ../gnome/applet/applet.c:2193 diff --git a/debian/patches/14-po_de.patch b/debian/patches/14-po_de.patch deleted file mode 100644 index 25ceff26..00000000 --- a/debian/patches/14-po_de.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: po/de.po -=================================================================== ---- po/de.po (Revision 2227) -+++ po/de.po (Arbeitskopie) -@@ -276,7 +276,7 @@ - #. 'Enable Networking' item - #: ../gnome/applet/applet.c:2170 - msgid "Enable _Networking" --msgstr "Netzwerk_aktivieren" -+msgstr "Netzwerk _aktivieren" - - #. 'Enable Wireless' item - #: ../gnome/applet/applet.c:2176 diff --git a/debian/rules b/debian/rules index 55dd9d1d..a4a1c76d 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . +DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties + clean:: rm -f po/*.gmo rm -f debian/*.1 @@ -21,7 +23,6 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS) -- cgit 1.3.0-6-gf8a5 From f04dbc618f4a8ef079e0acc1a185b0c7bf5eb2f6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 22:59:14 +0000 Subject: * debian/patches/20-stable_branch_updates_r2652.patch - Pull updates from the stable branch up until revision 2652. - Fixes broken link detection and a couple of smaller issues. - Adds support for the rfkill switch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1676 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +- .../patches/20-stable_branch_updates_r2652.patch | 914 +++++++++++++++++++++ 2 files changed, 919 insertions(+), 1 deletion(-) create mode 100644 debian/patches/20-stable_branch_updates_r2652.patch diff --git a/debian/changelog b/debian/changelog index 121895f8..656772f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,8 +36,12 @@ network-manager (0.6.5-1) unstable; urgency=low + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. + * debian/patches/20-stable_branch_updates_r2652.patch + - Pull updates from the stable branch up until revision 2652. + - Fixes broken link detection and a couple of smaller issues. + - Adds support for the rfkill switch. - -- Michael Biebl Sun, 26 Aug 2007 23:55:17 +0200 + -- Michael Biebl Mon, 27 Aug 2007 00:39:16 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/patches/20-stable_branch_updates_r2652.patch b/debian/patches/20-stable_branch_updates_r2652.patch new file mode 100644 index 00000000..aea8e86f --- /dev/null +++ b/debian/patches/20-stable_branch_updates_r2652.patch @@ -0,0 +1,914 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (Revision 2558) ++++ ChangeLog (Revision 2652) +@@ -1,3 +1,99 @@ ++2007-07-26 Dan Williams ++ ++ Patch from Bernhard Miklautz ++ ++ * src/NetworkManagerSystem.c ++ - (nm_system_device_set_ip4_route): don't add the route if it's on the ++ same subnet (#437396) ++ ++2007-07-26 Dan Williams ++ ++ * src/nm-device-802-11-wireless.c ++ - (real_start): I hate orinoco; apparently has trouble scanning too soon ++ after being brought up, so do the initial scan a bit later. ++ ++2007-06-27 Dan Williams ++ ++ * src/NetworkManager.c ++ - (nm_hal_init): set hardware RF to enabled if no killswitches are found ++ after the initial discovery ++ ++2007-06-21 Dan Williams ++ ++ More fixes for Fedora #194124, gnome.org #354565 ++ ++ * src/nm-device-802-3-ethernet.c ++ - (real_act_stage1_prepare): new function; fail activation if device ++ doesn't have a link ++ ++ * src/NetworkManagerPolicy.c ++ - (nm_policy_activation_finish): ensure device is actually activated ++ before sending out signals. Fixes a race where device cancellation ++ would be processed right after finish was scheduled, but not run. ++ - (nm_policy_device_change_check, nm_policy_schedule_device_change_check): ++ ensure device change check GSource ID is locked across threads; ++ allow interruption of activation of 802.3 ethernet devices that no ++ longer have an active link, and ensure that 802.3 ethernet devices ++ have an active link before starting activation ++ ++2007-06-21 Dan Williams ++ ++ Add HAL-based rfkill support, based on a patch from Benjamin Kahn. ++ ++ * src/NetworkManagerDbus.[ch] ++ - (nm_dbus_signal_wireless_enabled): new function, emit signals when ++ wireless enabled status changes ++ ++ * src/nm-dbus-nm.c ++ - (nm_dbus_nm_set_wireless_enabled): handle hardware rfkill correctly; ++ send errors when hardware switch overrides user request, and send ++ signals when wireless enabled state changes ++ - (nm_dbus_nm_get_wireless_enabled): send additional 'hardware rf enabled' ++ argument in method reply ++ ++ * src/NetworkManager.c ++ - (handle_killswitch_pcall_done, nm_killswitch_getpower_reply_cb, ++ nm_poll_killswitches, nm_add_killswitch_device, ++ nm_add_initial_killswitch_devices): new functions; detect and handle ++ hardware killswitches exported by HAL. Unfortunately we have to ++ poll the switches because HAL doesn't support signals for killswitches ++ yet. ++ - (nm_hal_device_new_capability): detect killswitches added asynchronously ++ - (nm_hal_init): look for killswitches when connecting to HAL ++ - (nm_hal_deinit): dispose of killswitches when deiniting HAL data ++ ++ * src/NetworkManagerMain.h ++ - Add bits to track killswitches ++ ++2007-06-12 Dan Williams ++ ++ * src/nm-device.c ++ - (real_act_stage3_ip_config_start): sometimes the device gets downed ++ during the wpa_supplicant association. Ensure the device is up ++ before it's used for IP configuration. ++ ++2007-06-07 Dan Williams ++ ++ Patch from Jon Nettleton ++ ++ * src/nm-device-802-11-wireless.c: ++ - (real_act_stage2_config): sleep 1 second to allow link status ++ to stabilize ++ ++2007-06-07 Dan Williams ++ ++ * (nm_device_802_3_ethernet_link_activated, ++ nm_device_802_3_ethernet_link_deactivated): fix ethernet link detection ++ behavior due to races between the netlink code and when the ++ device thread recognizes the change. Checking the link state ++ before scheduling the change even on the device thread is wrong. ++ (gnome.org #354565, rh #194124) ++ ++2007-04-25 Dan Williams ++ ++ * initscript/RedHat/NetworkManager.in: remove trailing backslash ++ (gnome.org #432401) ++ + 2007-04-18 Tambet Ingo + + * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network_cb): Update the security +Index: src/NetworkManagerDbus.c +=================================================================== +--- src/NetworkManagerDbus.c (Revision 2558) ++++ src/NetworkManagerDbus.c (Revision 2652) +@@ -434,6 +434,29 @@ + } + + ++void nm_dbus_signal_wireless_enabled (NMData * data) ++{ ++ DBusMessage * message; ++ ++ g_return_if_fail (data != NULL); ++ g_return_if_fail (data->dbus_connection != NULL); ++ ++ if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, "WirelessEnabled"))) ++ { ++ nm_warning ("%s(): Not enough memory for new dbus message!", __func__); ++ return; ++ } ++ ++ dbus_message_append_args (message, ++ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, ++ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, ++ DBUS_TYPE_INVALID); ++ if (!dbus_connection_send (data->dbus_connection, message, NULL)) ++ nm_warning ("%s(): Could not emit the WirelessEnabled signal!", __func__); ++ ++ dbus_message_unref (message); ++} ++ + /* + * nm_dbus_signal_filter + * +Index: src/NetworkManagerDbus.h +=================================================================== +--- src/NetworkManagerDbus.h (Revision 2558) ++++ src/NetworkManagerDbus.h (Revision 2652) +@@ -68,6 +68,7 @@ + + void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength); + void nm_dbus_signal_device_strength_change (DBusConnection *connection, NMDevice80211Wireless *dev, gint strength); ++void nm_dbus_signal_wireless_enabled (NMData * data); + + NMDevice * nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path); + +Index: src/nm-dbus-nm.c +=================================================================== +--- src/nm-dbus-nm.c (Revision 2558) ++++ src/nm-dbus-nm.c (Revision 2652) +@@ -483,53 +483,84 @@ + return (reply); + } + +-static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) ++static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) + { + gboolean enabled = FALSE; + DBusError err; +- NMData *app_data; ++ NMData * data; ++ DBusMessage * ret = NULL; + +- g_return_val_if_fail (data && data->data && connection && message, NULL); ++ g_return_val_if_fail (cb_data && cb_data->data && connection && message, NULL); + + dbus_error_init (&err); + if (!dbus_message_get_args (message, &err, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID)) +- return NULL; ++ goto out; + +- app_data = data->data; +- app_data->wireless_enabled = enabled; ++ data = cb_data->data; ++ if (enabled == data->wireless_enabled) ++ goto out; + +- if (!enabled) +- { +- GSList *elt; ++ /* Hardware rfkill overrides whatever user wants */ ++ if (!data->hw_rf_enabled) { ++ nm_info ("User request to %s wireless overridden by radio killswitch.", ++ enabled ? "enable" : "disable"); + +- /* Physically down all wireless devices */ +- nm_lock_mutex (app_data->dev_list_mutex, __FUNCTION__); +- for (elt = app_data->dev_list; elt; elt = g_slist_next (elt)) +- { +- NMDevice *dev = (NMDevice *)(elt->data); +- if (nm_device_is_802_11_wireless (dev)) +- { ++ /* Return error if user tries to re-enable wireless, or just ignore ++ * a disable wireless request when wireless is already disabled. ++ */ ++ if (enabled) { ++ ret = nm_dbus_create_error_message (message, ++ NM_DBUS_INTERFACE, ++ "DisabledBySystem", ++ "Wireless disabled by hardware switch."); ++ } ++ goto out; ++ } ++ ++ nm_info ("User request to %s wireless.", enabled ? "enable" : "disable"); ++ ++ data->wireless_enabled = enabled; ++ if (!data->wireless_enabled) { ++ GSList * elt; ++ ++ /* Deactivate all wireless devices and force them down so they ++ * turn off their radios. ++ */ ++ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); ++ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { ++ NMDevice * dev = (NMDevice *) elt->data; ++ if (nm_device_is_802_11_wireless (dev)) { + nm_device_deactivate (dev); + nm_device_bring_down (dev); + } + } +- nm_unlock_mutex (app_data->dev_list_mutex, __FUNCTION__); ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); + } + +- nm_policy_schedule_device_change_check (data->data); ++ nm_policy_schedule_device_change_check (data); ++ nm_dbus_signal_wireless_enabled (data); + +- return NULL; ++out: ++ return ret; + } + +-static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) ++static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) + { ++ NMData * data; + DBusMessage *reply = NULL; + +- g_return_val_if_fail (data && data->data && connection && message, NULL); ++ g_return_val_if_fail (cb_data && connection && message, NULL); + +- if ((reply = dbus_message_new_method_return (message))) +- dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &data->data->wireless_enabled, DBUS_TYPE_INVALID); ++ data = cb_data->data; ++ g_return_val_if_fail (data != NULL, NULL); + ++ if ((reply = dbus_message_new_method_return (message))) { ++ dbus_message_append_args (reply, ++ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, ++ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, ++ DBUS_TYPE_INVALID); ++ } ++ + return reply; + } + +Index: src/nm-device-802-3-ethernet.c +=================================================================== +--- src/nm-device-802-3-ethernet.c (Revision 2558) ++++ src/nm-device-802-3-ethernet.c (Revision 2652) +@@ -108,18 +108,16 @@ + GObject *obj, + NMDevice8023Ethernet *self) + { ++ GSource * source; ++ + /* Make sure signal is for us */ + if (NM_DEVICE (self) != NM_DEVICE (obj)) + return; + +- if (!nm_device_has_active_link (NM_DEVICE (self))) +- { +- GSource * source = g_idle_source_new (); +- +- g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); +- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); +- g_source_unref (source); +- } ++ source = g_idle_source_new (); ++ g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); ++ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); ++ g_source_unref (source); + } + + +@@ -135,18 +133,16 @@ + GObject *obj, + NMDevice8023Ethernet *self) + { ++ GSource * source; ++ + /* Make sure signal is for us */ + if (NM_DEVICE (self) != NM_DEVICE (obj)) + return; + +- if (nm_device_has_active_link (NM_DEVICE (self))) +- { +- GSource * source = g_idle_source_new (); +- +- g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); +- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); +- g_source_unref (source); +- } ++ source = g_idle_source_new (); ++ g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); ++ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); ++ g_source_unref (source); + } + + static void +@@ -211,6 +207,26 @@ + return caps; + } + ++ ++static NMActStageReturn ++real_act_stage1_prepare (NMDevice *dev, NMActRequest *req) ++{ ++ NMDevice8023Ethernet * self = NM_DEVICE_802_3_ETHERNET (dev); ++ NMDevice8023EthernetClass * klass; ++ NMDeviceClass * parent_class; ++ ++ /* Ensure ethernet devices have a link before going further with activation, ++ * partially works around Fedora #194124. ++ */ ++ if (!nm_device_has_active_link (dev)) ++ return NM_ACT_STAGE_RETURN_FAILURE; ++ ++ /* Chain up to parent */ ++ klass = NM_DEVICE_802_3_ETHERNET_GET_CLASS (self); ++ parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); ++ return parent_class->act_stage1_prepare (dev, req); ++} ++ + static void + nm_device_802_3_ethernet_dispose (GObject *object) + { +@@ -275,6 +291,7 @@ + parent_class->get_generic_capabilities = real_get_generic_capabilities; + parent_class->init = real_init; + parent_class->update_link = real_update_link; ++ parent_class->act_stage1_prepare = real_act_stage1_prepare; + + g_type_class_add_private (object_class, sizeof (NMDevice8023EthernetPrivate)); + } +Index: src/NetworkManagerPolicy.c +=================================================================== +--- src/NetworkManagerPolicy.c (Revision 2558) ++++ src/NetworkManagerPolicy.c (Revision 2652) +@@ -52,6 +52,7 @@ + NMDevice *dev = NULL; + NMData *data = NULL; + NMAccessPoint * ap = NULL; ++ NMActRequest * dev_req; + + g_return_val_if_fail (req != NULL, FALSE); + +@@ -61,6 +62,13 @@ + dev = nm_act_request_get_dev (req); + g_assert (dev); + ++ /* Ensure that inactive devices don't get the activated signal ++ * sent due to race conditions. ++ */ ++ dev_req = nm_device_get_act_request (dev); ++ if (!dev_req || (dev_req != req)) ++ return FALSE; ++ + if (nm_device_is_802_11_wireless (dev)) + ap = nm_act_request_get_ap (req); + +@@ -265,14 +273,16 @@ + } + + #if 0 +- nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (best_wired_dev) : "(null)", +- best_wireless_dev ? nm_device_get_iface (best_wireless_dev) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); ++ nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (NM_DEVICE (best_wired_dev)) : "(null)", ++ best_wireless_dev ? nm_device_get_iface (NM_DEVICE (best_wireless_dev)) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); + #endif + + return highest_priority_dev; + } + + ++static GStaticMutex dcc_mutex = G_STATIC_MUTEX_INIT; ++ + /* + * nm_policy_device_change_check + * +@@ -294,7 +304,9 @@ + + g_return_val_if_fail (data != NULL, FALSE); + ++ g_static_mutex_lock (&dcc_mutex); + data->dev_change_check_idle_id = 0; ++ g_static_mutex_unlock (&dcc_mutex); + + old_dev = nm_get_active_device (data); + +@@ -303,11 +315,19 @@ + + if (old_dev) + { ++ gboolean has_link = TRUE; + guint32 caps = nm_device_get_capabilities (old_dev); + ++ /* Ensure ethernet devices have a link before starting activation, ++ * partially works around Fedora #194124. ++ */ ++ if (nm_device_is_802_3_ethernet (old_dev)) ++ has_link = nm_device_has_active_link (old_dev); ++ + /* Don't interrupt a currently activating device. */ + if ( nm_device_is_activating (old_dev) +- && !nm_device_can_interrupt_activation (old_dev)) ++ && !nm_device_can_interrupt_activation (old_dev) ++ && has_link) + { + nm_info ("Old device '%s' activating, won't change.", nm_device_get_iface (old_dev)); + goto out; +@@ -425,13 +445,36 @@ + if (do_switch && (nm_device_is_802_3_ethernet (new_dev) || (nm_device_is_802_11_wireless (new_dev) && ap))) + { + NMActRequest * act_req = NULL; ++ gboolean has_link = TRUE; + +- if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) ++ /* Ensure ethernet devices have a link before starting activation, ++ * partially works around Fedora #194124. ++ */ ++ if (nm_device_is_802_3_ethernet (new_dev)) ++ has_link = nm_device_has_active_link (new_dev); ++ ++ if (has_link) + { +- nm_info ("Will activate connection '%s%s%s'.", nm_device_get_iface (new_dev), ap ? "/" : "", ap ? nm_ap_get_essid (ap) : ""); +- nm_policy_schedule_device_activation (act_req); +- nm_act_request_unref (act_req); ++ if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) ++ { ++ nm_info ("Will activate connection '%s%s%s'.", ++ nm_device_get_iface (new_dev), ++ ap ? "/" : "", ++ ap ? nm_ap_get_essid (ap) : ""); ++ nm_policy_schedule_device_activation (act_req); ++ nm_act_request_unref (act_req); ++ } ++ else ++ { ++ nm_info ("Error creating activation request for %s", ++ nm_device_get_iface (new_dev)); ++ } + } ++ else ++ { ++ nm_info ("Won't activate %s because it no longer has a link.", ++ nm_device_get_iface (new_dev)); ++ } + } + + if (ap) +@@ -452,11 +495,9 @@ + */ + void nm_policy_schedule_device_change_check (NMData *data) + { +- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; +- + g_return_if_fail (data != NULL); + +- g_static_mutex_lock (&mutex); ++ g_static_mutex_lock (&dcc_mutex); + + if (data->dev_change_check_idle_id == 0) + { +@@ -466,8 +507,7 @@ + data->dev_change_check_idle_id = g_source_attach (source, data->main_context); + g_source_unref (source); + } +- +- g_static_mutex_unlock (&mutex); ++ g_static_mutex_unlock (&dcc_mutex); + } + + +Index: src/nm-ap-security-wpa-eap.c +=================================================================== +--- src/nm-ap-security-wpa-eap.c (Revision 2558) ++++ src/nm-ap-security-wpa-eap.c (Revision 2652) +@@ -57,7 +57,6 @@ + NMAPSecurityWPA_EAP * security = NULL; + int eap_method; + int key_type; +- int phase2_type; + int wpa_version; + char * identity = NULL; + char * passwd = NULL; +Index: src/nm-device.c +=================================================================== +--- src/nm-device.c (Revision 2558) ++++ src/nm-device.c (Revision 2652) +@@ -856,6 +856,12 @@ + data = nm_act_request_get_data (req); + g_assert (data); + ++ /* Sometimes the device gets downed by wpa_supplicant; in any case, make ++ * sure it's up before anything tries to use it. ++ */ ++ if (!nm_device_is_up (self)) ++ nm_device_bring_up (self); ++ + /* DHCP devices try DHCP, non-DHCP default to SUCCESS */ + if (nm_device_get_use_dhcp (self)) + { +Index: src/NetworkManager.c +=================================================================== +--- src/NetworkManager.c (Revision 2558) ++++ src/NetworkManager.c (Revision 2652) +@@ -67,6 +67,7 @@ + + static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); + static void nm_data_free (NMData *data); ++static gboolean nm_poll_killswitches(gpointer user_data); + + /* + * nm_get_device_interface_from_hal +@@ -274,7 +275,184 @@ + } + + ++static void handle_killswitch_pcall_done (NMData *data, DBusPendingCall * pcall) ++{ ++ GSource * source; ++ gboolean now_enabled = FALSE; ++ gboolean now_disabled = FALSE; ++ ++ data->ks_pcall_list = g_slist_remove (data->ks_pcall_list, pcall); ++ if (g_slist_length (data->ks_pcall_list) > 0) ++ return; /* not done with all killswitches yet */ ++ ++ if (data->hw_rf_enabled != data->tmp_hw_rf_enabled) { ++ nm_info ("Wireless now %s by radio killswitch", ++ data->tmp_hw_rf_enabled ? "enabled" : "disabled"); ++ if (data->tmp_hw_rf_enabled) ++ now_enabled = TRUE; ++ else ++ now_disabled = TRUE; ++ ++ data->hw_rf_enabled = data->tmp_hw_rf_enabled; ++ } ++ ++ if (data->hw_rf_enabled == data->wireless_enabled) ++ goto out; ++ ++ /* Only re-enabled wireless if killswitch just changed, otherwise ++ * ignore hardware rf enabled state. ++ */ ++ if (now_enabled && !data->wireless_enabled) { ++ data->wireless_enabled = TRUE; ++ nm_policy_schedule_device_change_check (data); ++ nm_dbus_signal_wireless_enabled (data); ++ } else if (!data->hw_rf_enabled && data->wireless_enabled) { ++ GSList * elt; ++ ++ /* Deactivate all wireless devices and force them down so they ++ * turn off their radios. ++ */ ++ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); ++ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { ++ NMDevice * dev = (NMDevice *) elt->data; ++ if (nm_device_is_802_11_wireless (dev)) { ++ nm_device_deactivate (dev); ++ nm_device_bring_down (dev); ++ } ++ } ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); ++ ++ data->wireless_enabled = FALSE; ++ nm_policy_schedule_device_change_check (data); ++ nm_dbus_signal_wireless_enabled (data); ++ } ++ ++out: ++ /* Schedule another killswitch poll */ ++ source = g_timeout_source_new (6000); ++ g_source_set_callback (source, nm_poll_killswitches, data, NULL); ++ g_source_attach (source, data->main_context); ++ g_source_unref (source); ++} ++ ++static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * data) ++{ ++ DBusError err; ++ DBusMessage * reply = NULL; ++ guint32 status; ++ ++ g_return_if_fail (pcall != NULL); ++ g_return_if_fail (data != NULL); ++ ++ if (!dbus_pending_call_get_completed (pcall)) ++ goto out; ++ ++ if (!(reply = dbus_pending_call_steal_reply (pcall))) ++ goto out; ++ ++ if (message_is_error (reply)) { ++ dbus_error_init (&err); ++ dbus_set_error_from_message (&err, reply); ++ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); ++ dbus_error_free (&err); ++ goto out; ++ } ++ ++ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { ++ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); ++ dbus_error_free (&err); ++ goto out; ++ } ++ ++ if (status == 0) ++ data->tmp_hw_rf_enabled = FALSE; ++ ++out: ++ if (reply) ++ dbus_message_unref (reply); ++ ++ handle_killswitch_pcall_done (data, pcall); ++ dbus_pending_call_unref (pcall); ++} ++ ++ ++static gboolean nm_poll_killswitches (gpointer user_data) ++{ ++ NMData * data = (NMData *) user_data; ++ DBusConnection * connection = data->dbus_connection; ++ GSList * elt; ++ ++ g_return_val_if_fail (data != NULL, FALSE); ++ ++ data->tmp_hw_rf_enabled = TRUE; ++ ++ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) ++ { ++ DBusPendingCall * pcall; ++ DBusMessage * message; ++ ++ message = dbus_message_new_method_call ("org.freedesktop.Hal", ++ elt->data, ++ "org.freedesktop.Hal.Device.KillSwitch", ++ "GetPower"); ++ if (!dbus_connection_send_with_reply (connection, message, &pcall, 5000)) { ++ nm_warning ("%s(): could not send dbus message", __func__); ++ } else if (!pcall) { ++ nm_warning ("%s(): could not send dbus message; pcall was NULL", __func__); ++ } else { ++ dbus_pending_call_set_notify (pcall, ++ (DBusPendingCallNotifyFunction) nm_killswitch_getpower_reply_cb, ++ data, ++ NULL); ++ data->ks_pcall_list = g_slist_append (data->ks_pcall_list, pcall); ++ } ++ dbus_message_unref (message); ++ } ++ return FALSE; ++} ++ ++ + /* ++ * nm_add_killswitch_device ++ * ++ * Adds a killswitch device to the list ++ * ++ */ ++static void nm_add_killswitch_device (NMData * data, const char * udi) ++{ ++ char * type; ++ GSList * elt; ++ ++ type = libhal_device_get_property_string (data->hal_ctx, udi, "killswitch.type", NULL); ++ if (!type) ++ return; ++ ++ if (strcmp (type, "wlan") != 0) ++ goto out; ++ ++ /* see if it's already in the list */ ++ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) { ++ const char * list_udi = (const char *) elt->data; ++ if (strcmp (list_udi, udi) == 0) ++ goto out; ++ } ++ ++ /* Start polling switches if this is the first switch we've found */ ++ if (g_slist_length (data->killswitch_list) == 0) { ++ GSource * source = g_idle_source_new (); ++ g_source_set_callback (source, nm_poll_killswitches, data, NULL); ++ g_source_attach (source, data->main_context); ++ g_source_unref (source); ++ } ++ ++ data->killswitch_list = g_slist_append (data->killswitch_list, g_strdup (udi)); ++ nm_info ("Found radio killswitch %s", udi); ++ ++out: ++ libhal_free_string (type); ++} ++ ++/* + * nm_hal_device_new_capability + * + */ +@@ -283,10 +461,9 @@ + NMData *data = (NMData *)libhal_ctx_get_user_data (ctx); + + g_return_if_fail (data != NULL); ++ g_return_if_fail (capability != NULL); + +- /*nm_debug ("nm_hal_device_new_capability() called with udi = %s, capability = %s", udi, capability );*/ +- +- if (capability && ((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) ++ if (((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) + { + char *iface; + +@@ -296,6 +473,10 @@ + g_free (iface); + } + } ++ else if (strcmp (capability, "killswitch") == 0) ++ { ++ nm_add_killswitch_device (data, udi); ++ } + } + + +@@ -340,7 +521,31 @@ + libhal_free_string_array (net_devices); + } + ++void nm_add_initial_killswitch_devices (NMData * data) ++{ ++ char ** udis; ++ int num_udis, i; ++ DBusError error; + ++ g_return_if_fail (data != NULL); ++ ++ dbus_error_init (&error); ++ udis = libhal_find_device_by_capability (data->hal_ctx, "killswitch", &num_udis, &error); ++ if (!udis) ++ return; ++ ++ if (dbus_error_is_set (&error)) { ++ nm_warning("Could not find killswitch devices: %s", error.message); ++ dbus_error_free (&error); ++ return; ++ } ++ ++ for (i = 0; i < num_udis; i++) ++ nm_add_killswitch_device (data, udis[i]); ++ libhal_free_string_array (udis); ++} ++ ++ + /* + * nm_state_change_signal_broadcast + * +@@ -616,28 +821,39 @@ + g_return_if_fail (data != NULL); + + if ((data->hal_ctx = nm_get_hal_ctx (data))) ++ { ++ nm_add_initial_killswitch_devices (data); + nm_add_initial_devices (data); ++ } ++ ++ /* If there weren't any killswitches, mark hardware RF to on */ ++ if (g_slist_length (data->killswitch_list) == 0) ++ data->hw_rf_enabled = TRUE; + } + + + void nm_hal_deinit (NMData *data) + { ++ DBusError error; ++ + g_return_if_fail (data != NULL); + +- if (data->hal_ctx) ++ if (!data->hal_ctx) ++ return; ++ ++ g_slist_foreach (data->killswitch_list, (GFunc) g_free, NULL); ++ g_slist_free (data->killswitch_list); ++ data->killswitch_list = NULL; ++ ++ dbus_error_init (&error); ++ libhal_ctx_shutdown (data->hal_ctx, &error); ++ if (dbus_error_is_set (&error)) + { +- DBusError error; +- +- dbus_error_init (&error); +- libhal_ctx_shutdown (data->hal_ctx, &error); +- if (dbus_error_is_set (&error)) +- { +- nm_warning ("libhal shutdown failed - %s", error.message); +- dbus_error_free (&error); +- } +- libhal_ctx_free (data->hal_ctx); +- data->hal_ctx = NULL; ++ nm_warning ("libhal shutdown failed - %s", error.message); ++ dbus_error_free (&error); + } ++ libhal_ctx_free (data->hal_ctx); ++ data->hal_ctx = NULL; + } + + +Index: src/nm-device-802-11-wireless.c +=================================================================== +--- src/nm-device-802-11-wireless.c (Revision 2558) ++++ src/nm-device-802-11-wireless.c (Revision 2652) +@@ -617,7 +617,10 @@ + /* Start the scanning timeout for devices that can do scanning */ + if (nm_device_get_capabilities (dev) & NM_DEVICE_CAP_WIRELESS_SCAN) + { +- self->priv->pending_scan = g_idle_source_new (); ++ /* Stupid orinoco has problems scanning immediately after being up, ++ * so wait a bit before triggering a scan. ++ */ ++ self->priv->pending_scan = g_timeout_source_new (600); + g_source_set_callback (self->priv->pending_scan, + nm_device_802_11_wireless_scan, + self, +@@ -2981,6 +2984,9 @@ + return NM_ACT_STAGE_RETURN_POSTPONE; + } + ++ /* Some cards are dumb. Wait a second */ ++ sleep (1); ++ + iface = nm_device_get_iface (dev); + if (!supplicant_exec (self)) + { +@@ -3446,10 +3452,9 @@ + char *genie, *gpos, *gend, *custom; + NMAccessPoint *ap = NULL; + size_t clen; +- int maxrate; ++ int maxrate = 0; + struct iw_event iwe_buf, *iwe = &iwe_buf; + struct stream_descr stream; +- struct wireless_scan * wscan = NULL; + int ret; + + g_return_val_if_fail (dev != NULL, FALSE); +Index: src/NetworkManagerMain.h +=================================================================== +--- src/NetworkManagerMain.h (Revision 2558) ++++ src/NetworkManagerMain.h (Revision 2652) +@@ -82,6 +82,7 @@ + GSList * dev_list; + GMutex * dev_list_mutex; + ++ gboolean hw_rf_enabled; + gboolean wireless_enabled; + gboolean modem_active; + gboolean asleep; +@@ -90,6 +91,10 @@ + GSList * dialup_list; + GMutex * dialup_list_mutex; + ++ GSList * killswitch_list; ++ GSList * ks_pcall_list; /* track killswitch D-Bus pending calls */ ++ gboolean tmp_hw_rf_enabled; ++ + struct NMAccessPointList *allowed_ap_list; + struct NMAccessPointList *invalid_ap_list; + } NMData; +Index: src/NetworkManagerSystem.c +=================================================================== +--- src/NetworkManagerSystem.c (Revision 2558) ++++ src/NetworkManagerSystem.c (Revision 2652) +@@ -64,6 +64,7 @@ + struct sockaddr_in *p; + const char * iface; + int err; ++ NMIP4Config * config = NULL; + + iface = nm_device_get_iface (dev); + +@@ -75,6 +76,15 @@ + if (ip4_gateway == 0) + return TRUE; + ++ /* ++ * Do not add the route if the destination is on the same subnet. ++ */ ++ config = nm_device_get_ip4_config(dev); ++ if (config && ++ ((guint32)ip4_dest & nm_ip4_config_get_netmask(config)) == ++ (nm_ip4_config_get_address(config) & nm_ip4_config_get_netmask(config))) ++ return TRUE; ++ + if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL) + return FALSE; + -- cgit 1.3.0-6-gf8a5 From 5e7a39ec82eeeb644bd136e047d75bb51c51adc5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:04:27 +0000 Subject: - debian/copyright + Remove the copyright notices for files which are now in the nm-applet source package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1677 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/copyright | 12 ++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 656772f6..bbc219f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ network-manager (0.6.5-1) unstable; urgency=low + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. + - debian/copyright + + Remove the copyright notices for files which are now in the nm-applet + source package. * debian/patches/20-stable_branch_updates_r2652.patch - Pull updates from the stable branch up until revision 2652. - Fixes broken link detection and a couple of smaller issues. diff --git a/debian/copyright b/debian/copyright index 2cc573e8..8813c529 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,13 +22,9 @@ License: License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -src/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb. +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. -gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of -Anders Carlsson and are released under the terms of -the GNU Lesser General Public. (see above). - src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, and Novell, Inc. and it's released under the terms of the GNU General Public License. (see below). @@ -67,11 +63,7 @@ are released under the terms of the GNU General Public License. (see below). initscript/Debian/NetworkManager is copyright of , Mark Roach , Thom May -gnome/applet/menu-info.c, menu-info.h are copyright of -Jonathan Blandford and are released under the term of -the GNU General Public License. (see below). - -gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of +gnome/nm-vpn-properties.c, nm-vpn-properties.h are copyright of David Zeuthen, 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) -- cgit 1.3.0-6-gf8a5 From 7335936f2b285acf52d56570a290971572584651 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:19:41 +0000 Subject: + Update Build-Depends. Add autotools-dev, libglib2.0-dev and iproute, remove libpanel-applet2-dev. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1678 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbc219f4..c5249902 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,8 @@ network-manager (0.6.5-1) unstable; urgency=low + Remove the binary package network-manager-gnome. + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as nm-vpn-properties is now part of the network-manager binary package. - + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove - libpanel-applet2-dev. + + Update Build-Depends. Add autotools-dev, libglib2.0-dev and iproute, + remove libpanel-applet2-dev. - debian/rules + Do not build the nm-applet.1 manpage anymore. + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary diff --git a/debian/control b/debian/control index 07df5c2a..eb5f632d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 From 8519ea27928d06161a68e8775dfddbc669157e8a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:24:37 +0000 Subject: * debian/patches/02-dbus_access_network_manager.patch - Add support for at_console dbus access check. (Closes: #426462) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1679 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/patches/02-dbus_access_network_manager.patch | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5249902..cb6a7c32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ network-manager (0.6.5-1) unstable; urgency=low - Pull updates from the stable branch up until revision 2652. - Fixes broken link detection and a couple of smaller issues. - Adds support for the rfkill switch. + * debian/patches/02-dbus_access_network_manager.patch + - Add support for at_console dbus access check. (Closes: #426462) -- Michael Biebl Mon, 27 Aug 2007 00:39:16 +0200 diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index 139a3d87..ced5effe 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,15 +1,19 @@ ---- src/NetworkManager.conf.orig 2006-06-14 02:47:10.000000000 +0200 -+++ src/NetworkManager.conf 2006-06-14 02:48:31.000000000 +0200 -@@ -8,7 +8,11 @@ +Index: src/NetworkManager.conf +=================================================================== +--- src/NetworkManager.conf (Revision 2735) ++++ src/NetworkManager.conf (Arbeitskopie) +@@ -8,6 +8,14 @@ -- + + + + + ++ ++ ++ + - -- cgit 1.3.0-6-gf8a5 From 263d34e792f1a5bb73813e5654ff034fb704df24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:42:50 +0000 Subject: Post tagging commit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1681 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb6a7c32..3addd7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.5-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Michael Biebl Mon, 27 Aug 2007 01:42:37 +0200 + network-manager (0.6.5-1) unstable; urgency=low * New upstream release. (Closes: #420959, #431658) -- cgit 1.3.0-6-gf8a5 From 8e106e46371ab5ce776447c0b8c7b2413d752f40 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 18:27:56 +0000 Subject: * debian/patches/21-endianess_fix_r2754.patch - Fixes a problem with ASCII passphrases on big-endian systems due to a missing config.h include. (Closes: 391364) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1744 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++--- debian/patches/21-endianess_fix_r2754.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 debian/patches/21-endianess_fix_r2754.patch diff --git a/debian/changelog b/debian/changelog index 3addd7bd..11828177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (0.6.5-2) UNRELEASED; urgency=low +network-manager (0.6.5-2) unstable; urgency=low - * NOT RELEASED YET + * debian/patches/21-endianess_fix_r2754.patch + - Fixes a problem with ASCII passphrases on big-endian systems due to a missing + config.h include. (Closes: 391364) - -- Michael Biebl Mon, 27 Aug 2007 01:42:37 +0200 + -- Michael Biebl Sun, 09 Sep 2007 17:54:50 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/patches/21-endianess_fix_r2754.patch b/debian/patches/21-endianess_fix_r2754.patch new file mode 100644 index 00000000..4932e22a --- /dev/null +++ b/debian/patches/21-endianess_fix_r2754.patch @@ -0,0 +1,28 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (Revision 2753) ++++ ChangeLog (Revision 2754) +@@ -1,3 +1,8 @@ ++2007-08-30 Dan Williams ++ ++ * libnm-util/sha1.c ++ - Include config.h to get defines for endiannes (gnome.org #420216) ++ + 2007-07-26 Dan Williams + + Patch from Bernhard Miklautz +Index: libnm-util/sha1.c +=================================================================== +--- libnm-util/sha1.c (Revision 2753) ++++ libnm-util/sha1.c (Revision 2754) +@@ -12,6 +12,10 @@ + * See README and COPYING for more details. + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + -- cgit 1.3.0-6-gf8a5 From efaa302a97cc325431001b40277008b79a58a4a9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 18:28:59 +0000 Subject: - Fixes a problem with ASCII passphrases on big-endian systems due to a missing * debian/network-manager.manpages - Install nm-vpn-properties manpage. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1745 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/network-manager.manpages | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11828177..7f28e388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ network-manager (0.6.5-2) unstable; urgency=low * debian/patches/21-endianess_fix_r2754.patch - - Fixes a problem with ASCII passphrases on big-endian systems due to a missing + - Fixes a problem with ASCII passphrases on big-endian systems due to a missing config.h include. (Closes: 391364) + * debian/network-manager.manpages + - Install nm-vpn-properties manpage. - -- Michael Biebl Sun, 09 Sep 2007 17:54:50 +0200 + -- Michael Biebl Fri, 28 Sep 2007 20:28:16 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 153d1ce0..50ee9f13 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,4 @@ man/NetworkManagerDispatcher.1 man/nm-tool.1 man/NetworkManager.1 +debian/nm-vpn-properties.1 -- cgit 1.3.0-6-gf8a5 From 26f3ae33c2f5ed4c962523597a343ef1e1532736 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:08:01 +0000 Subject: * debian/control - Use the new "Homepage:" field to specify the upstream URL. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1746 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/control | 15 ++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f28e388..7e5aa1f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ network-manager (0.6.5-2) unstable; urgency=low config.h include. (Closes: 391364) * debian/network-manager.manpages - Install nm-vpn-properties manpage. + * debian/control + - Use the new "Homepage:" field to specify the upstream URL. - -- Michael Biebl Fri, 28 Sep 2007 20:28:16 +0200 + -- Michael Biebl Fri, 28 Sep 2007 20:37:08 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/control b/debian/control index eb5f632d..c852a6dc 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,11 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager +Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any @@ -23,8 +24,6 @@ Description: network management framework daemon from a DHCP server, and change nameservers whenever it sees fit. . This package provides the userspace daemons. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-dev Architecture: any @@ -33,8 +32,6 @@ Depends: pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib0 Section: libs @@ -50,8 +47,6 @@ Description: network management framework (GLib shared library) . This package provides the shared library that applications can use to query connection status via NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib-dev Section: libdevel @@ -67,8 +62,6 @@ Description: network management framework (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util0 Section: libs @@ -84,8 +77,6 @@ Description: network management framework (shared library) . This package contains a convenience library to ease the access to NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util-dev Section: libdevel @@ -100,6 +91,4 @@ Description: network management framework (development files) from a DHCP server, and change nameservers whenever it sees fit. . This package contains header and development files. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From e1a65e5b1eda31353ebd56b882568cd53507d34a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:17:01 +0000 Subject: * 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as nm-vpn-properties requires gnome druid which has been deprecated in GTK+ 2.12. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1747 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++- ...x_vpn_ftbfs_dont_disable_gnome_deprecated.patch | 44 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch diff --git a/debian/changelog b/debian/changelog index 7e5aa1f1..c3d83182 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,12 @@ network-manager (0.6.5-2) unstable; urgency=low - Install nm-vpn-properties manpage. * debian/control - Use the new "Homepage:" field to specify the upstream URL. + * 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch + - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as + nm-vpn-properties requires gnome druid which has been deprecated in + GTK+ 2.12. - -- Michael Biebl Fri, 28 Sep 2007 20:37:08 +0200 + -- Michael Biebl Fri, 28 Sep 2007 21:12:33 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch new file mode 100644 index 00000000..ac0459b6 --- /dev/null +++ b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch @@ -0,0 +1,44 @@ +=== modified file 'gnome/vpn-properties/Makefile.am' +--- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.am 2007-06-25 13:51:34 +0000 ++++ network-manager-0.6.5/gnome/vpn-properties/Makefile.am 2007-08-03 11:50:32 +0000 +@@ -21,17 +21,16 @@ nm_vpn_properties_CFLAGS = + $(GCONF_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBGNOMEUI_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DICONDIR=\""$(datadir)/icons"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DVERSION=\"$(VERSION)\" \ + $(NULL) + + nm_vpn_properties_LDADD = \ + $(GLADE_LIBS) \ + $(GTK_LIBS) \ + $(GCONF_LIBS) \ + +=== modified file 'gnome/vpn-properties/Makefile.in' +--- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.in 2007-06-25 13:51:34 +0000 ++++ network-manager-0.6.5/gnome/vpn-properties/Makefile.in 2007-08-03 11:50:32 +0000 +@@ -258,17 +258,16 @@ nm_vpn_properties_CFLAGS = \ + $(GCONF_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBGNOMEUI_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DICONDIR=\""$(datadir)/icons"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DVERSION=\"$(VERSION)\" \ + $(NULL) + + + nm_vpn_properties_LDADD = \ + $(GLADE_LIBS) \ + $(GTK_LIBS) \ + -- cgit 1.3.0-6-gf8a5 From 6a797f4958b22d0c9bf8849a58ec1ddce896ea51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:23:56 +0000 Subject: Fix the changelog entry. gnome-druid is in libgnomeui git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1748 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c3d83182..5e918fb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ network-manager (0.6.5-2) unstable; urgency=low * 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as nm-vpn-properties requires gnome druid which has been deprecated in - GTK+ 2.12. + libgnomeui 2.20. -- Michael Biebl Fri, 28 Sep 2007 21:12:33 +0200 -- cgit 1.3.0-6-gf8a5 From 0bb60eff4e78e18e793862e8e06d5235f19c3552 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:33:44 +0000 Subject: Post tagging commit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1750 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5e918fb9..a4065efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.5-3) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Michael Biebl Fri, 28 Sep 2007 21:33:25 +0200 + network-manager (0.6.5-2) unstable; urgency=low * debian/patches/21-endianess_fix_r2754.patch -- cgit 1.3.0-6-gf8a5 From 72482de1cc44c8b01220e45f7391282abfc52d76 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 22 Oct 2007 15:09:38 +0000 Subject: * debian/patches/23-rfkill_return_type.patch - The return type of the GetPower() method from Device.Killswitch has changed from UINT32 to INT32 in hal-0.5.10. Fix the code accordingly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1824 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++--- debian/patches/23-rfkill_return_type.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 debian/patches/23-rfkill_return_type.patch diff --git a/debian/changelog b/debian/changelog index a4065efd..e616438e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (0.6.5-3) UNRELEASED; urgency=low +network-manager (0.6.5-3) unstable; urgency=low - * NOT RELEASED YET + * debian/patches/23-rfkill_return_type.patch + - The return type of the GetPower() method from Device.Killswitch has + changed from UINT32 to INT32 in hal-0.5.10. Fix the code accordingly. - -- Michael Biebl Fri, 28 Sep 2007 21:33:25 +0200 + -- Michael Biebl Mon, 22 Oct 2007 17:05:44 +0200 network-manager (0.6.5-2) unstable; urgency=low diff --git a/debian/patches/23-rfkill_return_type.patch b/debian/patches/23-rfkill_return_type.patch new file mode 100644 index 00000000..1e327d46 --- /dev/null +++ b/debian/patches/23-rfkill_return_type.patch @@ -0,0 +1,22 @@ +Index: src/NetworkManager.c +=================================================================== +--- src/NetworkManager.c (Revision 2974) ++++ src/NetworkManager.c (Arbeitskopie) +@@ -339,7 +339,7 @@ + { + DBusError err; + DBusMessage * reply = NULL; +- guint32 status; ++ gint32 status; + + g_return_if_fail (pcall != NULL); + g_return_if_fail (data != NULL); +@@ -358,7 +358,7 @@ + goto out; + } + +- if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { ++ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { + nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); + dbus_error_free (&err); + goto out; -- cgit 1.3.0-6-gf8a5 From 1468ebe109738f235b1a0e20725e8bae038dfb4a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 2 Nov 2007 23:43:40 +0000 Subject: * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1835 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e616438e..e7e688a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.5-4) UNRELEASED; urgency=low + + * debian/control + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + + -- Michael Biebl Sat, 03 Nov 2007 00:43:02 +0100 + network-manager (0.6.5-3) unstable; urgency=low * debian/patches/23-rfkill_return_type.patch diff --git a/debian/control b/debian/control index c852a6dc..4cae2c45 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Utopia Maintenance Team , Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager +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 -- cgit 1.3.0-6-gf8a5 From 8d8ad4577ac189e0173fe659fbecc3d2f267777c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Dec 2007 07:04:11 +0000 Subject: - Bump Build-Depends on libnl-dev to (>= 1.0~pre8). * debian/patches/24-libnl1-pre8_fix.patch - Backport support for libnl 1.0-pre8 from upstream SVN. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1963 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++- debian/control | 4 +-- debian/patches/24-libnl1-pre8_fix.patch | 46 +++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 debian/patches/24-libnl1-pre8_fix.patch diff --git a/debian/changelog b/debian/changelog index e7e688a7..b48e2ab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Bump Build-Depends on libnl-dev to (>= 1.0~pre8). + * debian/patches/24-libnl1-pre8_fix.patch + - Backport support for libnl 1.0-pre8 from upstream SVN. - -- Michael Biebl Sat, 03 Nov 2007 00:43:02 +0100 + -- Michael Biebl Thu, 20 Dec 2007 07:58:34 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 4cae2c45..44ba3354 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, 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 (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, 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 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/ diff --git a/debian/patches/24-libnl1-pre8_fix.patch b/debian/patches/24-libnl1-pre8_fix.patch new file mode 100644 index 00000000..26a54e7b --- /dev/null +++ b/debian/patches/24-libnl1-pre8_fix.patch @@ -0,0 +1,46 @@ +=== modified file 'src/NetworkManagerSystem.c' +--- src/NetworkManagerSystem.c 2007-12-20 06:06:27 +0000 ++++ src/NetworkManagerSystem.c 2007-12-20 06:57:47 +0000 +@@ -224,16 +224,33 @@ + + static struct nl_handle * new_nl_handle (void) + { +- struct nl_handle * nlh = NULL; +- +- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); +- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); +- if (nl_connect(nlh, NETLINK_ROUTE) < 0) +- { +- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); ++ struct nl_handle * nlh = NULL; ++ struct nl_cb *cb; ++ ++ cb = nl_cb_alloc (NL_CB_VERBOSE); ++ nlh = nl_handle_alloc_cb (cb); ++ ++ if (!nlh) { ++ nm_warning ("couldn't allocate netlink handle."); ++ return NULL; ++ } ++ ++ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ /* HACK: try one more time. Because the netlink monitor for link state ++ * inits before we get here, it grabs the port that matches the PID ++ * of the NM process, which also happens to be the PID that libnl uses ++ * the first time too. The real fix is to convert nm-netlink-monitor.c ++ * over to use libnl. ++ */ + nl_handle_destroy (nlh); + nlh = NULL; +- } ++ ++ nlh = new_nl_handle (); ++ if (!nlh) { ++ nm_error ("couldn't connect to netlink: %s", nl_geterror ()); ++ return NULL; ++ } ++ } + + return nlh; + } + -- cgit 1.3.0-6-gf8a5 From 7de4a53bac759a854e1d45923d04aad686d45b6d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Dec 2007 07:05:06 +0000 Subject: - Backport support for libnl 1.0-pre8 from upstream SVN. * debian/network-manager.dirs - Add /var/run/NetworkManager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1964 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/network-manager.dirs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b48e2ab2..b4fe1b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,11 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low - The Vcs-* fields are now officially supported, so remove the XS- prefix. - Bump Build-Depends on libnl-dev to (>= 1.0~pre8). * debian/patches/24-libnl1-pre8_fix.patch - - Backport support for libnl 1.0-pre8 from upstream SVN. + - Backport support for libnl 1.0-pre8 from upstream SVN. + * debian/network-manager.dirs + - Add /var/run/NetworkManager. - -- Michael Biebl Thu, 20 Dec 2007 07:58:34 +0100 + -- Michael Biebl Thu, 20 Dec 2007 08:04:17 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index c505972a..231b4756 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,2 +1,3 @@ etc/NetworkManager/dispatcher.d var/lib/NetworkManager +var/run/NetworkManager -- cgit 1.3.0-6-gf8a5 From 645642682faedc926ecb79c83a0306202dd2f6a7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 23 Dec 2007 15:54:07 +0000 Subject: * debian/network-manager-dispatcher.script - Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for scripts in if-down.d to be compliant with ifupdown. (Closes: #452371) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2000 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ++++- debian/network-manager-dispatcher.script | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4fe1b24..f358ca8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low - Backport support for libnl 1.0-pre8 from upstream SVN. * debian/network-manager.dirs - Add /var/run/NetworkManager. + * debian/network-manager-dispatcher.script + - Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for + scripts in if-down.d to be compliant with ifupdown. (Closes: #452371) - -- Michael Biebl Thu, 20 Dec 2007 08:04:17 +0100 + -- Michael Biebl Sun, 23 Dec 2007 16:27:30 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script index abc6e4d5..fd182853 100644 --- a/debian/network-manager-dispatcher.script +++ b/debian/network-manager-dispatcher.script @@ -19,12 +19,12 @@ export VERBOSITY="0" case "$2" in up) export MODE="start" - export PHASE="up" + export PHASE="post-up" exec run-parts /etc/network/if-up.d ;; down) export MODE="stop" - export PHASE="down" + export PHASE="pre-down" exec run-parts /etc/network/if-down.d ;; pre-up) -- cgit 1.3.0-6-gf8a5 From 001add6140068afaa0edc1bc4579ef2e0f73b236 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 25 Dec 2007 15:52:48 +0000 Subject: * debian/patches/12_readme_format.patch - Fix line break in README file. (Closes: #444038) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2001 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/12_readme_format.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 debian/patches/12_readme_format.patch diff --git a/debian/changelog b/debian/changelog index f358ca8e..e7e86f04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.5-4) UNRELEASED; urgency=low +network-manager (0.6.5-4) unstable; urgency=low * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. @@ -10,8 +10,10 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low * debian/network-manager-dispatcher.script - Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for scripts in if-down.d to be compliant with ifupdown. (Closes: #452371) + * debian/patches/12_readme_format.patch + - Fix line break in README file. (Closes: #444038) - -- Michael Biebl Sun, 23 Dec 2007 16:27:30 +0100 + -- Michael Biebl Tue, 25 Dec 2007 16:51:00 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/patches/12_readme_format.patch b/debian/patches/12_readme_format.patch new file mode 100644 index 00000000..5fa39d24 --- /dev/null +++ b/debian/patches/12_readme_format.patch @@ -0,0 +1,14 @@ +Index: README +=================================================================== +--- README (Revision 3190) ++++ README (Arbeitskopie) +@@ -20,7 +20,8 @@ + For wireless networking support, NetworkManager keeps a list of wireless + networks, the preferred list. Preferred Networks are wireless networks that + the user has explicitly made NetworkManager associate with at some previous +-time. So if the user walks into a Starbucks and explicitly asks NetworkManager to associate with that Starbucks network, NetworkManager will remember the ++time. So if the user walks into a Starbucks and explicitly asks NetworkManager ++to associate with that Starbucks network, NetworkManager will remember the + Starbucks network information from that point on. Upon returning to that + Starbucks, NetworkManager will attempt to associate _automatically_ with the + Starbucks network since it is now in the Preferred Networks list. The point of -- cgit 1.3.0-6-gf8a5 From 2436bc7c43c54d14e8ec514f86e69c2938a79dc8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 25 Dec 2007 16:22:39 +0000 Subject: Post tagging commit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2003 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7e86f04..33c922d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.5-5) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Michael Biebl Tue, 25 Dec 2007 17:22:22 +0100 + network-manager (0.6.5-4) unstable; urgency=low * debian/control -- cgit 1.3.0-6-gf8a5 From 2d192e860a94462247e73bda6eeece5768fbb0fd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 21:59:21 +0000 Subject: * Rebuild against libnl1. (Closes: #461922) * debian/patches/24-get_mode_fix_r3122.patch - Pull r3122 from upstream stable branch. - Fix getting mode of device. * debian/patches/25-libnl_unique_pid_r3155.patch - Pull r3155 from stable branch. - Ensures that the pid acquired by libnl is unique. * debian/patches/26-libnl_1.0-pre8_r3206.patch - Pull r3206 from upstream stable branch. - Replaces 24-libnl1-pre8_fix.patch, which has been removed. - Fixes a FTBFS on architectures using SIGTRAP in G_BREAKPOINT(). (Closes: #459740) * debian/patches/13-validate_mac_addr.patch - Drop APs with an invalid MAC address. (Closes: #461500) Thanks to Sjoerd Simons for the patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2056 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 20 +- debian/patches/13-validate_mac_addr.patch | 33 ++ debian/patches/24-get_mode_fix_r3122.patch | 13 + debian/patches/24-libnl1-pre8_fix.patch | 46 --- debian/patches/25-libnl_unique_pid_r3155.patch | 417 +++++++++++++++++++++++++ debian/patches/26-libnl_1.0-pre8_r3206.patch | 202 ++++++++++++ 6 files changed, 682 insertions(+), 49 deletions(-) create mode 100644 debian/patches/13-validate_mac_addr.patch create mode 100644 debian/patches/24-get_mode_fix_r3122.patch delete mode 100644 debian/patches/24-libnl1-pre8_fix.patch create mode 100644 debian/patches/25-libnl_unique_pid_r3155.patch create mode 100644 debian/patches/26-libnl_1.0-pre8_r3206.patch diff --git a/debian/changelog b/debian/changelog index 33c922d6..6d4ed972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,22 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low - * NOT RELEASED YET - - -- Michael Biebl Tue, 25 Dec 2007 17:22:22 +0100 + * Rebuild against libnl1. (Closes: #461922) + * debian/patches/24-get_mode_fix_r3122.patch + - Pull r3122 from upstream stable branch. + - Fix getting mode of device. + * debian/patches/25-libnl_unique_pid_r3155.patch + - Pull r3155 from stable branch. + - Ensures that the pid acquired by libnl is unique. + * debian/patches/26-libnl_1.0-pre8_r3206.patch + - Pull r3206 from upstream stable branch. + - Replaces 24-libnl1-pre8_fix.patch, which has been removed. + - Fixes a FTBFS on architectures using SIGTRAP in G_BREAKPOINT(). + (Closes: #459740) + * debian/patches/13-validate_mac_addr.patch + - Drop APs with an invalid MAC address. (Closes: #461500) + Thanks to Sjoerd Simons for the patch. + + -- Michael Biebl Thu, 24 Jan 2008 22:49:09 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/patches/13-validate_mac_addr.patch b/debian/patches/13-validate_mac_addr.patch new file mode 100644 index 00000000..47a81e19 --- /dev/null +++ b/debian/patches/13-validate_mac_addr.patch @@ -0,0 +1,33 @@ +--- 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/24-get_mode_fix_r3122.patch b/debian/patches/24-get_mode_fix_r3122.patch new file mode 100644 index 00000000..f89db8d5 --- /dev/null +++ b/debian/patches/24-get_mode_fix_r3122.patch @@ -0,0 +1,13 @@ +Index: src/nm-device-802-11-wireless.c +=================================================================== +--- src/nm-device-802-11-wireless.c (Revision 3121) ++++ src/nm-device-802-11-wireless.c (Revision 3122) +@@ -1144,7 +1144,7 @@ + #endif + if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (NM_DEVICE (self)), SIOCGIWMODE, &wrq) == 0) + { +- if ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA)) ++ if ((wrq.u.mode == IW_MODE_ADHOC) || (wrq.u.mode == IW_MODE_INFRA)) + mode = wrq.u.mode; + } + else diff --git a/debian/patches/24-libnl1-pre8_fix.patch b/debian/patches/24-libnl1-pre8_fix.patch deleted file mode 100644 index 26a54e7b..00000000 --- a/debian/patches/24-libnl1-pre8_fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -=== modified file 'src/NetworkManagerSystem.c' ---- src/NetworkManagerSystem.c 2007-12-20 06:06:27 +0000 -+++ src/NetworkManagerSystem.c 2007-12-20 06:57:47 +0000 -@@ -224,16 +224,33 @@ - - static struct nl_handle * new_nl_handle (void) - { -- struct nl_handle * nlh = NULL; -- -- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); -- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); -- if (nl_connect(nlh, NETLINK_ROUTE) < 0) -- { -- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); -+ struct nl_handle * nlh = NULL; -+ struct nl_cb *cb; -+ -+ cb = nl_cb_alloc (NL_CB_VERBOSE); -+ nlh = nl_handle_alloc_cb (cb); -+ -+ if (!nlh) { -+ nm_warning ("couldn't allocate netlink handle."); -+ return NULL; -+ } -+ -+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ /* HACK: try one more time. Because the netlink monitor for link state -+ * inits before we get here, it grabs the port that matches the PID -+ * of the NM process, which also happens to be the PID that libnl uses -+ * the first time too. The real fix is to convert nm-netlink-monitor.c -+ * over to use libnl. -+ */ - nl_handle_destroy (nlh); - nlh = NULL; -- } -+ -+ nlh = new_nl_handle (); -+ if (!nlh) { -+ nm_error ("couldn't connect to netlink: %s", nl_geterror ()); -+ return NULL; -+ } -+ } - - return nlh; - } - diff --git a/debian/patches/25-libnl_unique_pid_r3155.patch b/debian/patches/25-libnl_unique_pid_r3155.patch new file mode 100644 index 00000000..a14aad83 --- /dev/null +++ b/debian/patches/25-libnl_unique_pid_r3155.patch @@ -0,0 +1,417 @@ +Index: src/NetworkManagerSystem.c +=================================================================== +--- src/NetworkManagerSystem.c (Revision 3154) ++++ src/NetworkManagerSystem.c (Revision 3155) +@@ -177,24 +177,6 @@ + } + + +-static struct nl_cache * get_link_cache (struct nl_handle *nlh) +-{ +- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; +- static struct nl_cache * link_cache = NULL; +- +- g_static_mutex_lock (&mutex); +- if (!link_cache) +- link_cache = rtnl_link_alloc_cache (nlh); +- if (!link_cache) +- nm_warning ("ERROR: couldn't allocate rtnl link cache!"); +- else +- nl_cache_update (nlh, link_cache); +- g_static_mutex_unlock (&mutex); +- +- return link_cache; +-} +- +- + static void iface_to_rtnl_index (const char *iface, struct nl_handle *nlh, struct rtnl_addr *addr) + { + struct nl_cache * cache = NULL; +@@ -204,14 +186,17 @@ + g_return_if_fail (nlh != NULL); + g_return_if_fail (addr != NULL); + +- if ((cache = get_link_cache (nlh))) +- { +- i = rtnl_link_name2i (cache, iface); +- if (RTNL_LINK_NOT_FOUND != i) +- rtnl_addr_set_ifindex (addr, i); ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache.", __func__); ++ return; + } +- else +- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); ++ ++ nl_cache_update (nlh, cache); ++ i = rtnl_link_name2i (cache, iface); ++ if (RTNL_LINK_NOT_FOUND != i) ++ rtnl_addr_set_ifindex (addr, i); ++ nl_cache_destroy_and_free (cache); + } + + +@@ -223,45 +208,104 @@ + g_return_val_if_fail (iface != NULL, NULL); + g_return_val_if_fail (nlh != NULL, NULL); + +- if ((cache = get_link_cache (nlh))) +- have_link = rtnl_link_get_by_name (cache, iface); +- else +- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache.", __func__); ++ return NULL; ++ } + ++ nl_cache_update (nlh, cache); ++ have_link = rtnl_link_get_by_name (cache, iface); ++ nl_cache_destroy_and_free (cache); ++ + return have_link; + } + ++static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; + +-static struct nl_handle * new_nl_handle (void) ++GHashTable *nl_pids = NULL; ++ ++static struct ++nl_handle * new_nl_handle (void) + { +- struct nl_handle * nlh = NULL; ++ struct nl_handle * nlh = NULL; ++ guint32 nl_pid; ++ int i = 0; + +- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); +- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); +- if (nl_connect(nlh, NETLINK_ROUTE) < 0) +- { +- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); +- nl_handle_destroy (nlh); +- nlh = NULL; ++ g_static_mutex_lock (&nlh_mutex); ++ ++ if (nl_pids == NULL) { ++ nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); ++ g_assert (nl_pids); ++ ++ /* Insert the PID used by nm-netlink-monitor.c */ ++ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); + } + ++ while (i++ < 10) { ++ nl_pid = g_random_int (); ++ if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) ++ break; ++ } ++ ++ if (i < 10) { ++ nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); ++ nl_handle_set_pid (nlh, nl_pid); ++ ++ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); ++ nl_handle_destroy (nlh); ++ nlh = NULL; ++ } else { ++ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); ++ } ++ } else { ++ g_warning ("%s: couldn't find free netlink pid.", __func__); ++ } ++ ++ g_static_mutex_unlock (&nlh_mutex); ++ + return nlh; + } + ++static void ++destroy_nl_handle (struct nl_handle *nlh) ++{ ++ g_return_if_fail (nlh != NULL); + ++ g_static_mutex_lock (&nlh_mutex); ++ g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); ++ g_static_mutex_unlock (&nlh_mutex); ++ ++ nl_close (nlh); ++ nl_handle_destroy (nlh); ++ ++} ++ ++ + int + nm_system_get_rtnl_index_from_iface (const char *iface) + { + struct nl_handle * nlh = NULL; +- struct nl_cache * cache = NULL; ++ struct nl_cache * cache; + int i = RTNL_LINK_NOT_FOUND; + + nlh = new_nl_handle (); +- if (nlh && (cache = get_link_cache (nlh))) +- i = rtnl_link_name2i (cache, iface); +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ if (!nlh) ++ return RTNL_LINK_NOT_FOUND; + ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache."); ++ goto out; ++ } ++ ++ nl_cache_update (nlh, cache); ++ i = rtnl_link_name2i (cache, iface); ++ nl_cache_destroy_and_free (cache); ++ ++out: ++ destroy_nl_handle (nlh); + return i; + } + +@@ -275,18 +319,31 @@ + char * buf = NULL; + + nlh = new_nl_handle (); +- if (nlh && (cache = get_link_cache (nlh))) +- { +- buf = g_malloc0 (MAX_IFACE_LEN); +- if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) +- { +- g_free (buf); +- buf = NULL; +- } ++ if (!nlh) ++ return NULL; ++ ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache."); ++ goto out; + } +- nl_close (nlh); +- nl_handle_destroy (nlh); + ++ nl_cache_update (nlh, cache); ++ ++ buf = g_malloc0 (MAX_IFACE_LEN); ++ if (!buf) ++ goto destroy_cache; ++ ++ if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) { ++ g_free (buf); ++ buf = NULL; ++ } ++ ++destroy_cache: ++ nl_cache_destroy_and_free (cache); ++ ++out: ++ destroy_nl_handle (nlh); + return buf; + } + +@@ -313,13 +370,15 @@ + config = nm_device_get_ip4_config (dev); + g_return_val_if_fail (config != NULL, FALSE); + ++ nlh = new_nl_handle (); ++ if (!nlh) ++ return FALSE; ++ + nm_system_delete_default_route (); + nm_system_device_flush_addresses (dev); + nm_system_device_flush_routes (dev); + nm_system_flush_arp_cache (); + +- nlh = new_nl_handle (); +- + if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_DEFAULT))) + { + iface_to_rtnl_index (nm_device_get_iface (dev), nlh, addr); +@@ -330,8 +389,7 @@ + else + nm_warning ("nm_system_device_set_from_ip4_config(): couldn't create rtnl address!\n"); + +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ destroy_nl_handle (nlh); + + sleep (1); + nm_system_device_set_ip4_route (dev, nm_ip4_config_get_gateway (config), 0, 0, nm_ip4_config_get_mss (config)); +@@ -424,7 +482,13 @@ + * Set IPv4 configuration of a VPN device from an NMIP4Config object. + * + */ +-gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevice *active_device, const char *iface, NMIP4Config *config, char **routes, int num_routes) ++gboolean ++nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, ++ NMDevice *active_device, ++ const char *iface, ++ NMIP4Config *config, ++ char **routes, ++ int num_routes) + { + NMIP4Config * ad_config = NULL; + struct nl_handle * nlh = NULL; +@@ -437,71 +501,73 @@ + if (active_device && (ad_config = nm_device_get_ip4_config (active_device))) + nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF, nm_ip4_config_get_mss (config)); + +- if (iface != NULL && strlen (iface)) +- { +- nm_system_device_set_up_down_with_iface (iface, TRUE); ++ if (!iface || !strlen (iface)) ++ goto done; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (); ++ if (!nlh) ++ goto done; + +- if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) +- { +- int err = 0; +- iface_to_rtnl_index (iface, nlh, addr); +- if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) +- nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); +- rtnl_addr_put (addr); +- } +- else +- nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); ++ nm_system_device_set_up_down_with_iface (iface, TRUE); + +- /* Set the MTU */ +- if ((request = rtnl_link_alloc ())) +- { +- struct rtnl_link * old; ++ if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) ++ { ++ int err = 0; ++ iface_to_rtnl_index (iface, nlh, addr); ++ if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) ++ nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); ++ rtnl_addr_put (addr); ++ } ++ else ++ nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); + +- old = iface_to_rtnl_link (iface, nlh); +- rtnl_link_set_mtu (request, 1412); +- rtnl_link_change (nlh, old, request, 0); ++ /* Set the MTU */ ++ if ((request = rtnl_link_alloc ())) ++ { ++ struct rtnl_link * old; + +- rtnl_link_put (old); +- rtnl_link_put (request); +- } ++ old = iface_to_rtnl_link (iface, nlh); ++ rtnl_link_set_mtu (request, 1412); ++ rtnl_link_change (nlh, old, request, 0); + +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ rtnl_link_put (old); ++ rtnl_link_put (request); ++ } + +- sleep (1); ++ destroy_nl_handle (nlh); + +- nm_system_device_flush_routes_with_iface (iface); +- if (num_routes <= 0) ++ sleep (1); ++ ++ nm_system_device_flush_routes_with_iface (iface); ++ if (num_routes <= 0) ++ { ++ nm_system_delete_default_route (); ++ nm_system_device_add_default_route_via_device_with_iface (iface); ++ } ++ else ++ { ++ int i; ++ for (i = 0; i < num_routes; i++) + { +- nm_system_delete_default_route (); +- nm_system_device_add_default_route_via_device_with_iface (iface); +- } +- else +- { +- int i; +- for (i = 0; i < num_routes; i++) ++ char *valid_ip4_route; ++ ++ /* Make sure the route is valid, otherwise it's a security risk as the route ++ * text is simply taken from the user, and passed directly to system(). If ++ * we did not check the route, think of: ++ * ++ * system("/sbin/ip route add `rm -rf /` dev eth0") ++ * ++ * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. ++ */ ++ if ((valid_ip4_route = validate_ip4_route (routes[i]))) + { +- char *valid_ip4_route; +- +- /* Make sure the route is valid, otherwise it's a security risk as the route +- * text is simply taken from the user, and passed directly to system(). If +- * we did not check the route, think of: +- * +- * system("/sbin/ip route add `rm -rf /` dev eth0") +- * +- * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. +- */ +- if ((valid_ip4_route = validate_ip4_route (routes[i]))) +- { +- nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); +- g_free (valid_ip4_route); +- } ++ nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); ++ g_free (valid_ip4_route); + } + } + } + ++done: + nm_named_manager_add_ip4_config (named, config); + + return TRUE; +@@ -548,7 +614,8 @@ + + g_return_val_if_fail (iface != NULL, FALSE); + +- if (!(nlh = new_nl_handle ())) ++ nlh = new_nl_handle (); ++ if (!nlh) + return FALSE; + + if (!(request = rtnl_link_alloc ())) +@@ -569,9 +636,7 @@ + success = TRUE; + + out: +- nl_close (nlh); +- nl_handle_destroy (nlh); +- ++ destroy_nl_handle (nlh); + return success; + } + +@@ -614,6 +679,6 @@ + out_request: + rtnl_link_put (request); + out_nl_close: +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ destroy_nl_handle (nlh); + } ++ diff --git a/debian/patches/26-libnl_1.0-pre8_r3206.patch b/debian/patches/26-libnl_1.0-pre8_r3206.patch new file mode 100644 index 00000000..6f96215d --- /dev/null +++ b/debian/patches/26-libnl_1.0-pre8_r3206.patch @@ -0,0 +1,202 @@ +Index: src/nm-netlink-monitor.c +=================================================================== +--- src/nm-netlink-monitor.c (Revision 3205) ++++ src/nm-netlink-monitor.c (Revision 3206) +@@ -174,7 +174,7 @@ + } + + monitor_address.nl_family = AF_NETLINK; +- monitor_address.nl_pid = getpid (); ++ monitor_address.nl_pid = UINT_MAX; + monitor_address.nl_groups = RTMGRP_LINK; + + if (bind (fd, +@@ -365,7 +365,7 @@ + packet.header.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtgenmsg)); + packet.header.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; + packet.header.nlmsg_type = RTM_GETLINK; +- packet.header.nlmsg_pid = getpid (); ++ packet.header.nlmsg_pid = UINT_MAX; + /* Might be good to generate a unique sequence number and track + the response */ + packet.header.nlmsg_seq = sequence_number << 16; +Index: src/NetworkManagerSystem.c +=================================================================== +--- src/NetworkManagerSystem.c (Revision 3205) ++++ src/NetworkManagerSystem.c (Revision 3206) +@@ -196,7 +196,7 @@ + i = rtnl_link_name2i (cache, iface); + if (RTNL_LINK_NOT_FOUND != i) + rtnl_addr_set_ifindex (addr, i); +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + } + + +@@ -216,55 +216,42 @@ + + nl_cache_update (nlh, cache); + have_link = rtnl_link_get_by_name (cache, iface); +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + + return have_link; + } + +-static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; +- +-GHashTable *nl_pids = NULL; +- + static struct +-nl_handle * new_nl_handle (void) ++nl_handle *new_nl_handle (gboolean recursive) + { +- struct nl_handle * nlh = NULL; +- guint32 nl_pid; +- int i = 0; ++ struct nl_handle *nlh = NULL; ++ struct nl_cb *cb; + +- g_static_mutex_lock (&nlh_mutex); +- +- if (nl_pids == NULL) { +- nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); +- g_assert (nl_pids); +- +- /* Insert the PID used by nm-netlink-monitor.c */ +- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); ++ cb = nl_cb_alloc (NL_CB_VERBOSE); ++ nlh = nl_handle_alloc_cb (cb); ++ if (!nlh) { ++ nm_warning ("%s: couldn't allocate netlink handle: %s", __func__, nl_geterror ()); ++ return NULL; + } + +- while (i++ < 10) { +- nl_pid = g_random_int (); +- if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) +- break; +- } ++ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ /* HACK: try one more time. Because the netlink monitor for link state ++ * inits before we get here, it grabs the port that matches the PID ++ * of the NM process, which also happens to be the PID that libnl uses ++ * the first time too. The real fix is to convert nm-netlink-monitor.c ++ * over to use libnl. ++ */ ++ nl_handle_destroy (nlh); ++ if (recursive) ++ return NULL; + +- if (i < 10) { +- nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); +- nl_handle_set_pid (nlh, nl_pid); +- +- if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ nlh = new_nl_handle (TRUE); ++ if (!nlh) { + nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); +- nl_handle_destroy (nlh); +- nlh = NULL; +- } else { +- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); ++ return NULL; + } +- } else { +- g_warning ("%s: couldn't find free netlink pid.", __func__); + } + +- g_static_mutex_unlock (&nlh_mutex); +- + return nlh; + } + +@@ -273,16 +260,10 @@ + { + g_return_if_fail (nlh != NULL); + +- g_static_mutex_lock (&nlh_mutex); +- g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); +- g_static_mutex_unlock (&nlh_mutex); +- + nl_close (nlh); + nl_handle_destroy (nlh); +- + } + +- + int + nm_system_get_rtnl_index_from_iface (const char *iface) + { +@@ -290,7 +271,7 @@ + struct nl_cache * cache; + int i = RTNL_LINK_NOT_FOUND; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return RTNL_LINK_NOT_FOUND; + +@@ -302,7 +283,7 @@ + + nl_cache_update (nlh, cache); + i = rtnl_link_name2i (cache, iface); +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + + out: + destroy_nl_handle (nlh); +@@ -318,7 +299,7 @@ + struct nl_cache * cache = NULL; + char * buf = NULL; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return NULL; + +@@ -340,7 +321,7 @@ + } + + destroy_cache: +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + + out: + destroy_nl_handle (nlh); +@@ -370,7 +351,7 @@ + config = nm_device_get_ip4_config (dev); + g_return_val_if_fail (config != NULL, FALSE); + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return FALSE; + +@@ -504,7 +485,7 @@ + if (!iface || !strlen (iface)) + goto done; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + goto done; + +@@ -614,7 +595,7 @@ + + g_return_val_if_fail (iface != NULL, FALSE); + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return FALSE; + +@@ -658,7 +639,7 @@ + if (!mtu) + return; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return; + -- cgit 1.3.0-6-gf8a5 From 650bce9abb175131d9494880baf1d5b6877b75be Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 22:00:58 +0000 Subject: fix typo in lsb-base dependency. 3.0-6 is shipping the required log_msg* functions. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2057 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 44ba3354..d67c779c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, 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) -- cgit 1.3.0-6-gf8a5 From a450971ec0fd237ad7984a936d4d04a4da0f1e67 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 23:09:01 +0000 Subject: * debian/patches/27-dont_repeat_errors.patch - Backported r3160 from upstream stable branch. - Don't repeat killswitch errors too often. (Closes: #456363) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2058 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++- debian/patches/27-dont_repeat_errors.patch | 37 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 debian/patches/27-dont_repeat_errors.patch diff --git a/debian/changelog b/debian/changelog index 6d4ed972..e7e19f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,11 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low * debian/patches/13-validate_mac_addr.patch - Drop APs with an invalid MAC address. (Closes: #461500) Thanks to Sjoerd Simons for the patch. + * debian/patches/27-dont_repeat_errors.patch + - Backported r3160 from upstream stable branch. + - Don't repeat killswitch errors too often. (Closes: #456363) - -- Michael Biebl Thu, 24 Jan 2008 22:49:09 +0100 + -- Michael Biebl Fri, 25 Jan 2008 00:07:19 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch new file mode 100644 index 00000000..64e23223 --- /dev/null +++ b/debian/patches/27-dont_repeat_errors.patch @@ -0,0 +1,37 @@ +diff --git a/src/NetworkManager.c b/src/NetworkManager.c +index 4f89f63..ddb5a4a 100644 +--- a/src/NetworkManager.c ++++ b/src/NetworkManager.c +@@ -65,6 +65,8 @@ + */ + static NMData *nm_data = NULL; + ++char *ks_err_message = NULL; ++ + static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); + static void nm_data_free (NMData *data); + static gboolean nm_poll_killswitches(gpointer user_data); +@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da + if (message_is_error (reply)) { + dbus_error_init (&err); + dbus_set_error_from_message (&err, reply); +- nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); ++ if (!ks_err_message || strcmp (ks_err_message, err.message)) { ++ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); ++ g_free (ks_err_message); ++ ks_err_message = g_strdup (err.message); ++ } + dbus_error_free (&err); + goto out; + } + + if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { +- nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); ++ if (!ks_err_message || strcmp (ks_err_message, err.message)) { ++ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); ++ g_free (ks_err_message); ++ ks_err_message = g_strdup (err.message); ++ } + dbus_error_free (&err); + goto out; + } -- cgit 1.3.0-6-gf8a5 From d002b93c4fcff7a8e9b5274ff4b07d1feed81a51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 23:21:18 +0000 Subject: * debian/network-manager.init, debian/network-manager.network-manager-dispatcher.init - Fix LSB init header. Use $remote_fs instead of $local_fs as the daemon requires /usr to be mounted. Remove S from Should-Stop. (Closes: #459480) - Shorten retry-time to 5 secs on stop. - Don't fail to start if daemon is already running. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2059 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 +++++++++-- debian/network-manager.init | 11 +++++------ debian/network-manager.network-manager-dispatcher.init | 11 +++++------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7e19f3b..896637d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,15 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low * debian/patches/27-dont_repeat_errors.patch - Backported r3160 from upstream stable branch. - Don't repeat killswitch errors too often. (Closes: #456363) - - -- Michael Biebl Fri, 25 Jan 2008 00:07:19 +0100 + * debian/network-manager.init, + debian/network-manager.network-manager-dispatcher.init + - Fix LSB init header. Use $remote_fs instead of $local_fs as the + daemon requires /usr to be mounted. + Remove S from Should-Stop. (Closes: #459480) + - Shorten retry-time to 5 secs on stop. + - Don't fail to start if daemon is already running. + + -- Michael Biebl Fri, 25 Jan 2008 00:11:47 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/network-manager.init b/debian/network-manager.init index d096e950..9e6fcf0b 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,12 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManager -# Required-Start: $local_fs dbus dhcdbd hal -# Required-Stop: $local_fs dbus dhcdbd hal +# Required-Start: $remote_fs dbus dhcdbd hal +# Required-Stop: $remote_fs dbus dhcdbd hal # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: network connection manager # Description: Daemon for automatically switching network # connections to the best available connection. @@ -34,7 +34,6 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions -test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # @@ -47,7 +46,7 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE } @@ -55,7 +54,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON } diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init index 2f386b2b..4384f18c 100644 --- a/debian/network-manager.network-manager-dispatcher.init +++ b/debian/network-manager.network-manager-dispatcher.init @@ -1,12 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManagerDispatcher -# Required-Start: $local_fs -# Required-Stop: $local_fs +# Required-Start: $remote_fs +# Required-Stop: $remote_fs # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: network events dispatcher # Description: This daemon automatically runs scripts when # NetworkManager changes the network state. @@ -28,7 +28,6 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions -test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher # @@ -41,7 +40,7 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE } @@ -49,7 +48,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON } -- cgit 1.3.0-6-gf8a5 From 13a4c904828864b472ba0a8b87a02340e7f7048b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 23:27:20 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2060 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 896637d6..e7dea542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.5-5) UNRELEASED; urgency=low +network-manager (0.6.5-5) unstable; urgency=low * Rebuild against libnl1. (Closes: #461922) * debian/patches/24-get_mode_fix_r3122.patch @@ -6,7 +6,7 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low - Fix getting mode of device. * debian/patches/25-libnl_unique_pid_r3155.patch - Pull r3155 from stable branch. - - Ensures that the pid acquired by libnl is unique. + - Ensures that the netlink pid is unique. * debian/patches/26-libnl_1.0-pre8_r3206.patch - Pull r3206 from upstream stable branch. - Replaces 24-libnl1-pre8_fix.patch, which has been removed. -- cgit 1.3.0-6-gf8a5 From 87731d3dcc428000731dda361ac5da9a45cdef1c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 25 Jan 2008 14:36:51 +0000 Subject: * SVN snapshot of the upcoming 0.7 release. * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - 04-if_fix.patch - 11-man_page_sh_name.patch - 12_readme_format.patch - 13-validate_mac_addr.patch - 20-stable_branch_updates_r2652.patch - 21-endianess_fix_r2754.patch - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - 23-rfkill_return_type.patch - 24-get_mode_fix_r3122.patch - 25-libnl_unique_pid_r3155.patch - 26-libnl_1.0-pre8_r3206.patch - 27-dont_repeat_errors.patch * debian/patches/05-debian_backend.patch - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2066 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 24 + debian/patches/01-supplicant_timeout.patch | 11 - .../patches/02-dbus_access_network_manager.patch | 8 +- debian/patches/04-if_fix.patch | 12 - debian/patches/05-debian_backend.patch | 350 ++++---- debian/patches/06-dispatch_more_events.patch | 99 --- debian/patches/11-man_page_sh_name.patch | 15 - debian/patches/12_readme_format.patch | 14 - debian/patches/13-validate_mac_addr.patch | 33 - .../patches/20-stable_branch_updates_r2652.patch | 914 --------------------- debian/patches/21-endianess_fix_r2754.patch | 28 - ...x_vpn_ftbfs_dont_disable_gnome_deprecated.patch | 44 - debian/patches/23-rfkill_return_type.patch | 22 - debian/patches/24-get_mode_fix_r3122.patch | 13 - debian/patches/25-libnl_unique_pid_r3155.patch | 417 ---------- debian/patches/26-libnl_1.0-pre8_r3206.patch | 202 ----- debian/patches/27-dont_repeat_errors.patch | 37 - 17 files changed, 203 insertions(+), 2040 deletions(-) delete mode 100644 debian/patches/01-supplicant_timeout.patch delete mode 100644 debian/patches/04-if_fix.patch delete mode 100644 debian/patches/06-dispatch_more_events.patch delete mode 100644 debian/patches/11-man_page_sh_name.patch delete mode 100644 debian/patches/12_readme_format.patch delete mode 100644 debian/patches/13-validate_mac_addr.patch delete mode 100644 debian/patches/20-stable_branch_updates_r2652.patch delete mode 100644 debian/patches/21-endianess_fix_r2754.patch delete mode 100644 debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch delete mode 100644 debian/patches/23-rfkill_return_type.patch delete mode 100644 debian/patches/24-get_mode_fix_r3122.patch delete mode 100644 debian/patches/25-libnl_unique_pid_r3155.patch delete mode 100644 debian/patches/26-libnl_1.0-pre8_r3206.patch delete mode 100644 debian/patches/27-dont_repeat_errors.patch diff --git a/debian/changelog b/debian/changelog index e7dea542..9ceb1e30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +network-manager (0.7.0~svn3269-1) experimental; urgency=low + + * SVN snapshot of the upcoming 0.7 release. + * Drop patches which are either obsolete, merged upstream or not yet ported + - 01-supplicant_timeout.patch + - 04-if_fix.patch + - 11-man_page_sh_name.patch + - 12_readme_format.patch + - 13-validate_mac_addr.patch + - 20-stable_branch_updates_r2652.patch + - 21-endianess_fix_r2754.patch + - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch + - 23-rfkill_return_type.patch + - 24-get_mode_fix_r3122.patch + - 25-libnl_unique_pid_r3155.patch + - 26-libnl_1.0-pre8_r3206.patch + - 27-dont_repeat_errors.patch + * debian/patches/05-debian_backend.patch + - Updated for 0.7. + * debian/patches/02-dbus_access_network_manager.patch + - Updated for 0.7. + + -- Michael Biebl Fri, 25 Jan 2008 15:35:15 +0100 + network-manager (0.6.5-5) unstable; urgency=low * Rebuild against libnl1. (Closes: #461922) 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..12ad59de 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 =================================================================== ---- src/NetworkManager.conf (Revision 2735) +--- src/NetworkManager.conf (Revision 3269) +++ src/NetworkManager.conf (Arbeitskopie) -@@ -8,6 +8,14 @@ - - +@@ -11,6 +11,14 @@ + + + + diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch deleted file mode 100644 index ca0b1574..00000000 --- a/debian/patches/04-if_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/nm-device-802-3-ethernet.c 2006-05-13 21:06:05.000000000 +0200 -+++ src/nm-device-802-3-ethernet.c.new 2006-08-13 22:34:56.000000000 +0200 -@@ -376,7 +376,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ -+#define _LINUX_IF_H - #include -+#undef _LINUX_IF_H - - static int - mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 931a2063..cc60352f 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,8 +1,170 @@ -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 @@ +Index: src/backends/interface_parser.c +=================================================================== +--- src/backends/interface_parser.c (Revision 2569) ++++ src/backends/interface_parser.c (Arbeitskopie) +@@ -73,14 +73,18 @@ + //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) +@@ -91,7 +95,7 @@ + first = last = NULL; + while(1) + { +- line = space = NULL; ++ line = NULL; + ret = fscanf(inp,"%255[^\n]\n",rline); + if (ret == EOF) + break; +@@ -104,50 +108,71 @@ + 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); + } +@@ -200,6 +225,18 @@ + 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; +Index: src/backends/interface_parser.h +=================================================================== +--- src/backends/interface_parser.h (Revision 2569) ++++ src/backends/interface_parser.h (Arbeitskopie) +@@ -44,6 +44,7 @@ + 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); + +Index: src/backends/NetworkManagerDebian.c +=================================================================== +--- src/backends/NetworkManagerDebian.c (Revision 2569) ++++ src/backends/NetworkManagerDebian.c (Arbeitskopie) +@@ -42,6 +42,7 @@ #include "nm-utils.h" #define ARPING "/usr/sbin/arping" @@ -10,7 +172,7 @@ index 740572a..4e3e44a 100644 /* * nm_system_init -@@ -238,14 +239,16 @@ void nm_system_kill_all_dhcp_daemons (void) +@@ -198,14 +199,16 @@ /* * nm_system_update_dns * @@ -31,7 +193,7 @@ index 740572a..4e3e44a 100644 } -@@ -257,8 +260,7 @@ void nm_system_update_dns (void) +@@ -217,8 +220,7 @@ * */ void nm_system_restart_mdns_responder (void) @@ -41,7 +203,7 @@ index 740572a..4e3e44a 100644 } -@@ -514,13 +516,60 @@ gboolean nm_system_device_get_use_dhcp (NMDevice *dev) +@@ -377,13 +379,60 @@ /* * nm_system_device_get_disabled * @@ -105,7 +267,7 @@ index 740572a..4e3e44a 100644 } -@@ -563,12 +612,18 @@ gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) +@@ -426,12 +475,18 @@ if (strcmp (dialup, config->name) == 0) { char *cmd; @@ -126,7 +288,7 @@ index 740572a..4e3e44a 100644 break; } } -@@ -587,12 +642,18 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) +@@ -450,12 +505,18 @@ if (strcmp (dialup, config->name) == 0) { char *cmd; @@ -147,7 +309,7 @@ index 740572a..4e3e44a 100644 break; } } -@@ -603,23 +664,26 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) +@@ -466,23 +527,26 @@ GSList * nm_system_get_dialup_config (void) { const char *buf; @@ -180,7 +342,7 @@ index 740572a..4e3e44a 100644 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) +@@ -494,14 +558,6 @@ } ifparser_destroy(); @@ -195,7 +357,7 @@ index 740572a..4e3e44a 100644 return list; } -@@ -679,7 +735,10 @@ void nm_system_set_hostname (NMIP4Config *config) +@@ -542,7 +598,10 @@ */ gboolean nm_system_should_modify_resolv_conf (void) { @@ -207,165 +369,3 @@ index 740572a..4e3e44a 100644 } -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/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch deleted file mode 100644 index 60d50432..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.1.in 2006-02-01 19:14:15.000000000 +0100 -+++ man/NetworkManagerDispatcher.1.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/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch deleted file mode 100644 index b363268c..00000000 --- a/debian/patches/11-man_page_sh_name.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: man/nm-tool.1.in -=================================================================== -RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v -retrieving revision 1.1 -diff -u -3 -p -r1.1 nm-tool.1.in ---- man/nm-tool.1.in 1 Feb 2006 18:14:15 -0000 1.1 -+++ man/nm-tool.1.in 30 Nov 2006 19:33:39 -0000 -@@ -3,6 +3,7 @@ - .\" Copyright (C) 2005 Robert Love - .\" - .TH NM-TOOL "1" -+.SH NAME - nm-tool \- utility to report NetworkManager state - .SH SYNOPSIS - .B nm-tool diff --git a/debian/patches/12_readme_format.patch b/debian/patches/12_readme_format.patch deleted file mode 100644 index 5fa39d24..00000000 --- a/debian/patches/12_readme_format.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: README -=================================================================== ---- README (Revision 3190) -+++ README (Arbeitskopie) -@@ -20,7 +20,8 @@ - For wireless networking support, NetworkManager keeps a list of wireless - networks, the preferred list. Preferred Networks are wireless networks that - the user has explicitly made NetworkManager associate with at some previous --time. So if the user walks into a Starbucks and explicitly asks NetworkManager to associate with that Starbucks network, NetworkManager will remember the -+time. So if the user walks into a Starbucks and explicitly asks NetworkManager -+to associate with that Starbucks network, NetworkManager will remember the - Starbucks network information from that point on. Upon returning to that - Starbucks, NetworkManager will attempt to associate _automatically_ with the - Starbucks network since it is now in the Preferred Networks list. The point of 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/20-stable_branch_updates_r2652.patch b/debian/patches/20-stable_branch_updates_r2652.patch deleted file mode 100644 index aea8e86f..00000000 --- a/debian/patches/20-stable_branch_updates_r2652.patch +++ /dev/null @@ -1,914 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (Revision 2558) -+++ ChangeLog (Revision 2652) -@@ -1,3 +1,99 @@ -+2007-07-26 Dan Williams -+ -+ Patch from Bernhard Miklautz -+ -+ * src/NetworkManagerSystem.c -+ - (nm_system_device_set_ip4_route): don't add the route if it's on the -+ same subnet (#437396) -+ -+2007-07-26 Dan Williams -+ -+ * src/nm-device-802-11-wireless.c -+ - (real_start): I hate orinoco; apparently has trouble scanning too soon -+ after being brought up, so do the initial scan a bit later. -+ -+2007-06-27 Dan Williams -+ -+ * src/NetworkManager.c -+ - (nm_hal_init): set hardware RF to enabled if no killswitches are found -+ after the initial discovery -+ -+2007-06-21 Dan Williams -+ -+ More fixes for Fedora #194124, gnome.org #354565 -+ -+ * src/nm-device-802-3-ethernet.c -+ - (real_act_stage1_prepare): new function; fail activation if device -+ doesn't have a link -+ -+ * src/NetworkManagerPolicy.c -+ - (nm_policy_activation_finish): ensure device is actually activated -+ before sending out signals. Fixes a race where device cancellation -+ would be processed right after finish was scheduled, but not run. -+ - (nm_policy_device_change_check, nm_policy_schedule_device_change_check): -+ ensure device change check GSource ID is locked across threads; -+ allow interruption of activation of 802.3 ethernet devices that no -+ longer have an active link, and ensure that 802.3 ethernet devices -+ have an active link before starting activation -+ -+2007-06-21 Dan Williams -+ -+ Add HAL-based rfkill support, based on a patch from Benjamin Kahn. -+ -+ * src/NetworkManagerDbus.[ch] -+ - (nm_dbus_signal_wireless_enabled): new function, emit signals when -+ wireless enabled status changes -+ -+ * src/nm-dbus-nm.c -+ - (nm_dbus_nm_set_wireless_enabled): handle hardware rfkill correctly; -+ send errors when hardware switch overrides user request, and send -+ signals when wireless enabled state changes -+ - (nm_dbus_nm_get_wireless_enabled): send additional 'hardware rf enabled' -+ argument in method reply -+ -+ * src/NetworkManager.c -+ - (handle_killswitch_pcall_done, nm_killswitch_getpower_reply_cb, -+ nm_poll_killswitches, nm_add_killswitch_device, -+ nm_add_initial_killswitch_devices): new functions; detect and handle -+ hardware killswitches exported by HAL. Unfortunately we have to -+ poll the switches because HAL doesn't support signals for killswitches -+ yet. -+ - (nm_hal_device_new_capability): detect killswitches added asynchronously -+ - (nm_hal_init): look for killswitches when connecting to HAL -+ - (nm_hal_deinit): dispose of killswitches when deiniting HAL data -+ -+ * src/NetworkManagerMain.h -+ - Add bits to track killswitches -+ -+2007-06-12 Dan Williams -+ -+ * src/nm-device.c -+ - (real_act_stage3_ip_config_start): sometimes the device gets downed -+ during the wpa_supplicant association. Ensure the device is up -+ before it's used for IP configuration. -+ -+2007-06-07 Dan Williams -+ -+ Patch from Jon Nettleton -+ -+ * src/nm-device-802-11-wireless.c: -+ - (real_act_stage2_config): sleep 1 second to allow link status -+ to stabilize -+ -+2007-06-07 Dan Williams -+ -+ * (nm_device_802_3_ethernet_link_activated, -+ nm_device_802_3_ethernet_link_deactivated): fix ethernet link detection -+ behavior due to races between the netlink code and when the -+ device thread recognizes the change. Checking the link state -+ before scheduling the change even on the device thread is wrong. -+ (gnome.org #354565, rh #194124) -+ -+2007-04-25 Dan Williams -+ -+ * initscript/RedHat/NetworkManager.in: remove trailing backslash -+ (gnome.org #432401) -+ - 2007-04-18 Tambet Ingo - - * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network_cb): Update the security -Index: src/NetworkManagerDbus.c -=================================================================== ---- src/NetworkManagerDbus.c (Revision 2558) -+++ src/NetworkManagerDbus.c (Revision 2652) -@@ -434,6 +434,29 @@ - } - - -+void nm_dbus_signal_wireless_enabled (NMData * data) -+{ -+ DBusMessage * message; -+ -+ g_return_if_fail (data != NULL); -+ g_return_if_fail (data->dbus_connection != NULL); -+ -+ if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, "WirelessEnabled"))) -+ { -+ nm_warning ("%s(): Not enough memory for new dbus message!", __func__); -+ return; -+ } -+ -+ dbus_message_append_args (message, -+ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, -+ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, -+ DBUS_TYPE_INVALID); -+ if (!dbus_connection_send (data->dbus_connection, message, NULL)) -+ nm_warning ("%s(): Could not emit the WirelessEnabled signal!", __func__); -+ -+ dbus_message_unref (message); -+} -+ - /* - * nm_dbus_signal_filter - * -Index: src/NetworkManagerDbus.h -=================================================================== ---- src/NetworkManagerDbus.h (Revision 2558) -+++ src/NetworkManagerDbus.h (Revision 2652) -@@ -68,6 +68,7 @@ - - void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength); - void nm_dbus_signal_device_strength_change (DBusConnection *connection, NMDevice80211Wireless *dev, gint strength); -+void nm_dbus_signal_wireless_enabled (NMData * data); - - NMDevice * nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path); - -Index: src/nm-dbus-nm.c -=================================================================== ---- src/nm-dbus-nm.c (Revision 2558) -+++ src/nm-dbus-nm.c (Revision 2652) -@@ -483,53 +483,84 @@ - return (reply); - } - --static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) -+static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) - { - gboolean enabled = FALSE; - DBusError err; -- NMData *app_data; -+ NMData * data; -+ DBusMessage * ret = NULL; - -- g_return_val_if_fail (data && data->data && connection && message, NULL); -+ g_return_val_if_fail (cb_data && cb_data->data && connection && message, NULL); - - dbus_error_init (&err); - if (!dbus_message_get_args (message, &err, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID)) -- return NULL; -+ goto out; - -- app_data = data->data; -- app_data->wireless_enabled = enabled; -+ data = cb_data->data; -+ if (enabled == data->wireless_enabled) -+ goto out; - -- if (!enabled) -- { -- GSList *elt; -+ /* Hardware rfkill overrides whatever user wants */ -+ if (!data->hw_rf_enabled) { -+ nm_info ("User request to %s wireless overridden by radio killswitch.", -+ enabled ? "enable" : "disable"); - -- /* Physically down all wireless devices */ -- nm_lock_mutex (app_data->dev_list_mutex, __FUNCTION__); -- for (elt = app_data->dev_list; elt; elt = g_slist_next (elt)) -- { -- NMDevice *dev = (NMDevice *)(elt->data); -- if (nm_device_is_802_11_wireless (dev)) -- { -+ /* Return error if user tries to re-enable wireless, or just ignore -+ * a disable wireless request when wireless is already disabled. -+ */ -+ if (enabled) { -+ ret = nm_dbus_create_error_message (message, -+ NM_DBUS_INTERFACE, -+ "DisabledBySystem", -+ "Wireless disabled by hardware switch."); -+ } -+ goto out; -+ } -+ -+ nm_info ("User request to %s wireless.", enabled ? "enable" : "disable"); -+ -+ data->wireless_enabled = enabled; -+ if (!data->wireless_enabled) { -+ GSList * elt; -+ -+ /* Deactivate all wireless devices and force them down so they -+ * turn off their radios. -+ */ -+ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); -+ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { -+ NMDevice * dev = (NMDevice *) elt->data; -+ if (nm_device_is_802_11_wireless (dev)) { - nm_device_deactivate (dev); - nm_device_bring_down (dev); - } - } -- nm_unlock_mutex (app_data->dev_list_mutex, __FUNCTION__); -+ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); - } - -- nm_policy_schedule_device_change_check (data->data); -+ nm_policy_schedule_device_change_check (data); -+ nm_dbus_signal_wireless_enabled (data); - -- return NULL; -+out: -+ return ret; - } - --static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) -+static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) - { -+ NMData * data; - DBusMessage *reply = NULL; - -- g_return_val_if_fail (data && data->data && connection && message, NULL); -+ g_return_val_if_fail (cb_data && connection && message, NULL); - -- if ((reply = dbus_message_new_method_return (message))) -- dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &data->data->wireless_enabled, DBUS_TYPE_INVALID); -+ data = cb_data->data; -+ g_return_val_if_fail (data != NULL, NULL); - -+ if ((reply = dbus_message_new_method_return (message))) { -+ dbus_message_append_args (reply, -+ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, -+ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, -+ DBUS_TYPE_INVALID); -+ } -+ - return reply; - } - -Index: src/nm-device-802-3-ethernet.c -=================================================================== ---- src/nm-device-802-3-ethernet.c (Revision 2558) -+++ src/nm-device-802-3-ethernet.c (Revision 2652) -@@ -108,18 +108,16 @@ - GObject *obj, - NMDevice8023Ethernet *self) - { -+ GSource * source; -+ - /* Make sure signal is for us */ - if (NM_DEVICE (self) != NM_DEVICE (obj)) - return; - -- if (!nm_device_has_active_link (NM_DEVICE (self))) -- { -- GSource * source = g_idle_source_new (); -- -- g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); -- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -- g_source_unref (source); -- } -+ source = g_idle_source_new (); -+ g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); -+ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -+ g_source_unref (source); - } - - -@@ -135,18 +133,16 @@ - GObject *obj, - NMDevice8023Ethernet *self) - { -+ GSource * source; -+ - /* Make sure signal is for us */ - if (NM_DEVICE (self) != NM_DEVICE (obj)) - return; - -- if (nm_device_has_active_link (NM_DEVICE (self))) -- { -- GSource * source = g_idle_source_new (); -- -- g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); -- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -- g_source_unref (source); -- } -+ source = g_idle_source_new (); -+ g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); -+ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -+ g_source_unref (source); - } - - static void -@@ -211,6 +207,26 @@ - return caps; - } - -+ -+static NMActStageReturn -+real_act_stage1_prepare (NMDevice *dev, NMActRequest *req) -+{ -+ NMDevice8023Ethernet * self = NM_DEVICE_802_3_ETHERNET (dev); -+ NMDevice8023EthernetClass * klass; -+ NMDeviceClass * parent_class; -+ -+ /* Ensure ethernet devices have a link before going further with activation, -+ * partially works around Fedora #194124. -+ */ -+ if (!nm_device_has_active_link (dev)) -+ return NM_ACT_STAGE_RETURN_FAILURE; -+ -+ /* Chain up to parent */ -+ klass = NM_DEVICE_802_3_ETHERNET_GET_CLASS (self); -+ parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); -+ return parent_class->act_stage1_prepare (dev, req); -+} -+ - static void - nm_device_802_3_ethernet_dispose (GObject *object) - { -@@ -275,6 +291,7 @@ - parent_class->get_generic_capabilities = real_get_generic_capabilities; - parent_class->init = real_init; - parent_class->update_link = real_update_link; -+ parent_class->act_stage1_prepare = real_act_stage1_prepare; - - g_type_class_add_private (object_class, sizeof (NMDevice8023EthernetPrivate)); - } -Index: src/NetworkManagerPolicy.c -=================================================================== ---- src/NetworkManagerPolicy.c (Revision 2558) -+++ src/NetworkManagerPolicy.c (Revision 2652) -@@ -52,6 +52,7 @@ - NMDevice *dev = NULL; - NMData *data = NULL; - NMAccessPoint * ap = NULL; -+ NMActRequest * dev_req; - - g_return_val_if_fail (req != NULL, FALSE); - -@@ -61,6 +62,13 @@ - dev = nm_act_request_get_dev (req); - g_assert (dev); - -+ /* Ensure that inactive devices don't get the activated signal -+ * sent due to race conditions. -+ */ -+ dev_req = nm_device_get_act_request (dev); -+ if (!dev_req || (dev_req != req)) -+ return FALSE; -+ - if (nm_device_is_802_11_wireless (dev)) - ap = nm_act_request_get_ap (req); - -@@ -265,14 +273,16 @@ - } - - #if 0 -- nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (best_wired_dev) : "(null)", -- best_wireless_dev ? nm_device_get_iface (best_wireless_dev) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); -+ nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (NM_DEVICE (best_wired_dev)) : "(null)", -+ best_wireless_dev ? nm_device_get_iface (NM_DEVICE (best_wireless_dev)) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); - #endif - - return highest_priority_dev; - } - - -+static GStaticMutex dcc_mutex = G_STATIC_MUTEX_INIT; -+ - /* - * nm_policy_device_change_check - * -@@ -294,7 +304,9 @@ - - g_return_val_if_fail (data != NULL, FALSE); - -+ g_static_mutex_lock (&dcc_mutex); - data->dev_change_check_idle_id = 0; -+ g_static_mutex_unlock (&dcc_mutex); - - old_dev = nm_get_active_device (data); - -@@ -303,11 +315,19 @@ - - if (old_dev) - { -+ gboolean has_link = TRUE; - guint32 caps = nm_device_get_capabilities (old_dev); - -+ /* Ensure ethernet devices have a link before starting activation, -+ * partially works around Fedora #194124. -+ */ -+ if (nm_device_is_802_3_ethernet (old_dev)) -+ has_link = nm_device_has_active_link (old_dev); -+ - /* Don't interrupt a currently activating device. */ - if ( nm_device_is_activating (old_dev) -- && !nm_device_can_interrupt_activation (old_dev)) -+ && !nm_device_can_interrupt_activation (old_dev) -+ && has_link) - { - nm_info ("Old device '%s' activating, won't change.", nm_device_get_iface (old_dev)); - goto out; -@@ -425,13 +445,36 @@ - if (do_switch && (nm_device_is_802_3_ethernet (new_dev) || (nm_device_is_802_11_wireless (new_dev) && ap))) - { - NMActRequest * act_req = NULL; -+ gboolean has_link = TRUE; - -- if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) -+ /* Ensure ethernet devices have a link before starting activation, -+ * partially works around Fedora #194124. -+ */ -+ if (nm_device_is_802_3_ethernet (new_dev)) -+ has_link = nm_device_has_active_link (new_dev); -+ -+ if (has_link) - { -- nm_info ("Will activate connection '%s%s%s'.", nm_device_get_iface (new_dev), ap ? "/" : "", ap ? nm_ap_get_essid (ap) : ""); -- nm_policy_schedule_device_activation (act_req); -- nm_act_request_unref (act_req); -+ if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) -+ { -+ nm_info ("Will activate connection '%s%s%s'.", -+ nm_device_get_iface (new_dev), -+ ap ? "/" : "", -+ ap ? nm_ap_get_essid (ap) : ""); -+ nm_policy_schedule_device_activation (act_req); -+ nm_act_request_unref (act_req); -+ } -+ else -+ { -+ nm_info ("Error creating activation request for %s", -+ nm_device_get_iface (new_dev)); -+ } - } -+ else -+ { -+ nm_info ("Won't activate %s because it no longer has a link.", -+ nm_device_get_iface (new_dev)); -+ } - } - - if (ap) -@@ -452,11 +495,9 @@ - */ - void nm_policy_schedule_device_change_check (NMData *data) - { -- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; -- - g_return_if_fail (data != NULL); - -- g_static_mutex_lock (&mutex); -+ g_static_mutex_lock (&dcc_mutex); - - if (data->dev_change_check_idle_id == 0) - { -@@ -466,8 +507,7 @@ - data->dev_change_check_idle_id = g_source_attach (source, data->main_context); - g_source_unref (source); - } -- -- g_static_mutex_unlock (&mutex); -+ g_static_mutex_unlock (&dcc_mutex); - } - - -Index: src/nm-ap-security-wpa-eap.c -=================================================================== ---- src/nm-ap-security-wpa-eap.c (Revision 2558) -+++ src/nm-ap-security-wpa-eap.c (Revision 2652) -@@ -57,7 +57,6 @@ - NMAPSecurityWPA_EAP * security = NULL; - int eap_method; - int key_type; -- int phase2_type; - int wpa_version; - char * identity = NULL; - char * passwd = NULL; -Index: src/nm-device.c -=================================================================== ---- src/nm-device.c (Revision 2558) -+++ src/nm-device.c (Revision 2652) -@@ -856,6 +856,12 @@ - data = nm_act_request_get_data (req); - g_assert (data); - -+ /* Sometimes the device gets downed by wpa_supplicant; in any case, make -+ * sure it's up before anything tries to use it. -+ */ -+ if (!nm_device_is_up (self)) -+ nm_device_bring_up (self); -+ - /* DHCP devices try DHCP, non-DHCP default to SUCCESS */ - if (nm_device_get_use_dhcp (self)) - { -Index: src/NetworkManager.c -=================================================================== ---- src/NetworkManager.c (Revision 2558) -+++ src/NetworkManager.c (Revision 2652) -@@ -67,6 +67,7 @@ - - static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); - static void nm_data_free (NMData *data); -+static gboolean nm_poll_killswitches(gpointer user_data); - - /* - * nm_get_device_interface_from_hal -@@ -274,7 +275,184 @@ - } - - -+static void handle_killswitch_pcall_done (NMData *data, DBusPendingCall * pcall) -+{ -+ GSource * source; -+ gboolean now_enabled = FALSE; -+ gboolean now_disabled = FALSE; -+ -+ data->ks_pcall_list = g_slist_remove (data->ks_pcall_list, pcall); -+ if (g_slist_length (data->ks_pcall_list) > 0) -+ return; /* not done with all killswitches yet */ -+ -+ if (data->hw_rf_enabled != data->tmp_hw_rf_enabled) { -+ nm_info ("Wireless now %s by radio killswitch", -+ data->tmp_hw_rf_enabled ? "enabled" : "disabled"); -+ if (data->tmp_hw_rf_enabled) -+ now_enabled = TRUE; -+ else -+ now_disabled = TRUE; -+ -+ data->hw_rf_enabled = data->tmp_hw_rf_enabled; -+ } -+ -+ if (data->hw_rf_enabled == data->wireless_enabled) -+ goto out; -+ -+ /* Only re-enabled wireless if killswitch just changed, otherwise -+ * ignore hardware rf enabled state. -+ */ -+ if (now_enabled && !data->wireless_enabled) { -+ data->wireless_enabled = TRUE; -+ nm_policy_schedule_device_change_check (data); -+ nm_dbus_signal_wireless_enabled (data); -+ } else if (!data->hw_rf_enabled && data->wireless_enabled) { -+ GSList * elt; -+ -+ /* Deactivate all wireless devices and force them down so they -+ * turn off their radios. -+ */ -+ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); -+ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { -+ NMDevice * dev = (NMDevice *) elt->data; -+ if (nm_device_is_802_11_wireless (dev)) { -+ nm_device_deactivate (dev); -+ nm_device_bring_down (dev); -+ } -+ } -+ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); -+ -+ data->wireless_enabled = FALSE; -+ nm_policy_schedule_device_change_check (data); -+ nm_dbus_signal_wireless_enabled (data); -+ } -+ -+out: -+ /* Schedule another killswitch poll */ -+ source = g_timeout_source_new (6000); -+ g_source_set_callback (source, nm_poll_killswitches, data, NULL); -+ g_source_attach (source, data->main_context); -+ g_source_unref (source); -+} -+ -+static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * data) -+{ -+ DBusError err; -+ DBusMessage * reply = NULL; -+ guint32 status; -+ -+ g_return_if_fail (pcall != NULL); -+ g_return_if_fail (data != NULL); -+ -+ if (!dbus_pending_call_get_completed (pcall)) -+ goto out; -+ -+ if (!(reply = dbus_pending_call_steal_reply (pcall))) -+ goto out; -+ -+ if (message_is_error (reply)) { -+ dbus_error_init (&err); -+ dbus_set_error_from_message (&err, reply); -+ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ dbus_error_free (&err); -+ goto out; -+ } -+ -+ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { -+ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ dbus_error_free (&err); -+ goto out; -+ } -+ -+ if (status == 0) -+ data->tmp_hw_rf_enabled = FALSE; -+ -+out: -+ if (reply) -+ dbus_message_unref (reply); -+ -+ handle_killswitch_pcall_done (data, pcall); -+ dbus_pending_call_unref (pcall); -+} -+ -+ -+static gboolean nm_poll_killswitches (gpointer user_data) -+{ -+ NMData * data = (NMData *) user_data; -+ DBusConnection * connection = data->dbus_connection; -+ GSList * elt; -+ -+ g_return_val_if_fail (data != NULL, FALSE); -+ -+ data->tmp_hw_rf_enabled = TRUE; -+ -+ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) -+ { -+ DBusPendingCall * pcall; -+ DBusMessage * message; -+ -+ message = dbus_message_new_method_call ("org.freedesktop.Hal", -+ elt->data, -+ "org.freedesktop.Hal.Device.KillSwitch", -+ "GetPower"); -+ if (!dbus_connection_send_with_reply (connection, message, &pcall, 5000)) { -+ nm_warning ("%s(): could not send dbus message", __func__); -+ } else if (!pcall) { -+ nm_warning ("%s(): could not send dbus message; pcall was NULL", __func__); -+ } else { -+ dbus_pending_call_set_notify (pcall, -+ (DBusPendingCallNotifyFunction) nm_killswitch_getpower_reply_cb, -+ data, -+ NULL); -+ data->ks_pcall_list = g_slist_append (data->ks_pcall_list, pcall); -+ } -+ dbus_message_unref (message); -+ } -+ return FALSE; -+} -+ -+ - /* -+ * nm_add_killswitch_device -+ * -+ * Adds a killswitch device to the list -+ * -+ */ -+static void nm_add_killswitch_device (NMData * data, const char * udi) -+{ -+ char * type; -+ GSList * elt; -+ -+ type = libhal_device_get_property_string (data->hal_ctx, udi, "killswitch.type", NULL); -+ if (!type) -+ return; -+ -+ if (strcmp (type, "wlan") != 0) -+ goto out; -+ -+ /* see if it's already in the list */ -+ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) { -+ const char * list_udi = (const char *) elt->data; -+ if (strcmp (list_udi, udi) == 0) -+ goto out; -+ } -+ -+ /* Start polling switches if this is the first switch we've found */ -+ if (g_slist_length (data->killswitch_list) == 0) { -+ GSource * source = g_idle_source_new (); -+ g_source_set_callback (source, nm_poll_killswitches, data, NULL); -+ g_source_attach (source, data->main_context); -+ g_source_unref (source); -+ } -+ -+ data->killswitch_list = g_slist_append (data->killswitch_list, g_strdup (udi)); -+ nm_info ("Found radio killswitch %s", udi); -+ -+out: -+ libhal_free_string (type); -+} -+ -+/* - * nm_hal_device_new_capability - * - */ -@@ -283,10 +461,9 @@ - NMData *data = (NMData *)libhal_ctx_get_user_data (ctx); - - g_return_if_fail (data != NULL); -+ g_return_if_fail (capability != NULL); - -- /*nm_debug ("nm_hal_device_new_capability() called with udi = %s, capability = %s", udi, capability );*/ -- -- if (capability && ((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) -+ if (((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) - { - char *iface; - -@@ -296,6 +473,10 @@ - g_free (iface); - } - } -+ else if (strcmp (capability, "killswitch") == 0) -+ { -+ nm_add_killswitch_device (data, udi); -+ } - } - - -@@ -340,7 +521,31 @@ - libhal_free_string_array (net_devices); - } - -+void nm_add_initial_killswitch_devices (NMData * data) -+{ -+ char ** udis; -+ int num_udis, i; -+ DBusError error; - -+ g_return_if_fail (data != NULL); -+ -+ dbus_error_init (&error); -+ udis = libhal_find_device_by_capability (data->hal_ctx, "killswitch", &num_udis, &error); -+ if (!udis) -+ return; -+ -+ if (dbus_error_is_set (&error)) { -+ nm_warning("Could not find killswitch devices: %s", error.message); -+ dbus_error_free (&error); -+ return; -+ } -+ -+ for (i = 0; i < num_udis; i++) -+ nm_add_killswitch_device (data, udis[i]); -+ libhal_free_string_array (udis); -+} -+ -+ - /* - * nm_state_change_signal_broadcast - * -@@ -616,28 +821,39 @@ - g_return_if_fail (data != NULL); - - if ((data->hal_ctx = nm_get_hal_ctx (data))) -+ { -+ nm_add_initial_killswitch_devices (data); - nm_add_initial_devices (data); -+ } -+ -+ /* If there weren't any killswitches, mark hardware RF to on */ -+ if (g_slist_length (data->killswitch_list) == 0) -+ data->hw_rf_enabled = TRUE; - } - - - void nm_hal_deinit (NMData *data) - { -+ DBusError error; -+ - g_return_if_fail (data != NULL); - -- if (data->hal_ctx) -+ if (!data->hal_ctx) -+ return; -+ -+ g_slist_foreach (data->killswitch_list, (GFunc) g_free, NULL); -+ g_slist_free (data->killswitch_list); -+ data->killswitch_list = NULL; -+ -+ dbus_error_init (&error); -+ libhal_ctx_shutdown (data->hal_ctx, &error); -+ if (dbus_error_is_set (&error)) - { -- DBusError error; -- -- dbus_error_init (&error); -- libhal_ctx_shutdown (data->hal_ctx, &error); -- if (dbus_error_is_set (&error)) -- { -- nm_warning ("libhal shutdown failed - %s", error.message); -- dbus_error_free (&error); -- } -- libhal_ctx_free (data->hal_ctx); -- data->hal_ctx = NULL; -+ nm_warning ("libhal shutdown failed - %s", error.message); -+ dbus_error_free (&error); - } -+ libhal_ctx_free (data->hal_ctx); -+ data->hal_ctx = NULL; - } - - -Index: src/nm-device-802-11-wireless.c -=================================================================== ---- src/nm-device-802-11-wireless.c (Revision 2558) -+++ src/nm-device-802-11-wireless.c (Revision 2652) -@@ -617,7 +617,10 @@ - /* Start the scanning timeout for devices that can do scanning */ - if (nm_device_get_capabilities (dev) & NM_DEVICE_CAP_WIRELESS_SCAN) - { -- self->priv->pending_scan = g_idle_source_new (); -+ /* Stupid orinoco has problems scanning immediately after being up, -+ * so wait a bit before triggering a scan. -+ */ -+ self->priv->pending_scan = g_timeout_source_new (600); - g_source_set_callback (self->priv->pending_scan, - nm_device_802_11_wireless_scan, - self, -@@ -2981,6 +2984,9 @@ - return NM_ACT_STAGE_RETURN_POSTPONE; - } - -+ /* Some cards are dumb. Wait a second */ -+ sleep (1); -+ - iface = nm_device_get_iface (dev); - if (!supplicant_exec (self)) - { -@@ -3446,10 +3452,9 @@ - char *genie, *gpos, *gend, *custom; - NMAccessPoint *ap = NULL; - size_t clen; -- int maxrate; -+ int maxrate = 0; - struct iw_event iwe_buf, *iwe = &iwe_buf; - struct stream_descr stream; -- struct wireless_scan * wscan = NULL; - int ret; - - g_return_val_if_fail (dev != NULL, FALSE); -Index: src/NetworkManagerMain.h -=================================================================== ---- src/NetworkManagerMain.h (Revision 2558) -+++ src/NetworkManagerMain.h (Revision 2652) -@@ -82,6 +82,7 @@ - GSList * dev_list; - GMutex * dev_list_mutex; - -+ gboolean hw_rf_enabled; - gboolean wireless_enabled; - gboolean modem_active; - gboolean asleep; -@@ -90,6 +91,10 @@ - GSList * dialup_list; - GMutex * dialup_list_mutex; - -+ GSList * killswitch_list; -+ GSList * ks_pcall_list; /* track killswitch D-Bus pending calls */ -+ gboolean tmp_hw_rf_enabled; -+ - struct NMAccessPointList *allowed_ap_list; - struct NMAccessPointList *invalid_ap_list; - } NMData; -Index: src/NetworkManagerSystem.c -=================================================================== ---- src/NetworkManagerSystem.c (Revision 2558) -+++ src/NetworkManagerSystem.c (Revision 2652) -@@ -64,6 +64,7 @@ - struct sockaddr_in *p; - const char * iface; - int err; -+ NMIP4Config * config = NULL; - - iface = nm_device_get_iface (dev); - -@@ -75,6 +76,15 @@ - if (ip4_gateway == 0) - return TRUE; - -+ /* -+ * Do not add the route if the destination is on the same subnet. -+ */ -+ config = nm_device_get_ip4_config(dev); -+ if (config && -+ ((guint32)ip4_dest & nm_ip4_config_get_netmask(config)) == -+ (nm_ip4_config_get_address(config) & nm_ip4_config_get_netmask(config))) -+ return TRUE; -+ - if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL) - return FALSE; - diff --git a/debian/patches/21-endianess_fix_r2754.patch b/debian/patches/21-endianess_fix_r2754.patch deleted file mode 100644 index 4932e22a..00000000 --- a/debian/patches/21-endianess_fix_r2754.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (Revision 2753) -+++ ChangeLog (Revision 2754) -@@ -1,3 +1,8 @@ -+2007-08-30 Dan Williams -+ -+ * libnm-util/sha1.c -+ - Include config.h to get defines for endiannes (gnome.org #420216) -+ - 2007-07-26 Dan Williams - - Patch from Bernhard Miklautz -Index: libnm-util/sha1.c -=================================================================== ---- libnm-util/sha1.c (Revision 2753) -+++ libnm-util/sha1.c (Revision 2754) -@@ -12,6 +12,10 @@ - * See README and COPYING for more details. - */ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - diff --git a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch deleted file mode 100644 index ac0459b6..00000000 --- a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch +++ /dev/null @@ -1,44 +0,0 @@ -=== modified file 'gnome/vpn-properties/Makefile.am' ---- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.am 2007-06-25 13:51:34 +0000 -+++ network-manager-0.6.5/gnome/vpn-properties/Makefile.am 2007-08-03 11:50:32 +0000 -@@ -21,17 +21,16 @@ nm_vpn_properties_CFLAGS = - $(GCONF_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) - - nm_vpn_properties_LDADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - -=== modified file 'gnome/vpn-properties/Makefile.in' ---- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.in 2007-06-25 13:51:34 +0000 -+++ network-manager-0.6.5/gnome/vpn-properties/Makefile.in 2007-08-03 11:50:32 +0000 -@@ -258,17 +258,16 @@ nm_vpn_properties_CFLAGS = \ - $(GCONF_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) - - - nm_vpn_properties_LDADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - diff --git a/debian/patches/23-rfkill_return_type.patch b/debian/patches/23-rfkill_return_type.patch deleted file mode 100644 index 1e327d46..00000000 --- a/debian/patches/23-rfkill_return_type.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/NetworkManager.c -=================================================================== ---- src/NetworkManager.c (Revision 2974) -+++ src/NetworkManager.c (Arbeitskopie) -@@ -339,7 +339,7 @@ - { - DBusError err; - DBusMessage * reply = NULL; -- guint32 status; -+ gint32 status; - - g_return_if_fail (pcall != NULL); - g_return_if_fail (data != NULL); -@@ -358,7 +358,7 @@ - goto out; - } - -- if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { -+ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { - nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); - dbus_error_free (&err); - goto out; diff --git a/debian/patches/24-get_mode_fix_r3122.patch b/debian/patches/24-get_mode_fix_r3122.patch deleted file mode 100644 index f89db8d5..00000000 --- a/debian/patches/24-get_mode_fix_r3122.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/nm-device-802-11-wireless.c -=================================================================== ---- src/nm-device-802-11-wireless.c (Revision 3121) -+++ src/nm-device-802-11-wireless.c (Revision 3122) -@@ -1144,7 +1144,7 @@ - #endif - if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (NM_DEVICE (self)), SIOCGIWMODE, &wrq) == 0) - { -- if ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA)) -+ if ((wrq.u.mode == IW_MODE_ADHOC) || (wrq.u.mode == IW_MODE_INFRA)) - mode = wrq.u.mode; - } - else diff --git a/debian/patches/25-libnl_unique_pid_r3155.patch b/debian/patches/25-libnl_unique_pid_r3155.patch deleted file mode 100644 index a14aad83..00000000 --- a/debian/patches/25-libnl_unique_pid_r3155.patch +++ /dev/null @@ -1,417 +0,0 @@ -Index: src/NetworkManagerSystem.c -=================================================================== ---- src/NetworkManagerSystem.c (Revision 3154) -+++ src/NetworkManagerSystem.c (Revision 3155) -@@ -177,24 +177,6 @@ - } - - --static struct nl_cache * get_link_cache (struct nl_handle *nlh) --{ -- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; -- static struct nl_cache * link_cache = NULL; -- -- g_static_mutex_lock (&mutex); -- if (!link_cache) -- link_cache = rtnl_link_alloc_cache (nlh); -- if (!link_cache) -- nm_warning ("ERROR: couldn't allocate rtnl link cache!"); -- else -- nl_cache_update (nlh, link_cache); -- g_static_mutex_unlock (&mutex); -- -- return link_cache; --} -- -- - static void iface_to_rtnl_index (const char *iface, struct nl_handle *nlh, struct rtnl_addr *addr) - { - struct nl_cache * cache = NULL; -@@ -204,14 +186,17 @@ - g_return_if_fail (nlh != NULL); - g_return_if_fail (addr != NULL); - -- if ((cache = get_link_cache (nlh))) -- { -- i = rtnl_link_name2i (cache, iface); -- if (RTNL_LINK_NOT_FOUND != i) -- rtnl_addr_set_ifindex (addr, i); -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache.", __func__); -+ return; - } -- else -- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); -+ -+ nl_cache_update (nlh, cache); -+ i = rtnl_link_name2i (cache, iface); -+ if (RTNL_LINK_NOT_FOUND != i) -+ rtnl_addr_set_ifindex (addr, i); -+ nl_cache_destroy_and_free (cache); - } - - -@@ -223,45 +208,104 @@ - g_return_val_if_fail (iface != NULL, NULL); - g_return_val_if_fail (nlh != NULL, NULL); - -- if ((cache = get_link_cache (nlh))) -- have_link = rtnl_link_get_by_name (cache, iface); -- else -- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache.", __func__); -+ return NULL; -+ } - -+ nl_cache_update (nlh, cache); -+ have_link = rtnl_link_get_by_name (cache, iface); -+ nl_cache_destroy_and_free (cache); -+ - return have_link; - } - -+static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; - --static struct nl_handle * new_nl_handle (void) -+GHashTable *nl_pids = NULL; -+ -+static struct -+nl_handle * new_nl_handle (void) - { -- struct nl_handle * nlh = NULL; -+ struct nl_handle * nlh = NULL; -+ guint32 nl_pid; -+ int i = 0; - -- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); -- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); -- if (nl_connect(nlh, NETLINK_ROUTE) < 0) -- { -- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); -- nl_handle_destroy (nlh); -- nlh = NULL; -+ g_static_mutex_lock (&nlh_mutex); -+ -+ if (nl_pids == NULL) { -+ nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); -+ g_assert (nl_pids); -+ -+ /* Insert the PID used by nm-netlink-monitor.c */ -+ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); - } - -+ while (i++ < 10) { -+ nl_pid = g_random_int (); -+ if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) -+ break; -+ } -+ -+ if (i < 10) { -+ nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); -+ nl_handle_set_pid (nlh, nl_pid); -+ -+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); -+ nl_handle_destroy (nlh); -+ nlh = NULL; -+ } else { -+ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); -+ } -+ } else { -+ g_warning ("%s: couldn't find free netlink pid.", __func__); -+ } -+ -+ g_static_mutex_unlock (&nlh_mutex); -+ - return nlh; - } - -+static void -+destroy_nl_handle (struct nl_handle *nlh) -+{ -+ g_return_if_fail (nlh != NULL); - -+ g_static_mutex_lock (&nlh_mutex); -+ g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); -+ g_static_mutex_unlock (&nlh_mutex); -+ -+ nl_close (nlh); -+ nl_handle_destroy (nlh); -+ -+} -+ -+ - int - nm_system_get_rtnl_index_from_iface (const char *iface) - { - struct nl_handle * nlh = NULL; -- struct nl_cache * cache = NULL; -+ struct nl_cache * cache; - int i = RTNL_LINK_NOT_FOUND; - - nlh = new_nl_handle (); -- if (nlh && (cache = get_link_cache (nlh))) -- i = rtnl_link_name2i (cache, iface); -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ if (!nlh) -+ return RTNL_LINK_NOT_FOUND; - -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache."); -+ goto out; -+ } -+ -+ nl_cache_update (nlh, cache); -+ i = rtnl_link_name2i (cache, iface); -+ nl_cache_destroy_and_free (cache); -+ -+out: -+ destroy_nl_handle (nlh); - return i; - } - -@@ -275,18 +319,31 @@ - char * buf = NULL; - - nlh = new_nl_handle (); -- if (nlh && (cache = get_link_cache (nlh))) -- { -- buf = g_malloc0 (MAX_IFACE_LEN); -- if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) -- { -- g_free (buf); -- buf = NULL; -- } -+ if (!nlh) -+ return NULL; -+ -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache."); -+ goto out; - } -- nl_close (nlh); -- nl_handle_destroy (nlh); - -+ nl_cache_update (nlh, cache); -+ -+ buf = g_malloc0 (MAX_IFACE_LEN); -+ if (!buf) -+ goto destroy_cache; -+ -+ if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) { -+ g_free (buf); -+ buf = NULL; -+ } -+ -+destroy_cache: -+ nl_cache_destroy_and_free (cache); -+ -+out: -+ destroy_nl_handle (nlh); - return buf; - } - -@@ -313,13 +370,15 @@ - config = nm_device_get_ip4_config (dev); - g_return_val_if_fail (config != NULL, FALSE); - -+ nlh = new_nl_handle (); -+ if (!nlh) -+ return FALSE; -+ - nm_system_delete_default_route (); - nm_system_device_flush_addresses (dev); - nm_system_device_flush_routes (dev); - nm_system_flush_arp_cache (); - -- nlh = new_nl_handle (); -- - if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_DEFAULT))) - { - iface_to_rtnl_index (nm_device_get_iface (dev), nlh, addr); -@@ -330,8 +389,7 @@ - else - nm_warning ("nm_system_device_set_from_ip4_config(): couldn't create rtnl address!\n"); - -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ destroy_nl_handle (nlh); - - sleep (1); - nm_system_device_set_ip4_route (dev, nm_ip4_config_get_gateway (config), 0, 0, nm_ip4_config_get_mss (config)); -@@ -424,7 +482,13 @@ - * Set IPv4 configuration of a VPN device from an NMIP4Config object. - * - */ --gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevice *active_device, const char *iface, NMIP4Config *config, char **routes, int num_routes) -+gboolean -+nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, -+ NMDevice *active_device, -+ const char *iface, -+ NMIP4Config *config, -+ char **routes, -+ int num_routes) - { - NMIP4Config * ad_config = NULL; - struct nl_handle * nlh = NULL; -@@ -437,71 +501,73 @@ - if (active_device && (ad_config = nm_device_get_ip4_config (active_device))) - nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF, nm_ip4_config_get_mss (config)); - -- if (iface != NULL && strlen (iface)) -- { -- nm_system_device_set_up_down_with_iface (iface, TRUE); -+ if (!iface || !strlen (iface)) -+ goto done; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (); -+ if (!nlh) -+ goto done; - -- if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) -- { -- int err = 0; -- iface_to_rtnl_index (iface, nlh, addr); -- if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) -- nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); -- rtnl_addr_put (addr); -- } -- else -- nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); -+ nm_system_device_set_up_down_with_iface (iface, TRUE); - -- /* Set the MTU */ -- if ((request = rtnl_link_alloc ())) -- { -- struct rtnl_link * old; -+ if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) -+ { -+ int err = 0; -+ iface_to_rtnl_index (iface, nlh, addr); -+ if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) -+ nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); -+ rtnl_addr_put (addr); -+ } -+ else -+ nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); - -- old = iface_to_rtnl_link (iface, nlh); -- rtnl_link_set_mtu (request, 1412); -- rtnl_link_change (nlh, old, request, 0); -+ /* Set the MTU */ -+ if ((request = rtnl_link_alloc ())) -+ { -+ struct rtnl_link * old; - -- rtnl_link_put (old); -- rtnl_link_put (request); -- } -+ old = iface_to_rtnl_link (iface, nlh); -+ rtnl_link_set_mtu (request, 1412); -+ rtnl_link_change (nlh, old, request, 0); - -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ rtnl_link_put (old); -+ rtnl_link_put (request); -+ } - -- sleep (1); -+ destroy_nl_handle (nlh); - -- nm_system_device_flush_routes_with_iface (iface); -- if (num_routes <= 0) -+ sleep (1); -+ -+ nm_system_device_flush_routes_with_iface (iface); -+ if (num_routes <= 0) -+ { -+ nm_system_delete_default_route (); -+ nm_system_device_add_default_route_via_device_with_iface (iface); -+ } -+ else -+ { -+ int i; -+ for (i = 0; i < num_routes; i++) - { -- nm_system_delete_default_route (); -- nm_system_device_add_default_route_via_device_with_iface (iface); -- } -- else -- { -- int i; -- for (i = 0; i < num_routes; i++) -+ char *valid_ip4_route; -+ -+ /* Make sure the route is valid, otherwise it's a security risk as the route -+ * text is simply taken from the user, and passed directly to system(). If -+ * we did not check the route, think of: -+ * -+ * system("/sbin/ip route add `rm -rf /` dev eth0") -+ * -+ * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. -+ */ -+ if ((valid_ip4_route = validate_ip4_route (routes[i]))) - { -- char *valid_ip4_route; -- -- /* Make sure the route is valid, otherwise it's a security risk as the route -- * text is simply taken from the user, and passed directly to system(). If -- * we did not check the route, think of: -- * -- * system("/sbin/ip route add `rm -rf /` dev eth0") -- * -- * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. -- */ -- if ((valid_ip4_route = validate_ip4_route (routes[i]))) -- { -- nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); -- g_free (valid_ip4_route); -- } -+ nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); -+ g_free (valid_ip4_route); - } - } - } - -+done: - nm_named_manager_add_ip4_config (named, config); - - return TRUE; -@@ -548,7 +614,8 @@ - - g_return_val_if_fail (iface != NULL, FALSE); - -- if (!(nlh = new_nl_handle ())) -+ nlh = new_nl_handle (); -+ if (!nlh) - return FALSE; - - if (!(request = rtnl_link_alloc ())) -@@ -569,9 +636,7 @@ - success = TRUE; - - out: -- nl_close (nlh); -- nl_handle_destroy (nlh); -- -+ destroy_nl_handle (nlh); - return success; - } - -@@ -614,6 +679,6 @@ - out_request: - rtnl_link_put (request); - out_nl_close: -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ destroy_nl_handle (nlh); - } -+ diff --git a/debian/patches/26-libnl_1.0-pre8_r3206.patch b/debian/patches/26-libnl_1.0-pre8_r3206.patch deleted file mode 100644 index 6f96215d..00000000 --- a/debian/patches/26-libnl_1.0-pre8_r3206.patch +++ /dev/null @@ -1,202 +0,0 @@ -Index: src/nm-netlink-monitor.c -=================================================================== ---- src/nm-netlink-monitor.c (Revision 3205) -+++ src/nm-netlink-monitor.c (Revision 3206) -@@ -174,7 +174,7 @@ - } - - monitor_address.nl_family = AF_NETLINK; -- monitor_address.nl_pid = getpid (); -+ monitor_address.nl_pid = UINT_MAX; - monitor_address.nl_groups = RTMGRP_LINK; - - if (bind (fd, -@@ -365,7 +365,7 @@ - packet.header.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtgenmsg)); - packet.header.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; - packet.header.nlmsg_type = RTM_GETLINK; -- packet.header.nlmsg_pid = getpid (); -+ packet.header.nlmsg_pid = UINT_MAX; - /* Might be good to generate a unique sequence number and track - the response */ - packet.header.nlmsg_seq = sequence_number << 16; -Index: src/NetworkManagerSystem.c -=================================================================== ---- src/NetworkManagerSystem.c (Revision 3205) -+++ src/NetworkManagerSystem.c (Revision 3206) -@@ -196,7 +196,7 @@ - i = rtnl_link_name2i (cache, iface); - if (RTNL_LINK_NOT_FOUND != i) - rtnl_addr_set_ifindex (addr, i); -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - } - - -@@ -216,55 +216,42 @@ - - nl_cache_update (nlh, cache); - have_link = rtnl_link_get_by_name (cache, iface); -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - - return have_link; - } - --static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; -- --GHashTable *nl_pids = NULL; -- - static struct --nl_handle * new_nl_handle (void) -+nl_handle *new_nl_handle (gboolean recursive) - { -- struct nl_handle * nlh = NULL; -- guint32 nl_pid; -- int i = 0; -+ struct nl_handle *nlh = NULL; -+ struct nl_cb *cb; - -- g_static_mutex_lock (&nlh_mutex); -- -- if (nl_pids == NULL) { -- nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); -- g_assert (nl_pids); -- -- /* Insert the PID used by nm-netlink-monitor.c */ -- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); -+ cb = nl_cb_alloc (NL_CB_VERBOSE); -+ nlh = nl_handle_alloc_cb (cb); -+ if (!nlh) { -+ nm_warning ("%s: couldn't allocate netlink handle: %s", __func__, nl_geterror ()); -+ return NULL; - } - -- while (i++ < 10) { -- nl_pid = g_random_int (); -- if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) -- break; -- } -+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ /* HACK: try one more time. Because the netlink monitor for link state -+ * inits before we get here, it grabs the port that matches the PID -+ * of the NM process, which also happens to be the PID that libnl uses -+ * the first time too. The real fix is to convert nm-netlink-monitor.c -+ * over to use libnl. -+ */ -+ nl_handle_destroy (nlh); -+ if (recursive) -+ return NULL; - -- if (i < 10) { -- nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); -- nl_handle_set_pid (nlh, nl_pid); -- -- if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ nlh = new_nl_handle (TRUE); -+ if (!nlh) { - nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); -- nl_handle_destroy (nlh); -- nlh = NULL; -- } else { -- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); -+ return NULL; - } -- } else { -- g_warning ("%s: couldn't find free netlink pid.", __func__); - } - -- g_static_mutex_unlock (&nlh_mutex); -- - return nlh; - } - -@@ -273,16 +260,10 @@ - { - g_return_if_fail (nlh != NULL); - -- g_static_mutex_lock (&nlh_mutex); -- g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); -- g_static_mutex_unlock (&nlh_mutex); -- - nl_close (nlh); - nl_handle_destroy (nlh); -- - } - -- - int - nm_system_get_rtnl_index_from_iface (const char *iface) - { -@@ -290,7 +271,7 @@ - struct nl_cache * cache; - int i = RTNL_LINK_NOT_FOUND; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return RTNL_LINK_NOT_FOUND; - -@@ -302,7 +283,7 @@ - - nl_cache_update (nlh, cache); - i = rtnl_link_name2i (cache, iface); -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - - out: - destroy_nl_handle (nlh); -@@ -318,7 +299,7 @@ - struct nl_cache * cache = NULL; - char * buf = NULL; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return NULL; - -@@ -340,7 +321,7 @@ - } - - destroy_cache: -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - - out: - destroy_nl_handle (nlh); -@@ -370,7 +351,7 @@ - config = nm_device_get_ip4_config (dev); - g_return_val_if_fail (config != NULL, FALSE); - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return FALSE; - -@@ -504,7 +485,7 @@ - if (!iface || !strlen (iface)) - goto done; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - goto done; - -@@ -614,7 +595,7 @@ - - g_return_val_if_fail (iface != NULL, FALSE); - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return FALSE; - -@@ -658,7 +639,7 @@ - if (!mtu) - return; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return; - diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch deleted file mode 100644 index 64e23223..00000000 --- a/debian/patches/27-dont_repeat_errors.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/NetworkManager.c b/src/NetworkManager.c -index 4f89f63..ddb5a4a 100644 ---- a/src/NetworkManager.c -+++ b/src/NetworkManager.c -@@ -65,6 +65,8 @@ - */ - static NMData *nm_data = NULL; - -+char *ks_err_message = NULL; -+ - static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); - static void nm_data_free (NMData *data); - static gboolean nm_poll_killswitches(gpointer user_data); -@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da - if (message_is_error (reply)) { - dbus_error_init (&err); - dbus_set_error_from_message (&err, reply); -- nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ if (!ks_err_message || strcmp (ks_err_message, err.message)) { -+ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ g_free (ks_err_message); -+ ks_err_message = g_strdup (err.message); -+ } - dbus_error_free (&err); - goto out; - } - - if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { -- nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ if (!ks_err_message || strcmp (ks_err_message, err.message)) { -+ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ g_free (ks_err_message); -+ ks_err_message = g_strdup (err.message); -+ } - dbus_error_free (&err); - goto out; - } -- cgit 1.3.0-6-gf8a5 From 4b7b208fc9bbf2f1476c15f817bc4d89b8e45a31 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:10:34 +0000 Subject: * New upstream release. (Closes: #470197) - Ensure dbus errors are properly initialised. (Closes: #471317) * Removed patches - debian/patches/04-if_fix.patch (obsolete) - debian/patches/11-man_page_sh_name.patch (merged upstream) - debian/patches/12_readme_format.patch (merged upstream) - debian/patches/20-stable_branch_updates_r2652.patch (merged upstream) - debian/patches/21-endianess_fix_r2754.patch (merged upstream) - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch (merged upstream) - debian/patches/23-rfkill_return_type.patch (fixed upstream) - debian/patches/24-get_mode_fix_r3122.patch (merged upstream) - debian/patches/25-libnl_unique_pid_r3155.patch (merged upstream) - debian/patches/26-libnl_1.0-pre8_r3206.patch (merged upstream) - debian/patches/27-dont_repeat_errors.patch (merged upstream) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2153 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 20 + debian/patches/04-if_fix.patch | 12 - debian/patches/11-man_page_sh_name.patch | 15 - debian/patches/12_readme_format.patch | 14 - .../patches/20-stable_branch_updates_r2652.patch | 914 --------------------- debian/patches/21-endianess_fix_r2754.patch | 28 - ...x_vpn_ftbfs_dont_disable_gnome_deprecated.patch | 44 - debian/patches/23-rfkill_return_type.patch | 22 - debian/patches/24-get_mode_fix_r3122.patch | 13 - debian/patches/25-libnl_unique_pid_r3155.patch | 417 ---------- debian/patches/26-libnl_1.0-pre8_r3206.patch | 202 ----- debian/patches/27-dont_repeat_errors.patch | 37 - 12 files changed, 20 insertions(+), 1718 deletions(-) delete mode 100644 debian/patches/04-if_fix.patch delete mode 100644 debian/patches/11-man_page_sh_name.patch delete mode 100644 debian/patches/12_readme_format.patch delete mode 100644 debian/patches/20-stable_branch_updates_r2652.patch delete mode 100644 debian/patches/21-endianess_fix_r2754.patch delete mode 100644 debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch delete mode 100644 debian/patches/23-rfkill_return_type.patch delete mode 100644 debian/patches/24-get_mode_fix_r3122.patch delete mode 100644 debian/patches/25-libnl_unique_pid_r3155.patch delete mode 100644 debian/patches/26-libnl_1.0-pre8_r3206.patch delete mode 100644 debian/patches/27-dont_repeat_errors.patch diff --git a/debian/changelog b/debian/changelog index e7dea542..e3483f24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +network-manager (0.6.6-1) UNRELEASED; urgency=low + + * New upstream release. (Closes: #470197) + - Ensure dbus errors are properly initialised. (Closes: #471317) + * Removed patches + - debian/patches/04-if_fix.patch (obsolete) + - debian/patches/11-man_page_sh_name.patch (merged upstream) + - debian/patches/12_readme_format.patch (merged upstream) + - debian/patches/20-stable_branch_updates_r2652.patch (merged upstream) + - debian/patches/21-endianess_fix_r2754.patch (merged upstream) + - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch + (merged upstream) + - debian/patches/23-rfkill_return_type.patch (fixed upstream) + - debian/patches/24-get_mode_fix_r3122.patch (merged upstream) + - debian/patches/25-libnl_unique_pid_r3155.patch (merged upstream) + - debian/patches/26-libnl_1.0-pre8_r3206.patch (merged upstream) + - debian/patches/27-dont_repeat_errors.patch (merged upstream) + + -- Michael Biebl Thu, 03 Apr 2008 00:49:13 +0200 + network-manager (0.6.5-5) unstable; urgency=low * Rebuild against libnl1. (Closes: #461922) diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch deleted file mode 100644 index ca0b1574..00000000 --- a/debian/patches/04-if_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/nm-device-802-3-ethernet.c 2006-05-13 21:06:05.000000000 +0200 -+++ src/nm-device-802-3-ethernet.c.new 2006-08-13 22:34:56.000000000 +0200 -@@ -376,7 +376,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ -+#define _LINUX_IF_H - #include -+#undef _LINUX_IF_H - - static int - mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch deleted file mode 100644 index b363268c..00000000 --- a/debian/patches/11-man_page_sh_name.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: man/nm-tool.1.in -=================================================================== -RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v -retrieving revision 1.1 -diff -u -3 -p -r1.1 nm-tool.1.in ---- man/nm-tool.1.in 1 Feb 2006 18:14:15 -0000 1.1 -+++ man/nm-tool.1.in 30 Nov 2006 19:33:39 -0000 -@@ -3,6 +3,7 @@ - .\" Copyright (C) 2005 Robert Love - .\" - .TH NM-TOOL "1" -+.SH NAME - nm-tool \- utility to report NetworkManager state - .SH SYNOPSIS - .B nm-tool diff --git a/debian/patches/12_readme_format.patch b/debian/patches/12_readme_format.patch deleted file mode 100644 index 5fa39d24..00000000 --- a/debian/patches/12_readme_format.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: README -=================================================================== ---- README (Revision 3190) -+++ README (Arbeitskopie) -@@ -20,7 +20,8 @@ - For wireless networking support, NetworkManager keeps a list of wireless - networks, the preferred list. Preferred Networks are wireless networks that - the user has explicitly made NetworkManager associate with at some previous --time. So if the user walks into a Starbucks and explicitly asks NetworkManager to associate with that Starbucks network, NetworkManager will remember the -+time. So if the user walks into a Starbucks and explicitly asks NetworkManager -+to associate with that Starbucks network, NetworkManager will remember the - Starbucks network information from that point on. Upon returning to that - Starbucks, NetworkManager will attempt to associate _automatically_ with the - Starbucks network since it is now in the Preferred Networks list. The point of diff --git a/debian/patches/20-stable_branch_updates_r2652.patch b/debian/patches/20-stable_branch_updates_r2652.patch deleted file mode 100644 index aea8e86f..00000000 --- a/debian/patches/20-stable_branch_updates_r2652.patch +++ /dev/null @@ -1,914 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (Revision 2558) -+++ ChangeLog (Revision 2652) -@@ -1,3 +1,99 @@ -+2007-07-26 Dan Williams -+ -+ Patch from Bernhard Miklautz -+ -+ * src/NetworkManagerSystem.c -+ - (nm_system_device_set_ip4_route): don't add the route if it's on the -+ same subnet (#437396) -+ -+2007-07-26 Dan Williams -+ -+ * src/nm-device-802-11-wireless.c -+ - (real_start): I hate orinoco; apparently has trouble scanning too soon -+ after being brought up, so do the initial scan a bit later. -+ -+2007-06-27 Dan Williams -+ -+ * src/NetworkManager.c -+ - (nm_hal_init): set hardware RF to enabled if no killswitches are found -+ after the initial discovery -+ -+2007-06-21 Dan Williams -+ -+ More fixes for Fedora #194124, gnome.org #354565 -+ -+ * src/nm-device-802-3-ethernet.c -+ - (real_act_stage1_prepare): new function; fail activation if device -+ doesn't have a link -+ -+ * src/NetworkManagerPolicy.c -+ - (nm_policy_activation_finish): ensure device is actually activated -+ before sending out signals. Fixes a race where device cancellation -+ would be processed right after finish was scheduled, but not run. -+ - (nm_policy_device_change_check, nm_policy_schedule_device_change_check): -+ ensure device change check GSource ID is locked across threads; -+ allow interruption of activation of 802.3 ethernet devices that no -+ longer have an active link, and ensure that 802.3 ethernet devices -+ have an active link before starting activation -+ -+2007-06-21 Dan Williams -+ -+ Add HAL-based rfkill support, based on a patch from Benjamin Kahn. -+ -+ * src/NetworkManagerDbus.[ch] -+ - (nm_dbus_signal_wireless_enabled): new function, emit signals when -+ wireless enabled status changes -+ -+ * src/nm-dbus-nm.c -+ - (nm_dbus_nm_set_wireless_enabled): handle hardware rfkill correctly; -+ send errors when hardware switch overrides user request, and send -+ signals when wireless enabled state changes -+ - (nm_dbus_nm_get_wireless_enabled): send additional 'hardware rf enabled' -+ argument in method reply -+ -+ * src/NetworkManager.c -+ - (handle_killswitch_pcall_done, nm_killswitch_getpower_reply_cb, -+ nm_poll_killswitches, nm_add_killswitch_device, -+ nm_add_initial_killswitch_devices): new functions; detect and handle -+ hardware killswitches exported by HAL. Unfortunately we have to -+ poll the switches because HAL doesn't support signals for killswitches -+ yet. -+ - (nm_hal_device_new_capability): detect killswitches added asynchronously -+ - (nm_hal_init): look for killswitches when connecting to HAL -+ - (nm_hal_deinit): dispose of killswitches when deiniting HAL data -+ -+ * src/NetworkManagerMain.h -+ - Add bits to track killswitches -+ -+2007-06-12 Dan Williams -+ -+ * src/nm-device.c -+ - (real_act_stage3_ip_config_start): sometimes the device gets downed -+ during the wpa_supplicant association. Ensure the device is up -+ before it's used for IP configuration. -+ -+2007-06-07 Dan Williams -+ -+ Patch from Jon Nettleton -+ -+ * src/nm-device-802-11-wireless.c: -+ - (real_act_stage2_config): sleep 1 second to allow link status -+ to stabilize -+ -+2007-06-07 Dan Williams -+ -+ * (nm_device_802_3_ethernet_link_activated, -+ nm_device_802_3_ethernet_link_deactivated): fix ethernet link detection -+ behavior due to races between the netlink code and when the -+ device thread recognizes the change. Checking the link state -+ before scheduling the change even on the device thread is wrong. -+ (gnome.org #354565, rh #194124) -+ -+2007-04-25 Dan Williams -+ -+ * initscript/RedHat/NetworkManager.in: remove trailing backslash -+ (gnome.org #432401) -+ - 2007-04-18 Tambet Ingo - - * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network_cb): Update the security -Index: src/NetworkManagerDbus.c -=================================================================== ---- src/NetworkManagerDbus.c (Revision 2558) -+++ src/NetworkManagerDbus.c (Revision 2652) -@@ -434,6 +434,29 @@ - } - - -+void nm_dbus_signal_wireless_enabled (NMData * data) -+{ -+ DBusMessage * message; -+ -+ g_return_if_fail (data != NULL); -+ g_return_if_fail (data->dbus_connection != NULL); -+ -+ if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, "WirelessEnabled"))) -+ { -+ nm_warning ("%s(): Not enough memory for new dbus message!", __func__); -+ return; -+ } -+ -+ dbus_message_append_args (message, -+ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, -+ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, -+ DBUS_TYPE_INVALID); -+ if (!dbus_connection_send (data->dbus_connection, message, NULL)) -+ nm_warning ("%s(): Could not emit the WirelessEnabled signal!", __func__); -+ -+ dbus_message_unref (message); -+} -+ - /* - * nm_dbus_signal_filter - * -Index: src/NetworkManagerDbus.h -=================================================================== ---- src/NetworkManagerDbus.h (Revision 2558) -+++ src/NetworkManagerDbus.h (Revision 2652) -@@ -68,6 +68,7 @@ - - void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength); - void nm_dbus_signal_device_strength_change (DBusConnection *connection, NMDevice80211Wireless *dev, gint strength); -+void nm_dbus_signal_wireless_enabled (NMData * data); - - NMDevice * nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path); - -Index: src/nm-dbus-nm.c -=================================================================== ---- src/nm-dbus-nm.c (Revision 2558) -+++ src/nm-dbus-nm.c (Revision 2652) -@@ -483,53 +483,84 @@ - return (reply); - } - --static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) -+static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) - { - gboolean enabled = FALSE; - DBusError err; -- NMData *app_data; -+ NMData * data; -+ DBusMessage * ret = NULL; - -- g_return_val_if_fail (data && data->data && connection && message, NULL); -+ g_return_val_if_fail (cb_data && cb_data->data && connection && message, NULL); - - dbus_error_init (&err); - if (!dbus_message_get_args (message, &err, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID)) -- return NULL; -+ goto out; - -- app_data = data->data; -- app_data->wireless_enabled = enabled; -+ data = cb_data->data; -+ if (enabled == data->wireless_enabled) -+ goto out; - -- if (!enabled) -- { -- GSList *elt; -+ /* Hardware rfkill overrides whatever user wants */ -+ if (!data->hw_rf_enabled) { -+ nm_info ("User request to %s wireless overridden by radio killswitch.", -+ enabled ? "enable" : "disable"); - -- /* Physically down all wireless devices */ -- nm_lock_mutex (app_data->dev_list_mutex, __FUNCTION__); -- for (elt = app_data->dev_list; elt; elt = g_slist_next (elt)) -- { -- NMDevice *dev = (NMDevice *)(elt->data); -- if (nm_device_is_802_11_wireless (dev)) -- { -+ /* Return error if user tries to re-enable wireless, or just ignore -+ * a disable wireless request when wireless is already disabled. -+ */ -+ if (enabled) { -+ ret = nm_dbus_create_error_message (message, -+ NM_DBUS_INTERFACE, -+ "DisabledBySystem", -+ "Wireless disabled by hardware switch."); -+ } -+ goto out; -+ } -+ -+ nm_info ("User request to %s wireless.", enabled ? "enable" : "disable"); -+ -+ data->wireless_enabled = enabled; -+ if (!data->wireless_enabled) { -+ GSList * elt; -+ -+ /* Deactivate all wireless devices and force them down so they -+ * turn off their radios. -+ */ -+ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); -+ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { -+ NMDevice * dev = (NMDevice *) elt->data; -+ if (nm_device_is_802_11_wireless (dev)) { - nm_device_deactivate (dev); - nm_device_bring_down (dev); - } - } -- nm_unlock_mutex (app_data->dev_list_mutex, __FUNCTION__); -+ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); - } - -- nm_policy_schedule_device_change_check (data->data); -+ nm_policy_schedule_device_change_check (data); -+ nm_dbus_signal_wireless_enabled (data); - -- return NULL; -+out: -+ return ret; - } - --static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) -+static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) - { -+ NMData * data; - DBusMessage *reply = NULL; - -- g_return_val_if_fail (data && data->data && connection && message, NULL); -+ g_return_val_if_fail (cb_data && connection && message, NULL); - -- if ((reply = dbus_message_new_method_return (message))) -- dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &data->data->wireless_enabled, DBUS_TYPE_INVALID); -+ data = cb_data->data; -+ g_return_val_if_fail (data != NULL, NULL); - -+ if ((reply = dbus_message_new_method_return (message))) { -+ dbus_message_append_args (reply, -+ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, -+ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, -+ DBUS_TYPE_INVALID); -+ } -+ - return reply; - } - -Index: src/nm-device-802-3-ethernet.c -=================================================================== ---- src/nm-device-802-3-ethernet.c (Revision 2558) -+++ src/nm-device-802-3-ethernet.c (Revision 2652) -@@ -108,18 +108,16 @@ - GObject *obj, - NMDevice8023Ethernet *self) - { -+ GSource * source; -+ - /* Make sure signal is for us */ - if (NM_DEVICE (self) != NM_DEVICE (obj)) - return; - -- if (!nm_device_has_active_link (NM_DEVICE (self))) -- { -- GSource * source = g_idle_source_new (); -- -- g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); -- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -- g_source_unref (source); -- } -+ source = g_idle_source_new (); -+ g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); -+ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -+ g_source_unref (source); - } - - -@@ -135,18 +133,16 @@ - GObject *obj, - NMDevice8023Ethernet *self) - { -+ GSource * source; -+ - /* Make sure signal is for us */ - if (NM_DEVICE (self) != NM_DEVICE (obj)) - return; - -- if (nm_device_has_active_link (NM_DEVICE (self))) -- { -- GSource * source = g_idle_source_new (); -- -- g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); -- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -- g_source_unref (source); -- } -+ source = g_idle_source_new (); -+ g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); -+ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); -+ g_source_unref (source); - } - - static void -@@ -211,6 +207,26 @@ - return caps; - } - -+ -+static NMActStageReturn -+real_act_stage1_prepare (NMDevice *dev, NMActRequest *req) -+{ -+ NMDevice8023Ethernet * self = NM_DEVICE_802_3_ETHERNET (dev); -+ NMDevice8023EthernetClass * klass; -+ NMDeviceClass * parent_class; -+ -+ /* Ensure ethernet devices have a link before going further with activation, -+ * partially works around Fedora #194124. -+ */ -+ if (!nm_device_has_active_link (dev)) -+ return NM_ACT_STAGE_RETURN_FAILURE; -+ -+ /* Chain up to parent */ -+ klass = NM_DEVICE_802_3_ETHERNET_GET_CLASS (self); -+ parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); -+ return parent_class->act_stage1_prepare (dev, req); -+} -+ - static void - nm_device_802_3_ethernet_dispose (GObject *object) - { -@@ -275,6 +291,7 @@ - parent_class->get_generic_capabilities = real_get_generic_capabilities; - parent_class->init = real_init; - parent_class->update_link = real_update_link; -+ parent_class->act_stage1_prepare = real_act_stage1_prepare; - - g_type_class_add_private (object_class, sizeof (NMDevice8023EthernetPrivate)); - } -Index: src/NetworkManagerPolicy.c -=================================================================== ---- src/NetworkManagerPolicy.c (Revision 2558) -+++ src/NetworkManagerPolicy.c (Revision 2652) -@@ -52,6 +52,7 @@ - NMDevice *dev = NULL; - NMData *data = NULL; - NMAccessPoint * ap = NULL; -+ NMActRequest * dev_req; - - g_return_val_if_fail (req != NULL, FALSE); - -@@ -61,6 +62,13 @@ - dev = nm_act_request_get_dev (req); - g_assert (dev); - -+ /* Ensure that inactive devices don't get the activated signal -+ * sent due to race conditions. -+ */ -+ dev_req = nm_device_get_act_request (dev); -+ if (!dev_req || (dev_req != req)) -+ return FALSE; -+ - if (nm_device_is_802_11_wireless (dev)) - ap = nm_act_request_get_ap (req); - -@@ -265,14 +273,16 @@ - } - - #if 0 -- nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (best_wired_dev) : "(null)", -- best_wireless_dev ? nm_device_get_iface (best_wireless_dev) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); -+ nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (NM_DEVICE (best_wired_dev)) : "(null)", -+ best_wireless_dev ? nm_device_get_iface (NM_DEVICE (best_wireless_dev)) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); - #endif - - return highest_priority_dev; - } - - -+static GStaticMutex dcc_mutex = G_STATIC_MUTEX_INIT; -+ - /* - * nm_policy_device_change_check - * -@@ -294,7 +304,9 @@ - - g_return_val_if_fail (data != NULL, FALSE); - -+ g_static_mutex_lock (&dcc_mutex); - data->dev_change_check_idle_id = 0; -+ g_static_mutex_unlock (&dcc_mutex); - - old_dev = nm_get_active_device (data); - -@@ -303,11 +315,19 @@ - - if (old_dev) - { -+ gboolean has_link = TRUE; - guint32 caps = nm_device_get_capabilities (old_dev); - -+ /* Ensure ethernet devices have a link before starting activation, -+ * partially works around Fedora #194124. -+ */ -+ if (nm_device_is_802_3_ethernet (old_dev)) -+ has_link = nm_device_has_active_link (old_dev); -+ - /* Don't interrupt a currently activating device. */ - if ( nm_device_is_activating (old_dev) -- && !nm_device_can_interrupt_activation (old_dev)) -+ && !nm_device_can_interrupt_activation (old_dev) -+ && has_link) - { - nm_info ("Old device '%s' activating, won't change.", nm_device_get_iface (old_dev)); - goto out; -@@ -425,13 +445,36 @@ - if (do_switch && (nm_device_is_802_3_ethernet (new_dev) || (nm_device_is_802_11_wireless (new_dev) && ap))) - { - NMActRequest * act_req = NULL; -+ gboolean has_link = TRUE; - -- if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) -+ /* Ensure ethernet devices have a link before starting activation, -+ * partially works around Fedora #194124. -+ */ -+ if (nm_device_is_802_3_ethernet (new_dev)) -+ has_link = nm_device_has_active_link (new_dev); -+ -+ if (has_link) - { -- nm_info ("Will activate connection '%s%s%s'.", nm_device_get_iface (new_dev), ap ? "/" : "", ap ? nm_ap_get_essid (ap) : ""); -- nm_policy_schedule_device_activation (act_req); -- nm_act_request_unref (act_req); -+ if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) -+ { -+ nm_info ("Will activate connection '%s%s%s'.", -+ nm_device_get_iface (new_dev), -+ ap ? "/" : "", -+ ap ? nm_ap_get_essid (ap) : ""); -+ nm_policy_schedule_device_activation (act_req); -+ nm_act_request_unref (act_req); -+ } -+ else -+ { -+ nm_info ("Error creating activation request for %s", -+ nm_device_get_iface (new_dev)); -+ } - } -+ else -+ { -+ nm_info ("Won't activate %s because it no longer has a link.", -+ nm_device_get_iface (new_dev)); -+ } - } - - if (ap) -@@ -452,11 +495,9 @@ - */ - void nm_policy_schedule_device_change_check (NMData *data) - { -- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; -- - g_return_if_fail (data != NULL); - -- g_static_mutex_lock (&mutex); -+ g_static_mutex_lock (&dcc_mutex); - - if (data->dev_change_check_idle_id == 0) - { -@@ -466,8 +507,7 @@ - data->dev_change_check_idle_id = g_source_attach (source, data->main_context); - g_source_unref (source); - } -- -- g_static_mutex_unlock (&mutex); -+ g_static_mutex_unlock (&dcc_mutex); - } - - -Index: src/nm-ap-security-wpa-eap.c -=================================================================== ---- src/nm-ap-security-wpa-eap.c (Revision 2558) -+++ src/nm-ap-security-wpa-eap.c (Revision 2652) -@@ -57,7 +57,6 @@ - NMAPSecurityWPA_EAP * security = NULL; - int eap_method; - int key_type; -- int phase2_type; - int wpa_version; - char * identity = NULL; - char * passwd = NULL; -Index: src/nm-device.c -=================================================================== ---- src/nm-device.c (Revision 2558) -+++ src/nm-device.c (Revision 2652) -@@ -856,6 +856,12 @@ - data = nm_act_request_get_data (req); - g_assert (data); - -+ /* Sometimes the device gets downed by wpa_supplicant; in any case, make -+ * sure it's up before anything tries to use it. -+ */ -+ if (!nm_device_is_up (self)) -+ nm_device_bring_up (self); -+ - /* DHCP devices try DHCP, non-DHCP default to SUCCESS */ - if (nm_device_get_use_dhcp (self)) - { -Index: src/NetworkManager.c -=================================================================== ---- src/NetworkManager.c (Revision 2558) -+++ src/NetworkManager.c (Revision 2652) -@@ -67,6 +67,7 @@ - - static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); - static void nm_data_free (NMData *data); -+static gboolean nm_poll_killswitches(gpointer user_data); - - /* - * nm_get_device_interface_from_hal -@@ -274,7 +275,184 @@ - } - - -+static void handle_killswitch_pcall_done (NMData *data, DBusPendingCall * pcall) -+{ -+ GSource * source; -+ gboolean now_enabled = FALSE; -+ gboolean now_disabled = FALSE; -+ -+ data->ks_pcall_list = g_slist_remove (data->ks_pcall_list, pcall); -+ if (g_slist_length (data->ks_pcall_list) > 0) -+ return; /* not done with all killswitches yet */ -+ -+ if (data->hw_rf_enabled != data->tmp_hw_rf_enabled) { -+ nm_info ("Wireless now %s by radio killswitch", -+ data->tmp_hw_rf_enabled ? "enabled" : "disabled"); -+ if (data->tmp_hw_rf_enabled) -+ now_enabled = TRUE; -+ else -+ now_disabled = TRUE; -+ -+ data->hw_rf_enabled = data->tmp_hw_rf_enabled; -+ } -+ -+ if (data->hw_rf_enabled == data->wireless_enabled) -+ goto out; -+ -+ /* Only re-enabled wireless if killswitch just changed, otherwise -+ * ignore hardware rf enabled state. -+ */ -+ if (now_enabled && !data->wireless_enabled) { -+ data->wireless_enabled = TRUE; -+ nm_policy_schedule_device_change_check (data); -+ nm_dbus_signal_wireless_enabled (data); -+ } else if (!data->hw_rf_enabled && data->wireless_enabled) { -+ GSList * elt; -+ -+ /* Deactivate all wireless devices and force them down so they -+ * turn off their radios. -+ */ -+ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); -+ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { -+ NMDevice * dev = (NMDevice *) elt->data; -+ if (nm_device_is_802_11_wireless (dev)) { -+ nm_device_deactivate (dev); -+ nm_device_bring_down (dev); -+ } -+ } -+ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); -+ -+ data->wireless_enabled = FALSE; -+ nm_policy_schedule_device_change_check (data); -+ nm_dbus_signal_wireless_enabled (data); -+ } -+ -+out: -+ /* Schedule another killswitch poll */ -+ source = g_timeout_source_new (6000); -+ g_source_set_callback (source, nm_poll_killswitches, data, NULL); -+ g_source_attach (source, data->main_context); -+ g_source_unref (source); -+} -+ -+static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * data) -+{ -+ DBusError err; -+ DBusMessage * reply = NULL; -+ guint32 status; -+ -+ g_return_if_fail (pcall != NULL); -+ g_return_if_fail (data != NULL); -+ -+ if (!dbus_pending_call_get_completed (pcall)) -+ goto out; -+ -+ if (!(reply = dbus_pending_call_steal_reply (pcall))) -+ goto out; -+ -+ if (message_is_error (reply)) { -+ dbus_error_init (&err); -+ dbus_set_error_from_message (&err, reply); -+ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ dbus_error_free (&err); -+ goto out; -+ } -+ -+ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { -+ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ dbus_error_free (&err); -+ goto out; -+ } -+ -+ if (status == 0) -+ data->tmp_hw_rf_enabled = FALSE; -+ -+out: -+ if (reply) -+ dbus_message_unref (reply); -+ -+ handle_killswitch_pcall_done (data, pcall); -+ dbus_pending_call_unref (pcall); -+} -+ -+ -+static gboolean nm_poll_killswitches (gpointer user_data) -+{ -+ NMData * data = (NMData *) user_data; -+ DBusConnection * connection = data->dbus_connection; -+ GSList * elt; -+ -+ g_return_val_if_fail (data != NULL, FALSE); -+ -+ data->tmp_hw_rf_enabled = TRUE; -+ -+ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) -+ { -+ DBusPendingCall * pcall; -+ DBusMessage * message; -+ -+ message = dbus_message_new_method_call ("org.freedesktop.Hal", -+ elt->data, -+ "org.freedesktop.Hal.Device.KillSwitch", -+ "GetPower"); -+ if (!dbus_connection_send_with_reply (connection, message, &pcall, 5000)) { -+ nm_warning ("%s(): could not send dbus message", __func__); -+ } else if (!pcall) { -+ nm_warning ("%s(): could not send dbus message; pcall was NULL", __func__); -+ } else { -+ dbus_pending_call_set_notify (pcall, -+ (DBusPendingCallNotifyFunction) nm_killswitch_getpower_reply_cb, -+ data, -+ NULL); -+ data->ks_pcall_list = g_slist_append (data->ks_pcall_list, pcall); -+ } -+ dbus_message_unref (message); -+ } -+ return FALSE; -+} -+ -+ - /* -+ * nm_add_killswitch_device -+ * -+ * Adds a killswitch device to the list -+ * -+ */ -+static void nm_add_killswitch_device (NMData * data, const char * udi) -+{ -+ char * type; -+ GSList * elt; -+ -+ type = libhal_device_get_property_string (data->hal_ctx, udi, "killswitch.type", NULL); -+ if (!type) -+ return; -+ -+ if (strcmp (type, "wlan") != 0) -+ goto out; -+ -+ /* see if it's already in the list */ -+ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) { -+ const char * list_udi = (const char *) elt->data; -+ if (strcmp (list_udi, udi) == 0) -+ goto out; -+ } -+ -+ /* Start polling switches if this is the first switch we've found */ -+ if (g_slist_length (data->killswitch_list) == 0) { -+ GSource * source = g_idle_source_new (); -+ g_source_set_callback (source, nm_poll_killswitches, data, NULL); -+ g_source_attach (source, data->main_context); -+ g_source_unref (source); -+ } -+ -+ data->killswitch_list = g_slist_append (data->killswitch_list, g_strdup (udi)); -+ nm_info ("Found radio killswitch %s", udi); -+ -+out: -+ libhal_free_string (type); -+} -+ -+/* - * nm_hal_device_new_capability - * - */ -@@ -283,10 +461,9 @@ - NMData *data = (NMData *)libhal_ctx_get_user_data (ctx); - - g_return_if_fail (data != NULL); -+ g_return_if_fail (capability != NULL); - -- /*nm_debug ("nm_hal_device_new_capability() called with udi = %s, capability = %s", udi, capability );*/ -- -- if (capability && ((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) -+ if (((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) - { - char *iface; - -@@ -296,6 +473,10 @@ - g_free (iface); - } - } -+ else if (strcmp (capability, "killswitch") == 0) -+ { -+ nm_add_killswitch_device (data, udi); -+ } - } - - -@@ -340,7 +521,31 @@ - libhal_free_string_array (net_devices); - } - -+void nm_add_initial_killswitch_devices (NMData * data) -+{ -+ char ** udis; -+ int num_udis, i; -+ DBusError error; - -+ g_return_if_fail (data != NULL); -+ -+ dbus_error_init (&error); -+ udis = libhal_find_device_by_capability (data->hal_ctx, "killswitch", &num_udis, &error); -+ if (!udis) -+ return; -+ -+ if (dbus_error_is_set (&error)) { -+ nm_warning("Could not find killswitch devices: %s", error.message); -+ dbus_error_free (&error); -+ return; -+ } -+ -+ for (i = 0; i < num_udis; i++) -+ nm_add_killswitch_device (data, udis[i]); -+ libhal_free_string_array (udis); -+} -+ -+ - /* - * nm_state_change_signal_broadcast - * -@@ -616,28 +821,39 @@ - g_return_if_fail (data != NULL); - - if ((data->hal_ctx = nm_get_hal_ctx (data))) -+ { -+ nm_add_initial_killswitch_devices (data); - nm_add_initial_devices (data); -+ } -+ -+ /* If there weren't any killswitches, mark hardware RF to on */ -+ if (g_slist_length (data->killswitch_list) == 0) -+ data->hw_rf_enabled = TRUE; - } - - - void nm_hal_deinit (NMData *data) - { -+ DBusError error; -+ - g_return_if_fail (data != NULL); - -- if (data->hal_ctx) -+ if (!data->hal_ctx) -+ return; -+ -+ g_slist_foreach (data->killswitch_list, (GFunc) g_free, NULL); -+ g_slist_free (data->killswitch_list); -+ data->killswitch_list = NULL; -+ -+ dbus_error_init (&error); -+ libhal_ctx_shutdown (data->hal_ctx, &error); -+ if (dbus_error_is_set (&error)) - { -- DBusError error; -- -- dbus_error_init (&error); -- libhal_ctx_shutdown (data->hal_ctx, &error); -- if (dbus_error_is_set (&error)) -- { -- nm_warning ("libhal shutdown failed - %s", error.message); -- dbus_error_free (&error); -- } -- libhal_ctx_free (data->hal_ctx); -- data->hal_ctx = NULL; -+ nm_warning ("libhal shutdown failed - %s", error.message); -+ dbus_error_free (&error); - } -+ libhal_ctx_free (data->hal_ctx); -+ data->hal_ctx = NULL; - } - - -Index: src/nm-device-802-11-wireless.c -=================================================================== ---- src/nm-device-802-11-wireless.c (Revision 2558) -+++ src/nm-device-802-11-wireless.c (Revision 2652) -@@ -617,7 +617,10 @@ - /* Start the scanning timeout for devices that can do scanning */ - if (nm_device_get_capabilities (dev) & NM_DEVICE_CAP_WIRELESS_SCAN) - { -- self->priv->pending_scan = g_idle_source_new (); -+ /* Stupid orinoco has problems scanning immediately after being up, -+ * so wait a bit before triggering a scan. -+ */ -+ self->priv->pending_scan = g_timeout_source_new (600); - g_source_set_callback (self->priv->pending_scan, - nm_device_802_11_wireless_scan, - self, -@@ -2981,6 +2984,9 @@ - return NM_ACT_STAGE_RETURN_POSTPONE; - } - -+ /* Some cards are dumb. Wait a second */ -+ sleep (1); -+ - iface = nm_device_get_iface (dev); - if (!supplicant_exec (self)) - { -@@ -3446,10 +3452,9 @@ - char *genie, *gpos, *gend, *custom; - NMAccessPoint *ap = NULL; - size_t clen; -- int maxrate; -+ int maxrate = 0; - struct iw_event iwe_buf, *iwe = &iwe_buf; - struct stream_descr stream; -- struct wireless_scan * wscan = NULL; - int ret; - - g_return_val_if_fail (dev != NULL, FALSE); -Index: src/NetworkManagerMain.h -=================================================================== ---- src/NetworkManagerMain.h (Revision 2558) -+++ src/NetworkManagerMain.h (Revision 2652) -@@ -82,6 +82,7 @@ - GSList * dev_list; - GMutex * dev_list_mutex; - -+ gboolean hw_rf_enabled; - gboolean wireless_enabled; - gboolean modem_active; - gboolean asleep; -@@ -90,6 +91,10 @@ - GSList * dialup_list; - GMutex * dialup_list_mutex; - -+ GSList * killswitch_list; -+ GSList * ks_pcall_list; /* track killswitch D-Bus pending calls */ -+ gboolean tmp_hw_rf_enabled; -+ - struct NMAccessPointList *allowed_ap_list; - struct NMAccessPointList *invalid_ap_list; - } NMData; -Index: src/NetworkManagerSystem.c -=================================================================== ---- src/NetworkManagerSystem.c (Revision 2558) -+++ src/NetworkManagerSystem.c (Revision 2652) -@@ -64,6 +64,7 @@ - struct sockaddr_in *p; - const char * iface; - int err; -+ NMIP4Config * config = NULL; - - iface = nm_device_get_iface (dev); - -@@ -75,6 +76,15 @@ - if (ip4_gateway == 0) - return TRUE; - -+ /* -+ * Do not add the route if the destination is on the same subnet. -+ */ -+ config = nm_device_get_ip4_config(dev); -+ if (config && -+ ((guint32)ip4_dest & nm_ip4_config_get_netmask(config)) == -+ (nm_ip4_config_get_address(config) & nm_ip4_config_get_netmask(config))) -+ return TRUE; -+ - if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL) - return FALSE; - diff --git a/debian/patches/21-endianess_fix_r2754.patch b/debian/patches/21-endianess_fix_r2754.patch deleted file mode 100644 index 4932e22a..00000000 --- a/debian/patches/21-endianess_fix_r2754.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (Revision 2753) -+++ ChangeLog (Revision 2754) -@@ -1,3 +1,8 @@ -+2007-08-30 Dan Williams -+ -+ * libnm-util/sha1.c -+ - Include config.h to get defines for endiannes (gnome.org #420216) -+ - 2007-07-26 Dan Williams - - Patch from Bernhard Miklautz -Index: libnm-util/sha1.c -=================================================================== ---- libnm-util/sha1.c (Revision 2753) -+++ libnm-util/sha1.c (Revision 2754) -@@ -12,6 +12,10 @@ - * See README and COPYING for more details. - */ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - diff --git a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch deleted file mode 100644 index ac0459b6..00000000 --- a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch +++ /dev/null @@ -1,44 +0,0 @@ -=== modified file 'gnome/vpn-properties/Makefile.am' ---- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.am 2007-06-25 13:51:34 +0000 -+++ network-manager-0.6.5/gnome/vpn-properties/Makefile.am 2007-08-03 11:50:32 +0000 -@@ -21,17 +21,16 @@ nm_vpn_properties_CFLAGS = - $(GCONF_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) - - nm_vpn_properties_LDADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - -=== modified file 'gnome/vpn-properties/Makefile.in' ---- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.in 2007-06-25 13:51:34 +0000 -+++ network-manager-0.6.5/gnome/vpn-properties/Makefile.in 2007-08-03 11:50:32 +0000 -@@ -258,17 +258,16 @@ nm_vpn_properties_CFLAGS = \ - $(GCONF_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(LIBGNOMEUI_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DICONDIR=\""$(datadir)/icons"\" \ - -DGLADEDIR=\""$(gladedir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -DVERSION=\"$(VERSION)\" \ - $(NULL) - - - nm_vpn_properties_LDADD = \ - $(GLADE_LIBS) \ - $(GTK_LIBS) \ - diff --git a/debian/patches/23-rfkill_return_type.patch b/debian/patches/23-rfkill_return_type.patch deleted file mode 100644 index 1e327d46..00000000 --- a/debian/patches/23-rfkill_return_type.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/NetworkManager.c -=================================================================== ---- src/NetworkManager.c (Revision 2974) -+++ src/NetworkManager.c (Arbeitskopie) -@@ -339,7 +339,7 @@ - { - DBusError err; - DBusMessage * reply = NULL; -- guint32 status; -+ gint32 status; - - g_return_if_fail (pcall != NULL); - g_return_if_fail (data != NULL); -@@ -358,7 +358,7 @@ - goto out; - } - -- if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { -+ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { - nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); - dbus_error_free (&err); - goto out; diff --git a/debian/patches/24-get_mode_fix_r3122.patch b/debian/patches/24-get_mode_fix_r3122.patch deleted file mode 100644 index f89db8d5..00000000 --- a/debian/patches/24-get_mode_fix_r3122.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/nm-device-802-11-wireless.c -=================================================================== ---- src/nm-device-802-11-wireless.c (Revision 3121) -+++ src/nm-device-802-11-wireless.c (Revision 3122) -@@ -1144,7 +1144,7 @@ - #endif - if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (NM_DEVICE (self)), SIOCGIWMODE, &wrq) == 0) - { -- if ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA)) -+ if ((wrq.u.mode == IW_MODE_ADHOC) || (wrq.u.mode == IW_MODE_INFRA)) - mode = wrq.u.mode; - } - else diff --git a/debian/patches/25-libnl_unique_pid_r3155.patch b/debian/patches/25-libnl_unique_pid_r3155.patch deleted file mode 100644 index a14aad83..00000000 --- a/debian/patches/25-libnl_unique_pid_r3155.patch +++ /dev/null @@ -1,417 +0,0 @@ -Index: src/NetworkManagerSystem.c -=================================================================== ---- src/NetworkManagerSystem.c (Revision 3154) -+++ src/NetworkManagerSystem.c (Revision 3155) -@@ -177,24 +177,6 @@ - } - - --static struct nl_cache * get_link_cache (struct nl_handle *nlh) --{ -- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; -- static struct nl_cache * link_cache = NULL; -- -- g_static_mutex_lock (&mutex); -- if (!link_cache) -- link_cache = rtnl_link_alloc_cache (nlh); -- if (!link_cache) -- nm_warning ("ERROR: couldn't allocate rtnl link cache!"); -- else -- nl_cache_update (nlh, link_cache); -- g_static_mutex_unlock (&mutex); -- -- return link_cache; --} -- -- - static void iface_to_rtnl_index (const char *iface, struct nl_handle *nlh, struct rtnl_addr *addr) - { - struct nl_cache * cache = NULL; -@@ -204,14 +186,17 @@ - g_return_if_fail (nlh != NULL); - g_return_if_fail (addr != NULL); - -- if ((cache = get_link_cache (nlh))) -- { -- i = rtnl_link_name2i (cache, iface); -- if (RTNL_LINK_NOT_FOUND != i) -- rtnl_addr_set_ifindex (addr, i); -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache.", __func__); -+ return; - } -- else -- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); -+ -+ nl_cache_update (nlh, cache); -+ i = rtnl_link_name2i (cache, iface); -+ if (RTNL_LINK_NOT_FOUND != i) -+ rtnl_addr_set_ifindex (addr, i); -+ nl_cache_destroy_and_free (cache); - } - - -@@ -223,45 +208,104 @@ - g_return_val_if_fail (iface != NULL, NULL); - g_return_val_if_fail (nlh != NULL, NULL); - -- if ((cache = get_link_cache (nlh))) -- have_link = rtnl_link_get_by_name (cache, iface); -- else -- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache.", __func__); -+ return NULL; -+ } - -+ nl_cache_update (nlh, cache); -+ have_link = rtnl_link_get_by_name (cache, iface); -+ nl_cache_destroy_and_free (cache); -+ - return have_link; - } - -+static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; - --static struct nl_handle * new_nl_handle (void) -+GHashTable *nl_pids = NULL; -+ -+static struct -+nl_handle * new_nl_handle (void) - { -- struct nl_handle * nlh = NULL; -+ struct nl_handle * nlh = NULL; -+ guint32 nl_pid; -+ int i = 0; - -- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); -- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); -- if (nl_connect(nlh, NETLINK_ROUTE) < 0) -- { -- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); -- nl_handle_destroy (nlh); -- nlh = NULL; -+ g_static_mutex_lock (&nlh_mutex); -+ -+ if (nl_pids == NULL) { -+ nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); -+ g_assert (nl_pids); -+ -+ /* Insert the PID used by nm-netlink-monitor.c */ -+ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); - } - -+ while (i++ < 10) { -+ nl_pid = g_random_int (); -+ if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) -+ break; -+ } -+ -+ if (i < 10) { -+ nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); -+ nl_handle_set_pid (nlh, nl_pid); -+ -+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); -+ nl_handle_destroy (nlh); -+ nlh = NULL; -+ } else { -+ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); -+ } -+ } else { -+ g_warning ("%s: couldn't find free netlink pid.", __func__); -+ } -+ -+ g_static_mutex_unlock (&nlh_mutex); -+ - return nlh; - } - -+static void -+destroy_nl_handle (struct nl_handle *nlh) -+{ -+ g_return_if_fail (nlh != NULL); - -+ g_static_mutex_lock (&nlh_mutex); -+ g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); -+ g_static_mutex_unlock (&nlh_mutex); -+ -+ nl_close (nlh); -+ nl_handle_destroy (nlh); -+ -+} -+ -+ - int - nm_system_get_rtnl_index_from_iface (const char *iface) - { - struct nl_handle * nlh = NULL; -- struct nl_cache * cache = NULL; -+ struct nl_cache * cache; - int i = RTNL_LINK_NOT_FOUND; - - nlh = new_nl_handle (); -- if (nlh && (cache = get_link_cache (nlh))) -- i = rtnl_link_name2i (cache, iface); -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ if (!nlh) -+ return RTNL_LINK_NOT_FOUND; - -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache."); -+ goto out; -+ } -+ -+ nl_cache_update (nlh, cache); -+ i = rtnl_link_name2i (cache, iface); -+ nl_cache_destroy_and_free (cache); -+ -+out: -+ destroy_nl_handle (nlh); - return i; - } - -@@ -275,18 +319,31 @@ - char * buf = NULL; - - nlh = new_nl_handle (); -- if (nlh && (cache = get_link_cache (nlh))) -- { -- buf = g_malloc0 (MAX_IFACE_LEN); -- if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) -- { -- g_free (buf); -- buf = NULL; -- } -+ if (!nlh) -+ return NULL; -+ -+ cache = rtnl_link_alloc_cache (nlh); -+ if (!cache) { -+ nm_warning ("%s: couldn't allocate link cache."); -+ goto out; - } -- nl_close (nlh); -- nl_handle_destroy (nlh); - -+ nl_cache_update (nlh, cache); -+ -+ buf = g_malloc0 (MAX_IFACE_LEN); -+ if (!buf) -+ goto destroy_cache; -+ -+ if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) { -+ g_free (buf); -+ buf = NULL; -+ } -+ -+destroy_cache: -+ nl_cache_destroy_and_free (cache); -+ -+out: -+ destroy_nl_handle (nlh); - return buf; - } - -@@ -313,13 +370,15 @@ - config = nm_device_get_ip4_config (dev); - g_return_val_if_fail (config != NULL, FALSE); - -+ nlh = new_nl_handle (); -+ if (!nlh) -+ return FALSE; -+ - nm_system_delete_default_route (); - nm_system_device_flush_addresses (dev); - nm_system_device_flush_routes (dev); - nm_system_flush_arp_cache (); - -- nlh = new_nl_handle (); -- - if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_DEFAULT))) - { - iface_to_rtnl_index (nm_device_get_iface (dev), nlh, addr); -@@ -330,8 +389,7 @@ - else - nm_warning ("nm_system_device_set_from_ip4_config(): couldn't create rtnl address!\n"); - -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ destroy_nl_handle (nlh); - - sleep (1); - nm_system_device_set_ip4_route (dev, nm_ip4_config_get_gateway (config), 0, 0, nm_ip4_config_get_mss (config)); -@@ -424,7 +482,13 @@ - * Set IPv4 configuration of a VPN device from an NMIP4Config object. - * - */ --gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevice *active_device, const char *iface, NMIP4Config *config, char **routes, int num_routes) -+gboolean -+nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, -+ NMDevice *active_device, -+ const char *iface, -+ NMIP4Config *config, -+ char **routes, -+ int num_routes) - { - NMIP4Config * ad_config = NULL; - struct nl_handle * nlh = NULL; -@@ -437,71 +501,73 @@ - if (active_device && (ad_config = nm_device_get_ip4_config (active_device))) - nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF, nm_ip4_config_get_mss (config)); - -- if (iface != NULL && strlen (iface)) -- { -- nm_system_device_set_up_down_with_iface (iface, TRUE); -+ if (!iface || !strlen (iface)) -+ goto done; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (); -+ if (!nlh) -+ goto done; - -- if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) -- { -- int err = 0; -- iface_to_rtnl_index (iface, nlh, addr); -- if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) -- nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); -- rtnl_addr_put (addr); -- } -- else -- nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); -+ nm_system_device_set_up_down_with_iface (iface, TRUE); - -- /* Set the MTU */ -- if ((request = rtnl_link_alloc ())) -- { -- struct rtnl_link * old; -+ if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) -+ { -+ int err = 0; -+ iface_to_rtnl_index (iface, nlh, addr); -+ if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) -+ nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); -+ rtnl_addr_put (addr); -+ } -+ else -+ nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); - -- old = iface_to_rtnl_link (iface, nlh); -- rtnl_link_set_mtu (request, 1412); -- rtnl_link_change (nlh, old, request, 0); -+ /* Set the MTU */ -+ if ((request = rtnl_link_alloc ())) -+ { -+ struct rtnl_link * old; - -- rtnl_link_put (old); -- rtnl_link_put (request); -- } -+ old = iface_to_rtnl_link (iface, nlh); -+ rtnl_link_set_mtu (request, 1412); -+ rtnl_link_change (nlh, old, request, 0); - -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ rtnl_link_put (old); -+ rtnl_link_put (request); -+ } - -- sleep (1); -+ destroy_nl_handle (nlh); - -- nm_system_device_flush_routes_with_iface (iface); -- if (num_routes <= 0) -+ sleep (1); -+ -+ nm_system_device_flush_routes_with_iface (iface); -+ if (num_routes <= 0) -+ { -+ nm_system_delete_default_route (); -+ nm_system_device_add_default_route_via_device_with_iface (iface); -+ } -+ else -+ { -+ int i; -+ for (i = 0; i < num_routes; i++) - { -- nm_system_delete_default_route (); -- nm_system_device_add_default_route_via_device_with_iface (iface); -- } -- else -- { -- int i; -- for (i = 0; i < num_routes; i++) -+ char *valid_ip4_route; -+ -+ /* Make sure the route is valid, otherwise it's a security risk as the route -+ * text is simply taken from the user, and passed directly to system(). If -+ * we did not check the route, think of: -+ * -+ * system("/sbin/ip route add `rm -rf /` dev eth0") -+ * -+ * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. -+ */ -+ if ((valid_ip4_route = validate_ip4_route (routes[i]))) - { -- char *valid_ip4_route; -- -- /* Make sure the route is valid, otherwise it's a security risk as the route -- * text is simply taken from the user, and passed directly to system(). If -- * we did not check the route, think of: -- * -- * system("/sbin/ip route add `rm -rf /` dev eth0") -- * -- * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. -- */ -- if ((valid_ip4_route = validate_ip4_route (routes[i]))) -- { -- nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); -- g_free (valid_ip4_route); -- } -+ nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); -+ g_free (valid_ip4_route); - } - } - } - -+done: - nm_named_manager_add_ip4_config (named, config); - - return TRUE; -@@ -548,7 +614,8 @@ - - g_return_val_if_fail (iface != NULL, FALSE); - -- if (!(nlh = new_nl_handle ())) -+ nlh = new_nl_handle (); -+ if (!nlh) - return FALSE; - - if (!(request = rtnl_link_alloc ())) -@@ -569,9 +636,7 @@ - success = TRUE; - - out: -- nl_close (nlh); -- nl_handle_destroy (nlh); -- -+ destroy_nl_handle (nlh); - return success; - } - -@@ -614,6 +679,6 @@ - out_request: - rtnl_link_put (request); - out_nl_close: -- nl_close (nlh); -- nl_handle_destroy (nlh); -+ destroy_nl_handle (nlh); - } -+ diff --git a/debian/patches/26-libnl_1.0-pre8_r3206.patch b/debian/patches/26-libnl_1.0-pre8_r3206.patch deleted file mode 100644 index 6f96215d..00000000 --- a/debian/patches/26-libnl_1.0-pre8_r3206.patch +++ /dev/null @@ -1,202 +0,0 @@ -Index: src/nm-netlink-monitor.c -=================================================================== ---- src/nm-netlink-monitor.c (Revision 3205) -+++ src/nm-netlink-monitor.c (Revision 3206) -@@ -174,7 +174,7 @@ - } - - monitor_address.nl_family = AF_NETLINK; -- monitor_address.nl_pid = getpid (); -+ monitor_address.nl_pid = UINT_MAX; - monitor_address.nl_groups = RTMGRP_LINK; - - if (bind (fd, -@@ -365,7 +365,7 @@ - packet.header.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtgenmsg)); - packet.header.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; - packet.header.nlmsg_type = RTM_GETLINK; -- packet.header.nlmsg_pid = getpid (); -+ packet.header.nlmsg_pid = UINT_MAX; - /* Might be good to generate a unique sequence number and track - the response */ - packet.header.nlmsg_seq = sequence_number << 16; -Index: src/NetworkManagerSystem.c -=================================================================== ---- src/NetworkManagerSystem.c (Revision 3205) -+++ src/NetworkManagerSystem.c (Revision 3206) -@@ -196,7 +196,7 @@ - i = rtnl_link_name2i (cache, iface); - if (RTNL_LINK_NOT_FOUND != i) - rtnl_addr_set_ifindex (addr, i); -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - } - - -@@ -216,55 +216,42 @@ - - nl_cache_update (nlh, cache); - have_link = rtnl_link_get_by_name (cache, iface); -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - - return have_link; - } - --static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; -- --GHashTable *nl_pids = NULL; -- - static struct --nl_handle * new_nl_handle (void) -+nl_handle *new_nl_handle (gboolean recursive) - { -- struct nl_handle * nlh = NULL; -- guint32 nl_pid; -- int i = 0; -+ struct nl_handle *nlh = NULL; -+ struct nl_cb *cb; - -- g_static_mutex_lock (&nlh_mutex); -- -- if (nl_pids == NULL) { -- nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); -- g_assert (nl_pids); -- -- /* Insert the PID used by nm-netlink-monitor.c */ -- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); -+ cb = nl_cb_alloc (NL_CB_VERBOSE); -+ nlh = nl_handle_alloc_cb (cb); -+ if (!nlh) { -+ nm_warning ("%s: couldn't allocate netlink handle: %s", __func__, nl_geterror ()); -+ return NULL; - } - -- while (i++ < 10) { -- nl_pid = g_random_int (); -- if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) -- break; -- } -+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ /* HACK: try one more time. Because the netlink monitor for link state -+ * inits before we get here, it grabs the port that matches the PID -+ * of the NM process, which also happens to be the PID that libnl uses -+ * the first time too. The real fix is to convert nm-netlink-monitor.c -+ * over to use libnl. -+ */ -+ nl_handle_destroy (nlh); -+ if (recursive) -+ return NULL; - -- if (i < 10) { -- nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); -- nl_handle_set_pid (nlh, nl_pid); -- -- if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ nlh = new_nl_handle (TRUE); -+ if (!nlh) { - nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); -- nl_handle_destroy (nlh); -- nlh = NULL; -- } else { -- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); -+ return NULL; - } -- } else { -- g_warning ("%s: couldn't find free netlink pid.", __func__); - } - -- g_static_mutex_unlock (&nlh_mutex); -- - return nlh; - } - -@@ -273,16 +260,10 @@ - { - g_return_if_fail (nlh != NULL); - -- g_static_mutex_lock (&nlh_mutex); -- g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); -- g_static_mutex_unlock (&nlh_mutex); -- - nl_close (nlh); - nl_handle_destroy (nlh); -- - } - -- - int - nm_system_get_rtnl_index_from_iface (const char *iface) - { -@@ -290,7 +271,7 @@ - struct nl_cache * cache; - int i = RTNL_LINK_NOT_FOUND; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return RTNL_LINK_NOT_FOUND; - -@@ -302,7 +283,7 @@ - - nl_cache_update (nlh, cache); - i = rtnl_link_name2i (cache, iface); -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - - out: - destroy_nl_handle (nlh); -@@ -318,7 +299,7 @@ - struct nl_cache * cache = NULL; - char * buf = NULL; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return NULL; - -@@ -340,7 +321,7 @@ - } - - destroy_cache: -- nl_cache_destroy_and_free (cache); -+ nl_cache_free (cache); - - out: - destroy_nl_handle (nlh); -@@ -370,7 +351,7 @@ - config = nm_device_get_ip4_config (dev); - g_return_val_if_fail (config != NULL, FALSE); - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return FALSE; - -@@ -504,7 +485,7 @@ - if (!iface || !strlen (iface)) - goto done; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - goto done; - -@@ -614,7 +595,7 @@ - - g_return_val_if_fail (iface != NULL, FALSE); - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return FALSE; - -@@ -658,7 +639,7 @@ - if (!mtu) - return; - -- nlh = new_nl_handle (); -+ nlh = new_nl_handle (FALSE); - if (!nlh) - return; - diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch deleted file mode 100644 index 64e23223..00000000 --- a/debian/patches/27-dont_repeat_errors.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/NetworkManager.c b/src/NetworkManager.c -index 4f89f63..ddb5a4a 100644 ---- a/src/NetworkManager.c -+++ b/src/NetworkManager.c -@@ -65,6 +65,8 @@ - */ - static NMData *nm_data = NULL; - -+char *ks_err_message = NULL; -+ - static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); - static void nm_data_free (NMData *data); - static gboolean nm_poll_killswitches(gpointer user_data); -@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da - if (message_is_error (reply)) { - dbus_error_init (&err); - dbus_set_error_from_message (&err, reply); -- nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ if (!ks_err_message || strcmp (ks_err_message, err.message)) { -+ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); -+ g_free (ks_err_message); -+ ks_err_message = g_strdup (err.message); -+ } - dbus_error_free (&err); - goto out; - } - - if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { -- nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ if (!ks_err_message || strcmp (ks_err_message, err.message)) { -+ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); -+ g_free (ks_err_message); -+ ks_err_message = g_strdup (err.message); -+ } - dbus_error_free (&err); - goto out; - } -- cgit 1.3.0-6-gf8a5 From 6750b359b814598de75aa800c952a2a7e0844939 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:20:38 +0000 Subject: * debian/patches/06-dispatch_more_events.patch - NetworkManagerDispatcher.1.in has been renamed to NetworkManagerDispatcher.8.in. Update the patch accordingly. * debian/network-manager.manpages - The NetworkManager and NetworkManagerDispatcher man pages have been moved to section 8. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2154 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++++- debian/patches/06-dispatch_more_events.patch | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3483f24..3662e3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,14 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low - debian/patches/25-libnl_unique_pid_r3155.patch (merged upstream) - debian/patches/26-libnl_1.0-pre8_r3206.patch (merged upstream) - debian/patches/27-dont_repeat_errors.patch (merged upstream) + * debian/patches/06-dispatch_more_events.patch + - NetworkManagerDispatcher.1.in has been renamed to + NetworkManagerDispatcher.8.in. Update the patch accordingly. + * debian/network-manager.manpages + - The NetworkManager and NetworkManagerDispatcher man pages have been + moved to section 8. - -- Michael Biebl Thu, 03 Apr 2008 00:49:13 +0200 + -- Michael Biebl Thu, 03 Apr 2008 02:11:34 +0200 network-manager (0.6.5-5) unstable; urgency=low diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index 60d50432..8ef4b176 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -48,8 +48,8 @@ nmd_execute_scripts (action, dev_iface_name); } ---- man/NetworkManagerDispatcher.1.in 2006-02-01 19:14:15.000000000 +0100 -+++ man/NetworkManagerDispatcher.1.in.new 2006-08-15 20:13:00.000000000 +0200 +--- 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 -- cgit 1.3.0-6-gf8a5 From 46efdb6a1ccbe8aceb9e78065c01ececd466dd5f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:22:06 +0000 Subject: Mark the patches, which were pulled from upstream svn differently. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2155 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3662e3ab..a9f48af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,15 +6,15 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low - debian/patches/04-if_fix.patch (obsolete) - debian/patches/11-man_page_sh_name.patch (merged upstream) - debian/patches/12_readme_format.patch (merged upstream) - - debian/patches/20-stable_branch_updates_r2652.patch (merged upstream) - - debian/patches/21-endianess_fix_r2754.patch (merged upstream) + - debian/patches/20-stable_branch_updates_r2652.patch (applied upstream) + - debian/patches/21-endianess_fix_r2754.patch (applied upstream) - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch (merged upstream) - debian/patches/23-rfkill_return_type.patch (fixed upstream) - - debian/patches/24-get_mode_fix_r3122.patch (merged upstream) - - debian/patches/25-libnl_unique_pid_r3155.patch (merged upstream) - - debian/patches/26-libnl_1.0-pre8_r3206.patch (merged upstream) - - debian/patches/27-dont_repeat_errors.patch (merged upstream) + - debian/patches/24-get_mode_fix_r3122.patch (applied upstream) + - debian/patches/25-libnl_unique_pid_r3155.patch (applied upstream) + - debian/patches/26-libnl_1.0-pre8_r3206.patch (applied upstream) + - debian/patches/27-dont_repeat_errors.patch (applied upstream) * debian/patches/06-dispatch_more_events.patch - NetworkManagerDispatcher.1.in has been renamed to NetworkManagerDispatcher.8.in. Update the patch accordingly. -- cgit 1.3.0-6-gf8a5 From 21880be8206c4c90dae6826f8b479c74b9d7d942 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:24:41 +0000 Subject: debian/patches/07-domain_search.patch - Add support for DHCP domain-search option. (Closes: #465158) Thanks to Bas Zoetekouw for the patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2156 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 + debian/patches/07-domain_search.patch | 281 ++++++++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) create mode 100644 debian/patches/07-domain_search.patch diff --git a/debian/changelog b/debian/changelog index a9f48af7..c19d55df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low - debian/patches/25-libnl_unique_pid_r3155.patch (applied upstream) - debian/patches/26-libnl_1.0-pre8_r3206.patch (applied upstream) - debian/patches/27-dont_repeat_errors.patch (applied upstream) + * debian/patches/07-domain_search.patch + - Add support for DHCP domain-search option. (Closes: #465158) + Thanks to Bas Zoetekouw for the patch. * debian/patches/06-dispatch_more_events.patch - NetworkManagerDispatcher.1.in has been renamed to NetworkManagerDispatcher.8.in. Update the patch accordingly. diff --git a/debian/patches/07-domain_search.patch b/debian/patches/07-domain_search.patch new file mode 100644 index 00000000..cf614a0d --- /dev/null +++ b/debian/patches/07-domain_search.patch @@ -0,0 +1,281 @@ +Index: NetworkManager-0.6/src/dhcp-manager/nm-dhcp-manager.c +=================================================================== +--- NetworkManager-0.6.orig/src/dhcp-manager/nm-dhcp-manager.c 2008-03-02 09:25:16.000000000 +0100 ++++ NetworkManager-0.6/src/dhcp-manager/nm-dhcp-manager.c 2008-03-02 09:26:33.000000000 +0100 +@@ -472,6 +472,7 @@ + guint32 num_ip4_nis_servers = 0; + char * hostname = NULL; + char * domain_names = NULL; ++ char * domain_searches = NULL; + char * nis_domain = NULL; + guint32 * ip4_nis_servers = NULL; + struct in_addr temp_addr; +@@ -520,6 +521,7 @@ + get_ip4_string (manager, dev, "host_name", &hostname, TRUE); + get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers, FALSE); + get_ip4_string (manager, dev, "domain_name", &domain_names, TRUE); ++ get_ip4_string (manager, dev, "domain_search", &domain_searches, TRUE); + get_ip4_string (manager, dev, "nis_domain", &nis_domain, TRUE); + get_ip4_uint32s (manager, dev, "nis_servers", &ip4_nis_servers, &num_ip4_nis_servers, TRUE); + +@@ -557,14 +559,27 @@ + + if (domain_names) + { +- char **searches = g_strsplit (domain_names, " ", 0); ++ char **domains = g_strsplit (domain_names, " ", 0); + char **s; + +- for (s = searches; *s; s++) ++ for (s = domains; *s; s++) + { + nm_info (" domain name '%s'", *s); + nm_ip4_config_add_domain (ip4_config, *s); + } ++ g_strfreev (domains); ++ } ++ ++ if (domain_searches) ++ { ++ char **searches = g_strsplit (domain_searches, " ", 0); ++ char **s; ++ ++ for (s = searches; *s; s++) ++ { ++ nm_info (" domain search '%s'", *s); ++ nm_ip4_config_add_search (ip4_config, *s); ++ } + g_strfreev (searches); + } + +Index: NetworkManager-0.6/src/named-manager/nm-named-manager.c +=================================================================== +--- NetworkManager-0.6.orig/src/named-manager/nm-named-manager.c 2008-03-02 09:25:16.000000000 +0100 ++++ NetworkManager-0.6/src/named-manager/nm-named-manager.c 2008-03-02 09:26:33.000000000 +0100 +@@ -319,7 +319,7 @@ + static char * + compute_searches (NMNamedManager *mgr, NMIP4Config *config) + { +- int i, num_searches; ++ int i, num_searches, num_domains; + GString *str = NULL; + + g_return_val_if_fail (mgr != NULL, g_strdup ("")); +@@ -328,14 +328,54 @@ + if (!config) + return g_strdup (""); + +- num_searches = nm_ip4_config_get_num_domains (config); +- for (i = 0; i < num_searches; i++) +- { +- if (!str) +- str = g_string_new ("search"); ++ num_searches = nm_ip4_config_get_num_searches (config); ++ num_domains = nm_ip4_config_get_num_domains (config); ++ ++ /* ISC DHCP 3.1 provides support for the domain-search option. This is the ++ * correct way for a DHCP server to provide a domain search list. Wedging ++ * multiple domains into the domain-name option is a horrible hack. ++ * ++ * So, we handle it like this (as proposed by Andrew Pollock at ++ * http://bugs.debian.org/465158): ++ * ++ * - if the domain-search option is present in the data received via DHCP, ++ * use it in favour of the domain-name option for setting the search ++ * directive in /etc/resolv.conf ++ * ++ * - if the domain-name option is present in the data received via DHCP, use ++ * it to set the domain directive in /etc/resolv.conf ++ * (this is handled in compute_domain() below) ++ * ++ * - if only the domain-name option is present in the data received via DHCP ++ * (and domain-search is not), for backwards compatibility, set the search ++ * directive in /etc/resolv.conf to the specified domain names ++ */ + +- g_string_append_c (str, ' '); +- g_string_append (str, nm_ip4_config_get_domain (config, i)); ++ if ( num_searches == 0 && num_domains > 0 ) ++ { ++ /* old, pre-ISC-3.1 fallback: ++ * use (possibly multiple entries from) domain-name for the search entry */ ++ str = g_string_new ("search"); ++ for (i = 0; i < num_domains; i++) ++ { ++ g_string_append_c (str, ' '); ++ g_string_append (str, nm_ip4_config_get_domain (config, i)); ++ } ++ } ++ else if ( num_searches > 0 ) ++ { ++ /* the "correct", post-ISC-3.1 situation: use searches just as received */ ++ str = g_string_new ("search"); ++ for (i = 0; i < num_searches; i++) ++ { ++ g_string_append_c (str, ' '); ++ g_string_append (str, nm_ip4_config_get_search (config, i)); ++ } ++ } ++ else /* num_searches == 0 && num_domains == 0 */ ++ { ++ /* no info available at all */ ++ return g_strdup (""); + } + + if (!str) +@@ -346,11 +386,41 @@ + return g_string_free (str, FALSE); + } + ++static char * ++compute_domain (NMNamedManager *mgr, NMIP4Config *config) ++{ ++ int num_domains; ++ GString *str = NULL; ++ ++ g_return_val_if_fail (mgr != NULL, g_strdup ("")); ++ ++ /* config can be NULL */ ++ if (!config) ++ return g_strdup (""); ++ ++ num_domains = nm_ip4_config_get_num_domains (config); ++ ++ /* warn the user that he should change his config ++ * (see comments above in compute_search() ) */ ++ if ( num_domains > 1 ) ++ nm_warning ("DHCP server sent multiple entries in domain-name; this is obsolete behaviour; please fix or update your DHCP server"); ++ ++ if (num_domains == 0) ++ return g_strdup (""); ++ ++ str = g_string_new ("domain "); ++ g_string_append (str, nm_ip4_config_get_domain (config, 0)); ++ g_string_append_c (str, '\n'); ++ ++ return g_string_free (str, FALSE); ++} ++ + static gboolean + rewrite_resolv_conf (NMNamedManager *mgr, NMIP4Config *config, GError **error) + { + const char * tmp_resolv_conf = RESOLV_CONF ".tmp"; + char * searches = NULL; ++ char * domain = NULL; + FILE * f; + NMIP4Config *ns_config = config; + +@@ -388,23 +458,27 @@ + } + g_return_val_if_fail (ns_config != NULL, FALSE); + ++ domain = compute_domain (mgr, ns_config); + searches = compute_searches (mgr, ns_config); + + if (mgr->priv->use_named == TRUE) { + /* Using caching-nameserver & local DNS */ +- if (fprintf (f, "%s%s%s", "; Use a local caching nameserver controlled by NetworkManager\n\n", searches, "\nnameserver 127.0.0.1\n") < 0) ++ if (fprintf (f, "%s%s%s%s", "; Use a local caching nameserver controlled by NetworkManager\n\n", domain, searches, "\nnameserver 127.0.0.1\n") < 0) + goto lose; + } else { + /* Using glibc resolver */ + char *nameservers = compute_nameservers (mgr, ns_config); + ++ fprintf (f, "%s\n\n", domain); + fprintf (f, "%s\n\n", searches); +- g_free (searches); +- + fprintf (f, "%s\n\n", nameservers); ++ + g_free (nameservers); + } + ++ g_free (domain); ++ g_free (searches); ++ + if (fclose (f) < 0) + goto lose; + +@@ -414,6 +488,7 @@ + return TRUE; + + lose: ++ g_free (domain); + g_free (searches); + fclose (f); + g_set_error (error, +Index: NetworkManager-0.6/src/nm-ip4-config.c +=================================================================== +--- NetworkManager-0.6.orig/src/nm-ip4-config.c 2008-03-02 09:25:16.000000000 +0100 ++++ NetworkManager-0.6/src/nm-ip4-config.c 2008-03-02 09:26:33.000000000 +0100 +@@ -46,6 +46,7 @@ + + GSList * nameservers; + GSList * domains; ++ GSList * searches; + + gchar * hostname; + gchar * nis_domain; +@@ -275,6 +276,17 @@ + config->domains = g_slist_append (config->domains, g_strdup (domain)); + } + ++void nm_ip4_config_add_search (NMIP4Config *config, const char *search) ++{ ++ g_return_if_fail (config != NULL); ++ g_return_if_fail (search != NULL); ++ ++ if (!strlen (search)) ++ return; ++ ++ config->searches = g_slist_append (config->searches, g_strdup (search)); ++} ++ + void nm_ip4_config_set_hostname (NMIP4Config *config, const char *hostname) + { + g_return_if_fail (config != NULL); +@@ -329,6 +341,25 @@ + return (g_slist_length (config->domains)); + } + ++const char *nm_ip4_config_get_search (NMIP4Config *config, guint i) ++{ ++ const char *search; ++ ++ g_return_val_if_fail (config != NULL, NULL); ++ g_return_val_if_fail (i < g_slist_length (config->searches), NULL); ++ ++ if ((search = (const char *) g_slist_nth_data (config->searches, i))) ++ return search; ++ return NULL; ++} ++ ++guint32 nm_ip4_config_get_num_searches (NMIP4Config *config) ++{ ++ g_return_val_if_fail (config != NULL, 0); ++ ++ return (g_slist_length (config->searches)); ++} ++ + guint32 nm_ip4_config_get_mtu (NMIP4Config *config) + { + g_return_val_if_fail (config != NULL, 0); +Index: NetworkManager-0.6/src/nm-ip4-config.h +=================================================================== +--- NetworkManager-0.6.orig/src/nm-ip4-config.h 2008-03-02 09:25:16.000000000 +0100 ++++ NetworkManager-0.6/src/nm-ip4-config.h 2008-03-02 09:26:33.000000000 +0100 +@@ -68,6 +68,14 @@ + const char * nm_ip4_config_get_domain (NMIP4Config *config, guint i); + guint32 nm_ip4_config_get_num_domains (NMIP4Config *config); + ++void nm_ip4_config_add_search (NMIP4Config *config, const char *search); ++const char * nm_ip4_config_get_search (NMIP4Config *config, guint i); ++guint32 nm_ip4_config_get_num_searches (NMIP4Config *config); ++ ++void nm_ip4_config_add_domain (NMIP4Config *config, const char *search); ++const char * nm_ip4_config_get_domain (NMIP4Config *config, guint i); ++guint32 nm_ip4_config_get_num_searches (NMIP4Config *config); ++ + guint32 nm_ip4_config_get_mtu (NMIP4Config *config); + void nm_ip4_config_set_mtu (NMIP4Config *config, guint32 mtu); + -- cgit 1.3.0-6-gf8a5 From 1efa26722f56347565745957c56c0818eee42d3e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:34:09 +0000 Subject: debian/control - The pkg-config files have been fixed upstream and unnecessary dependencies were removed. Update Depends: for libnm-glib-dev and libnm-util-dev accordingly. (Closes: #469195) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2157 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/control | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c19d55df..7c48e9c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,10 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low * debian/network-manager.manpages - The NetworkManager and NetworkManagerDispatcher man pages have been moved to section 8. + * debian/control + - The pkg-config files have been fixed upstream and unnecessary + dependencies were removed. Update Depends: for libnm-glib-dev and + libnm-util-dev accordingly. (Closes: #469195) -- Michael Biebl Thu, 03 Apr 2008 02:11:34 +0200 diff --git a/debian/control b/debian/control index d67c779c..6808acfd 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-glib0 (= ${binary:Version}), libglib2.0-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 @@ -81,7 +81,7 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-util0 (= ${binary:Version}), libdbus-1-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 -- cgit 1.3.0-6-gf8a5 From 35737a6076f8e534c35828a299d54bfd91e550ca Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:36:39 +0000 Subject: Forgot to commit this changes in r2154. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2158 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.manpages | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 50ee9f13..2228d957 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,4 +1,4 @@ -man/NetworkManagerDispatcher.1 +man/NetworkManagerDispatcher.8 man/nm-tool.1 -man/NetworkManager.1 +man/NetworkManager.8 debian/nm-vpn-properties.1 -- cgit 1.3.0-6-gf8a5 From eb8f8ce9dc798e8c9ec6b0adb7709ad18a8330ae Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:53:19 +0000 Subject: debian/rules, debian/network-manager.postinst - Minimize downtime during upgrades. (Closes: #432322) Restart the service in postinst instead of stop in prerm and start in postinst. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2159 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +++++- debian/network-manager.postinst | 12 ++++++++++++ debian/network-manager.preinst | 5 +---- debian/rules | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c48e9c2..aa1d5892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,12 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low - The pkg-config files have been fixed upstream and unnecessary dependencies were removed. Update Depends: for libnm-glib-dev and libnm-util-dev accordingly. (Closes: #469195) + * debian/rules, debian/network-manager.postinst + - Minimize downtime during upgrades. (Closes: #432322) + Restart the service in postinst instead of stop in prerm and start in + postinst. - -- Michael Biebl Thu, 03 Apr 2008 02:11:34 +0200 + -- Michael Biebl Thu, 03 Apr 2008 02:37:16 +0200 network-manager (0.6.5-5) unstable; urgency=low diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c2a445c7..4d7cb755 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -43,6 +43,18 @@ case "$1" in if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true fi + + # Stop the service on upgrades before it is started again. + # dh_installinit -r will create the start code. + if [ -n "$2" ]; then + 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 + ;; abort-upgrade|abort-deconfigure|abort-remove) diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 3f737448..c3cc480e 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -35,10 +35,7 @@ prep_rm_conffile() case "$1" in - install) - ;; - - upgrade) + install|upgrade) # Upgrade from previous versions if dpkg --compare-versions "$2" lt "0.6.4-8"; then if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then diff --git a/debian/rules b/debian/rules index a4a1c76d..9442c792 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . +DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 . DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties -- cgit 1.3.0-6-gf8a5 From 43c312ba7032101a1c6c962f4aa7da056c710d7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 01:29:36 +0000 Subject: debian/patches/08-hal_deprecated_keys.patch - Add support for the "net.originating_device" key, which has replaced the deprecated "net.physical_device" key in newer HAL versions. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2160 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/patches/08-hal_deprecated_keys.patch | 34 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 debian/patches/08-hal_deprecated_keys.patch diff --git a/debian/changelog b/debian/changelog index aa1d5892..a0103566 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low * debian/patches/07-domain_search.patch - Add support for DHCP domain-search option. (Closes: #465158) Thanks to Bas Zoetekouw for the patch. + * debian/patches/08-hal_deprecated_keys.patch + - Add support for the "net.originating_device" key, which has replaced + the deprecated "net.physical_device" key in newer HAL versions. * debian/patches/06-dispatch_more_events.patch - NetworkManagerDispatcher.1.in has been renamed to NetworkManagerDispatcher.8.in. Update the patch accordingly. diff --git a/debian/patches/08-hal_deprecated_keys.patch b/debian/patches/08-hal_deprecated_keys.patch new file mode 100644 index 00000000..5e09f8c2 --- /dev/null +++ b/debian/patches/08-hal_deprecated_keys.patch @@ -0,0 +1,34 @@ +Index: src/nm-device.c +=================================================================== +--- src/nm-device.c (Revision 3527) ++++ src/nm-device.c (Arbeitskopie) +@@ -115,19 +115,24 @@ + nm_get_device_driver_name (LibHalContext *ctx, const char *udi) + { + char * driver_name = NULL; +- char * physdev_udi = NULL; ++ char * origdev_udi = NULL; + + g_return_val_if_fail (ctx != NULL, NULL); + g_return_val_if_fail (udi != NULL, NULL); + +- physdev_udi = libhal_device_get_property_string (ctx, udi, "net.physical_device", NULL); +- if (physdev_udi && libhal_device_property_exists (ctx, physdev_udi, "info.linux.driver", NULL)) ++ origdev_udi = libhal_device_get_property_string (ctx, udi, "net.originating_device", NULL); ++ if (!origdev_udi) { ++ /* Older HAL uses 'physical_device' */ ++ origdev_udi = libhal_device_get_property_string (ctx, udi, "net.physical_device", NULL); ++ } ++ ++ if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) + { +- char *drv = libhal_device_get_property_string (ctx, physdev_udi, "info.linux.driver", NULL); ++ char *drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); + driver_name = g_strdup (drv); + g_free (drv); + } +- g_free (physdev_udi); ++ g_free (origdev_udi); + + return driver_name; + } -- cgit 1.3.0-6-gf8a5 From a85d75fcd3c5736d43e6ac4d945ee572fdd65b29 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 01:33:55 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2161 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a0103566..4eba1052 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.6-1) UNRELEASED; urgency=low +network-manager (0.6.6-1) unstable; urgency=low * New upstream release. (Closes: #470197) - Ensure dbus errors are properly initialised. (Closes: #471317) -- cgit 1.3.0-6-gf8a5 From c160b99e5ca09d606fa4e762cd71533d33ebf5b9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Apr 2008 12:38:47 +0000 Subject: debian/control - Add Build-Depends on pkg-config. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2187 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/control | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4eba1052..56f0631f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.6-2) UNRELEASED; urgency=low + + * debian/control + - Add Build-Depends on pkg-config. + + -- Michael Biebl Thu, 03 Apr 2008 03:41:27 +0200 + network-manager (0.6.6-1) unstable; urgency=low * New upstream release. (Closes: #470197) diff --git a/debian/control b/debian/control index 6808acfd..e00e6e35 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, 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 +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, quilt Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager @@ -28,7 +28,6 @@ Description: network management framework daemon Package: network-manager-dev Architecture: any Section: devel -Depends: pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. -- cgit 1.3.0-6-gf8a5 From 7c0c1bdc6afc0968a1b7df06600dabbac997143d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Apr 2008 12:41:10 +0000 Subject: Improve watch file to not hardcode the versioned subdirectory. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2189 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index f2d66b4c..4b762cde 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -http://download.gnome.org/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz +http://download.gnome.org/sources/NetworkManager/([\d\.]+)/NetworkManager-(.*)\.tar\.gz -- cgit 1.3.0-6-gf8a5 From 63242af5d6ebf808fcaff9ebb59d897646792042 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 18 Jun 2008 13:05:11 +0000 Subject: Merge mbiebl's packaging git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2304 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 67 +++++- debian/control | 12 +- debian/copyright | 8 - debian/libnm-glib-dev.install | 2 +- debian/libnm-glib0.symbols | 179 ++++++++++++++ debian/libnm-util-dev.install | 12 +- debian/libnm-util0.symbols | 94 ++++++++ debian/network-manager-dev.install | 1 - debian/network-manager.dirs | 1 + debian/network-manager.init | 7 +- debian/network-manager.install | 20 +- debian/network-manager.manpages | 4 +- debian/network-manager.postinst | 26 +- debian/network-manager.postrm | 85 ------- debian/network-manager.preinst | 26 +- debian/nm-system-settings.conf | 2 + debian/nm-vpn-properties.sgml | 95 -------- .../patches/02-dbus_access_network_manager.patch | 6 +- debian/patches/03-system-settings-conf.patch | 11 + debian/patches/05-debian_backend.patch | 262 ++++----------------- debian/patches/series | 3 + debian/rules | 20 +- debian/watch | 2 +- 23 files changed, 458 insertions(+), 487 deletions(-) create mode 100644 debian/libnm-glib0.symbols create mode 100644 debian/libnm-util0.symbols delete mode 100644 debian/network-manager.postrm create mode 100644 debian/nm-system-settings.conf delete mode 100644 debian/nm-vpn-properties.sgml create mode 100644 debian/patches/03-system-settings-conf.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 9ceb1e30..5449b7c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,27 +1,70 @@ -network-manager (0.7.0~svn3269-1) experimental; urgency=low +network-manager (0.7.0~svn3747-1) experimental; urgency=low * SVN snapshot of the upcoming 0.7 release. * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - - 04-if_fix.patch - - 11-man_page_sh_name.patch - - 12_readme_format.patch - 13-validate_mac_addr.patch - - 20-stable_branch_updates_r2652.patch - - 21-endianess_fix_r2754.patch - - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - - 23-rfkill_return_type.patch - - 24-get_mode_fix_r3122.patch - - 25-libnl_unique_pid_r3155.patch - - 26-libnl_1.0-pre8_r3206.patch - - 27-dont_repeat_errors.patch * debian/patches/05-debian_backend.patch - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. + * debian/patches/03-system-settings-conf.patch + - Added. Put system settings config file in /etc/NetworkManager + * debian/control: Updated dependencies and build-depends + * debian/rules: + - Switch to quilt as a patch system + - Update for the 0.7 build + * debian/copyright: Updated + * debian/nm-vpn-properties.sgml: Dropped, obsolete + * debian/watch: Updated to match both the current 0.6 and the upcoming 0.7 + series + * debian/network-manager.postrm: Relevant code moved to preinst + * debian/network-manager.network-manager-dispatcher.init: Dropped, obsolete + * debian/*.install: Updated + * debian/*.symbols: Updated -- Michael Biebl Fri, 25 Jan 2008 15:35:15 +0100 +network-manager (0.6.6-1) unstable; urgency=low + + * New upstream release. (Closes: #470197) + - Ensure dbus errors are properly initialised. (Closes: #471317) + * Removed patches + - debian/patches/04-if_fix.patch (obsolete) + - debian/patches/11-man_page_sh_name.patch (merged upstream) + - debian/patches/12_readme_format.patch (merged upstream) + - debian/patches/20-stable_branch_updates_r2652.patch (applied upstream) + - debian/patches/21-endianess_fix_r2754.patch (applied upstream) + - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch + (merged upstream) + - debian/patches/23-rfkill_return_type.patch (fixed upstream) + - debian/patches/24-get_mode_fix_r3122.patch (applied upstream) + - debian/patches/25-libnl_unique_pid_r3155.patch (applied upstream) + - debian/patches/26-libnl_1.0-pre8_r3206.patch (applied upstream) + - debian/patches/27-dont_repeat_errors.patch (applied upstream) + * debian/patches/07-domain_search.patch + - Add support for DHCP domain-search option. (Closes: #465158) + Thanks to Bas Zoetekouw for the patch. + * debian/patches/08-hal_deprecated_keys.patch + - Add support for the "net.originating_device" key, which has replaced + the deprecated "net.physical_device" key in newer HAL versions. + * debian/patches/06-dispatch_more_events.patch + - NetworkManagerDispatcher.1.in has been renamed to + NetworkManagerDispatcher.8.in. Update the patch accordingly. + * debian/network-manager.manpages + - The NetworkManager and NetworkManagerDispatcher man pages have been + moved to section 8. + * debian/control + - The pkg-config files have been fixed upstream and unnecessary + dependencies were removed. Update Depends: for libnm-glib-dev and + libnm-util-dev accordingly. (Closes: #469195) + * debian/rules, debian/network-manager.postinst + - Minimize downtime during upgrades. (Closes: #432322) + Restart the service in postinst instead of stop in prerm and start in + postinst. + + -- Michael Biebl Thu, 03 Apr 2008 02:37:16 +0200 + network-manager (0.6.5-5) unstable; urgency=low * Rebuild against libnl1. (Closes: #461922) diff --git a/debian/control b/debian/control index d67c779c..ebc55fa6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,12 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, 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 +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config, + intltool, quilt, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.74-4), + 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), ppp-dev, docbook-to-man, libpolkit-dbus-dev, + libgnutls-dev Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager @@ -11,8 +16,8 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, 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 +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser +Recommends: network-manager-gnome | network-manager-kde, policykit Conflicts: network-manager-gnome (<< 0.6.5-1) Replaces: network-manager-gnome (<< 0.6.5-1) Description: network management framework daemon @@ -28,7 +33,6 @@ Description: network management framework daemon Package: network-manager-dev Architecture: any Section: devel -Depends: pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. diff --git a/debian/copyright b/debian/copyright index 8813c529..d940e36d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,9 +22,6 @@ License: 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. - src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, and Novell, Inc. and it's released under the terms of the GNU General Public License. (see below). @@ -63,11 +60,6 @@ are released under the terms of the GNU General Public License. (see below). initscript/Debian/NetworkManager is copyright of , Mark Roach , Thom May -gnome/nm-vpn-properties.c, nm-vpn-properties.h are copyright of -David Zeuthen, 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 and it's released under the terms of the GNU General Public License. diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index 624f7a5a..b4bbf4bc 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -1,4 +1,4 @@ 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/include/libnm-glib/ diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols new file mode 100644 index 00000000..7e5e8b38 --- /dev/null +++ b/debian/libnm-glib0.symbols @@ -0,0 +1,179 @@ +libnm_glib.so.0 libnm-glib0 #MINVER# + dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_settings_BOOLEAN__POINTER_POINTER@Base 0.7.0~svn3712 + dbus_glib_nm_exported_connection_object_info@Base 0.7.0~svn3712 + dbus_glib_nm_settings_object_info@Base 0.7.0~svn3712 + 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~svn3712 + nm_access_point_get_frequency@Base 0.7.0~svn3712 + nm_access_point_get_hw_address@Base 0.7.0~svn3712 + nm_access_point_get_max_bitrate@Base 0.7.0~svn3712 + nm_access_point_get_mode@Base 0.7.0~svn3712 + nm_access_point_get_rsn_flags@Base 0.7.0~svn3712 + nm_access_point_get_ssid@Base 0.7.0~svn3712 + nm_access_point_get_strength@Base 0.7.0~svn3712 + nm_access_point_get_type@Base 0.7.0~svn3712 + nm_access_point_get_wpa_flags@Base 0.7.0~svn3712 + nm_access_point_new@Base 0.7.0~svn3712 + nm_active_connection_get_connection@Base 0.7.0~svn3712 + nm_active_connection_get_default@Base 0.7.0~svn3712 + nm_active_connection_get_devices@Base 0.7.0~svn3712 + nm_active_connection_get_scope@Base 0.7.0~svn3712 + nm_active_connection_get_service_name@Base 0.7.0~svn3712 + nm_active_connection_get_shared_connection@Base 0.7.0~svn3712 + nm_active_connection_get_shared_service_name@Base 0.7.0~svn3712 + nm_active_connection_get_specific_object@Base 0.7.0~svn3712 + nm_active_connection_get_state@Base 0.7.0~svn3712 + nm_active_connection_get_type@Base 0.7.0~svn3712 + nm_active_connection_new@Base 0.7.0~svn3712 + nm_cdma_device_get_type@Base 0.7.0~svn3712 + nm_cdma_device_new@Base 0.7.0~svn3712 + nm_client_activate_connection@Base 0.7.0~svn3712 + nm_client_deactivate_connection@Base 0.7.0~svn3712 + nm_client_get_active_connections@Base 0.7.0~svn3712 + nm_client_get_device_by_path@Base 0.7.0~svn3712 + nm_client_get_devices@Base 0.7.0~svn3712 + nm_client_get_manager_running@Base 0.7.0~svn3712 + nm_client_get_state@Base 0.7.0~svn3712 + nm_client_get_type@Base 0.7.0~svn3712 + nm_client_new@Base 0.7.0~svn3712 + nm_client_sleep@Base 0.7.0~svn3712 + nm_client_wireless_get_enabled@Base 0.7.0~svn3712 + nm_client_wireless_hardware_get_enabled@Base 0.7.0~svn3712 + nm_client_wireless_set_enabled@Base 0.7.0~svn3712 + nm_dbus_connection_get_type@Base 0.7.0~svn3712 + nm_dbus_connection_new@Base 0.7.0~svn3712 + nm_dbus_get_int_property@Base 0.7.0~svn3712 + nm_dbus_get_object_path_property@Base 0.7.0~svn3712 + nm_dbus_get_property@Base 0.7.0~svn3712 + nm_dbus_get_string_property@Base 0.7.0~svn3712 + nm_dbus_get_uint_property@Base 0.7.0~svn3712 + nm_dbus_introspect@Base 0.7.0~svn3712 + nm_dbus_set_property@Base 0.7.0~svn3712 + nm_dbus_settings_get_connection_by_path@Base 0.7.0~svn3712 + nm_dbus_settings_get_type@Base 0.7.0~svn3712 + nm_dbus_settings_new@Base 0.7.0~svn3712 + nm_dbus_settings_system_add_connection@Base 0.7.0~svn3712 + nm_dbus_settings_system_get_type@Base 0.7.0~svn3712 + nm_dbus_settings_system_get_unmanaged_devices@Base 0.7.0~svn3712 + nm_dbus_settings_system_new@Base 0.7.0~svn3712 + nm_device_ethernet_get_carrier@Base 0.7.0~svn3746 + nm_device_ethernet_get_hw_address@Base 0.7.0~svn3746 + nm_device_ethernet_get_speed@Base 0.7.0~svn3746 + nm_device_ethernet_get_type@Base 0.7.0~svn3746 + nm_device_ethernet_new@Base 0.7.0~svn3746 + nm_device_get_capabilities@Base 0.7.0~svn3712 + nm_device_get_driver@Base 0.7.0~svn3712 + nm_device_get_iface@Base 0.7.0~svn3712 + nm_device_get_ip4_config@Base 0.7.0~svn3712 + nm_device_get_managed@Base 0.7.0~svn3712 + nm_device_get_product@Base 0.7.0~svn3712 + nm_device_get_state@Base 0.7.0~svn3712 + nm_device_get_type@Base 0.7.0~svn3712 + nm_device_get_udi@Base 0.7.0~svn3712 + nm_device_get_vendor@Base 0.7.0~svn3712 + nm_device_new@Base 0.7.0~svn3712 + nm_device_wifi_get_access_point_by_path@Base 0.7.0~svn3746 + nm_device_wifi_get_access_points@Base 0.7.0~svn3746 + nm_device_wifi_get_active_access_point@Base 0.7.0~svn3746 + nm_device_wifi_get_bitrate@Base 0.7.0~svn3746 + nm_device_wifi_get_capabilities@Base 0.7.0~svn3746 + nm_device_wifi_get_hw_address@Base 0.7.0~svn3746 + nm_device_wifi_get_mode@Base 0.7.0~svn3746 + nm_device_wifi_get_type@Base 0.7.0~svn3746 + nm_device_wifi_new@Base 0.7.0~svn3746 + nm_device_wifi_set_wireless_enabled@Base 0.7.0~svn3746 + nm_exported_connection_delete@Base 0.7.0~svn3712 + nm_exported_connection_get_connection@Base 0.7.0~svn3712 + nm_exported_connection_get_id@Base 0.7.0~svn3712 + nm_exported_connection_get_type@Base 0.7.0~svn3712 + nm_exported_connection_new@Base 0.7.0~svn3712 + nm_exported_connection_register_object@Base 0.7.0~svn3712 + nm_exported_connection_signal_removed@Base 0.7.0~svn3712 + nm_exported_connection_signal_updated@Base 0.7.0~svn3712 + nm_exported_connection_update@Base 0.7.0~svn3712 + nm_gsm_device_get_type@Base 0.7.0~svn3712 + nm_gsm_device_new@Base 0.7.0~svn3712 + nm_ip4_config_get_addresses@Base 0.7.0~svn3712 + nm_ip4_config_get_domains@Base 0.7.0~svn3712 + nm_ip4_config_get_hostname@Base 0.7.0~svn3712 + nm_ip4_config_get_nameservers@Base 0.7.0~svn3712 + nm_ip4_config_get_nis_domain@Base 0.7.0~svn3712 + nm_ip4_config_get_nis_servers@Base 0.7.0~svn3712 + nm_ip4_config_get_type@Base 0.7.0~svn3712 + nm_ip4_config_new@Base 0.7.0~svn3712 + nm_marshal_VOID__OBJECT_OBJECT_ENUM@Base 0.7.0~svn3712 + nm_marshal_VOID__OBJECT_POINTER@Base 0.7.0~svn3712 + nm_marshal_VOID__OBJECT_STRING@Base 0.7.0~svn3712 + nm_marshal_VOID__OBJECT_UINT@Base 0.7.0~svn3712 + nm_marshal_VOID__OBJECT_UINT_UINT@Base 0.7.0~svn3712 + nm_marshal_VOID__POINTER_STRING@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_INT@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_OBJECT@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_STRING@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_STRING_POINTER@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_STRING_STRING@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_UCHAR@Base 0.7.0~svn3712 + nm_marshal_VOID__STRING_UINT@Base 0.7.0~svn3712 + nm_marshal_VOID__UINT_UINT@Base 0.7.0~svn3712 + nm_object_array_demarshal@Base 0.7.0~svn3712 + nm_object_array_get_type@Base 0.7.0~svn3712 + nm_object_cache_add@Base 0.7.0~svn3712 + nm_object_cache_get@Base 0.7.0~svn3712 + nm_object_cache_remove_by_object@Base 0.7.0~svn3712 + nm_object_cache_remove_by_path@Base 0.7.0~svn3712 + nm_object_demarshal_generic@Base 0.7.0~svn3712 + nm_object_get_boolean_property@Base 0.7.0~svn3712 + nm_object_get_byte_array_property@Base 0.7.0~svn3712 + nm_object_get_byte_property@Base 0.7.0~svn3712 + nm_object_get_connection@Base 0.7.0~svn3712 + nm_object_get_double_property@Base 0.7.0~svn3712 + nm_object_get_int_property@Base 0.7.0~svn3712 + nm_object_get_object_path_property@Base 0.7.0~svn3712 + nm_object_get_path@Base 0.7.0~svn3712 + nm_object_get_property@Base 0.7.0~svn3712 + nm_object_get_string_property@Base 0.7.0~svn3712 + nm_object_get_type@Base 0.7.0~svn3712 + nm_object_get_uint_property@Base 0.7.0~svn3712 + nm_object_handle_properties_changed@Base 0.7.0~svn3712 + nm_object_queue_notify@Base 0.7.0~svn3712 + nm_object_set_property@Base 0.7.0~svn3712 + nm_serial_device_get_bytes_received@Base 0.7.0~svn3746 + nm_serial_device_get_bytes_sent@Base 0.7.0~svn3746 + nm_serial_device_get_type@Base 0.7.0~svn3746 + nm_settings_error_quark@Base 0.7.0~svn3712 + nm_settings_get_type@Base 0.7.0~svn3712 + nm_settings_list_connections@Base 0.7.0~svn3712 + nm_settings_signal_new_connection@Base 0.7.0~svn3712 + nm_ssid_demarshal@Base 0.7.0~svn3712 + nm_ssid_get_type@Base 0.7.0~svn3712 + nm_string_array_demarshal@Base 0.7.0~svn3712 + nm_string_array_get_type@Base 0.7.0~svn3712 + nm_uint_array_demarshal@Base 0.7.0~svn3712 + nm_uint_array_get_type@Base 0.7.0~svn3712 + nm_vpn_connection_get_banner@Base 0.7.0~svn3712 + nm_vpn_connection_get_type@Base 0.7.0~svn3712 + nm_vpn_connection_get_vpn_state@Base 0.7.0~svn3712 + nm_vpn_connection_new@Base 0.7.0~svn3712 +libnm_glib_vpn.so.0 libnm-glib0 #MINVER# + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__STRING_POINTER@Base 0.7.0~svn3712 + dbus_glib_nm_vpn_plugin_object_info@Base 0.7.0~svn3712 + nm_vpn_plugin_disconnect@Base 0.7.0~svn3712 + nm_vpn_plugin_error_get_type@Base 0.7.0~svn3712 + nm_vpn_plugin_error_quark@Base 0.7.0~svn3712 + nm_vpn_plugin_failure@Base 0.7.0~svn3712 + nm_vpn_plugin_get_connection@Base 0.7.0~svn3712 + nm_vpn_plugin_get_state@Base 0.7.0~svn3712 + nm_vpn_plugin_get_type@Base 0.7.0~svn3712 + nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 + nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 + nm_vpn_plugin_set_state@Base 0.7.0~svn3712 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.symbols b/debian/libnm-util0.symbols new file mode 100644 index 00000000..7ebf78b7 --- /dev/null +++ b/debian/libnm-util0.symbols @@ -0,0 +1,94 @@ +libnm-util.so.0 libnm-util0 #MINVER# + crypto_decrypt@Base 0.7.0~svn3712 + crypto_deinit@Base 0.7.0~svn3712 + crypto_get_private_key@Base 0.7.0~svn3712 + crypto_init@Base 0.7.0~svn3712 + crypto_load_and_verify_certificate@Base 0.7.0~svn3712 + crypto_md5_hash@Base 0.7.0~svn3712 + crypto_verify_cert@Base 0.7.0~svn3712 + nm_connection_add_setting@Base 0.7.0~svn3712 + nm_connection_clear_secrets@Base 0.7.0~svn3712 + nm_connection_compare@Base 0.7.0~svn3712 + nm_connection_create_setting@Base 0.7.0~svn3712 + nm_connection_dump@Base 0.7.0~svn3712 + nm_connection_for_each_setting_value@Base 0.7.0~svn3712 + nm_connection_get_path@Base 0.7.0~svn3712 + nm_connection_get_scope@Base 0.7.0~svn3712 + nm_connection_get_setting@Base 0.7.0~svn3712 + nm_connection_get_setting_by_name@Base 0.7.0~svn3712 + nm_connection_get_type@Base 0.7.0~svn3712 + nm_connection_lookup_setting_type@Base 0.7.0~svn3712 + nm_connection_need_secrets@Base 0.7.0~svn3712 + nm_connection_new@Base 0.7.0~svn3712 + nm_connection_new_from_hash@Base 0.7.0~svn3712 + nm_connection_remove_setting@Base 0.7.0~svn3712 + nm_connection_replace_settings@Base 0.7.0~svn3712 + nm_connection_set_path@Base 0.7.0~svn3712 + nm_connection_set_scope@Base 0.7.0~svn3712 + nm_connection_to_hash@Base 0.7.0~svn3712 + nm_connection_update_secrets@Base 0.7.0~svn3712 + nm_connection_verify@Base 0.7.0~svn3712 + nm_crypto_error_quark@Base 0.7.0~svn3712 + nm_param_spec_specialized@Base 0.7.0~svn3712 + nm_param_spec_specialized_get_type@Base 0.7.0~svn3712 + nm_setting_802_1x_get_type@Base 0.7.0~svn3712 + nm_setting_802_1x_new@Base 0.7.0~svn3712 + nm_setting_802_1x_set_ca_cert@Base 0.7.0~svn3712 + nm_setting_802_1x_set_client_cert@Base 0.7.0~svn3712 + nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.0~svn3712 + nm_setting_802_1x_set_phase2_client_cert@Base 0.7.0~svn3712 + nm_setting_802_1x_set_phase2_private_key@Base 0.7.0~svn3712 + nm_setting_802_1x_set_private_key@Base 0.7.0~svn3712 + nm_setting_cdma_get_type@Base 0.7.0~svn3712 + nm_setting_cdma_new@Base 0.7.0~svn3712 + nm_setting_clear_secrets@Base 0.7.0~svn3712 + nm_setting_compare@Base 0.7.0~svn3712 + nm_setting_connection_get_type@Base 0.7.0~svn3712 + nm_setting_connection_new@Base 0.7.0~svn3712 + nm_setting_duplicate@Base 0.7.0~svn3712 + nm_setting_enumerate_values@Base 0.7.0~svn3712 + nm_setting_from_hash@Base 0.7.0~svn3712 + nm_setting_get_name@Base 0.7.0~svn3712 + nm_setting_get_type@Base 0.7.0~svn3712 + nm_setting_gsm_get_type@Base 0.7.0~svn3712 + nm_setting_gsm_new@Base 0.7.0~svn3712 + nm_setting_ip4_config_get_type@Base 0.7.0~svn3712 + nm_setting_ip4_config_new@Base 0.7.0~svn3712 + nm_setting_need_secrets@Base 0.7.0~svn3712 + nm_setting_ppp_get_type@Base 0.7.0~svn3712 + nm_setting_ppp_new@Base 0.7.0~svn3712 + nm_setting_pppoe_get_type@Base 0.7.0~svn3712 + nm_setting_pppoe_new@Base 0.7.0~svn3712 + nm_setting_register@Base 0.7.0~svn3712 + nm_setting_serial_get_type@Base 0.7.0~svn3712 + nm_setting_serial_new@Base 0.7.0~svn3712 + nm_setting_to_hash@Base 0.7.0~svn3712 + nm_setting_to_string@Base 0.7.0~svn3712 + nm_setting_unregister@Base 0.7.0~svn3712 + nm_setting_update_secrets@Base 0.7.0~svn3712 + nm_setting_verify@Base 0.7.0~svn3712 + nm_setting_vpn_get_type@Base 0.7.0~svn3712 + nm_setting_vpn_new@Base 0.7.0~svn3712 + nm_setting_vpn_properties_get_type@Base 0.7.0~svn3712 + nm_setting_vpn_properties_new@Base 0.7.0~svn3712 + nm_setting_wired_get_type@Base 0.7.0~svn3712 + nm_setting_wired_new@Base 0.7.0~svn3712 + nm_setting_wireless_ap_security_compatible@Base 0.7.0~svn3712 + nm_setting_wireless_get_type@Base 0.7.0~svn3712 + nm_setting_wireless_new@Base 0.7.0~svn3712 + nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 + nm_setting_wireless_security_new@Base 0.7.0~svn3712 + nm_utils_escape_ssid@Base 0.7.0~svn3712 + nm_utils_garray_to_string@Base 0.7.0~svn3712 + nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712 + nm_utils_ip4_addresses_from_gvalue@Base 0.7.0~svn3712 + nm_utils_ip4_addresses_to_gvalue@Base 0.7.0~svn3712 + nm_utils_is_empty_ssid@Base 0.7.0~svn3712 + nm_utils_register_value_transformations@Base 0.7.0~svn3712 + nm_utils_same_ssid@Base 0.7.0~svn3712 + nm_utils_security_valid@Base 0.7.0~svn3712 + nm_utils_slist_free@Base 0.7.0~svn3712 + nm_utils_ssid_to_utf8@Base 0.7.0~svn3712 + nm_utils_string_in_list@Base 0.7.0~svn3712 + nm_utils_string_list_contains@Base 0.7.0~svn3712 + nm_utils_string_slist_validate@Base 0.7.0~svn3712 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.dirs b/debian/network-manager.dirs index 231b4756..60de4e65 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,3 +1,4 @@ etc/NetworkManager/dispatcher.d +etc/NetworkManager/system-connections var/lib/NetworkManager var/run/NetworkManager diff --git a/debian/network-manager.init b/debian/network-manager.init index 9e6fcf0b..10fca34d 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 diff --git a/debian/network-manager.install b/debian/network-manager.install index 90422942..c5fd4648 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,8 +1,16 @@ 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/libnm-settings-plugin-keyfile.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/nm-system-settings.conf etc/NetworkManager/ diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 50ee9f13..7f4f19b0 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,4 +1,2 @@ -man/NetworkManagerDispatcher.1 +man/NetworkManager.8 man/nm-tool.1 -man/NetworkManager.1 -debian/nm-vpn-properties.1 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c2a445c7..c7694427 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -16,25 +16,8 @@ # abort-remove in-favour -# 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 @@ -43,6 +26,15 @@ case "$1" in if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true fi + + # Stop the service on upgrades before it is started again. + # dh_installinit -r will create the start code. + if [ -n "$2" ]; then + if [ -x "/etc/init.d/network-manager" ]; then + invoke-rc.d network-manager stop || true + fi + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) 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: -# remove -# -# After the package was purged: -# purge -# -# After the package was upgraded: -# upgrade -# if that fails: -# failed-upgrade -# -# -# After all of the packages files have been replaced: -# disappear -# -# -# If preinst fails during install: -# abort-install -# -# If preinst fails during upgrade of removed package: -# abort-install -# -# If preinst fails during upgrade: -# abort-upgrade - - -# 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 3f737448..8b64b293 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -15,8 +15,8 @@ # abort-upgrade -# Prepare to remove a no-longer used conffile -prep_rm_conffile() +# remove a no-longer used conffile +rm_conffile() { PKGNAME="$1" CONFFILE="$2" @@ -25,20 +25,19 @@ 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 } case "$1" in - install) - ;; - - upgrade) + install|upgrade) # Upgrade from previous versions if dpkg --compare-versions "$2" lt "0.6.4-8"; then if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then @@ -47,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..c37b5968 --- /dev/null +++ b/debian/nm-system-settings.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile 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 @@ - 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. - - --> - - - 8 February, 2006"> - - - GNU"> - GPL"> -]> - - - -
- giskard@autistici.org; -
- - Riccardo - Setti - - - 2006 - Riccardo Setti - - &date; - - - nm-vpn-properties - 1 - - - &package; - - Network management framework - - - - &package; - - - - DESCRIPTION - - &package; is the gnome front-end for the NetworkManager VPN handler - - - SEE ALSO - - NetworkManager (1), nm-applet (1) - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Riccardo Setti giskard@autistici.org for - the Debian system. - - - - - - diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index 12ad59de..ad1ed08f 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,7 +1,7 @@ -Index: src/NetworkManager.conf +Index: NetworkManager/src/NetworkManager.conf =================================================================== ---- src/NetworkManager.conf (Revision 3269) -+++ src/NetworkManager.conf (Arbeitskopie) +--- 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 @@ diff --git a/debian/patches/03-system-settings-conf.patch b/debian/patches/03-system-settings-conf.patch new file mode 100644 index 00000000..9f605930 --- /dev/null +++ b/debian/patches/03-system-settings-conf.patch @@ -0,0 +1,11 @@ +Index: NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in +=================================================================== +--- NetworkManager.orig/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in 2008-06-11 12:28:11.000000000 +0200 ++++ NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in 2008-06-11 12:32:51.000000000 +0200 +@@ -1,5 +1,5 @@ + [D-BUS Service] + Name=org.freedesktop.NetworkManagerSystemSettings +-Exec=@sbindir@/nm-system-settings --config /etc/nm-system-settings.conf ++Exec=@sbindir@/nm-system-settings --config /etc/NetworkManager/nm-system-settings.conf + User=root + diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index cc60352f..1851e7de 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,7 +1,48 @@ -Index: src/backends/interface_parser.c +Index: NetworkManager/src/backends/NetworkManagerDebian.c =================================================================== ---- src/backends/interface_parser.c (Revision 2569) -+++ src/backends/interface_parser.c (Arbeitskopie) +--- NetworkManager.orig/src/backends/NetworkManagerDebian.c 2008-06-11 12:28:11.000000000 +0200 ++++ NetworkManager/src/backends/NetworkManagerDebian.c 2008-06-11 12:33:02.000000000 +0200 +@@ -74,18 +74,21 @@ + nm_spawn_process ("/usr/bin/killall -q dhclient"); + } + ++#define RESOLVCONF "resolvconf" + + /* + * 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"); ++ } + } + + /* +@@ -125,6 +128,9 @@ + */ + gboolean nm_system_should_modify_resolv_conf (void) + { +- return TRUE; ++ if (g_find_program_in_path(RESOLVCONF) != NULL) ++ return FALSE; ++ else ++ return TRUE; + } + +Index: NetworkManager/src/backends/interface_parser.c +=================================================================== +--- NetworkManager.orig/src/backends/interface_parser.c 2008-06-11 12:28:11.000000000 +0200 ++++ NetworkManager/src/backends/interface_parser.c 2008-06-11 12:33:02.000000000 +0200 @@ -73,14 +73,18 @@ //printf("added data '%s' with key '%s'\n",data,key); } @@ -148,10 +189,10 @@ Index: src/backends/interface_parser.c const char *ifparser_getkey(if_block* iface, const char *key) { if_data *curr = iface->info; -Index: src/backends/interface_parser.h +Index: NetworkManager/src/backends/interface_parser.h =================================================================== ---- src/backends/interface_parser.h (Revision 2569) -+++ src/backends/interface_parser.h (Arbeitskopie) +--- NetworkManager.orig/src/backends/interface_parser.h 2008-06-11 12:28:11.000000000 +0200 ++++ NetworkManager/src/backends/interface_parser.h 2008-06-11 12:33:02.000000000 +0200 @@ -44,6 +44,7 @@ void ifparser_destroy(void); @@ -160,212 +201,3 @@ Index: src/backends/interface_parser.h if_block *ifparser_getfirst(void); const char *ifparser_getkey(if_block* iface, const char *key); -Index: src/backends/NetworkManagerDebian.c -=================================================================== ---- src/backends/NetworkManagerDebian.c (Revision 2569) -+++ src/backends/NetworkManagerDebian.c (Arbeitskopie) -@@ -42,6 +42,7 @@ - #include "nm-utils.h" - - #define ARPING "/usr/sbin/arping" -+#define RESOLVCONF "resolvconf" - - /* - * nm_system_init -@@ -198,14 +199,16 @@ - /* - * 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"); -+ } - } - - -@@ -217,8 +220,7 @@ - * - */ - void nm_system_restart_mdns_responder (void) --{ -- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder"); -+{ - } - - -@@ -377,13 +379,60 @@ - /* - * 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; - } - - -@@ -426,12 +475,18 @@ - 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; - } - } -@@ -450,12 +505,18 @@ - 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; - } - } -@@ -466,23 +527,26 @@ - 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); -@@ -494,14 +558,6 @@ - } - 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; - } - -@@ -542,7 +598,10 @@ - */ - 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/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..a7c62915 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +02-dbus_access_network_manager.patch +03-system-settings-conf.patch +05-debian_backend.patch diff --git a/debian/rules b/debian/rules index a4a1c76d..fda59f0b 100755 --- a/debian/rules +++ b/debian/rules @@ -2,30 +2,24 @@ 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/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk 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-crypto=gnutls -DEB_DH_INSTALLINIT_ARGS := -- 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 14 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 diff --git a/debian/watch b/debian/watch index f2d66b4c..4b762cde 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -http://download.gnome.org/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz +http://download.gnome.org/sources/NetworkManager/([\d\.]+)/NetworkManager-(.*)\.tar\.gz -- cgit 1.3.0-6-gf8a5 From f1aa51a3317f086454995b0eec9ec4053bffe2e3 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 18 Jun 2008 13:39:30 +0000 Subject: * New SVN snapshot * debian/patches/03-system-settings-conf.patch - Removed. Merged upstream git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2305 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/patches/03-system-settings-conf.patch | 11 ----------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 debian/patches/03-system-settings-conf.patch diff --git a/debian/changelog b/debian/changelog index 5449b7c4..1b20da3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low + + * New SVN snapshot + * debian/patches/03-system-settings-conf.patch + - Removed. Merged upstream + + -- Sjoerd Simons Wed, 18 Jun 2008 14:39:19 +0100 + network-manager (0.7.0~svn3747-1) experimental; urgency=low * SVN snapshot of the upcoming 0.7 release. diff --git a/debian/patches/03-system-settings-conf.patch b/debian/patches/03-system-settings-conf.patch deleted file mode 100644 index 9f605930..00000000 --- a/debian/patches/03-system-settings-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in -=================================================================== ---- NetworkManager.orig/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in 2008-06-11 12:28:11.000000000 +0200 -+++ NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in 2008-06-11 12:32:51.000000000 +0200 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=org.freedesktop.NetworkManagerSystemSettings --Exec=@sbindir@/nm-system-settings --config /etc/nm-system-settings.conf -+Exec=@sbindir@/nm-system-settings --config /etc/NetworkManager/nm-system-settings.conf - User=root - diff --git a/debian/patches/series b/debian/patches/series index a7c62915..fa071840 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 02-dbus_access_network_manager.patch -03-system-settings-conf.patch 05-debian_backend.patch -- cgit 1.3.0-6-gf8a5 From 92668c4bfabe804de6ef609986b7cf974e8af695 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 18 Jun 2008 14:54:57 +0000 Subject: * Split out libnm-glib-vpn from libnm-glib * debian/rules: Use list-missing git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2308 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/control | 28 ++++++++++++++++++++++++++++ debian/libnm-glib-dev.install | 13 ++++++++++--- debian/libnm-glib-vpn-dev.install | 4 ++++ debian/libnm-glib-vpn0.install | 1 + debian/libnm-glib-vpn0.symbols | 25 +++++++++++++++++++++++++ debian/libnm-glib0.install | 2 +- debian/libnm-glib0.symbols | 16 ---------------- debian/libnm-util0.symbols | 27 +++++++++++++++++++++++++++ debian/rules | 4 +++- 10 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 debian/libnm-glib-vpn-dev.install create mode 100644 debian/libnm-glib-vpn0.install create mode 100644 debian/libnm-glib-vpn0.symbols diff --git a/debian/changelog b/debian/changelog index 1b20da3b..f8eaa6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low * New SVN snapshot * debian/patches/03-system-settings-conf.patch - Removed. Merged upstream + * Split out libnm-glib-vpn from libnm-glib + * debian/rules: Use list-missing - -- Sjoerd Simons Wed, 18 Jun 2008 14:39:19 +0100 + -- Sjoerd Simons Wed, 18 Jun 2008 15:50:59 +0100 network-manager (0.7.0~svn3747-1) experimental; urgency=low diff --git a/debian/control b/debian/control index ebc55fa6..38c22efb 100644 --- a/debian/control +++ b/debian/control @@ -67,6 +67,34 @@ Description: network management framework (GLib interface) This package provides the interface that applications can use to query connection status via NetworkManager. +Package: libnm-glib-vpn0 +Section: libs +Architecture: any +Depends: ${shlibs: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}), 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-util0 Section: libs Architecture: any diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index b4bbf4bc..e2c4fbcb 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -1,4 +1,11 @@ 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/libnm-glib/ +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-*-settings*.h +debian/tmp/usr/include/libnm-glib/nm-*-connection.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..d260415a --- /dev/null +++ b/debian/libnm-glib-vpn0.symbols @@ -0,0 +1,25 @@ +libnm_glib_vpn.so.0 libnm-glib0 #MINVER# + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER_POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__POINTER@Base 0.7.0~svn3712 + dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__STRING_POINTER@Base 0.7.0~svn3712 + dbus_glib_nm_vpn_plugin_object_info@Base 0.7.0~svn3712 + nm_vpn_plugin_disconnect@Base 0.7.0~svn3712 + nm_vpn_plugin_error_get_type@Base 0.7.0~svn3712 + nm_vpn_plugin_error_quark@Base 0.7.0~svn3712 + nm_vpn_plugin_failure@Base 0.7.0~svn3712 + nm_vpn_plugin_get_connection@Base 0.7.0~svn3712 + nm_vpn_plugin_get_state@Base 0.7.0~svn3712 + nm_vpn_plugin_get_type@Base 0.7.0~svn3712 + nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 + nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 + nm_vpn_plugin_set_state@Base 0.7.0~svn3712 + nm_vpn_plugin_ui_interface_export@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_interface_get_type@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_interface_import@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0~svn3758-1 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 index 7e5e8b38..ad2172cc 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -161,19 +161,3 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_vpn_connection_get_type@Base 0.7.0~svn3712 nm_vpn_connection_get_vpn_state@Base 0.7.0~svn3712 nm_vpn_connection_new@Base 0.7.0~svn3712 -libnm_glib_vpn.so.0 libnm-glib0 #MINVER# - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__STRING_POINTER@Base 0.7.0~svn3712 - dbus_glib_nm_vpn_plugin_object_info@Base 0.7.0~svn3712 - nm_vpn_plugin_disconnect@Base 0.7.0~svn3712 - nm_vpn_plugin_error_get_type@Base 0.7.0~svn3712 - nm_vpn_plugin_error_quark@Base 0.7.0~svn3712 - nm_vpn_plugin_failure@Base 0.7.0~svn3712 - nm_vpn_plugin_get_connection@Base 0.7.0~svn3712 - nm_vpn_plugin_get_state@Base 0.7.0~svn3712 - nm_vpn_plugin_get_type@Base 0.7.0~svn3712 - nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 - nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 - nm_vpn_plugin_set_state@Base 0.7.0~svn3712 diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols index 7ebf78b7..677e93a3 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -18,6 +18,7 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_connection_get_setting_by_name@Base 0.7.0~svn3712 nm_connection_get_type@Base 0.7.0~svn3712 nm_connection_lookup_setting_type@Base 0.7.0~svn3712 + nm_connection_lookup_setting_type_by_quark@Base 0.7.0~svn3758-1 nm_connection_need_secrets@Base 0.7.0~svn3712 nm_connection_new@Base 0.7.0~svn3712 nm_connection_new_from_hash@Base 0.7.0~svn3712 @@ -31,6 +32,8 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_crypto_error_quark@Base 0.7.0~svn3712 nm_param_spec_specialized@Base 0.7.0~svn3712 nm_param_spec_specialized_get_type@Base 0.7.0~svn3712 + nm_setting_802_1x_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_802_1x_error_quark@Base 0.7.0~svn3758-1 nm_setting_802_1x_get_type@Base 0.7.0~svn3712 nm_setting_802_1x_new@Base 0.7.0~svn3712 nm_setting_802_1x_set_ca_cert@Base 0.7.0~svn3712 @@ -39,10 +42,14 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_802_1x_set_phase2_client_cert@Base 0.7.0~svn3712 nm_setting_802_1x_set_phase2_private_key@Base 0.7.0~svn3712 nm_setting_802_1x_set_private_key@Base 0.7.0~svn3712 + nm_setting_cdma_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_cdma_error_quark@Base 0.7.0~svn3758-1 nm_setting_cdma_get_type@Base 0.7.0~svn3712 nm_setting_cdma_new@Base 0.7.0~svn3712 nm_setting_clear_secrets@Base 0.7.0~svn3712 nm_setting_compare@Base 0.7.0~svn3712 + nm_setting_connection_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_connection_error_quark@Base 0.7.0~svn3758-1 nm_setting_connection_get_type@Base 0.7.0~svn3712 nm_setting_connection_new@Base 0.7.0~svn3712 nm_setting_duplicate@Base 0.7.0~svn3712 @@ -50,16 +57,26 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_from_hash@Base 0.7.0~svn3712 nm_setting_get_name@Base 0.7.0~svn3712 nm_setting_get_type@Base 0.7.0~svn3712 + nm_setting_gsm_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_gsm_error_quark@Base 0.7.0~svn3758-1 nm_setting_gsm_get_type@Base 0.7.0~svn3712 nm_setting_gsm_new@Base 0.7.0~svn3712 + nm_setting_ip4_config_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_ip4_config_error_quark@Base 0.7.0~svn3758-1 nm_setting_ip4_config_get_type@Base 0.7.0~svn3712 nm_setting_ip4_config_new@Base 0.7.0~svn3712 nm_setting_need_secrets@Base 0.7.0~svn3712 + nm_setting_ppp_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_ppp_error_quark@Base 0.7.0~svn3758-1 nm_setting_ppp_get_type@Base 0.7.0~svn3712 nm_setting_ppp_new@Base 0.7.0~svn3712 + nm_setting_pppoe_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_pppoe_error_quark@Base 0.7.0~svn3758-1 nm_setting_pppoe_get_type@Base 0.7.0~svn3712 nm_setting_pppoe_new@Base 0.7.0~svn3712 nm_setting_register@Base 0.7.0~svn3712 + nm_setting_serial_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_serial_error_quark@Base 0.7.0~svn3758-1 nm_setting_serial_get_type@Base 0.7.0~svn3712 nm_setting_serial_new@Base 0.7.0~svn3712 nm_setting_to_hash@Base 0.7.0~svn3712 @@ -67,15 +84,25 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_unregister@Base 0.7.0~svn3712 nm_setting_update_secrets@Base 0.7.0~svn3712 nm_setting_verify@Base 0.7.0~svn3712 + nm_setting_vpn_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_vpn_error_quark@Base 0.7.0~svn3758-1 nm_setting_vpn_get_type@Base 0.7.0~svn3712 nm_setting_vpn_new@Base 0.7.0~svn3712 + nm_setting_vpn_properties_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_vpn_properties_error_quark@Base 0.7.0~svn3758-1 nm_setting_vpn_properties_get_type@Base 0.7.0~svn3712 nm_setting_vpn_properties_new@Base 0.7.0~svn3712 + nm_setting_wired_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_wired_error_quark@Base 0.7.0~svn3758-1 nm_setting_wired_get_type@Base 0.7.0~svn3712 nm_setting_wired_new@Base 0.7.0~svn3712 nm_setting_wireless_ap_security_compatible@Base 0.7.0~svn3712 + nm_setting_wireless_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_wireless_error_quark@Base 0.7.0~svn3758-1 nm_setting_wireless_get_type@Base 0.7.0~svn3712 nm_setting_wireless_new@Base 0.7.0~svn3712 + nm_setting_wireless_security_error_get_type@Base 0.7.0~svn3758-1 + nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758-1 nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 nm_setting_wireless_security_new@Base 0.7.0~svn3712 nm_utils_escape_ssid@Base 0.7.0~svn3712 diff --git a/debian/rules b/debian/rules index fda59f0b..b5b73e3b 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ include /usr/share/cdbs/1/rules/debhelper.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_INSTALL_DOCS_ALL := README AUTHORS TODO DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" @@ -22,4 +25,3 @@ clean:: binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown - -- cgit 1.3.0-6-gf8a5 From 2579d166668e77da3e1f45d147c4d539c7d82101 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 18 Jun 2008 17:39:15 +0000 Subject: Ensure we install all header files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2317 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-dev.install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index e2c4fbcb..d45c2eb7 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -4,8 +4,8 @@ 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*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-*-settings*.h -debian/tmp/usr/include/libnm-glib/nm-*-connection.h +debian/tmp/usr/include/libnm-glib/nm*settings*.h +debian/tmp/usr/include/libnm-glib/nm*connection.h -- cgit 1.3.0-6-gf8a5 From 1e5acd55634f6a025f252ffb9ab3e877d800856d Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 18 Jun 2008 17:47:38 +0000 Subject: Don't forget about nm-types.h git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2318 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-dev.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index d45c2eb7..df8e5221 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -9,3 +9,4 @@ 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*settings*.h debian/tmp/usr/include/libnm-glib/nm*connection.h +debian/tmp/usr/include/libnm-glib/nm-types.h -- cgit 1.3.0-6-gf8a5 From 1c6c729bb8369723dc4dc4a894e24ad5b40e8615 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Jun 2008 22:18:13 +0000 Subject: Fix symbols files (remove Debian revision) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2320 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn0.symbols | 18 +++++++------- debian/libnm-util0.symbols | 54 +++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols index d260415a..3b386abf 100644 --- a/debian/libnm-glib-vpn0.symbols +++ b/debian/libnm-glib-vpn0.symbols @@ -14,12 +14,12 @@ libnm_glib_vpn.so.0 libnm-glib0 #MINVER# nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 nm_vpn_plugin_set_state@Base 0.7.0~svn3712 - nm_vpn_plugin_ui_interface_export@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_interface_get_type@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_interface_import@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0~svn3758-1 - nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0~svn3758-1 + nm_vpn_plugin_ui_interface_export@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_interface_get_type@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_interface_import@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0~svn3758 diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols index 677e93a3..ef33a74b 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -18,7 +18,7 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_connection_get_setting_by_name@Base 0.7.0~svn3712 nm_connection_get_type@Base 0.7.0~svn3712 nm_connection_lookup_setting_type@Base 0.7.0~svn3712 - nm_connection_lookup_setting_type_by_quark@Base 0.7.0~svn3758-1 + nm_connection_lookup_setting_type_by_quark@Base 0.7.0~svn3758 nm_connection_need_secrets@Base 0.7.0~svn3712 nm_connection_new@Base 0.7.0~svn3712 nm_connection_new_from_hash@Base 0.7.0~svn3712 @@ -32,8 +32,8 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_crypto_error_quark@Base 0.7.0~svn3712 nm_param_spec_specialized@Base 0.7.0~svn3712 nm_param_spec_specialized_get_type@Base 0.7.0~svn3712 - nm_setting_802_1x_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_802_1x_error_quark@Base 0.7.0~svn3758-1 + nm_setting_802_1x_error_get_type@Base 0.7.0~svn3758 + nm_setting_802_1x_error_quark@Base 0.7.0~svn3758 nm_setting_802_1x_get_type@Base 0.7.0~svn3712 nm_setting_802_1x_new@Base 0.7.0~svn3712 nm_setting_802_1x_set_ca_cert@Base 0.7.0~svn3712 @@ -42,14 +42,14 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_802_1x_set_phase2_client_cert@Base 0.7.0~svn3712 nm_setting_802_1x_set_phase2_private_key@Base 0.7.0~svn3712 nm_setting_802_1x_set_private_key@Base 0.7.0~svn3712 - nm_setting_cdma_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_cdma_error_quark@Base 0.7.0~svn3758-1 + nm_setting_cdma_error_get_type@Base 0.7.0~svn3758 + nm_setting_cdma_error_quark@Base 0.7.0~svn3758 nm_setting_cdma_get_type@Base 0.7.0~svn3712 nm_setting_cdma_new@Base 0.7.0~svn3712 nm_setting_clear_secrets@Base 0.7.0~svn3712 nm_setting_compare@Base 0.7.0~svn3712 - nm_setting_connection_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_connection_error_quark@Base 0.7.0~svn3758-1 + nm_setting_connection_error_get_type@Base 0.7.0~svn3758 + nm_setting_connection_error_quark@Base 0.7.0~svn3758 nm_setting_connection_get_type@Base 0.7.0~svn3712 nm_setting_connection_new@Base 0.7.0~svn3712 nm_setting_duplicate@Base 0.7.0~svn3712 @@ -57,26 +57,26 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_from_hash@Base 0.7.0~svn3712 nm_setting_get_name@Base 0.7.0~svn3712 nm_setting_get_type@Base 0.7.0~svn3712 - nm_setting_gsm_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_gsm_error_quark@Base 0.7.0~svn3758-1 + nm_setting_gsm_error_get_type@Base 0.7.0~svn3758 + nm_setting_gsm_error_quark@Base 0.7.0~svn3758 nm_setting_gsm_get_type@Base 0.7.0~svn3712 nm_setting_gsm_new@Base 0.7.0~svn3712 - nm_setting_ip4_config_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_ip4_config_error_quark@Base 0.7.0~svn3758-1 + nm_setting_ip4_config_error_get_type@Base 0.7.0~svn3758 + nm_setting_ip4_config_error_quark@Base 0.7.0~svn3758 nm_setting_ip4_config_get_type@Base 0.7.0~svn3712 nm_setting_ip4_config_new@Base 0.7.0~svn3712 nm_setting_need_secrets@Base 0.7.0~svn3712 - nm_setting_ppp_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_ppp_error_quark@Base 0.7.0~svn3758-1 + nm_setting_ppp_error_get_type@Base 0.7.0~svn3758 + nm_setting_ppp_error_quark@Base 0.7.0~svn3758 nm_setting_ppp_get_type@Base 0.7.0~svn3712 nm_setting_ppp_new@Base 0.7.0~svn3712 - nm_setting_pppoe_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_pppoe_error_quark@Base 0.7.0~svn3758-1 + nm_setting_pppoe_error_get_type@Base 0.7.0~svn3758 + nm_setting_pppoe_error_quark@Base 0.7.0~svn3758 nm_setting_pppoe_get_type@Base 0.7.0~svn3712 nm_setting_pppoe_new@Base 0.7.0~svn3712 nm_setting_register@Base 0.7.0~svn3712 - nm_setting_serial_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_serial_error_quark@Base 0.7.0~svn3758-1 + nm_setting_serial_error_get_type@Base 0.7.0~svn3758 + nm_setting_serial_error_quark@Base 0.7.0~svn3758 nm_setting_serial_get_type@Base 0.7.0~svn3712 nm_setting_serial_new@Base 0.7.0~svn3712 nm_setting_to_hash@Base 0.7.0~svn3712 @@ -84,25 +84,25 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_unregister@Base 0.7.0~svn3712 nm_setting_update_secrets@Base 0.7.0~svn3712 nm_setting_verify@Base 0.7.0~svn3712 - nm_setting_vpn_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_vpn_error_quark@Base 0.7.0~svn3758-1 + nm_setting_vpn_error_get_type@Base 0.7.0~svn3758 + nm_setting_vpn_error_quark@Base 0.7.0~svn3758 nm_setting_vpn_get_type@Base 0.7.0~svn3712 nm_setting_vpn_new@Base 0.7.0~svn3712 - nm_setting_vpn_properties_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_vpn_properties_error_quark@Base 0.7.0~svn3758-1 + nm_setting_vpn_properties_error_get_type@Base 0.7.0~svn3758 + nm_setting_vpn_properties_error_quark@Base 0.7.0~svn3758 nm_setting_vpn_properties_get_type@Base 0.7.0~svn3712 nm_setting_vpn_properties_new@Base 0.7.0~svn3712 - nm_setting_wired_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_wired_error_quark@Base 0.7.0~svn3758-1 + nm_setting_wired_error_get_type@Base 0.7.0~svn3758 + nm_setting_wired_error_quark@Base 0.7.0~svn3758 nm_setting_wired_get_type@Base 0.7.0~svn3712 nm_setting_wired_new@Base 0.7.0~svn3712 nm_setting_wireless_ap_security_compatible@Base 0.7.0~svn3712 - nm_setting_wireless_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_wireless_error_quark@Base 0.7.0~svn3758-1 + nm_setting_wireless_error_get_type@Base 0.7.0~svn3758 + nm_setting_wireless_error_quark@Base 0.7.0~svn3758 nm_setting_wireless_get_type@Base 0.7.0~svn3712 nm_setting_wireless_new@Base 0.7.0~svn3712 - nm_setting_wireless_security_error_get_type@Base 0.7.0~svn3758-1 - nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758-1 + nm_setting_wireless_security_error_get_type@Base 0.7.0~svn3758 + nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758 nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 nm_setting_wireless_security_new@Base 0.7.0~svn3712 nm_utils_escape_ssid@Base 0.7.0~svn3712 -- cgit 1.3.0-6-gf8a5 From d5fc2a7f95ccfd111c2e1bb412e68ea2b7551574 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Jun 2008 22:20:07 +0000 Subject: - nm-vpn-properties was removed. Remove the now unnecessary build-deps. - Wrap lines in the long description. - libnm-glib-dev seems to required network-manager-dev git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2321 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 38c22efb..182d92f7 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config, - intltool, quilt, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.74-4), - 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), ppp-dev, docbook-to-man, libpolkit-dbus-dev, + 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 Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager @@ -55,7 +55,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-glib0 (= ${binary:Version}), 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 @@ -79,7 +79,8 @@ Description: network management framework (GLib VPN shared library) 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. + This package provides the shared library that applications can use for + creating VPN connections via NetworkManager. Package: libnm-glib-vpn-dev Section: libdevel @@ -93,7 +94,8 @@ Description: network management framework (GLib interface) 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. + This package provides the shared library that applications can use for + creating VPN connections via NetworkManager. Package: libnm-util0 Section: libs -- cgit 1.3.0-6-gf8a5 From ea0e9c81f08f312774fee15a6b891679e9f5ed99 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Jun 2008 22:21:18 +0000 Subject: Merge changelog. 0.7.0~svn3747-1 was never released. A more complete changelog will follow... git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2322 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8eaa6d4..baff8566 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,12 @@ network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low - * New SVN snapshot - * debian/patches/03-system-settings-conf.patch - - Removed. Merged upstream + * SVN snapshot of the upcoming 0.7 release. + + [ Sjoerd Simons ] * Split out libnm-glib-vpn from libnm-glib * debian/rules: Use list-missing - -- Sjoerd Simons Wed, 18 Jun 2008 15:50:59 +0100 - -network-manager (0.7.0~svn3747-1) experimental; urgency=low - - * SVN snapshot of the upcoming 0.7 release. + [ Michael Biebl ] * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - 13-validate_mac_addr.patch @@ -18,12 +14,10 @@ network-manager (0.7.0~svn3747-1) experimental; urgency=low - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. - * debian/patches/03-system-settings-conf.patch - - Added. Put system settings config file in /etc/NetworkManager * debian/control: Updated dependencies and build-depends * debian/rules: - Switch to quilt as a patch system - - Update for the 0.7 build + - Update for the 0.7 build * debian/copyright: Updated * debian/nm-vpn-properties.sgml: Dropped, obsolete * debian/watch: Updated to match both the current 0.6 and the upcoming 0.7 @@ -33,7 +27,7 @@ network-manager (0.7.0~svn3747-1) experimental; urgency=low * debian/*.install: Updated * debian/*.symbols: Updated - -- Michael Biebl Fri, 25 Jan 2008 15:35:15 +0100 + -- Michael Biebl Thu, 19 Jun 2008 00:11:17 +0200 network-manager (0.6.6-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 60e125890e3f1a8ad6da7d6250578e50c0d09605 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Jun 2008 22:23:48 +0000 Subject: Actually remove the NetworkManagerDispatcher init script. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2323 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- ...network-manager.network-manager-dispatcher.init | 79 ---------------------- 1 file changed, 79 deletions(-) delete mode 100644 debian/network-manager.network-manager-dispatcher.init diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init deleted file mode 100644 index 4384f18c..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 -# Required-Stop: $remote_fs -# 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 -- cgit 1.3.0-6-gf8a5 From 974a626ec1fdba2628546b0a7af56d363de5b2a3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Jun 2008 23:58:40 +0000 Subject: Fix the package name in libnm-glib-vpn0.symbols git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2325 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn0.symbols | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols index 3b386abf..2f872155 100644 --- a/debian/libnm-glib-vpn0.symbols +++ b/debian/libnm-glib-vpn0.symbols @@ -1,4 +1,4 @@ -libnm_glib_vpn.so.0 libnm-glib0 #MINVER# +libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER@Base 0.7.0~svn3712 dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER_POINTER@Base 0.7.0~svn3712 dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__POINTER@Base 0.7.0~svn3712 -- cgit 1.3.0-6-gf8a5 From a84f43c2e39184cfe24823889393e30487c5b2d3 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 22 Jun 2008 21:27:01 +0000 Subject: * debian/patches/10-execute_system_dhclient_script.patch - Added. Let NM's custom dhclient script execute the systems dhclient script. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2333 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++- .../10-execute_system_dhclient_script.patch | 29 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 debian/patches/10-execute_system_dhclient_script.patch diff --git a/debian/changelog b/debian/changelog index baff8566..35ecc2d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,12 @@ network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low * debian/*.install: Updated * debian/*.symbols: Updated - -- Michael Biebl Thu, 19 Jun 2008 00:11:17 +0200 + [ Sjoerd Simons ] + * debian/patches/10-execute_system_dhclient_script.patch + - Added. Let NM's custom dhclient script execute the systems dhclient + script. + + -- Sjoerd Simons Sun, 22 Jun 2008 22:25:32 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/10-execute_system_dhclient_script.patch b/debian/patches/10-execute_system_dhclient_script.patch new file mode 100644 index 00000000..bf040bf6 --- /dev/null +++ b/debian/patches/10-execute_system_dhclient_script.patch @@ -0,0 +1,29 @@ +commit ab7e3a44e2869b91a62d12b3157fa1debc5df7a9 +Author: Sjoerd Simons +Date: Sun Jun 22 22:23:38 2008 +0100 + + Execute system dhclient script + +diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c +index 9917235..30d7a02 100644 +--- a/callouts/nm-dhcp-client-action.c ++++ b/callouts/nm-dhcp-client-action.c +@@ -34,6 +34,9 @@ + #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client" + #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" + ++ ++#define SYSTEM_DHCLIENT_SCRIPT "/sbin/dhclient-script" ++ + /** + * Start a dict in a dbus message. Should be paired with a call to + * {@link wpa_dbus_dict_close_write}. +@@ -295,6 +298,8 @@ main (int argc, char *argv[]) + + g_type_init (); + ++ g_spawn_command_line_sync (SYSTEM_DHCLIENT_SCRIPT, NULL, NULL, NULL, NULL); ++ + /* Get a connection to the system bus */ + connection = dbus_init (); + if (connection == NULL) diff --git a/debian/patches/series b/debian/patches/series index fa071840..96d76b16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02-dbus_access_network_manager.patch 05-debian_backend.patch +10-execute_system_dhclient_script.patch -- cgit 1.3.0-6-gf8a5 From d3b68e218e4bc02fc9056797dd5e120704ad8121 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 5 Jul 2008 12:59:01 +0000 Subject: * debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch - Fix memory leak in src/nm-dbus-net.c. (Closes: #488604) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2346 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- .../09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch diff --git a/debian/changelog b/debian/changelog index 56f0631f..97ecc068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ network-manager (0.6.6-2) UNRELEASED; urgency=low * debian/control - Add Build-Depends on pkg-config. + * debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch + - Fix memory leak in src/nm-dbus-net.c. (Closes: #488604) - -- Michael Biebl Thu, 03 Apr 2008 03:41:27 +0200 + -- Michael Biebl Sat, 05 Jul 2008 14:57:29 +0200 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch b/debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch new file mode 100644 index 00000000..c3bf1011 --- /dev/null +++ b/debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch @@ -0,0 +1,13 @@ +Index: src/nm-dbus-net.c +=================================================================== +--- src/nm-dbus-net.c (Revision 3769) ++++ src/nm-dbus-net.c (Revision 3770) +@@ -69,6 +69,8 @@ + + compare_path = g_strdup_printf ("%s/%s/Networks/%s", + NM_DBUS_PATH_DEVICES, escaped_dev, escaped_ssid); ++ g_free (escaped_dev); ++ g_free (escaped_ssid); + + len = strlen (compare_path); + if (strncmp (path, compare_path, len) == 0) { -- cgit 1.3.0-6-gf8a5 From 7f5c8a34fb28a0073b9eaa441d3974f91e9d6810 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 5 Jul 2008 13:04:50 +0000 Subject: Drop obsolete Depends on iputils-arping. (Closes: #487794) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2347 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 97ecc068..08e6ac6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ network-manager (0.6.6-2) UNRELEASED; urgency=low * debian/control - Add Build-Depends on pkg-config. + - Drop obsolete Depends on iputils-arping. (Closes: #487794) * debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch - Fix memory leak in src/nm-dbus-net.c. (Closes: #488604) diff --git a/debian/control b/debian/control index e00e6e35..5f296a62 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 3.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.7.1), ifupdown, adduser +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) -- cgit 1.3.0-6-gf8a5 From 392a5b915ed88e703c2a5359c6e7deb976bc037a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 5 Jul 2008 13:12:33 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2348 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08e6ac6a..e43854fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.6-2) UNRELEASED; urgency=low +network-manager (0.6.6-2) unstable; urgency=low * debian/control - Add Build-Depends on pkg-config. @@ -6,7 +6,7 @@ network-manager (0.6.6-2) UNRELEASED; urgency=low * debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch - Fix memory leak in src/nm-dbus-net.c. (Closes: #488604) - -- Michael Biebl Sat, 05 Jul 2008 14:57:29 +0200 + -- Michael Biebl Sat, 05 Jul 2008 15:11:33 +0200 network-manager (0.6.6-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 03a9095412e1aaea4b202213d88c26f0ba63a38f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:39:05 +0000 Subject: Update symbols file for svn snapshot r4002 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2405 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn0.symbols | 5 ---- debian/libnm-glib0.symbols | 59 +++++------------------------------------- debian/libnm-util0.symbols | 30 ++++++++++----------- 3 files changed, 21 insertions(+), 73 deletions(-) diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols index 2f872155..24a96635 100644 --- a/debian/libnm-glib-vpn0.symbols +++ b/debian/libnm-glib-vpn0.symbols @@ -1,9 +1,4 @@ libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__BOXED_POINTER_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_vpn_plugin_BOOLEAN__STRING_POINTER@Base 0.7.0~svn3712 - dbus_glib_nm_vpn_plugin_object_info@Base 0.7.0~svn3712 nm_vpn_plugin_disconnect@Base 0.7.0~svn3712 nm_vpn_plugin_error_get_type@Base 0.7.0~svn3712 nm_vpn_plugin_error_quark@Base 0.7.0~svn3712 diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols index ad2172cc..3865072d 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -1,10 +1,4 @@ libnm_glib.so.0 libnm-glib0 #MINVER# - dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER@Base 0.7.0~svn3712 - dbus_glib_marshal_nm_settings_BOOLEAN__POINTER_POINTER@Base 0.7.0~svn3712 - dbus_glib_nm_exported_connection_object_info@Base 0.7.0~svn3712 - dbus_glib_nm_settings_object_info@Base 0.7.0~svn3712 libnm_glib_get_network_state@Base 0.6.4 libnm_glib_init@Base 0.6.4 libnm_glib_register_callback@Base 0.6.4 @@ -26,8 +20,6 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_active_connection_get_devices@Base 0.7.0~svn3712 nm_active_connection_get_scope@Base 0.7.0~svn3712 nm_active_connection_get_service_name@Base 0.7.0~svn3712 - nm_active_connection_get_shared_connection@Base 0.7.0~svn3712 - nm_active_connection_get_shared_service_name@Base 0.7.0~svn3712 nm_active_connection_get_specific_object@Base 0.7.0~svn3712 nm_active_connection_get_state@Base 0.7.0~svn3712 nm_active_connection_get_type@Base 0.7.0~svn3712 @@ -49,13 +41,6 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_client_wireless_set_enabled@Base 0.7.0~svn3712 nm_dbus_connection_get_type@Base 0.7.0~svn3712 nm_dbus_connection_new@Base 0.7.0~svn3712 - nm_dbus_get_int_property@Base 0.7.0~svn3712 - nm_dbus_get_object_path_property@Base 0.7.0~svn3712 - nm_dbus_get_property@Base 0.7.0~svn3712 - nm_dbus_get_string_property@Base 0.7.0~svn3712 - nm_dbus_get_uint_property@Base 0.7.0~svn3712 - nm_dbus_introspect@Base 0.7.0~svn3712 - nm_dbus_set_property@Base 0.7.0~svn3712 nm_dbus_settings_get_connection_by_path@Base 0.7.0~svn3712 nm_dbus_settings_get_type@Base 0.7.0~svn3712 nm_dbus_settings_new@Base 0.7.0~svn3712 @@ -69,6 +54,7 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_device_ethernet_get_type@Base 0.7.0~svn3746 nm_device_ethernet_new@Base 0.7.0~svn3746 nm_device_get_capabilities@Base 0.7.0~svn3712 + nm_device_get_dhcp4_config@Base 0.7.0~svn3907 nm_device_get_driver@Base 0.7.0~svn3712 nm_device_get_iface@Base 0.7.0~svn3712 nm_device_get_ip4_config@Base 0.7.0~svn3712 @@ -88,7 +74,10 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_device_wifi_get_mode@Base 0.7.0~svn3746 nm_device_wifi_get_type@Base 0.7.0~svn3746 nm_device_wifi_new@Base 0.7.0~svn3746 - nm_device_wifi_set_wireless_enabled@Base 0.7.0~svn3746 + nm_dhcp4_config_get_one_option@Base 0.7.0~svn3907 + nm_dhcp4_config_get_options@Base 0.7.0~svn3907 + nm_dhcp4_config_get_type@Base 0.7.0~svn3907 + nm_dhcp4_config_new@Base 0.7.0~svn3907 nm_exported_connection_delete@Base 0.7.0~svn3712 nm_exported_connection_get_connection@Base 0.7.0~svn3712 nm_exported_connection_get_id@Base 0.7.0~svn3712 @@ -104,46 +93,13 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_ip4_config_get_domains@Base 0.7.0~svn3712 nm_ip4_config_get_hostname@Base 0.7.0~svn3712 nm_ip4_config_get_nameservers@Base 0.7.0~svn3712 - nm_ip4_config_get_nis_domain@Base 0.7.0~svn3712 - nm_ip4_config_get_nis_servers@Base 0.7.0~svn3712 + nm_ip4_config_get_routes@Base 0.7.0~svn3900 nm_ip4_config_get_type@Base 0.7.0~svn3712 nm_ip4_config_new@Base 0.7.0~svn3712 - nm_marshal_VOID__OBJECT_OBJECT_ENUM@Base 0.7.0~svn3712 - nm_marshal_VOID__OBJECT_POINTER@Base 0.7.0~svn3712 - nm_marshal_VOID__OBJECT_STRING@Base 0.7.0~svn3712 - nm_marshal_VOID__OBJECT_UINT@Base 0.7.0~svn3712 - nm_marshal_VOID__OBJECT_UINT_UINT@Base 0.7.0~svn3712 - nm_marshal_VOID__POINTER_STRING@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_INT@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_OBJECT@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_STRING@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_STRING_POINTER@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_STRING_STRING@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_UCHAR@Base 0.7.0~svn3712 - nm_marshal_VOID__STRING_UINT@Base 0.7.0~svn3712 - nm_marshal_VOID__UINT_UINT@Base 0.7.0~svn3712 - nm_object_array_demarshal@Base 0.7.0~svn3712 nm_object_array_get_type@Base 0.7.0~svn3712 - nm_object_cache_add@Base 0.7.0~svn3712 - nm_object_cache_get@Base 0.7.0~svn3712 - nm_object_cache_remove_by_object@Base 0.7.0~svn3712 - nm_object_cache_remove_by_path@Base 0.7.0~svn3712 - nm_object_demarshal_generic@Base 0.7.0~svn3712 - nm_object_get_boolean_property@Base 0.7.0~svn3712 - nm_object_get_byte_array_property@Base 0.7.0~svn3712 - nm_object_get_byte_property@Base 0.7.0~svn3712 nm_object_get_connection@Base 0.7.0~svn3712 - nm_object_get_double_property@Base 0.7.0~svn3712 - nm_object_get_int_property@Base 0.7.0~svn3712 - nm_object_get_object_path_property@Base 0.7.0~svn3712 nm_object_get_path@Base 0.7.0~svn3712 - nm_object_get_property@Base 0.7.0~svn3712 - nm_object_get_string_property@Base 0.7.0~svn3712 nm_object_get_type@Base 0.7.0~svn3712 - nm_object_get_uint_property@Base 0.7.0~svn3712 - nm_object_handle_properties_changed@Base 0.7.0~svn3712 - nm_object_queue_notify@Base 0.7.0~svn3712 - nm_object_set_property@Base 0.7.0~svn3712 nm_serial_device_get_bytes_received@Base 0.7.0~svn3746 nm_serial_device_get_bytes_sent@Base 0.7.0~svn3746 nm_serial_device_get_type@Base 0.7.0~svn3746 @@ -151,11 +107,8 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_settings_get_type@Base 0.7.0~svn3712 nm_settings_list_connections@Base 0.7.0~svn3712 nm_settings_signal_new_connection@Base 0.7.0~svn3712 - nm_ssid_demarshal@Base 0.7.0~svn3712 nm_ssid_get_type@Base 0.7.0~svn3712 - nm_string_array_demarshal@Base 0.7.0~svn3712 nm_string_array_get_type@Base 0.7.0~svn3712 - nm_uint_array_demarshal@Base 0.7.0~svn3712 nm_uint_array_get_type@Base 0.7.0~svn3712 nm_vpn_connection_get_banner@Base 0.7.0~svn3712 nm_vpn_connection_get_type@Base 0.7.0~svn3712 diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols index ef33a74b..73e10cf4 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -1,16 +1,12 @@ libnm-util.so.0 libnm-util0 #MINVER# - crypto_decrypt@Base 0.7.0~svn3712 - crypto_deinit@Base 0.7.0~svn3712 - crypto_get_private_key@Base 0.7.0~svn3712 - crypto_init@Base 0.7.0~svn3712 - crypto_load_and_verify_certificate@Base 0.7.0~svn3712 - crypto_md5_hash@Base 0.7.0~svn3712 - crypto_verify_cert@Base 0.7.0~svn3712 nm_connection_add_setting@Base 0.7.0~svn3712 nm_connection_clear_secrets@Base 0.7.0~svn3712 nm_connection_compare@Base 0.7.0~svn3712 nm_connection_create_setting@Base 0.7.0~svn3712 nm_connection_dump@Base 0.7.0~svn3712 + nm_connection_duplicate@Base 0.7.0~svn3758 + nm_connection_error_get_type@Base 0.7.0~svn3896 + nm_connection_error_quark@Base 0.7.0~svn3896 nm_connection_for_each_setting_value@Base 0.7.0~svn3712 nm_connection_get_path@Base 0.7.0~svn3712 nm_connection_get_scope@Base 0.7.0~svn3712 @@ -29,9 +25,6 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_connection_to_hash@Base 0.7.0~svn3712 nm_connection_update_secrets@Base 0.7.0~svn3712 nm_connection_verify@Base 0.7.0~svn3712 - nm_crypto_error_quark@Base 0.7.0~svn3712 - nm_param_spec_specialized@Base 0.7.0~svn3712 - nm_param_spec_specialized_get_type@Base 0.7.0~svn3712 nm_setting_802_1x_error_get_type@Base 0.7.0~svn3758 nm_setting_802_1x_error_quark@Base 0.7.0~svn3758 nm_setting_802_1x_get_type@Base 0.7.0~svn3712 @@ -65,6 +58,10 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_ip4_config_error_quark@Base 0.7.0~svn3758 nm_setting_ip4_config_get_type@Base 0.7.0~svn3712 nm_setting_ip4_config_new@Base 0.7.0~svn3712 + nm_setting_ip6_config_error_get_type@Base 0.7.0~svn3778 + nm_setting_ip6_config_error_quark@Base 0.7.0~svn3778 + nm_setting_ip6_config_get_type@Base 0.7.0~svn3778 + nm_setting_ip6_config_new@Base 0.7.0~svn3778 nm_setting_need_secrets@Base 0.7.0~svn3712 nm_setting_ppp_error_get_type@Base 0.7.0~svn3758 nm_setting_ppp_error_quark@Base 0.7.0~svn3758 @@ -88,10 +85,6 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_vpn_error_quark@Base 0.7.0~svn3758 nm_setting_vpn_get_type@Base 0.7.0~svn3712 nm_setting_vpn_new@Base 0.7.0~svn3712 - nm_setting_vpn_properties_error_get_type@Base 0.7.0~svn3758 - nm_setting_vpn_properties_error_quark@Base 0.7.0~svn3758 - nm_setting_vpn_properties_get_type@Base 0.7.0~svn3712 - nm_setting_vpn_properties_new@Base 0.7.0~svn3712 nm_setting_wired_error_get_type@Base 0.7.0~svn3758 nm_setting_wired_error_quark@Base 0.7.0~svn3758 nm_setting_wired_get_type@Base 0.7.0~svn3712 @@ -106,10 +99,17 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 nm_setting_wireless_security_new@Base 0.7.0~svn3712 nm_utils_escape_ssid@Base 0.7.0~svn3712 - nm_utils_garray_to_string@Base 0.7.0~svn3712 nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712 nm_utils_ip4_addresses_from_gvalue@Base 0.7.0~svn3712 nm_utils_ip4_addresses_to_gvalue@Base 0.7.0~svn3712 + nm_utils_ip4_netmask_to_prefix@Base 0.7.0~svn3815 + nm_utils_ip4_prefix_to_netmask@Base 0.7.0~svn3815 + nm_utils_ip4_routes_from_gvalue@Base 0.7.0~svn3900 + nm_utils_ip4_routes_to_gvalue@Base 0.7.0~svn3900 + nm_utils_ip6_addresses_from_gvalue@Base 0.7.0~svn3778 + nm_utils_ip6_addresses_to_gvalue@Base 0.7.0~svn3778 + nm_utils_ip6_dns_from_gvalue@Base 0.7.0~svn3778 + nm_utils_ip6_dns_to_gvalue@Base 0.7.0~svn3778 nm_utils_is_empty_ssid@Base 0.7.0~svn3712 nm_utils_register_value_transformations@Base 0.7.0~svn3712 nm_utils_same_ssid@Base 0.7.0~svn3712 -- cgit 1.3.0-6-gf8a5 From 92143f880c0a11aed70296548429c5471b9e6921 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:40:18 +0000 Subject: Add "status" action. Requires lsb-base (>= 3.2-14). git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2406 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/network-manager.init b/debian/network-manager.init index 10fca34d..18797994 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -74,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 -- cgit 1.3.0-6-gf8a5 From 5cd7afe32fa5b10e8bf1fb6ee56046aeb7032e67 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:43:29 +0000 Subject: Disable 05-debian_backend.patch and 10-execute_system_dhclient_script.patch The integration of resolvconf will have to be done differently. The current patches no longer apply. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2407 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 96d76b16..af6b144d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 02-dbus_access_network_manager.patch -05-debian_backend.patch -10-execute_system_dhclient_script.patch +#05-debian_backend.patch +#10-execute_system_dhclient_script.patch -- cgit 1.3.0-6-gf8a5 From 201e3a618d923458630147f43f1bffb78776c6ab Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:44:12 +0000 Subject: Stop NM at priority 88, exclude private libs from dh_makeshlibs. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2408 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index b5b73e3b..8567f7e3 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ 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" @@ -17,7 +19,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-distro=debian \ --with-crypto=gnutls -DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 . +DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . clean:: rm -f po/*.gmo -- cgit 1.3.0-6-gf8a5 From 8969ee16a9b75c03926138718ec11248a35f39c4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:46:43 +0000 Subject: Update installed files/directories - Install avahi action script and dbus config file - Install nm-dhcp4-config.h header - Install dispatcher.d and system-connections directories created by upstream. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2409 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-dev.install | 1 + debian/network-manager.dirs | 2 -- debian/network-manager.install | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index df8e5221..ddf3366a 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -7,6 +7,7 @@ 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/network-manager.dirs b/debian/network-manager.dirs index 60de4e65..35ce9986 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,4 +1,2 @@ -etc/NetworkManager/dispatcher.d -etc/NetworkManager/system-connections var/lib/NetworkManager var/run/NetworkManager diff --git a/debian/network-manager.install b/debian/network-manager.install index c5fd4648..f99a2e65 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -4,6 +4,7 @@ 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/pppd/*/*.so debian/tmp/usr/share/locale/ @@ -13,4 +14,7 @@ debian/tmp/etc/dbus-1/system.d/NetworkManager.conf 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/ -- cgit 1.3.0-6-gf8a5 From 991227b597984d246a661f2ff9d3a7fac620b11b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:47:21 +0000 Subject: Copyright has to be revised. This is a first attempt to remove stale stuff. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2410 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/copyright | 84 +++++++++----------------------------------------------- 1 file changed, 13 insertions(+), 71 deletions(-) diff --git a/debian/copyright b/debian/copyright index d940e36d..1f3cbaa2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,82 +3,24 @@ 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 +Copyright: + (C) Copyright 2008 Red Hat, Inc. License: - This package 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 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 - 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 - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, 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 -and it's released under the terms of the GNU General Public License. (see below). - -src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett -and it's released under the terms of the GNU General Public License. (see below) - -src/backends/NetworkManagerGentoo.c is copyright of Dan Williams , -Dan Willemsen , 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 and it's released under the terms of -the GNU General Public License. (see below). - -src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams , -Kay Sievers , Robert Love 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 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 and -are released under the terms of the GNU General Public License. (see below). - -initscript/Debian/NetworkManager is copyright of , -Mark Roach , Thom May - -The rest of the source (what it's not mentioned here) -is copyright of Dan Williams and it's released under -the terms of the GNU General Public License. - -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. + 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 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'. -- cgit 1.3.0-6-gf8a5 From e8fa62a4c18a0a93238bdad2358020240fdecad8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:47:48 +0000 Subject: Update to svn r4002 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2411 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35ecc2d8..7f1bfb2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4002-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. @@ -25,7 +25,7 @@ network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low * debian/network-manager.postrm: Relevant code moved to preinst * debian/network-manager.network-manager-dispatcher.init: Dropped, obsolete * debian/*.install: Updated - * debian/*.symbols: Updated + * debian/*.symbols: Added [ Sjoerd Simons ] * debian/patches/10-execute_system_dhclient_script.patch -- cgit 1.3.0-6-gf8a5 From f96aa9e0905f493b68759d1f52642a29048be1d8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 19:49:32 +0000 Subject: - Bump Standards Version to 3.8.0 - Suggest avahi-autoipd, NM no longer does IPv4LL - Bump dependency on lsb-base, required by status_of_proc git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2412 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 182d92f7..56d3a84c 100644 --- a/debian/control +++ b/debian/control @@ -4,21 +4,20 @@ Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl 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 -Standards-Version: 3.7.3 + 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 +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}, lsb-base (>= 3.0-6), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser +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 Recommends: network-manager-gnome | network-manager-kde, policykit Conflicts: network-manager-gnome (<< 0.6.5-1) +Suggests: avahi-autoipd Replaces: network-manager-gnome (<< 0.6.5-1) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From 51377af1b0da7ebc9501e0486d2318c8f4c8ca45 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 20:14:37 +0000 Subject: Remove, all relevant parts are upstream now git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2413 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/05-debian_backend.patch | 203 --------------------------------- 1 file changed, 203 deletions(-) delete mode 100644 debian/patches/05-debian_backend.patch diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch deleted file mode 100644 index 1851e7de..00000000 --- a/debian/patches/05-debian_backend.patch +++ /dev/null @@ -1,203 +0,0 @@ -Index: NetworkManager/src/backends/NetworkManagerDebian.c -=================================================================== ---- NetworkManager.orig/src/backends/NetworkManagerDebian.c 2008-06-11 12:28:11.000000000 +0200 -+++ NetworkManager/src/backends/NetworkManagerDebian.c 2008-06-11 12:33:02.000000000 +0200 -@@ -74,18 +74,21 @@ - nm_spawn_process ("/usr/bin/killall -q dhclient"); - } - -+#define RESOLVCONF "resolvconf" - - /* - * 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"); -+ } - } - - /* -@@ -125,6 +128,9 @@ - */ - gboolean nm_system_should_modify_resolv_conf (void) - { -- return TRUE; -+ if (g_find_program_in_path(RESOLVCONF) != NULL) -+ return FALSE; -+ else -+ return TRUE; - } - -Index: NetworkManager/src/backends/interface_parser.c -=================================================================== ---- NetworkManager.orig/src/backends/interface_parser.c 2008-06-11 12:28:11.000000000 +0200 -+++ NetworkManager/src/backends/interface_parser.c 2008-06-11 12:33:02.000000000 +0200 -@@ -73,14 +73,18 @@ - //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) -@@ -91,7 +95,7 @@ - first = last = NULL; - while(1) - { -- line = space = NULL; -+ line = NULL; - ret = fscanf(inp,"%255[^\n]\n",rline); - if (ret == EOF) - break; -@@ -104,50 +108,71 @@ - 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); - } -@@ -200,6 +225,18 @@ - 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; -Index: NetworkManager/src/backends/interface_parser.h -=================================================================== ---- NetworkManager.orig/src/backends/interface_parser.h 2008-06-11 12:28:11.000000000 +0200 -+++ NetworkManager/src/backends/interface_parser.h 2008-06-11 12:33:02.000000000 +0200 -@@ -44,6 +44,7 @@ - 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); - -- cgit 1.3.0-6-gf8a5 From dca9f3c2961cb9a32e26aa77e0cb08f4029e2404 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 20:15:21 +0000 Subject: Remove 10-execute_system_dhclient_script.patch, patch no longer applies. Resolvconf intergration will have to be addressedd differently. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2414 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +----- .../10-execute_system_dhclient_script.patch | 29 ---------------------- debian/patches/series | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 debian/patches/10-execute_system_dhclient_script.patch diff --git a/debian/changelog b/debian/changelog index 7f1bfb2d..4097f33a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,12 +27,7 @@ network-manager (0.7.0~svn4002-1) UNRELEASED; urgency=low * debian/*.install: Updated * debian/*.symbols: Added - [ Sjoerd Simons ] - * debian/patches/10-execute_system_dhclient_script.patch - - Added. Let NM's custom dhclient script execute the systems dhclient - script. - - -- Sjoerd Simons Sun, 22 Jun 2008 22:25:32 +0100 + -- Michael Biebl Fri, 22 Aug 2008 21:53:54 +0200 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/10-execute_system_dhclient_script.patch b/debian/patches/10-execute_system_dhclient_script.patch deleted file mode 100644 index bf040bf6..00000000 --- a/debian/patches/10-execute_system_dhclient_script.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit ab7e3a44e2869b91a62d12b3157fa1debc5df7a9 -Author: Sjoerd Simons -Date: Sun Jun 22 22:23:38 2008 +0100 - - Execute system dhclient script - -diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c -index 9917235..30d7a02 100644 ---- a/callouts/nm-dhcp-client-action.c -+++ b/callouts/nm-dhcp-client-action.c -@@ -34,6 +34,9 @@ - #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client" - #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" - -+ -+#define SYSTEM_DHCLIENT_SCRIPT "/sbin/dhclient-script" -+ - /** - * Start a dict in a dbus message. Should be paired with a call to - * {@link wpa_dbus_dict_close_write}. -@@ -295,6 +298,8 @@ main (int argc, char *argv[]) - - g_type_init (); - -+ g_spawn_command_line_sync (SYSTEM_DHCLIENT_SCRIPT, NULL, NULL, NULL, NULL); -+ - /* Get a connection to the system bus */ - connection = dbus_init (); - if (connection == NULL) diff --git a/debian/patches/series b/debian/patches/series index af6b144d..5bb8c3f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ 02-dbus_access_network_manager.patch -#05-debian_backend.patch -#10-execute_system_dhclient_script.patch -- cgit 1.3.0-6-gf8a5 From 0375f3ff8c5df4dc87e61cbe7ea8f284eac6f531 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 20:16:09 +0000 Subject: Update to r4004, which contains our custom backend changes. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2415 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4097f33a..185658f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4002-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. -- cgit 1.3.0-6-gf8a5 From f92919a8880a68c40f5a38333e47a843099d6161 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 30 Sep 2008 17:21:44 +0000 Subject: * Newer tarball * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2426 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +- debian/control | 2 +- debian/libnm-glib0.symbols | 1 - debian/patches/03-run-resolvconf.patch | 138 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 debian/patches/03-run-resolvconf.patch diff --git a/debian/changelog b/debian/changelog index 185658f9..4b5b9c6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4035-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. @@ -27,7 +27,11 @@ network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low * debian/*.install: Updated * debian/*.symbols: Added - -- Michael Biebl Fri, 22 Aug 2008 21:53:54 +0200 + [ Simon McVittie ] + * Newer tarball + * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf + + -- Simon McVittie Thu, 04 Sep 2008 19:29:36 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 56d3a84c..95addae7 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -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 +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, resolvconf Recommends: network-manager-gnome | network-manager-kde, policykit Conflicts: network-manager-gnome (<< 0.6.5-1) Suggests: avahi-autoipd diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols index 3865072d..4065a539 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -80,7 +80,6 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_dhcp4_config_new@Base 0.7.0~svn3907 nm_exported_connection_delete@Base 0.7.0~svn3712 nm_exported_connection_get_connection@Base 0.7.0~svn3712 - nm_exported_connection_get_id@Base 0.7.0~svn3712 nm_exported_connection_get_type@Base 0.7.0~svn3712 nm_exported_connection_new@Base 0.7.0~svn3712 nm_exported_connection_register_object@Base 0.7.0~svn3712 diff --git a/debian/patches/03-run-resolvconf.patch b/debian/patches/03-run-resolvconf.patch new file mode 100644 index 00000000..d043d191 --- /dev/null +++ b/debian/patches/03-run-resolvconf.patch @@ -0,0 +1,138 @@ +Index: src/named-manager/nm-named-manager.c +=================================================================== +--- NetworkManager/src/named-manager/nm-named-manager.c (revision 4035) ++++ NetworkManager/src/named-manager/nm-named-manager.c (working copy) +@@ -189,6 +178,133 @@ + return TRUE; + } + ++#elif defined(TARGET_DEBIAN) ++ ++static void ++resolvconf_child_setup (gpointer user_data G_GNUC_UNUSED) ++{ ++ pid_t pid = getpid (); ++ setpgid (pid, pid); ++} ++ ++static gint ++run_resolvconf (GError **error) ++{ ++ char *argv[4]; ++ gint stdin_fd; ++ ++ argv[0] = "/sbin/resolvconf"; ++ argv[1] = "-a"; ++ argv[2] = "NetworkManager"; ++ argv[3] = NULL; ++ ++ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, resolvconf_child_setup, ++ NULL, NULL, &stdin_fd, NULL, NULL, error)) ++ return -1; ++ ++ return stdin_fd; ++} ++ ++static gboolean ++update_resolv_conf (const char *iface, ++ const char *domain, ++ char **searches, ++ char **nameservers, ++ GError **error) ++{ ++ gint fd; ++ char *domain_str = NULL; ++ char *searches_str = NULL; ++ char *nameservers_str = NULL; ++ FILE *f; ++ ++ fd = run_resolvconf (error); ++ if (fd < 0) ++ return FALSE; ++ ++ if ((f = fdopen (fd, "w")) == NULL) { ++ g_set_error (error, ++ NM_NAMED_MANAGER_ERROR, ++ NM_NAMED_MANAGER_ERROR_SYSTEM, ++ "Could not fdopen pipe to resolvconf: %s\n", ++ g_strerror (errno)); ++ return FALSE; ++ } ++ ++ if (fprintf (f, "%s","# generated by NetworkManager, do not edit!\n\n") < 0) { ++ g_set_error (error, ++ NM_NAMED_MANAGER_ERROR, ++ NM_NAMED_MANAGER_ERROR_SYSTEM, ++ "Could not write to resolvconf: %s\n", ++ g_strerror (errno)); ++ fclose (f); ++ return FALSE; ++ } ++ ++ if (domain) ++ domain_str = g_strconcat ("domain ", domain, "\n\n", NULL); ++ ++ if (searches) { ++ char *tmp_str; ++ ++ tmp_str = g_strjoinv (" ", searches); ++ searches_str = g_strconcat ("search ", tmp_str, "\n\n", NULL); ++ g_free (tmp_str); ++ } ++ ++ if (nameservers) { ++ GString *str; ++ int num; ++ int i; ++ ++ str = g_string_new (""); ++ num = g_strv_length (nameservers); ++ ++ for (i = 0; i < num; i++) { ++ if (i == 3) { ++ g_string_append (str, "\n# "); ++ g_string_append (str, _("NOTE: the glibc resolver does not support more than 3 nameservers.")); ++ g_string_append (str, "\n# "); ++ g_string_append (str, _("The nameservers listed below may not be recognized.")); ++ g_string_append_c (str, '\n'); ++ } ++ ++ g_string_append (str, "nameserver "); ++ g_string_append (str, nameservers[i]); ++ g_string_append_c (str, '\n'); ++ } ++ ++ nameservers_str = g_string_free (str, FALSE); ++ } ++ ++ if (fprintf (f, "%s%s%s\n", ++ domain_str ? domain_str : "", ++ searches_str ? searches_str : "", ++ nameservers_str ? nameservers_str : "") < 0) { ++ g_set_error (error, ++ NM_NAMED_MANAGER_ERROR, ++ NM_NAMED_MANAGER_ERROR_SYSTEM, ++ "Could not write to resolvconf: %s\n", ++ g_strerror (errno)); ++ } ++ ++ g_free (domain_str); ++ g_free (searches_str); ++ g_free (nameservers_str); ++ ++ if (fclose (f) < 0) { ++ if (*error == NULL) { ++ g_set_error (error, ++ NM_NAMED_MANAGER_ERROR, ++ NM_NAMED_MANAGER_ERROR_SYSTEM, ++ "Could not close pipe to resolvconf: %s\n", ++ g_strerror (errno)); ++ } ++ } ++ ++ return *error ? FALSE : TRUE; ++} ++ + #else + /**********************************/ + /* Generic */ diff --git a/debian/patches/series b/debian/patches/series index 5bb8c3f1..bcd2e41b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 02-dbus_access_network_manager.patch +03-run-resolvconf.patch -- cgit 1.3.0-6-gf8a5 From fac5793026f98c0bcccbab994db40d65fd6bcbfa Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 1 Oct 2008 11:40:09 +0000 Subject: Revert r2426 After a short discussion on irc, it deemed to be best to revert this change as upstream has added resolvconf in r4043 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2427 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +- debian/control | 2 +- debian/libnm-glib0.symbols | 1 + debian/patches/03-run-resolvconf.patch | 138 --------------------------------- debian/patches/series | 1 - 5 files changed, 4 insertions(+), 146 deletions(-) delete mode 100644 debian/patches/03-run-resolvconf.patch diff --git a/debian/changelog b/debian/changelog index 4b5b9c6c..185658f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4035-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. @@ -27,11 +27,7 @@ network-manager (0.7.0~svn4035-1) UNRELEASED; urgency=low * debian/*.install: Updated * debian/*.symbols: Added - [ Simon McVittie ] - * Newer tarball - * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf - - -- Simon McVittie Thu, 04 Sep 2008 19:29:36 +0100 + -- Michael Biebl Fri, 22 Aug 2008 21:53:54 +0200 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 95addae7..56d3a84c 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -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, resolvconf +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 Recommends: network-manager-gnome | network-manager-kde, policykit Conflicts: network-manager-gnome (<< 0.6.5-1) Suggests: avahi-autoipd diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols index 4065a539..3865072d 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -80,6 +80,7 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_dhcp4_config_new@Base 0.7.0~svn3907 nm_exported_connection_delete@Base 0.7.0~svn3712 nm_exported_connection_get_connection@Base 0.7.0~svn3712 + nm_exported_connection_get_id@Base 0.7.0~svn3712 nm_exported_connection_get_type@Base 0.7.0~svn3712 nm_exported_connection_new@Base 0.7.0~svn3712 nm_exported_connection_register_object@Base 0.7.0~svn3712 diff --git a/debian/patches/03-run-resolvconf.patch b/debian/patches/03-run-resolvconf.patch deleted file mode 100644 index d043d191..00000000 --- a/debian/patches/03-run-resolvconf.patch +++ /dev/null @@ -1,138 +0,0 @@ -Index: src/named-manager/nm-named-manager.c -=================================================================== ---- NetworkManager/src/named-manager/nm-named-manager.c (revision 4035) -+++ NetworkManager/src/named-manager/nm-named-manager.c (working copy) -@@ -189,6 +178,133 @@ - return TRUE; - } - -+#elif defined(TARGET_DEBIAN) -+ -+static void -+resolvconf_child_setup (gpointer user_data G_GNUC_UNUSED) -+{ -+ pid_t pid = getpid (); -+ setpgid (pid, pid); -+} -+ -+static gint -+run_resolvconf (GError **error) -+{ -+ char *argv[4]; -+ gint stdin_fd; -+ -+ argv[0] = "/sbin/resolvconf"; -+ argv[1] = "-a"; -+ argv[2] = "NetworkManager"; -+ argv[3] = NULL; -+ -+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, resolvconf_child_setup, -+ NULL, NULL, &stdin_fd, NULL, NULL, error)) -+ return -1; -+ -+ return stdin_fd; -+} -+ -+static gboolean -+update_resolv_conf (const char *iface, -+ const char *domain, -+ char **searches, -+ char **nameservers, -+ GError **error) -+{ -+ gint fd; -+ char *domain_str = NULL; -+ char *searches_str = NULL; -+ char *nameservers_str = NULL; -+ FILE *f; -+ -+ fd = run_resolvconf (error); -+ if (fd < 0) -+ return FALSE; -+ -+ if ((f = fdopen (fd, "w")) == NULL) { -+ g_set_error (error, -+ NM_NAMED_MANAGER_ERROR, -+ NM_NAMED_MANAGER_ERROR_SYSTEM, -+ "Could not fdopen pipe to resolvconf: %s\n", -+ g_strerror (errno)); -+ return FALSE; -+ } -+ -+ if (fprintf (f, "%s","# generated by NetworkManager, do not edit!\n\n") < 0) { -+ g_set_error (error, -+ NM_NAMED_MANAGER_ERROR, -+ NM_NAMED_MANAGER_ERROR_SYSTEM, -+ "Could not write to resolvconf: %s\n", -+ g_strerror (errno)); -+ fclose (f); -+ return FALSE; -+ } -+ -+ if (domain) -+ domain_str = g_strconcat ("domain ", domain, "\n\n", NULL); -+ -+ if (searches) { -+ char *tmp_str; -+ -+ tmp_str = g_strjoinv (" ", searches); -+ searches_str = g_strconcat ("search ", tmp_str, "\n\n", NULL); -+ g_free (tmp_str); -+ } -+ -+ if (nameservers) { -+ GString *str; -+ int num; -+ int i; -+ -+ str = g_string_new (""); -+ num = g_strv_length (nameservers); -+ -+ for (i = 0; i < num; i++) { -+ if (i == 3) { -+ g_string_append (str, "\n# "); -+ g_string_append (str, _("NOTE: the glibc resolver does not support more than 3 nameservers.")); -+ g_string_append (str, "\n# "); -+ g_string_append (str, _("The nameservers listed below may not be recognized.")); -+ g_string_append_c (str, '\n'); -+ } -+ -+ g_string_append (str, "nameserver "); -+ g_string_append (str, nameservers[i]); -+ g_string_append_c (str, '\n'); -+ } -+ -+ nameservers_str = g_string_free (str, FALSE); -+ } -+ -+ if (fprintf (f, "%s%s%s\n", -+ domain_str ? domain_str : "", -+ searches_str ? searches_str : "", -+ nameservers_str ? nameservers_str : "") < 0) { -+ g_set_error (error, -+ NM_NAMED_MANAGER_ERROR, -+ NM_NAMED_MANAGER_ERROR_SYSTEM, -+ "Could not write to resolvconf: %s\n", -+ g_strerror (errno)); -+ } -+ -+ g_free (domain_str); -+ g_free (searches_str); -+ g_free (nameservers_str); -+ -+ if (fclose (f) < 0) { -+ if (*error == NULL) { -+ g_set_error (error, -+ NM_NAMED_MANAGER_ERROR, -+ NM_NAMED_MANAGER_ERROR_SYSTEM, -+ "Could not close pipe to resolvconf: %s\n", -+ g_strerror (errno)); -+ } -+ } -+ -+ return *error ? FALSE : TRUE; -+} -+ - #else - /**********************************/ - /* Generic */ diff --git a/debian/patches/series b/debian/patches/series index bcd2e41b..5bb8c3f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 02-dbus_access_network_manager.patch -03-run-resolvconf.patch -- cgit 1.3.0-6-gf8a5 From 84c285f2ba5d341d2328d6f2964d870d37ff9f77 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 2 Oct 2008 22:17:18 +0000 Subject: Update to svn version 4142 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2428 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++-- debian/control | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 185658f9..8ef9707e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4142-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. @@ -27,7 +27,10 @@ network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low * debian/*.install: Updated * debian/*.symbols: Added - -- Michael Biebl Fri, 22 Aug 2008 21:53:54 +0200 + [ Sjoerd Simons ] + * debian/control: Add build-depend on uuid-dev + + -- Sjoerd Simons Thu, 02 Oct 2008 23:14:10 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 56d3a84c..7c0878ed 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Riccardo Setti , Michael Biebl 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 + 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 -- cgit 1.3.0-6-gf8a5 From 3b38e6623c4f563144d5b5b3e2fbf5f0f5d2d70a Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 2 Oct 2008 22:40:18 +0000 Subject: Update the various symbols files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2429 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/libnm-glib-vpn0.symbols | 2 ++ debian/libnm-glib0.symbols | 1 - debian/libnm-util0.symbols | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ef9707e..5ff17bc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,9 @@ network-manager (0.7.0~svn4142-1) UNRELEASED; urgency=low [ Sjoerd Simons ] * debian/control: Add build-depend on uuid-dev + * Update the various symbols files - -- Sjoerd Simons Thu, 02 Oct 2008 23:14:10 +0100 + -- Sjoerd Simons Thu, 02 Oct 2008 23:39:59 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols index 24a96635..1fe4d8c7 100644 --- a/debian/libnm-glib-vpn0.symbols +++ b/debian/libnm-glib-vpn0.symbols @@ -9,6 +9,7 @@ libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 nm_vpn_plugin_set_state@Base 0.7.0~svn3712 + nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.0~svn4142-1 nm_vpn_plugin_ui_interface_export@Base 0.7.0~svn3758 nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0~svn3758 nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0~svn3758 @@ -17,4 +18,5 @@ libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0~svn3758 nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0~svn3758 nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0~svn3758 + nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.0~svn4142-1 nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0~svn3758 diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols index 3865072d..4065a539 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -80,7 +80,6 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_dhcp4_config_new@Base 0.7.0~svn3907 nm_exported_connection_delete@Base 0.7.0~svn3712 nm_exported_connection_get_connection@Base 0.7.0~svn3712 - nm_exported_connection_get_id@Base 0.7.0~svn3712 nm_exported_connection_get_type@Base 0.7.0~svn3712 nm_exported_connection_new@Base 0.7.0~svn3712 nm_exported_connection_register_object@Base 0.7.0~svn3712 diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols index 73e10cf4..e2c1af40 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -98,8 +98,10 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758 nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 nm_setting_wireless_security_new@Base 0.7.0~svn3712 + nm_utils_deinit@Base 0.7.0~svn4142-1 nm_utils_escape_ssid@Base 0.7.0~svn3712 nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712 + nm_utils_init@Base 0.7.0~svn4142-1 nm_utils_ip4_addresses_from_gvalue@Base 0.7.0~svn3712 nm_utils_ip4_addresses_to_gvalue@Base 0.7.0~svn3712 nm_utils_ip4_netmask_to_prefix@Base 0.7.0~svn3815 @@ -119,3 +121,5 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_utils_string_in_list@Base 0.7.0~svn3712 nm_utils_string_list_contains@Base 0.7.0~svn3712 nm_utils_string_slist_validate@Base 0.7.0~svn3712 + nm_utils_uuid_generate@Base 0.7.0~svn4142-1 + nm_utils_uuid_generate_from_string@Base 0.7.0~svn4142-1 -- cgit 1.3.0-6-gf8a5 From 19c88300a309da2219f7a9a2e041fcee60ae630e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Oct 2008 23:55:09 +0000 Subject: Strip off debian revision git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2431 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn0.symbols | 4 ++-- debian/libnm-util0.symbols | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols index 1fe4d8c7..8e201565 100644 --- a/debian/libnm-glib-vpn0.symbols +++ b/debian/libnm-glib-vpn0.symbols @@ -9,7 +9,7 @@ libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 nm_vpn_plugin_set_state@Base 0.7.0~svn3712 - nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.0~svn4142-1 + nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.0~svn4142 nm_vpn_plugin_ui_interface_export@Base 0.7.0~svn3758 nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0~svn3758 nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0~svn3758 @@ -18,5 +18,5 @@ libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0~svn3758 nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0~svn3758 nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.0~svn4142-1 + nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.0~svn4142 nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0~svn3758 diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols index e2c1af40..256e5e67 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -98,10 +98,10 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758 nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 nm_setting_wireless_security_new@Base 0.7.0~svn3712 - nm_utils_deinit@Base 0.7.0~svn4142-1 + nm_utils_deinit@Base 0.7.0~svn4142 nm_utils_escape_ssid@Base 0.7.0~svn3712 nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712 - nm_utils_init@Base 0.7.0~svn4142-1 + nm_utils_init@Base 0.7.0~svn4142 nm_utils_ip4_addresses_from_gvalue@Base 0.7.0~svn3712 nm_utils_ip4_addresses_to_gvalue@Base 0.7.0~svn3712 nm_utils_ip4_netmask_to_prefix@Base 0.7.0~svn3815 @@ -121,5 +121,5 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_utils_string_in_list@Base 0.7.0~svn3712 nm_utils_string_list_contains@Base 0.7.0~svn3712 nm_utils_string_slist_validate@Base 0.7.0~svn3712 - nm_utils_uuid_generate@Base 0.7.0~svn4142-1 - nm_utils_uuid_generate_from_string@Base 0.7.0~svn4142-1 + nm_utils_uuid_generate@Base 0.7.0~svn4142 + nm_utils_uuid_generate_from_string@Base 0.7.0~svn4142 -- cgit 1.3.0-6-gf8a5 From 94674c5138a73ea9f557e0286552504697e4b72f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Oct 2008 23:57:04 +0000 Subject: Pass the correct path of resolvconf and dhclient to ./configure git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2432 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 8567f7e3..d2593423 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,8 @@ DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --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 88 0 1 6 . -- cgit 1.3.0-6-gf8a5 From 25e8a2ff6e2dd54bfa2f222a7ee935e3749ec523 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Oct 2008 23:57:25 +0000 Subject: Install the ifupdown plugin and enable it by default. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2433 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.install | 1 + debian/nm-system-settings.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/network-manager.install b/debian/network-manager.install index f99a2e65..f861ce48 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -6,6 +6,7 @@ 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/ diff --git a/debian/nm-system-settings.conf b/debian/nm-system-settings.conf index c37b5968..8f4ce8e3 100644 --- a/debian/nm-system-settings.conf +++ b/debian/nm-system-settings.conf @@ -1,2 +1,2 @@ [main] -plugins=keyfile +plugins=ifupdown,keyfile -- cgit 1.3.0-6-gf8a5 From 6718f3ccce8e98824b7db929a4eb49cac218148e Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 3 Oct 2008 11:40:53 +0000 Subject: * debian/patches/03-nm_get_debian_hostname.patch: - Added. Temporary minimal patch to get hostname from /etc/hostname. There is work being done upstream for a more extensive version. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2434 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ++- debian/patches/03-nm_get_debian_hostname.patch | 49 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 debian/patches/03-nm_get_debian_hostname.patch diff --git a/debian/changelog b/debian/changelog index 5ff17bc4..d5954a51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,8 +30,11 @@ network-manager (0.7.0~svn4142-1) UNRELEASED; urgency=low [ Sjoerd Simons ] * debian/control: Add build-depend on uuid-dev * Update the various symbols files + * debian/patches/03-nm_get_debian_hostname.patch: + - Added. Temporary minimal patch to get hostname from /etc/hostname. There + is work being done upstream for a more extensive version. - -- Sjoerd Simons Thu, 02 Oct 2008 23:39:59 +0100 + -- Sjoerd Simons Fri, 03 Oct 2008 12:39:14 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/03-nm_get_debian_hostname.patch b/debian/patches/03-nm_get_debian_hostname.patch new file mode 100644 index 00000000..32bc595c --- /dev/null +++ b/debian/patches/03-nm_get_debian_hostname.patch @@ -0,0 +1,49 @@ +Index: system-settings/plugins/ifupdown/plugin.c +=================================================================== +--- system-settings/plugins/ifupdown/plugin.c (revision 4142) ++++ system-settings/plugins/ifupdown/plugin.c (working copy) +@@ -293,9 +293,15 @@ + case NM_SYSTEM_CONFIG_INTERFACE_PROP_CAPABILITIES: + g_value_set_uint (value, NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE); + break; +- case NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME: +- g_value_set_string (value, ""); ++ case NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME: { ++ char *hostname; ++ if (g_file_get_contents ("/etc/hostname", &hostname, NULL, NULL)) { ++ g_value_take_string (value, hostname); ++ } else { ++ g_value_set_string (value, ""); ++ } + break; ++ } + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +Index: system-settings/src/dbus-settings.c +=================================================================== +--- system-settings/src/dbus-settings.c (revision 4142) ++++ system-settings/src/dbus-settings.c (working copy) +@@ -240,17 +240,12 @@ + * that provides one. + */ + for (iter = priv->plugins; iter; iter = iter->next) { +- NMSystemConfigInterfaceCapabilities caps = NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE; ++ char *hostname = NULL; + +- g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_CAPABILITIES, &caps, NULL); +- if (caps & NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME) { +- char *hostname = NULL; +- +- g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL); +- if (hostname && strlen (hostname)) { +- g_value_take_string (value, hostname); +- break; +- } ++ g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL); ++ if (hostname && strlen (hostname)) { ++ g_value_take_string (value, hostname); ++ break; + } + } + diff --git a/debian/patches/series b/debian/patches/series index 5bb8c3f1..69c29189 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 02-dbus_access_network_manager.patch +03-nm_get_debian_hostname.patch -- cgit 1.3.0-6-gf8a5 From fa26f37318b19204dda98daf4206479ca2f9a962 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 9 Oct 2008 22:31:49 +0000 Subject: Update to svn revision 4160 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2456 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- debian/patches/series | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5954a51..a22d77b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4142-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4160-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. @@ -34,7 +34,7 @@ network-manager (0.7.0~svn4142-1) UNRELEASED; urgency=low - Added. Temporary minimal patch to get hostname from /etc/hostname. There is work being done upstream for a more extensive version. - -- Sjoerd Simons Fri, 03 Oct 2008 12:39:14 +0100 + -- Sjoerd Simons Thu, 09 Oct 2008 23:31:04 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 69c29189..6320ab60 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 02-dbus_access_network_manager.patch -03-nm_get_debian_hostname.patch +03-nm_get_debian_hostname.patch -p0 -- cgit 1.3.0-6-gf8a5 From ee96c6179353d7d61385f91a74dd2cc325bc5872 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 9 Oct 2008 22:34:20 +0000 Subject: remove 03-nm_get_debian_hostname.patch, a more complete implementation is merged upstream git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2457 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 --- debian/patches/03-nm_get_debian_hostname.patch | 49 -------------------------- debian/patches/series | 1 - 3 files changed, 55 deletions(-) delete mode 100644 debian/patches/03-nm_get_debian_hostname.patch diff --git a/debian/changelog b/debian/changelog index a22d77b6..14d6172b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,11 +30,6 @@ network-manager (0.7.0~svn4160-1) UNRELEASED; urgency=low [ Sjoerd Simons ] * debian/control: Add build-depend on uuid-dev * Update the various symbols files - * debian/patches/03-nm_get_debian_hostname.patch: - - Added. Temporary minimal patch to get hostname from /etc/hostname. There - is work being done upstream for a more extensive version. - - -- Sjoerd Simons Thu, 09 Oct 2008 23:31:04 +0100 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/03-nm_get_debian_hostname.patch b/debian/patches/03-nm_get_debian_hostname.patch deleted file mode 100644 index 32bc595c..00000000 --- a/debian/patches/03-nm_get_debian_hostname.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: system-settings/plugins/ifupdown/plugin.c -=================================================================== ---- system-settings/plugins/ifupdown/plugin.c (revision 4142) -+++ system-settings/plugins/ifupdown/plugin.c (working copy) -@@ -293,9 +293,15 @@ - case NM_SYSTEM_CONFIG_INTERFACE_PROP_CAPABILITIES: - g_value_set_uint (value, NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE); - break; -- case NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME: -- g_value_set_string (value, ""); -+ case NM_SYSTEM_CONFIG_INTERFACE_PROP_HOSTNAME: { -+ char *hostname; -+ if (g_file_get_contents ("/etc/hostname", &hostname, NULL, NULL)) { -+ g_value_take_string (value, hostname); -+ } else { -+ g_value_set_string (value, ""); -+ } - break; -+ } - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -Index: system-settings/src/dbus-settings.c -=================================================================== ---- system-settings/src/dbus-settings.c (revision 4142) -+++ system-settings/src/dbus-settings.c (working copy) -@@ -240,17 +240,12 @@ - * that provides one. - */ - for (iter = priv->plugins; iter; iter = iter->next) { -- NMSystemConfigInterfaceCapabilities caps = NM_SYSTEM_CONFIG_INTERFACE_CAP_NONE; -+ char *hostname = NULL; - -- g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_CAPABILITIES, &caps, NULL); -- if (caps & NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME) { -- char *hostname = NULL; -- -- g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL); -- if (hostname && strlen (hostname)) { -- g_value_take_string (value, hostname); -- break; -- } -+ g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL); -+ if (hostname && strlen (hostname)) { -+ g_value_take_string (value, hostname); -+ break; - } - } - diff --git a/debian/patches/series b/debian/patches/series index 6320ab60..5bb8c3f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 02-dbus_access_network_manager.patch -03-nm_get_debian_hostname.patch -p0 -- cgit 1.3.0-6-gf8a5 From 7b5dff1d5f7b35b403e0b0f951f46ba03198e2ae Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 9 Oct 2008 22:36:36 +0000 Subject: unfuck the changelog git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2458 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 14d6172b..8e9509a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ network-manager (0.7.0~svn4160-1) UNRELEASED; urgency=low * debian/control: Add build-depend on uuid-dev * Update the various symbols files + -- Sjoerd Simons Thu, 09 Oct 2008 23:36:24 +0100 + network-manager (0.6.6-1) unstable; urgency=low * New upstream release. (Closes: #470197) -- cgit 1.3.0-6-gf8a5 From d985af6d4c0754f734f6f4092ac88aa2805e8f6d Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 18 Oct 2008 19:02:32 +0000 Subject: Update snapshot to svn version 4191 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2460 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8e9509a3..902c5996 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4160-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4191-1) UNRELEASED; urgency=low * SVN snapshot of the upcoming 0.7 release. -- cgit 1.3.0-6-gf8a5 From 356a48bb40925e8944ffe570b361cac6c4c0c06e Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 18 Oct 2008 20:30:07 +0000 Subject: target experimental git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2464 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 902c5996..af82b594 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0~svn4191-1) UNRELEASED; urgency=low +network-manager (0.7.0~svn4191-1) experimental; urgency=low * SVN snapshot of the upcoming 0.7 release. @@ -30,8 +30,9 @@ network-manager (0.7.0~svn4191-1) UNRELEASED; urgency=low [ Sjoerd Simons ] * debian/control: Add build-depend on uuid-dev * Update the various symbols files + * Update to current svn - -- Sjoerd Simons Thu, 09 Oct 2008 23:36:24 +0100 + -- Sjoerd Simons Sat, 18 Oct 2008 21:28:05 +0100 network-manager (0.6.6-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From fb286271e348e0db3b028ddce3dcf46683652d4f Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 29 Nov 2008 21:05:27 +0000 Subject: Start preparing new upstream release (0.7.0) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2507 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index af82b594..c5a22bc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.7.0-1) UNRELEASED; urgency=low + + * New upstream release + + -- Sjoerd Simons Sat, 29 Nov 2008 22:04:26 +0100 + network-manager (0.7.0~svn4191-1) experimental; urgency=low * SVN snapshot of the upcoming 0.7 release. -- cgit 1.3.0-6-gf8a5 From 4191dc022dd65aee2cd541e40bac510989177a71 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 29 Nov 2008 21:22:54 +0000 Subject: debian/libnm-util0.symbols: Updated git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2508 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +- debian/libnm-util0.symbols | 203 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 184 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5a22bc1..0e33e81a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * New upstream release + * debian/libnm-util0.symbols: Updated - -- Sjoerd Simons Sat, 29 Nov 2008 22:04:26 +0100 + -- Sjoerd Simons Sat, 29 Nov 2008 22:22:42 +0100 network-manager (0.7.0~svn4191-1) experimental; urgency=low diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols index 256e5e67..5e96c7d8 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -25,79 +25,248 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_connection_to_hash@Base 0.7.0~svn3712 nm_connection_update_secrets@Base 0.7.0~svn3712 nm_connection_verify@Base 0.7.0~svn3712 + nm_ip4_address_compare@Base 0.7.0-1 + nm_ip4_address_dup@Base 0.7.0-1 + nm_ip4_address_get_address@Base 0.7.0-1 + nm_ip4_address_get_gateway@Base 0.7.0-1 + nm_ip4_address_get_prefix@Base 0.7.0-1 + nm_ip4_address_new@Base 0.7.0-1 + nm_ip4_address_ref@Base 0.7.0-1 + nm_ip4_address_set_address@Base 0.7.0-1 + nm_ip4_address_set_gateway@Base 0.7.0-1 + nm_ip4_address_set_prefix@Base 0.7.0-1 + nm_ip4_address_unref@Base 0.7.0-1 + nm_ip4_route_compare@Base 0.7.0-1 + nm_ip4_route_dup@Base 0.7.0-1 + nm_ip4_route_get_dest@Base 0.7.0-1 + nm_ip4_route_get_metric@Base 0.7.0-1 + nm_ip4_route_get_next_hop@Base 0.7.0-1 + nm_ip4_route_get_prefix@Base 0.7.0-1 + nm_ip4_route_new@Base 0.7.0-1 + nm_ip4_route_ref@Base 0.7.0-1 + nm_ip4_route_set_dest@Base 0.7.0-1 + nm_ip4_route_set_metric@Base 0.7.0-1 + nm_ip4_route_set_next_hop@Base 0.7.0-1 + nm_ip4_route_set_prefix@Base 0.7.0-1 + nm_ip4_route_unref@Base 0.7.0-1 + nm_setting_802_1x_add_eap_method@Base 0.7.0-1 + nm_setting_802_1x_clear_eap_methods@Base 0.7.0-1 nm_setting_802_1x_error_get_type@Base 0.7.0~svn3758 nm_setting_802_1x_error_quark@Base 0.7.0~svn3758 + nm_setting_802_1x_get_anonymous_identity@Base 0.7.0-1 + nm_setting_802_1x_get_ca_cert@Base 0.7.0-1 + nm_setting_802_1x_get_ca_path@Base 0.7.0-1 + nm_setting_802_1x_get_client_cert@Base 0.7.0-1 + nm_setting_802_1x_get_eap_method@Base 0.7.0-1 + nm_setting_802_1x_get_identity@Base 0.7.0-1 + nm_setting_802_1x_get_num_eap_methods@Base 0.7.0-1 + nm_setting_802_1x_get_password@Base 0.7.0-1 + nm_setting_802_1x_get_phase1_fast_provisioning@Base 0.7.0-1 + nm_setting_802_1x_get_phase1_peaplabel@Base 0.7.0-1 + nm_setting_802_1x_get_phase1_peapver@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_auth@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_autheap@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_ca_cert@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_ca_path@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_client_cert@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_private_key@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0-1 + nm_setting_802_1x_get_phase2_private_key_type@Base 0.7.0-1 + nm_setting_802_1x_get_pin@Base 0.7.0-1 + nm_setting_802_1x_get_private_key@Base 0.7.0-1 + nm_setting_802_1x_get_private_key_password@Base 0.7.0-1 + nm_setting_802_1x_get_private_key_type@Base 0.7.0-1 + nm_setting_802_1x_get_psk@Base 0.7.0-1 + nm_setting_802_1x_get_system_ca_certs@Base 0.7.0-1 nm_setting_802_1x_get_type@Base 0.7.0~svn3712 nm_setting_802_1x_new@Base 0.7.0~svn3712 - nm_setting_802_1x_set_ca_cert@Base 0.7.0~svn3712 - nm_setting_802_1x_set_client_cert@Base 0.7.0~svn3712 - nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.0~svn3712 - nm_setting_802_1x_set_phase2_client_cert@Base 0.7.0~svn3712 - nm_setting_802_1x_set_phase2_private_key@Base 0.7.0~svn3712 - nm_setting_802_1x_set_private_key@Base 0.7.0~svn3712 + nm_setting_802_1x_remove_eap_method@Base 0.7.0-1 + nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0-1 + nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0-1 + nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0-1 + nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0-1 + nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0-1 + nm_setting_802_1x_set_private_key_from_file@Base 0.7.0-1 nm_setting_cdma_error_get_type@Base 0.7.0~svn3758 nm_setting_cdma_error_quark@Base 0.7.0~svn3758 + nm_setting_cdma_get_number@Base 0.7.0-1 + nm_setting_cdma_get_password@Base 0.7.0-1 nm_setting_cdma_get_type@Base 0.7.0~svn3712 + nm_setting_cdma_get_username@Base 0.7.0-1 nm_setting_cdma_new@Base 0.7.0~svn3712 nm_setting_clear_secrets@Base 0.7.0~svn3712 nm_setting_compare@Base 0.7.0~svn3712 nm_setting_connection_error_get_type@Base 0.7.0~svn3758 nm_setting_connection_error_quark@Base 0.7.0~svn3758 + nm_setting_connection_get_autoconnect@Base 0.7.0-1 + nm_setting_connection_get_connection_type@Base 0.7.0-1 + nm_setting_connection_get_id@Base 0.7.0-1 + nm_setting_connection_get_read_only@Base 0.7.0-1 + nm_setting_connection_get_timestamp@Base 0.7.0-1 nm_setting_connection_get_type@Base 0.7.0~svn3712 + nm_setting_connection_get_uuid@Base 0.7.0-1 nm_setting_connection_new@Base 0.7.0~svn3712 nm_setting_duplicate@Base 0.7.0~svn3712 nm_setting_enumerate_values@Base 0.7.0~svn3712 - nm_setting_from_hash@Base 0.7.0~svn3712 + nm_setting_error_get_type@Base 0.7.0-1 + nm_setting_error_quark@Base 0.7.0-1 nm_setting_get_name@Base 0.7.0~svn3712 nm_setting_get_type@Base 0.7.0~svn3712 nm_setting_gsm_error_get_type@Base 0.7.0~svn3758 nm_setting_gsm_error_quark@Base 0.7.0~svn3758 + nm_setting_gsm_get_apn@Base 0.7.0-1 + nm_setting_gsm_get_band@Base 0.7.0-1 + nm_setting_gsm_get_network_id@Base 0.7.0-1 + nm_setting_gsm_get_network_type@Base 0.7.0-1 + nm_setting_gsm_get_number@Base 0.7.0-1 + nm_setting_gsm_get_password@Base 0.7.0-1 + nm_setting_gsm_get_pin@Base 0.7.0-1 + nm_setting_gsm_get_puk@Base 0.7.0-1 nm_setting_gsm_get_type@Base 0.7.0~svn3712 + nm_setting_gsm_get_username@Base 0.7.0-1 nm_setting_gsm_new@Base 0.7.0~svn3712 + nm_setting_ip4_config_add_address@Base 0.7.0-1 + nm_setting_ip4_config_add_dns@Base 0.7.0-1 + nm_setting_ip4_config_add_dns_search@Base 0.7.0-1 + nm_setting_ip4_config_add_route@Base 0.7.0-1 + nm_setting_ip4_config_clear_addresses@Base 0.7.0-1 + nm_setting_ip4_config_clear_dns@Base 0.7.0-1 + nm_setting_ip4_config_clear_dns_searches@Base 0.7.0-1 + nm_setting_ip4_config_clear_routes@Base 0.7.0-1 nm_setting_ip4_config_error_get_type@Base 0.7.0~svn3758 nm_setting_ip4_config_error_quark@Base 0.7.0~svn3758 + nm_setting_ip4_config_get_address@Base 0.7.0-1 + nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.0-1 + nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.0-1 + nm_setting_ip4_config_get_dns@Base 0.7.0-1 + nm_setting_ip4_config_get_dns_search@Base 0.7.0-1 + nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.0-1 + nm_setting_ip4_config_get_ignore_auto_routes@Base 0.7.0-1 + nm_setting_ip4_config_get_method@Base 0.7.0-1 + nm_setting_ip4_config_get_num_addresses@Base 0.7.0-1 + nm_setting_ip4_config_get_num_dns@Base 0.7.0-1 + nm_setting_ip4_config_get_num_dns_searches@Base 0.7.0-1 + nm_setting_ip4_config_get_num_routes@Base 0.7.0-1 + nm_setting_ip4_config_get_route@Base 0.7.0-1 nm_setting_ip4_config_get_type@Base 0.7.0~svn3712 nm_setting_ip4_config_new@Base 0.7.0~svn3712 - nm_setting_ip6_config_error_get_type@Base 0.7.0~svn3778 - nm_setting_ip6_config_error_quark@Base 0.7.0~svn3778 - nm_setting_ip6_config_get_type@Base 0.7.0~svn3778 - nm_setting_ip6_config_new@Base 0.7.0~svn3778 + nm_setting_ip4_config_remove_address@Base 0.7.0-1 + nm_setting_ip4_config_remove_dns@Base 0.7.0-1 + nm_setting_ip4_config_remove_dns_search@Base 0.7.0-1 + nm_setting_ip4_config_remove_route@Base 0.7.0-1 nm_setting_need_secrets@Base 0.7.0~svn3712 + nm_setting_new_from_hash@Base 0.7.0-1 nm_setting_ppp_error_get_type@Base 0.7.0~svn3758 nm_setting_ppp_error_quark@Base 0.7.0~svn3758 + nm_setting_ppp_get_baud@Base 0.7.0-1 + nm_setting_ppp_get_crtscts@Base 0.7.0-1 + nm_setting_ppp_get_lcp_echo_failure@Base 0.7.0-1 + nm_setting_ppp_get_lcp_echo_interval@Base 0.7.0-1 + nm_setting_ppp_get_mppe_stateful@Base 0.7.0-1 + nm_setting_ppp_get_mru@Base 0.7.0-1 + nm_setting_ppp_get_mtu@Base 0.7.0-1 + nm_setting_ppp_get_no_vj_comp@Base 0.7.0-1 + nm_setting_ppp_get_noauth@Base 0.7.0-1 + nm_setting_ppp_get_nobsdcomp@Base 0.7.0-1 + nm_setting_ppp_get_nodeflate@Base 0.7.0-1 + nm_setting_ppp_get_refuse_chap@Base 0.7.0-1 + nm_setting_ppp_get_refuse_eap@Base 0.7.0-1 + nm_setting_ppp_get_refuse_mschap@Base 0.7.0-1 + nm_setting_ppp_get_refuse_mschapv2@Base 0.7.0-1 + nm_setting_ppp_get_refuse_pap@Base 0.7.0-1 + nm_setting_ppp_get_require_mppe@Base 0.7.0-1 + nm_setting_ppp_get_require_mppe_128@Base 0.7.0-1 nm_setting_ppp_get_type@Base 0.7.0~svn3712 nm_setting_ppp_new@Base 0.7.0~svn3712 nm_setting_pppoe_error_get_type@Base 0.7.0~svn3758 nm_setting_pppoe_error_quark@Base 0.7.0~svn3758 + nm_setting_pppoe_get_password@Base 0.7.0-1 + nm_setting_pppoe_get_service@Base 0.7.0-1 nm_setting_pppoe_get_type@Base 0.7.0~svn3712 + nm_setting_pppoe_get_username@Base 0.7.0-1 nm_setting_pppoe_new@Base 0.7.0~svn3712 - nm_setting_register@Base 0.7.0~svn3712 nm_setting_serial_error_get_type@Base 0.7.0~svn3758 nm_setting_serial_error_quark@Base 0.7.0~svn3758 + nm_setting_serial_get_baud@Base 0.7.0-1 + nm_setting_serial_get_bits@Base 0.7.0-1 + nm_setting_serial_get_parity@Base 0.7.0-1 + nm_setting_serial_get_send_delay@Base 0.7.0-1 + nm_setting_serial_get_stopbits@Base 0.7.0-1 nm_setting_serial_get_type@Base 0.7.0~svn3712 nm_setting_serial_new@Base 0.7.0~svn3712 nm_setting_to_hash@Base 0.7.0~svn3712 nm_setting_to_string@Base 0.7.0~svn3712 - nm_setting_unregister@Base 0.7.0~svn3712 nm_setting_update_secrets@Base 0.7.0~svn3712 nm_setting_verify@Base 0.7.0~svn3712 + nm_setting_vpn_add_data_item@Base 0.7.0-1 + nm_setting_vpn_add_secret@Base 0.7.0-1 nm_setting_vpn_error_get_type@Base 0.7.0~svn3758 nm_setting_vpn_error_quark@Base 0.7.0~svn3758 + nm_setting_vpn_foreach_data_item@Base 0.7.0-1 + nm_setting_vpn_foreach_secret@Base 0.7.0-1 + nm_setting_vpn_get_data_item@Base 0.7.0-1 + nm_setting_vpn_get_secret@Base 0.7.0-1 + nm_setting_vpn_get_service_type@Base 0.7.0-1 nm_setting_vpn_get_type@Base 0.7.0~svn3712 + nm_setting_vpn_get_user_name@Base 0.7.0-1 nm_setting_vpn_new@Base 0.7.0~svn3712 + nm_setting_vpn_remove_data_item@Base 0.7.0-1 + nm_setting_vpn_remove_secret@Base 0.7.0-1 nm_setting_wired_error_get_type@Base 0.7.0~svn3758 nm_setting_wired_error_quark@Base 0.7.0~svn3758 + nm_setting_wired_get_auto_negotiate@Base 0.7.0-1 + nm_setting_wired_get_duplex@Base 0.7.0-1 + nm_setting_wired_get_mac_address@Base 0.7.0-1 + nm_setting_wired_get_mtu@Base 0.7.0-1 + nm_setting_wired_get_port@Base 0.7.0-1 + nm_setting_wired_get_speed@Base 0.7.0-1 nm_setting_wired_get_type@Base 0.7.0~svn3712 nm_setting_wired_new@Base 0.7.0~svn3712 + nm_setting_wireless_add_seen_bssid@Base 0.7.0-1 nm_setting_wireless_ap_security_compatible@Base 0.7.0~svn3712 nm_setting_wireless_error_get_type@Base 0.7.0~svn3758 nm_setting_wireless_error_quark@Base 0.7.0~svn3758 + nm_setting_wireless_get_band@Base 0.7.0-1 + nm_setting_wireless_get_bssid@Base 0.7.0-1 + nm_setting_wireless_get_channel@Base 0.7.0-1 + nm_setting_wireless_get_mac_address@Base 0.7.0-1 + nm_setting_wireless_get_mode@Base 0.7.0-1 + nm_setting_wireless_get_mtu@Base 0.7.0-1 + nm_setting_wireless_get_num_seen_bssids@Base 0.7.0-1 + nm_setting_wireless_get_rate@Base 0.7.0-1 + nm_setting_wireless_get_security@Base 0.7.0-1 + nm_setting_wireless_get_seen_bssid@Base 0.7.0-1 + nm_setting_wireless_get_ssid@Base 0.7.0-1 + nm_setting_wireless_get_tx_power@Base 0.7.0-1 nm_setting_wireless_get_type@Base 0.7.0~svn3712 nm_setting_wireless_new@Base 0.7.0~svn3712 + nm_setting_wireless_security_add_group@Base 0.7.0-1 + nm_setting_wireless_security_add_pairwise@Base 0.7.0-1 + nm_setting_wireless_security_add_proto@Base 0.7.0-1 + nm_setting_wireless_security_clear_groups@Base 0.7.0-1 + nm_setting_wireless_security_clear_pairwise@Base 0.7.0-1 + nm_setting_wireless_security_clear_protos@Base 0.7.0-1 nm_setting_wireless_security_error_get_type@Base 0.7.0~svn3758 nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758 + nm_setting_wireless_security_get_auth_alg@Base 0.7.0-1 + nm_setting_wireless_security_get_group@Base 0.7.0-1 + nm_setting_wireless_security_get_key_mgmt@Base 0.7.0-1 + nm_setting_wireless_security_get_leap_password@Base 0.7.0-1 + nm_setting_wireless_security_get_leap_username@Base 0.7.0-1 + nm_setting_wireless_security_get_num_groups@Base 0.7.0-1 + nm_setting_wireless_security_get_num_pairwise@Base 0.7.0-1 + nm_setting_wireless_security_get_num_protos@Base 0.7.0-1 + nm_setting_wireless_security_get_pairwise@Base 0.7.0-1 + nm_setting_wireless_security_get_proto@Base 0.7.0-1 + nm_setting_wireless_security_get_psk@Base 0.7.0-1 nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 + nm_setting_wireless_security_get_wep_key@Base 0.7.0-1 + nm_setting_wireless_security_get_wep_tx_keyidx@Base 0.7.0-1 nm_setting_wireless_security_new@Base 0.7.0~svn3712 + nm_setting_wireless_security_remove_group@Base 0.7.0-1 + nm_setting_wireless_security_remove_pairwise@Base 0.7.0-1 + nm_setting_wireless_security_remove_proto@Base 0.7.0-1 + nm_setting_wireless_security_set_wep_key@Base 0.7.0-1 nm_utils_deinit@Base 0.7.0~svn4142 nm_utils_escape_ssid@Base 0.7.0~svn3712 nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712 @@ -108,18 +277,10 @@ libnm-util.so.0 libnm-util0 #MINVER# nm_utils_ip4_prefix_to_netmask@Base 0.7.0~svn3815 nm_utils_ip4_routes_from_gvalue@Base 0.7.0~svn3900 nm_utils_ip4_routes_to_gvalue@Base 0.7.0~svn3900 - nm_utils_ip6_addresses_from_gvalue@Base 0.7.0~svn3778 - nm_utils_ip6_addresses_to_gvalue@Base 0.7.0~svn3778 - nm_utils_ip6_dns_from_gvalue@Base 0.7.0~svn3778 - nm_utils_ip6_dns_to_gvalue@Base 0.7.0~svn3778 nm_utils_is_empty_ssid@Base 0.7.0~svn3712 - nm_utils_register_value_transformations@Base 0.7.0~svn3712 nm_utils_same_ssid@Base 0.7.0~svn3712 nm_utils_security_valid@Base 0.7.0~svn3712 nm_utils_slist_free@Base 0.7.0~svn3712 nm_utils_ssid_to_utf8@Base 0.7.0~svn3712 - nm_utils_string_in_list@Base 0.7.0~svn3712 - nm_utils_string_list_contains@Base 0.7.0~svn3712 - nm_utils_string_slist_validate@Base 0.7.0~svn3712 nm_utils_uuid_generate@Base 0.7.0~svn4142 nm_utils_uuid_generate_from_string@Base 0.7.0~svn4142 -- cgit 1.3.0-6-gf8a5 From a447c8079ad25f03424908182932fc3e42e738e5 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 29 Nov 2008 22:15:59 +0000 Subject: debian/libnm-glib0.symbols: Updated git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2510 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/libnm-glib0.symbols | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0e33e81a..bf5bb629 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * New upstream release * debian/libnm-util0.symbols: Updated + * debian/libnm-glib0.symbols: Updated - -- Sjoerd Simons Sat, 29 Nov 2008 22:22:42 +0100 + -- Sjoerd Simons Sat, 29 Nov 2008 23:15:47 +0100 network-manager (0.7.0~svn4191-1) experimental; urgency=low diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols index 4065a539..cae14e2e 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -45,6 +45,7 @@ libnm_glib.so.0 libnm-glib0 #MINVER# nm_dbus_settings_get_type@Base 0.7.0~svn3712 nm_dbus_settings_new@Base 0.7.0~svn3712 nm_dbus_settings_system_add_connection@Base 0.7.0~svn3712 + nm_dbus_settings_system_get_can_modify@Base 0.7.0-1 nm_dbus_settings_system_get_type@Base 0.7.0~svn3712 nm_dbus_settings_system_get_unmanaged_devices@Base 0.7.0~svn3712 nm_dbus_settings_system_new@Base 0.7.0~svn3712 -- cgit 1.3.0-6-gf8a5 From 68214fcc44dd2c5e8272c06e538271e9d6ab39e0 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 30 Nov 2008 14:07:06 +0000 Subject: * debian/patches/03-F3507g.patch - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2513 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +- debian/patches/03-F3507g.patch | 129 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 debian/patches/03-F3507g.patch diff --git a/debian/changelog b/debian/changelog index bf5bb629..6160b39c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * New upstream release * 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 - -- Sjoerd Simons Sat, 29 Nov 2008 23:15:47 +0100 + -- Sjoerd Simons Sun, 30 Nov 2008 15:06:27 +0100 network-manager (0.7.0~svn4191-1) experimental; urgency=low diff --git a/debian/patches/03-F3507g.patch b/debian/patches/03-F3507g.patch new file mode 100644 index 00000000..296eab81 --- /dev/null +++ b/debian/patches/03-F3507g.patch @@ -0,0 +1,129 @@ +Index: src/nm-gsm-device.c +=================================================================== +--- src/nm-gsm-device.c (revision 4357) ++++ src/nm-gsm-device.c (working copy) +@@ -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,36 +666,27 @@ + 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; ++ const char *init_string = modem_init_sequences[priv->init_tries]; + +- if (!init_string) +- init_string = "ATZ E0 V1 X4 &C1 +FCLASS=0"; +- + 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: src/nm-serial-device.c +=================================================================== +--- src/nm-serial-device.c (revision 4357) ++++ src/nm-serial-device.c (working copy) +@@ -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/series b/debian/patches/series index 5bb8c3f1..4e4e8051 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 02-dbus_access_network_manager.patch +03--F3507g.patch -p0 -- cgit 1.3.0-6-gf8a5 From aa77e416480d52c3b30905e28680931ec144fbff Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 30 Nov 2008 14:07:49 +0000 Subject: Update all symbols files - Strip of debian revision number - Use the final 0.7.0 version number for the ~svn??? snapshots which were never released anyway. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2514 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn0.symbols | 42 +-- debian/libnm-glib0.symbols | 220 ++++++++-------- debian/libnm-util0.symbols | 570 ++++++++++++++++++++--------------------- 3 files changed, 416 insertions(+), 416 deletions(-) diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols index 8e201565..0fd8a139 100644 --- a/debian/libnm-glib-vpn0.symbols +++ b/debian/libnm-glib-vpn0.symbols @@ -1,22 +1,22 @@ libnm_glib_vpn.so.0 libnm-glib-vpn0 #MINVER# - nm_vpn_plugin_disconnect@Base 0.7.0~svn3712 - nm_vpn_plugin_error_get_type@Base 0.7.0~svn3712 - nm_vpn_plugin_error_quark@Base 0.7.0~svn3712 - nm_vpn_plugin_failure@Base 0.7.0~svn3712 - nm_vpn_plugin_get_connection@Base 0.7.0~svn3712 - nm_vpn_plugin_get_state@Base 0.7.0~svn3712 - nm_vpn_plugin_get_type@Base 0.7.0~svn3712 - nm_vpn_plugin_set_ip4_config@Base 0.7.0~svn3712 - nm_vpn_plugin_set_login_banner@Base 0.7.0~svn3712 - nm_vpn_plugin_set_state@Base 0.7.0~svn3712 - nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.0~svn4142 - nm_vpn_plugin_ui_interface_export@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_interface_get_type@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_interface_import@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.0~svn3758 - nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.0~svn4142 - nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.0~svn3758 + 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.symbols b/debian/libnm-glib0.symbols index cae14e2e..aed61ada 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -4,113 +4,113 @@ libnm_glib.so.0 libnm-glib0 #MINVER# 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~svn3712 - nm_access_point_get_frequency@Base 0.7.0~svn3712 - nm_access_point_get_hw_address@Base 0.7.0~svn3712 - nm_access_point_get_max_bitrate@Base 0.7.0~svn3712 - nm_access_point_get_mode@Base 0.7.0~svn3712 - nm_access_point_get_rsn_flags@Base 0.7.0~svn3712 - nm_access_point_get_ssid@Base 0.7.0~svn3712 - nm_access_point_get_strength@Base 0.7.0~svn3712 - nm_access_point_get_type@Base 0.7.0~svn3712 - nm_access_point_get_wpa_flags@Base 0.7.0~svn3712 - nm_access_point_new@Base 0.7.0~svn3712 - nm_active_connection_get_connection@Base 0.7.0~svn3712 - nm_active_connection_get_default@Base 0.7.0~svn3712 - nm_active_connection_get_devices@Base 0.7.0~svn3712 - nm_active_connection_get_scope@Base 0.7.0~svn3712 - nm_active_connection_get_service_name@Base 0.7.0~svn3712 - nm_active_connection_get_specific_object@Base 0.7.0~svn3712 - nm_active_connection_get_state@Base 0.7.0~svn3712 - nm_active_connection_get_type@Base 0.7.0~svn3712 - nm_active_connection_new@Base 0.7.0~svn3712 - nm_cdma_device_get_type@Base 0.7.0~svn3712 - nm_cdma_device_new@Base 0.7.0~svn3712 - nm_client_activate_connection@Base 0.7.0~svn3712 - nm_client_deactivate_connection@Base 0.7.0~svn3712 - nm_client_get_active_connections@Base 0.7.0~svn3712 - nm_client_get_device_by_path@Base 0.7.0~svn3712 - nm_client_get_devices@Base 0.7.0~svn3712 - nm_client_get_manager_running@Base 0.7.0~svn3712 - nm_client_get_state@Base 0.7.0~svn3712 - nm_client_get_type@Base 0.7.0~svn3712 - nm_client_new@Base 0.7.0~svn3712 - nm_client_sleep@Base 0.7.0~svn3712 - nm_client_wireless_get_enabled@Base 0.7.0~svn3712 - nm_client_wireless_hardware_get_enabled@Base 0.7.0~svn3712 - nm_client_wireless_set_enabled@Base 0.7.0~svn3712 - nm_dbus_connection_get_type@Base 0.7.0~svn3712 - nm_dbus_connection_new@Base 0.7.0~svn3712 - nm_dbus_settings_get_connection_by_path@Base 0.7.0~svn3712 - nm_dbus_settings_get_type@Base 0.7.0~svn3712 - nm_dbus_settings_new@Base 0.7.0~svn3712 - nm_dbus_settings_system_add_connection@Base 0.7.0~svn3712 - nm_dbus_settings_system_get_can_modify@Base 0.7.0-1 - nm_dbus_settings_system_get_type@Base 0.7.0~svn3712 - nm_dbus_settings_system_get_unmanaged_devices@Base 0.7.0~svn3712 - nm_dbus_settings_system_new@Base 0.7.0~svn3712 - nm_device_ethernet_get_carrier@Base 0.7.0~svn3746 - nm_device_ethernet_get_hw_address@Base 0.7.0~svn3746 - nm_device_ethernet_get_speed@Base 0.7.0~svn3746 - nm_device_ethernet_get_type@Base 0.7.0~svn3746 - nm_device_ethernet_new@Base 0.7.0~svn3746 - nm_device_get_capabilities@Base 0.7.0~svn3712 - nm_device_get_dhcp4_config@Base 0.7.0~svn3907 - nm_device_get_driver@Base 0.7.0~svn3712 - nm_device_get_iface@Base 0.7.0~svn3712 - nm_device_get_ip4_config@Base 0.7.0~svn3712 - nm_device_get_managed@Base 0.7.0~svn3712 - nm_device_get_product@Base 0.7.0~svn3712 - nm_device_get_state@Base 0.7.0~svn3712 - nm_device_get_type@Base 0.7.0~svn3712 - nm_device_get_udi@Base 0.7.0~svn3712 - nm_device_get_vendor@Base 0.7.0~svn3712 - nm_device_new@Base 0.7.0~svn3712 - nm_device_wifi_get_access_point_by_path@Base 0.7.0~svn3746 - nm_device_wifi_get_access_points@Base 0.7.0~svn3746 - nm_device_wifi_get_active_access_point@Base 0.7.0~svn3746 - nm_device_wifi_get_bitrate@Base 0.7.0~svn3746 - nm_device_wifi_get_capabilities@Base 0.7.0~svn3746 - nm_device_wifi_get_hw_address@Base 0.7.0~svn3746 - nm_device_wifi_get_mode@Base 0.7.0~svn3746 - nm_device_wifi_get_type@Base 0.7.0~svn3746 - nm_device_wifi_new@Base 0.7.0~svn3746 - nm_dhcp4_config_get_one_option@Base 0.7.0~svn3907 - nm_dhcp4_config_get_options@Base 0.7.0~svn3907 - nm_dhcp4_config_get_type@Base 0.7.0~svn3907 - nm_dhcp4_config_new@Base 0.7.0~svn3907 - nm_exported_connection_delete@Base 0.7.0~svn3712 - nm_exported_connection_get_connection@Base 0.7.0~svn3712 - nm_exported_connection_get_type@Base 0.7.0~svn3712 - nm_exported_connection_new@Base 0.7.0~svn3712 - nm_exported_connection_register_object@Base 0.7.0~svn3712 - nm_exported_connection_signal_removed@Base 0.7.0~svn3712 - nm_exported_connection_signal_updated@Base 0.7.0~svn3712 - nm_exported_connection_update@Base 0.7.0~svn3712 - nm_gsm_device_get_type@Base 0.7.0~svn3712 - nm_gsm_device_new@Base 0.7.0~svn3712 - nm_ip4_config_get_addresses@Base 0.7.0~svn3712 - nm_ip4_config_get_domains@Base 0.7.0~svn3712 - nm_ip4_config_get_hostname@Base 0.7.0~svn3712 - nm_ip4_config_get_nameservers@Base 0.7.0~svn3712 - nm_ip4_config_get_routes@Base 0.7.0~svn3900 - nm_ip4_config_get_type@Base 0.7.0~svn3712 - nm_ip4_config_new@Base 0.7.0~svn3712 - nm_object_array_get_type@Base 0.7.0~svn3712 - nm_object_get_connection@Base 0.7.0~svn3712 - nm_object_get_path@Base 0.7.0~svn3712 - nm_object_get_type@Base 0.7.0~svn3712 - nm_serial_device_get_bytes_received@Base 0.7.0~svn3746 - nm_serial_device_get_bytes_sent@Base 0.7.0~svn3746 - nm_serial_device_get_type@Base 0.7.0~svn3746 - nm_settings_error_quark@Base 0.7.0~svn3712 - nm_settings_get_type@Base 0.7.0~svn3712 - nm_settings_list_connections@Base 0.7.0~svn3712 - nm_settings_signal_new_connection@Base 0.7.0~svn3712 - nm_ssid_get_type@Base 0.7.0~svn3712 - nm_string_array_get_type@Base 0.7.0~svn3712 - nm_uint_array_get_type@Base 0.7.0~svn3712 - nm_vpn_connection_get_banner@Base 0.7.0~svn3712 - nm_vpn_connection_get_type@Base 0.7.0~svn3712 - nm_vpn_connection_get_vpn_state@Base 0.7.0~svn3712 - nm_vpn_connection_new@Base 0.7.0~svn3712 + 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-util0.symbols b/debian/libnm-util0.symbols index 5e96c7d8..03adfdd9 100644 --- a/debian/libnm-util0.symbols +++ b/debian/libnm-util0.symbols @@ -1,286 +1,286 @@ libnm-util.so.0 libnm-util0 #MINVER# - nm_connection_add_setting@Base 0.7.0~svn3712 - nm_connection_clear_secrets@Base 0.7.0~svn3712 - nm_connection_compare@Base 0.7.0~svn3712 - nm_connection_create_setting@Base 0.7.0~svn3712 - nm_connection_dump@Base 0.7.0~svn3712 - nm_connection_duplicate@Base 0.7.0~svn3758 - nm_connection_error_get_type@Base 0.7.0~svn3896 - nm_connection_error_quark@Base 0.7.0~svn3896 - nm_connection_for_each_setting_value@Base 0.7.0~svn3712 - nm_connection_get_path@Base 0.7.0~svn3712 - nm_connection_get_scope@Base 0.7.0~svn3712 - nm_connection_get_setting@Base 0.7.0~svn3712 - nm_connection_get_setting_by_name@Base 0.7.0~svn3712 - nm_connection_get_type@Base 0.7.0~svn3712 - nm_connection_lookup_setting_type@Base 0.7.0~svn3712 - nm_connection_lookup_setting_type_by_quark@Base 0.7.0~svn3758 - nm_connection_need_secrets@Base 0.7.0~svn3712 - nm_connection_new@Base 0.7.0~svn3712 - nm_connection_new_from_hash@Base 0.7.0~svn3712 - nm_connection_remove_setting@Base 0.7.0~svn3712 - nm_connection_replace_settings@Base 0.7.0~svn3712 - nm_connection_set_path@Base 0.7.0~svn3712 - nm_connection_set_scope@Base 0.7.0~svn3712 - nm_connection_to_hash@Base 0.7.0~svn3712 - nm_connection_update_secrets@Base 0.7.0~svn3712 - nm_connection_verify@Base 0.7.0~svn3712 - nm_ip4_address_compare@Base 0.7.0-1 - nm_ip4_address_dup@Base 0.7.0-1 - nm_ip4_address_get_address@Base 0.7.0-1 - nm_ip4_address_get_gateway@Base 0.7.0-1 - nm_ip4_address_get_prefix@Base 0.7.0-1 - nm_ip4_address_new@Base 0.7.0-1 - nm_ip4_address_ref@Base 0.7.0-1 - nm_ip4_address_set_address@Base 0.7.0-1 - nm_ip4_address_set_gateway@Base 0.7.0-1 - nm_ip4_address_set_prefix@Base 0.7.0-1 - nm_ip4_address_unref@Base 0.7.0-1 - nm_ip4_route_compare@Base 0.7.0-1 - nm_ip4_route_dup@Base 0.7.0-1 - nm_ip4_route_get_dest@Base 0.7.0-1 - nm_ip4_route_get_metric@Base 0.7.0-1 - nm_ip4_route_get_next_hop@Base 0.7.0-1 - nm_ip4_route_get_prefix@Base 0.7.0-1 - nm_ip4_route_new@Base 0.7.0-1 - nm_ip4_route_ref@Base 0.7.0-1 - nm_ip4_route_set_dest@Base 0.7.0-1 - nm_ip4_route_set_metric@Base 0.7.0-1 - nm_ip4_route_set_next_hop@Base 0.7.0-1 - nm_ip4_route_set_prefix@Base 0.7.0-1 - nm_ip4_route_unref@Base 0.7.0-1 - nm_setting_802_1x_add_eap_method@Base 0.7.0-1 - nm_setting_802_1x_clear_eap_methods@Base 0.7.0-1 - nm_setting_802_1x_error_get_type@Base 0.7.0~svn3758 - nm_setting_802_1x_error_quark@Base 0.7.0~svn3758 - nm_setting_802_1x_get_anonymous_identity@Base 0.7.0-1 - nm_setting_802_1x_get_ca_cert@Base 0.7.0-1 - nm_setting_802_1x_get_ca_path@Base 0.7.0-1 - nm_setting_802_1x_get_client_cert@Base 0.7.0-1 - nm_setting_802_1x_get_eap_method@Base 0.7.0-1 - nm_setting_802_1x_get_identity@Base 0.7.0-1 - nm_setting_802_1x_get_num_eap_methods@Base 0.7.0-1 - nm_setting_802_1x_get_password@Base 0.7.0-1 - nm_setting_802_1x_get_phase1_fast_provisioning@Base 0.7.0-1 - nm_setting_802_1x_get_phase1_peaplabel@Base 0.7.0-1 - nm_setting_802_1x_get_phase1_peapver@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_auth@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_autheap@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_ca_cert@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_ca_path@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_client_cert@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_private_key@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0-1 - nm_setting_802_1x_get_phase2_private_key_type@Base 0.7.0-1 - nm_setting_802_1x_get_pin@Base 0.7.0-1 - nm_setting_802_1x_get_private_key@Base 0.7.0-1 - nm_setting_802_1x_get_private_key_password@Base 0.7.0-1 - nm_setting_802_1x_get_private_key_type@Base 0.7.0-1 - nm_setting_802_1x_get_psk@Base 0.7.0-1 - nm_setting_802_1x_get_system_ca_certs@Base 0.7.0-1 - nm_setting_802_1x_get_type@Base 0.7.0~svn3712 - nm_setting_802_1x_new@Base 0.7.0~svn3712 - nm_setting_802_1x_remove_eap_method@Base 0.7.0-1 - nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0-1 - nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0-1 - nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0-1 - nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0-1 - nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0-1 - nm_setting_802_1x_set_private_key_from_file@Base 0.7.0-1 - nm_setting_cdma_error_get_type@Base 0.7.0~svn3758 - nm_setting_cdma_error_quark@Base 0.7.0~svn3758 - nm_setting_cdma_get_number@Base 0.7.0-1 - nm_setting_cdma_get_password@Base 0.7.0-1 - nm_setting_cdma_get_type@Base 0.7.0~svn3712 - nm_setting_cdma_get_username@Base 0.7.0-1 - nm_setting_cdma_new@Base 0.7.0~svn3712 - nm_setting_clear_secrets@Base 0.7.0~svn3712 - nm_setting_compare@Base 0.7.0~svn3712 - nm_setting_connection_error_get_type@Base 0.7.0~svn3758 - nm_setting_connection_error_quark@Base 0.7.0~svn3758 - nm_setting_connection_get_autoconnect@Base 0.7.0-1 - nm_setting_connection_get_connection_type@Base 0.7.0-1 - nm_setting_connection_get_id@Base 0.7.0-1 - nm_setting_connection_get_read_only@Base 0.7.0-1 - nm_setting_connection_get_timestamp@Base 0.7.0-1 - nm_setting_connection_get_type@Base 0.7.0~svn3712 - nm_setting_connection_get_uuid@Base 0.7.0-1 - nm_setting_connection_new@Base 0.7.0~svn3712 - nm_setting_duplicate@Base 0.7.0~svn3712 - nm_setting_enumerate_values@Base 0.7.0~svn3712 - nm_setting_error_get_type@Base 0.7.0-1 - nm_setting_error_quark@Base 0.7.0-1 - nm_setting_get_name@Base 0.7.0~svn3712 - nm_setting_get_type@Base 0.7.0~svn3712 - nm_setting_gsm_error_get_type@Base 0.7.0~svn3758 - nm_setting_gsm_error_quark@Base 0.7.0~svn3758 - nm_setting_gsm_get_apn@Base 0.7.0-1 - nm_setting_gsm_get_band@Base 0.7.0-1 - nm_setting_gsm_get_network_id@Base 0.7.0-1 - nm_setting_gsm_get_network_type@Base 0.7.0-1 - nm_setting_gsm_get_number@Base 0.7.0-1 - nm_setting_gsm_get_password@Base 0.7.0-1 - nm_setting_gsm_get_pin@Base 0.7.0-1 - nm_setting_gsm_get_puk@Base 0.7.0-1 - nm_setting_gsm_get_type@Base 0.7.0~svn3712 - nm_setting_gsm_get_username@Base 0.7.0-1 - nm_setting_gsm_new@Base 0.7.0~svn3712 - nm_setting_ip4_config_add_address@Base 0.7.0-1 - nm_setting_ip4_config_add_dns@Base 0.7.0-1 - nm_setting_ip4_config_add_dns_search@Base 0.7.0-1 - nm_setting_ip4_config_add_route@Base 0.7.0-1 - nm_setting_ip4_config_clear_addresses@Base 0.7.0-1 - nm_setting_ip4_config_clear_dns@Base 0.7.0-1 - nm_setting_ip4_config_clear_dns_searches@Base 0.7.0-1 - nm_setting_ip4_config_clear_routes@Base 0.7.0-1 - nm_setting_ip4_config_error_get_type@Base 0.7.0~svn3758 - nm_setting_ip4_config_error_quark@Base 0.7.0~svn3758 - nm_setting_ip4_config_get_address@Base 0.7.0-1 - nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.0-1 - nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.0-1 - nm_setting_ip4_config_get_dns@Base 0.7.0-1 - nm_setting_ip4_config_get_dns_search@Base 0.7.0-1 - nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.0-1 - nm_setting_ip4_config_get_ignore_auto_routes@Base 0.7.0-1 - nm_setting_ip4_config_get_method@Base 0.7.0-1 - nm_setting_ip4_config_get_num_addresses@Base 0.7.0-1 - nm_setting_ip4_config_get_num_dns@Base 0.7.0-1 - nm_setting_ip4_config_get_num_dns_searches@Base 0.7.0-1 - nm_setting_ip4_config_get_num_routes@Base 0.7.0-1 - nm_setting_ip4_config_get_route@Base 0.7.0-1 - nm_setting_ip4_config_get_type@Base 0.7.0~svn3712 - nm_setting_ip4_config_new@Base 0.7.0~svn3712 - nm_setting_ip4_config_remove_address@Base 0.7.0-1 - nm_setting_ip4_config_remove_dns@Base 0.7.0-1 - nm_setting_ip4_config_remove_dns_search@Base 0.7.0-1 - nm_setting_ip4_config_remove_route@Base 0.7.0-1 - nm_setting_need_secrets@Base 0.7.0~svn3712 - nm_setting_new_from_hash@Base 0.7.0-1 - nm_setting_ppp_error_get_type@Base 0.7.0~svn3758 - nm_setting_ppp_error_quark@Base 0.7.0~svn3758 - nm_setting_ppp_get_baud@Base 0.7.0-1 - nm_setting_ppp_get_crtscts@Base 0.7.0-1 - nm_setting_ppp_get_lcp_echo_failure@Base 0.7.0-1 - nm_setting_ppp_get_lcp_echo_interval@Base 0.7.0-1 - nm_setting_ppp_get_mppe_stateful@Base 0.7.0-1 - nm_setting_ppp_get_mru@Base 0.7.0-1 - nm_setting_ppp_get_mtu@Base 0.7.0-1 - nm_setting_ppp_get_no_vj_comp@Base 0.7.0-1 - nm_setting_ppp_get_noauth@Base 0.7.0-1 - nm_setting_ppp_get_nobsdcomp@Base 0.7.0-1 - nm_setting_ppp_get_nodeflate@Base 0.7.0-1 - nm_setting_ppp_get_refuse_chap@Base 0.7.0-1 - nm_setting_ppp_get_refuse_eap@Base 0.7.0-1 - nm_setting_ppp_get_refuse_mschap@Base 0.7.0-1 - nm_setting_ppp_get_refuse_mschapv2@Base 0.7.0-1 - nm_setting_ppp_get_refuse_pap@Base 0.7.0-1 - nm_setting_ppp_get_require_mppe@Base 0.7.0-1 - nm_setting_ppp_get_require_mppe_128@Base 0.7.0-1 - nm_setting_ppp_get_type@Base 0.7.0~svn3712 - nm_setting_ppp_new@Base 0.7.0~svn3712 - nm_setting_pppoe_error_get_type@Base 0.7.0~svn3758 - nm_setting_pppoe_error_quark@Base 0.7.0~svn3758 - nm_setting_pppoe_get_password@Base 0.7.0-1 - nm_setting_pppoe_get_service@Base 0.7.0-1 - nm_setting_pppoe_get_type@Base 0.7.0~svn3712 - nm_setting_pppoe_get_username@Base 0.7.0-1 - nm_setting_pppoe_new@Base 0.7.0~svn3712 - nm_setting_serial_error_get_type@Base 0.7.0~svn3758 - nm_setting_serial_error_quark@Base 0.7.0~svn3758 - nm_setting_serial_get_baud@Base 0.7.0-1 - nm_setting_serial_get_bits@Base 0.7.0-1 - nm_setting_serial_get_parity@Base 0.7.0-1 - nm_setting_serial_get_send_delay@Base 0.7.0-1 - nm_setting_serial_get_stopbits@Base 0.7.0-1 - nm_setting_serial_get_type@Base 0.7.0~svn3712 - nm_setting_serial_new@Base 0.7.0~svn3712 - nm_setting_to_hash@Base 0.7.0~svn3712 - nm_setting_to_string@Base 0.7.0~svn3712 - nm_setting_update_secrets@Base 0.7.0~svn3712 - nm_setting_verify@Base 0.7.0~svn3712 - nm_setting_vpn_add_data_item@Base 0.7.0-1 - nm_setting_vpn_add_secret@Base 0.7.0-1 - nm_setting_vpn_error_get_type@Base 0.7.0~svn3758 - nm_setting_vpn_error_quark@Base 0.7.0~svn3758 - nm_setting_vpn_foreach_data_item@Base 0.7.0-1 - nm_setting_vpn_foreach_secret@Base 0.7.0-1 - nm_setting_vpn_get_data_item@Base 0.7.0-1 - nm_setting_vpn_get_secret@Base 0.7.0-1 - nm_setting_vpn_get_service_type@Base 0.7.0-1 - nm_setting_vpn_get_type@Base 0.7.0~svn3712 - nm_setting_vpn_get_user_name@Base 0.7.0-1 - nm_setting_vpn_new@Base 0.7.0~svn3712 - nm_setting_vpn_remove_data_item@Base 0.7.0-1 - nm_setting_vpn_remove_secret@Base 0.7.0-1 - nm_setting_wired_error_get_type@Base 0.7.0~svn3758 - nm_setting_wired_error_quark@Base 0.7.0~svn3758 - nm_setting_wired_get_auto_negotiate@Base 0.7.0-1 - nm_setting_wired_get_duplex@Base 0.7.0-1 - nm_setting_wired_get_mac_address@Base 0.7.0-1 - nm_setting_wired_get_mtu@Base 0.7.0-1 - nm_setting_wired_get_port@Base 0.7.0-1 - nm_setting_wired_get_speed@Base 0.7.0-1 - nm_setting_wired_get_type@Base 0.7.0~svn3712 - nm_setting_wired_new@Base 0.7.0~svn3712 - nm_setting_wireless_add_seen_bssid@Base 0.7.0-1 - nm_setting_wireless_ap_security_compatible@Base 0.7.0~svn3712 - nm_setting_wireless_error_get_type@Base 0.7.0~svn3758 - nm_setting_wireless_error_quark@Base 0.7.0~svn3758 - nm_setting_wireless_get_band@Base 0.7.0-1 - nm_setting_wireless_get_bssid@Base 0.7.0-1 - nm_setting_wireless_get_channel@Base 0.7.0-1 - nm_setting_wireless_get_mac_address@Base 0.7.0-1 - nm_setting_wireless_get_mode@Base 0.7.0-1 - nm_setting_wireless_get_mtu@Base 0.7.0-1 - nm_setting_wireless_get_num_seen_bssids@Base 0.7.0-1 - nm_setting_wireless_get_rate@Base 0.7.0-1 - nm_setting_wireless_get_security@Base 0.7.0-1 - nm_setting_wireless_get_seen_bssid@Base 0.7.0-1 - nm_setting_wireless_get_ssid@Base 0.7.0-1 - nm_setting_wireless_get_tx_power@Base 0.7.0-1 - nm_setting_wireless_get_type@Base 0.7.0~svn3712 - nm_setting_wireless_new@Base 0.7.0~svn3712 - nm_setting_wireless_security_add_group@Base 0.7.0-1 - nm_setting_wireless_security_add_pairwise@Base 0.7.0-1 - nm_setting_wireless_security_add_proto@Base 0.7.0-1 - nm_setting_wireless_security_clear_groups@Base 0.7.0-1 - nm_setting_wireless_security_clear_pairwise@Base 0.7.0-1 - nm_setting_wireless_security_clear_protos@Base 0.7.0-1 - nm_setting_wireless_security_error_get_type@Base 0.7.0~svn3758 - nm_setting_wireless_security_error_quark@Base 0.7.0~svn3758 - nm_setting_wireless_security_get_auth_alg@Base 0.7.0-1 - nm_setting_wireless_security_get_group@Base 0.7.0-1 - nm_setting_wireless_security_get_key_mgmt@Base 0.7.0-1 - nm_setting_wireless_security_get_leap_password@Base 0.7.0-1 - nm_setting_wireless_security_get_leap_username@Base 0.7.0-1 - nm_setting_wireless_security_get_num_groups@Base 0.7.0-1 - nm_setting_wireless_security_get_num_pairwise@Base 0.7.0-1 - nm_setting_wireless_security_get_num_protos@Base 0.7.0-1 - nm_setting_wireless_security_get_pairwise@Base 0.7.0-1 - nm_setting_wireless_security_get_proto@Base 0.7.0-1 - nm_setting_wireless_security_get_psk@Base 0.7.0-1 - nm_setting_wireless_security_get_type@Base 0.7.0~svn3712 - nm_setting_wireless_security_get_wep_key@Base 0.7.0-1 - nm_setting_wireless_security_get_wep_tx_keyidx@Base 0.7.0-1 - nm_setting_wireless_security_new@Base 0.7.0~svn3712 - nm_setting_wireless_security_remove_group@Base 0.7.0-1 - nm_setting_wireless_security_remove_pairwise@Base 0.7.0-1 - nm_setting_wireless_security_remove_proto@Base 0.7.0-1 - nm_setting_wireless_security_set_wep_key@Base 0.7.0-1 - nm_utils_deinit@Base 0.7.0~svn4142 - nm_utils_escape_ssid@Base 0.7.0~svn3712 - nm_utils_gvalue_hash_dup@Base 0.7.0~svn3712 - nm_utils_init@Base 0.7.0~svn4142 - nm_utils_ip4_addresses_from_gvalue@Base 0.7.0~svn3712 - nm_utils_ip4_addresses_to_gvalue@Base 0.7.0~svn3712 - nm_utils_ip4_netmask_to_prefix@Base 0.7.0~svn3815 - nm_utils_ip4_prefix_to_netmask@Base 0.7.0~svn3815 - nm_utils_ip4_routes_from_gvalue@Base 0.7.0~svn3900 - nm_utils_ip4_routes_to_gvalue@Base 0.7.0~svn3900 - nm_utils_is_empty_ssid@Base 0.7.0~svn3712 - nm_utils_same_ssid@Base 0.7.0~svn3712 - nm_utils_security_valid@Base 0.7.0~svn3712 - nm_utils_slist_free@Base 0.7.0~svn3712 - nm_utils_ssid_to_utf8@Base 0.7.0~svn3712 - nm_utils_uuid_generate@Base 0.7.0~svn4142 - nm_utils_uuid_generate_from_string@Base 0.7.0~svn4142 + 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 -- cgit 1.3.0-6-gf8a5 From b64380cd69dbc1556d8d36c39081fe685ae5a329 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 30 Nov 2008 14:08:29 +0000 Subject: Fix typo in the name git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2515 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 4e4e8051..11aea666 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 02-dbus_access_network_manager.patch -03--F3507g.patch -p0 +03-F3507g.patch -p0 -- cgit 1.3.0-6-gf8a5 From c85a8b8af284df81fd9d27392db4cb17a5129ab6 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 3 Dec 2008 23:52:46 +0000 Subject: debian/control: Recommend ppp git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2517 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6160b39c..7b87c8e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * debian/libnm-glib0.symbols: Updated * debian/patches/03-F3507g.patch - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards + * debian/control: Recommend ppp - -- Sjoerd Simons Sun, 30 Nov 2008 15:06:27 +0100 + -- Sjoerd Simons Wed, 03 Dec 2008 23:50:41 +0000 network-manager (0.7.0~svn4191-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 7c0878ed..3d599a50 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any 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 -Recommends: network-manager-gnome | network-manager-kde, policykit +Recommends: network-manager-gnome | network-manager-kde, policykit, ppp Conflicts: network-manager-gnome (<< 0.6.5-1) Suggests: avahi-autoipd Replaces: network-manager-gnome (<< 0.6.5-1) -- cgit 1.3.0-6-gf8a5 From 3af857bd8faf37dc81955eb03026eb4f4a86bc95 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 5 Dec 2008 23:53:36 +0000 Subject: * 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. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2538 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 10 +- debian/control | 4 +- debian/libnm-util0.install | 1 - debian/libnm-util0.symbols | 286 ----------------------------------- debian/libnm-util1.install | 1 + debian/libnm-util1.symbols | 286 +++++++++++++++++++++++++++++++++++ debian/patches/04-ltversioning.patch | 78 ++++++++++ debian/patches/series | 1 + 8 files changed, 377 insertions(+), 290 deletions(-) delete mode 100644 debian/libnm-util0.install delete mode 100644 debian/libnm-util0.symbols create mode 100644 debian/libnm-util1.install create mode 100644 debian/libnm-util1.symbols create mode 100644 debian/patches/04-ltversioning.patch diff --git a/debian/changelog b/debian/changelog index 7b87c8e9..14de33e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low + [ Sjoerd Simons ] * New upstream release * debian/libnm-util0.symbols: Updated * debian/libnm-glib0.symbols: Updated @@ -7,7 +8,14 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards * debian/control: Recommend ppp - -- Sjoerd Simons Wed, 03 Dec 2008 23:50:41 +0000 + [ 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. + + -- Michael Biebl Sat, 06 Dec 2008 00:43:22 +0100 network-manager (0.7.0~svn4191-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 3d599a50..a2a0759f 100644 --- a/debian/control +++ b/debian/control @@ -96,7 +96,7 @@ Description: network management framework (GLib interface) This package provides the shared library that applications can use for creating VPN connections via NetworkManager. -Package: libnm-util0 +Package: libnm-util1 Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -114,7 +114,7 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-util1 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) 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/libnm-util0.install b/debian/libnm-util0.install deleted file mode 100644 index 051d4901..00000000 --- a/debian/libnm-util0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libnm-util.so.* diff --git a/debian/libnm-util0.symbols b/debian/libnm-util0.symbols deleted file mode 100644 index 03adfdd9..00000000 --- a/debian/libnm-util0.symbols +++ /dev/null @@ -1,286 +0,0 @@ -libnm-util.so.0 libnm-util0 #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/libnm-util1.install b/debian/libnm-util1.install new file mode 100644 index 00000000..051d4901 --- /dev/null +++ b/debian/libnm-util1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-util.so.* 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/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/series b/debian/patches/series index 11aea666..13051060 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02-dbus_access_network_manager.patch 03-F3507g.patch -p0 +04-ltversioning.patch -- cgit 1.3.0-6-gf8a5 From d185a500e9559ec5d6b3aa02df089928a29f9f97 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 6 Dec 2008 00:12:06 +0000 Subject: * debian/patches/05-dhclient_lease_files.patch - Change the location of the dhclient lease files to /var/lib/dhcp3. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2539 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/patches/05-dhclient_lease_files.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 19 insertions(+) create mode 100644 debian/patches/05-dhclient_lease_files.patch diff --git a/debian/changelog b/debian/changelog index 14de33e4..1a1245c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low (Closes: #503682) * Update control, install and symbols file for the new libnm-util library name. + * debian/patches/05-dhclient_lease_files.patch + - Change the location of the dhclient lease files to /var/lib/dhcp3. -- Michael Biebl Sat, 06 Dec 2008 00:43:22 +0100 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/series b/debian/patches/series index 13051060..682ac519 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02-dbus_access_network_manager.patch 03-F3507g.patch -p0 04-ltversioning.patch +05-dhclient_lease_files.patch -- cgit 1.3.0-6-gf8a5 From 9b5b71fb2e35be89fe41de10d844f13c37713edb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 06:48:51 +0000 Subject: Rework the changelog for (0.7.0~svn4191-1) List all changes between 0.6.6-2 and 0.7.0~svn4191-1 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2659 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 57 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a1245c7..78460721 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,28 +28,57 @@ network-manager (0.7.0~svn4191-1) experimental; urgency=low * debian/rules: Use list-missing [ Michael Biebl ] - * Drop patches which are either obsolete, merged upstream or not yet ported - - 01-supplicant_timeout.patch - - 13-validate_mac_addr.patch - * debian/patches/05-debian_backend.patch - - Updated for 0.7. + * 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: Updated dependencies and build-depends + * 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: - - Switch to quilt as a patch system - - Update for the 0.7 build - * debian/copyright: Updated + - 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/watch: Updated to match both the current 0.6 and the upcoming 0.7 - series + * debian/copyright: Revised and updated * debian/network-manager.postrm: Relevant code moved to preinst - * debian/network-manager.network-manager-dispatcher.init: Dropped, obsolete + * 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. + 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: Added + * 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 ] - * debian/control: Add build-depend on uuid-dev * Update the various symbols files * Update to current svn -- cgit 1.3.0-6-gf8a5 From a9bbe0d868fa4a7ab4047f24f8bf8424c7122cb0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 07:55:37 +0000 Subject: Close bug reports that are fixed by this new upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2660 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 15 ++++++++++++--- debian/control | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78460721..3db5207d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,21 @@ network-manager (0.7.0-1) UNRELEASED; 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 ] - * New upstream release * 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 + * debian/control: Recommend ppp (Closes: #507842) [ Michael Biebl ] * debian/patches/04-ltversioning.patch @@ -64,7 +73,7 @@ network-manager (0.7.0~svn4191-1) experimental; urgency=low - 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. + - 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 diff --git a/debian/control b/debian/control index a2a0759f..3184838f 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Package: network-manager Architecture: any 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 Recommends: network-manager-gnome | network-manager-kde, policykit, ppp -Conflicts: network-manager-gnome (<< 0.6.5-1) Suggests: avahi-autoipd +Conflicts: network-manager-gnome (<< 0.6.5-1) Replaces: network-manager-gnome (<< 0.6.5-1) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From dc6e834b453aa443d672daf8066a782353f6fb83 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:03:46 +0000 Subject: * debian/control - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd plugin is now shipped by this package. - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) as the 0.6 versions of those packages do not work with network-manager 0.7. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2661 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++++ debian/control | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3db5207d..95b7cb27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,11 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low (Closes: #503682) * Update control, install and symbols file for the new libnm-util library name. + * debian/control + - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd + plugin is now shipped by this package. + - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) 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. diff --git a/debian/control b/debian/control index 3184838f..3de07185 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,9 @@ Architecture: any 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 Recommends: network-manager-gnome | network-manager-kde, policykit, ppp Suggests: avahi-autoipd -Conflicts: network-manager-gnome (<< 0.6.5-1) -Replaces: network-manager-gnome (<< 0.6.5-1) +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~~) 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 -- cgit 1.3.0-6-gf8a5 From 538d0b44c43b1dec7c4f878a673bd8dd277be048 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:18:47 +0000 Subject: Add the vpn (core) plugins also to the Breaks list. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2662 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 95b7cb27..9759f5b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * debian/control - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd plugin is now shipped by this package. - - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) as the 0.6 + - 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. diff --git a/debian/control b/debian/control index 3de07185..43056543 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ 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~~) +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 -- cgit 1.3.0-6-gf8a5 From b245ce08232e425cc68d5a5428a088e2a7949121 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:28:27 +0000 Subject: * debian/network-manager.README.Debian - Merge the README.Debian from Ubuntu which describes the new managed/unmanaged modes. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2663 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++ debian/network-manager.README.Debian | 95 +++++++++++++++--------------------- 2 files changed, 41 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9759f5b4..409e7cc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,9 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low 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 the README.Debian from Ubuntu which describes the new + managed/unmanaged modes. -- Michael Biebl Sat, 06 Dec 2008 00:43:22 +0100 diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index c59c7f9b..aabe01f3 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 one in network-manager 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. +Not that NetworkManager 0.7 will not provive UI hooks to up and down ppp +connections managed outside of NetworkManager itself (not that it ever worked +nicely before). -- cgit 1.3.0-6-gf8a5 From 05749841eeaaac8e6123c64e0275e0c5646830c7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:39:13 +0000 Subject: * debian/nm-system-settings.conf - Set default mode to unmanaged. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2664 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/network-manager.README.Debian | 4 ++-- debian/nm-system-settings.conf | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 409e7cc1..b0e51ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * debian/network-manager.README.Debian - Merge the README.Debian from Ubuntu which describes the new managed/unmanaged modes. + * debian/nm-system-settings.conf + - Set default mode to unmanaged. -- Michael Biebl Sat, 06 Dec 2008 00:43:22 +0100 diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index aabe01f3..0f52b41e 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -43,7 +43,7 @@ using the command: Dial-up configuration ~~~~~~~~~~~~~~~~~~~~~ -Your dialup configurations can now be one in network-manager connection editor. +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. @@ -51,7 +51,7 @@ 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. -Not that NetworkManager 0.7 will not provive UI hooks to up and down ppp +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/nm-system-settings.conf b/debian/nm-system-settings.conf index 8f4ce8e3..d8b33d91 100644 --- a/debian/nm-system-settings.conf +++ b/debian/nm-system-settings.conf @@ -1,2 +1,5 @@ [main] plugins=ifupdown,keyfile + +[ifupdown] +managed=false -- cgit 1.3.0-6-gf8a5 From febefda25ba100bfe35cc15d9792398b207938b1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:42:40 +0000 Subject: changelog tweaks git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2665 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0e51ab1..3bba7039 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low - 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. + 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. @@ -31,7 +31,7 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low * 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 the README.Debian from Ubuntu which describes the new + - Merge README.Debian from Ubuntu which describes the new managed/unmanaged modes. * debian/nm-system-settings.conf - Set default mode to unmanaged. -- cgit 1.3.0-6-gf8a5 From 449ebc392179238690caabd60ddac186121a1cc4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:55:59 +0000 Subject: * debian/copyright - Revised and updated. libnm-glib and libnm-util are licensed under the LGPL v2 or later. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2666 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/copyright | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3bba7039..78ac7d32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low 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 Sat, 06 Dec 2008 00:43:22 +0100 diff --git a/debian/copyright b/debian/copyright index 1f3cbaa2..681bb9b2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,13 @@ Sun, 3 Oct 2004 11:54:56 +0100. It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager + +All files if not specified otherwise are licensed under the following terms: + Copyright: - (C) Copyright 2008 Red Hat, Inc. + + Copyright (C) 2006 - 2008 Red Hat, Inc. + Copyright (C) 2006 - 2008 Novell, Inc. License: @@ -25,3 +30,58 @@ License: 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 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 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 + 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'. + + + +libnm-util/*.[ch], libnm-glib/*.[ch]: + +Copyright: + + Copyright (C) 2005 - 2008 Red Hat, Inc. + Copyright (C) 2005 - 2008 Novell, Inc. + +License: + + 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 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 + 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'. -- cgit 1.3.0-6-gf8a5 From c57d2b8e62bffd194540b17dc3c15335a26df0a5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 08:56:31 +0000 Subject: Upload to experimental git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2667 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78ac7d32..a2e41fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0-1) UNRELEASED; urgency=low +network-manager (0.7.0-1) experimental; urgency=low * New upstream release. (Closes: #446098) - Allow connections before login (system connections). (Closes: #461831) @@ -39,7 +39,7 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low - Revised and updated. libnm-glib and libnm-util are licensed under the LGPL v2 or later. - -- Michael Biebl Sat, 06 Dec 2008 00:43:22 +0100 + -- Michael Biebl Tue, 16 Dec 2008 09:56:14 +0100 network-manager (0.7.0~svn4191-1) experimental; urgency=low -- cgit 1.3.0-6-gf8a5 From 6bec240d5ff814832788295109505e0117b1fe01 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 16 Dec 2008 09:04:31 +0000 Subject: Refresh 03-F3507g.patch with -p1 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2668 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/03-F3507g.patch | 21 ++++++++++----------- debian/patches/series | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/patches/03-F3507g.patch b/debian/patches/03-F3507g.patch index 296eab81..d475a874 100644 --- a/debian/patches/03-F3507g.patch +++ b/debian/patches/03-F3507g.patch @@ -1,7 +1,7 @@ -Index: src/nm-gsm-device.c +Index: network-manager-0.7.0/src/nm-gsm-device.c =================================================================== ---- src/nm-gsm-device.c (revision 4357) -+++ src/nm-gsm-device.c (working copy) +--- 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; @@ -60,7 +60,7 @@ Index: src/nm-gsm-device.c check_pin (NM_GSM_DEVICE (device)); break; case -1: -@@ -657,36 +666,27 @@ +@@ -657,35 +666,26 @@ NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); break; default: @@ -98,14 +98,13 @@ Index: src/nm-gsm-device.c + NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device); const char *responses[] = { "OK", "ERROR", "ERR", NULL }; - const char *init_string = user_data; -+ const char *init_string = modem_init_sequences[priv->init_tries]; - +- - 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; @@ -115,10 +114,10 @@ Index: src/nm-gsm-device.c if (!id) *reason = NM_DEVICE_STATE_REASON_UNKNOWN; -Index: src/nm-serial-device.c +Index: network-manager-0.7.0/src/nm-serial-device.c =================================================================== ---- src/nm-serial-device.c (revision 4357) -+++ src/nm-serial-device.c (working copy) +--- 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 @@ } diff --git a/debian/patches/series b/debian/patches/series index 682ac519..c38d933a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 02-dbus_access_network_manager.patch -03-F3507g.patch -p0 +03-F3507g.patch 04-ltversioning.patch 05-dhclient_lease_files.patch -- cgit 1.3.0-6-gf8a5 From d8626ab2792543bad402bc2d9940d4ae3906450e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 13 Jan 2009 06:10:11 +0000 Subject: * debian/network-manager.network-manager-dispatcher.init - NetworkManagerDispatcher uses the D-Bus system bus. Update the LSB header accordingly to avoid breakages with insserv based systems. (Closes: #500085) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2733 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 9 +++++++++ debian/network-manager.network-manager-dispatcher.init | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e43854fe..2bb255d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (0.6.6-3) UNRELEASED; urgency=low + + * debian/network-manager.network-manager-dispatcher.init + - NetworkManagerDispatcher uses the D-Bus system bus. Update the LSB + header accordingly to avoid breakages with insserv based systems. + (Closes: #500085) + + -- Michael Biebl Tue, 13 Jan 2009 07:05:50 +0100 + network-manager (0.6.6-2) unstable; urgency=low * debian/control diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init index 4384f18c..34a44c35 100644 --- a/debian/network-manager.network-manager-dispatcher.init +++ b/debian/network-manager.network-manager-dispatcher.init @@ -1,8 +1,8 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManagerDispatcher -# Required-Start: $remote_fs -# Required-Stop: $remote_fs +# Required-Start: $remote_fs dbus +# Required-Stop: $remote_fs dbus # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -- cgit 1.3.0-6-gf8a5 From c0511f8f2fa85157b2f56f91c2583d30ac9199b8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 13 Jan 2009 07:10:58 +0000 Subject: * debian/control - Add ${misc:Depends} to all binary packages. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2734 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/control | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a2e41fa2..7b9da4d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.7.0-2) UNRELEASED; urgency=low + + * debian/control + - Add ${misc:Depends} to all binary packages. + + -- Michael Biebl Tue, 13 Jan 2009 08:10:22 +0100 + network-manager (0.7.0-1) experimental; urgency=low * New upstream release. (Closes: #446098) diff --git a/debian/control b/debian/control index 43056543..9a869674 100644 --- a/debian/control +++ b/debian/control @@ -33,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. @@ -40,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 @@ -55,7 +56,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${binary:Version}), network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +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 @@ -70,7 +71,7 @@ Description: network management framework (GLib interface) 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 @@ -85,7 +86,7 @@ Description: network management framework (GLib VPN shared library) Package: libnm-glib-vpn-dev Section: libdevel Architecture: any -Depends: libnm-glib-vpn0 (= ${binary:Version}), libnm-glib-dev +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 @@ -100,7 +101,7 @@ Description: network management framework (GLib interface) Package: libnm-util1 Section: libs Architecture: any -Depends: ${shlibs:Depends} +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 @@ -115,7 +116,7 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util1 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) 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 -- cgit 1.3.0-6-gf8a5 From 618dfd9122d6532faf8a87c922509c3b711490f2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 13 Jan 2009 07:15:00 +0000 Subject: Let network-manager depend on dhcp3-client directly, as the dependency on dhcdbd has been removed. (Closes: #509655) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2735 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7b9da4d4..0ee6354a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ 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) -- Michael Biebl Tue, 13 Jan 2009 08:10:22 +0100 diff --git a/debian/control b/debian/control index 9a869674..0e443965 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -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 +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~~) -- cgit 1.3.0-6-gf8a5 From 44c2362491293cbd4839cb89087de99e26b4ddf9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 14 Jan 2009 08:16:21 +0000 Subject: * debian/patches/20-manual_means_always_online.patch - manual-means-online: If there are interfaces that are not managed by NetworkManager because they have custom configuration in /etc/network/interfaces, we assume to be online. This is obviously not always correct. But reporting offline state for unmanaged devices is causing major hassles as more and more apps rely on NM and go into offline mode otherwise, even if there is a connection (established via ifupdown). (Closes: #491826, #502371, #509006, #509829, #511712) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2742 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 12 ++++++-- debian/patches/20-manual_means_always_online.patch | 36 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 debian/patches/20-manual_means_always_online.patch diff --git a/debian/changelog b/debian/changelog index 2bb255d5..21b3cee8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,16 @@ network-manager (0.6.6-3) UNRELEASED; urgency=low - NetworkManagerDispatcher uses the D-Bus system bus. Update the LSB header accordingly to avoid breakages with insserv based systems. (Closes: #500085) - - -- Michael Biebl Tue, 13 Jan 2009 07:05:50 +0100 + * debian/patches/20-manual_means_always_online.patch + - manual-means-online: If there are interfaces that are not managed by + NetworkManager because they have custom configuration in + /etc/network/interfaces, we assume to be online. This is obviously not + always correct. But reporting offline state for unmanaged devices is + causing major hassles as more and more apps rely on NM and go into + offline mode otherwise, even if there is a connection (established via + ifupdown). (Closes: #491826, #502371, #509006, #509829, #511712) + + -- Michael Biebl Tue, 13 Jan 2009 07:11:49 +0100 network-manager (0.6.6-2) unstable; urgency=low diff --git a/debian/patches/20-manual_means_always_online.patch b/debian/patches/20-manual_means_always_online.patch new file mode 100644 index 00000000..4da87b8e --- /dev/null +++ b/debian/patches/20-manual_means_always_online.patch @@ -0,0 +1,36 @@ +diff -Nur bzr.debian.0.9.5/src/NetworkManagerDbus.c bzr.debian.0.9.5.new/src/NetworkManagerDbus.c +--- bzr.debian.0.9.5/src/NetworkManagerDbus.c 2007-06-25 17:38:42.000000000 +0200 ++++ bzr.debian.0.9.5.new/src/NetworkManagerDbus.c 2007-06-25 17:38:42.000000000 +0200 +@@ -302,6 +302,9 @@ + if (data->asleep == TRUE) + return NM_STATE_ASLEEP; + ++ if (data->always_online == TRUE) ++ return NM_STATE_CONNECTED; ++ + act_dev = nm_get_active_device (data); + if (!act_dev && !data->modem_active) + return NM_STATE_DISCONNECTED; +diff -Nur bzr.debian.0.9.5/src/NetworkManagerMain.h bzr.debian.0.9.5.new/src/NetworkManagerMain.h +--- bzr.debian.0.9.5/src/NetworkManagerMain.h 2007-06-25 17:18:17.000000000 +0200 ++++ bzr.debian.0.9.5.new/src/NetworkManagerMain.h 2007-06-25 17:38:42.000000000 +0200 +@@ -86,6 +86,7 @@ + gboolean modem_active; + gboolean asleep; + gboolean disconnected; ++ gboolean always_online; + + GSList * dialup_list; + GMutex * dialup_list_mutex; +diff -Nur bzr.debian.0.9.5/src/nm-device.c bzr.debian.0.9.5.new/src/nm-device.c +--- bzr.debian.0.9.5/src/nm-device.c 2007-06-25 17:38:42.000000000 +0200 ++++ bzr.debian.0.9.5.new/src/nm-device.c 2007-06-25 17:38:42.000000000 +0200 +@@ -195,6 +195,8 @@ + /* Allow distributions to flag devices as disabled */ + if (nm_system_device_get_disabled (dev)) + { ++ /* In this case, we assume we're always online */ ++ app_data->always_online = TRUE; + g_object_unref (G_OBJECT (dev)); + return NULL; + } -- cgit 1.3.0-6-gf8a5 From f3f297e4598798a3b6b27f110e5533f51cce3df6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 14 Jan 2009 08:29:25 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2743 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21b3cee8..52bd7a87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.6-3) UNRELEASED; urgency=low +network-manager (0.6.6-3) unstable; urgency=low * debian/network-manager.network-manager-dispatcher.init - NetworkManagerDispatcher uses the D-Bus system bus. Update the LSB @@ -13,7 +13,7 @@ network-manager (0.6.6-3) UNRELEASED; urgency=low offline mode otherwise, even if there is a connection (established via ifupdown). (Closes: #491826, #502371, #509006, #509829, #511712) - -- Michael Biebl Tue, 13 Jan 2009 07:11:49 +0100 + -- Michael Biebl Wed, 14 Jan 2009 09:29:03 +0100 network-manager (0.6.6-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 3360926018da3618eb76894ba4e68b92f0d480be Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 14 Jan 2009 08:37:36 +0000 Subject: Drop quilt build-dep, where are not using quilt for the unstable branch (yet) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2744 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5f296a62..54ce327f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -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, quilt +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 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 From 12f3b34448da0d03cabdde5801492038b319ad6c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 20 Feb 2009 01:47:38 +0000 Subject: * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2862 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ee6354a..884dc8fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ network-manager (0.7.0-2) UNRELEASED; urgency=low - 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 Tue, 13 Jan 2009 08:10:22 +0100 diff --git a/debian/rules b/debian/rules index d2593423..8e81f9b1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/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/class/autotools.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -- cgit 1.3.0-6-gf8a5 -- cgit 1.3.0-6-gf8a5 From 5b1afa498f15562272686b5a7b167780bc55b213 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:05:46 +0000 Subject: Merged revisions 2066,2304-2305,2308,2317-2318,2320-2323,2325,2333,2405-2415,2426-2429,2431-2434,2456-2458,2460,2464,2507-2508,2510,2513-2515,2517,2538-2539,2659-2668,2734-2735,2862 via svnmerge from svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager ........ r2066 | biebl | 2008-01-25 15:36:51 +0100 (Fr, 25 Jan 2008) | 19 lines * SVN snapshot of the upcoming 0.7 release. * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - 04-if_fix.patch - 11-man_page_sh_name.patch - 12_readme_format.patch - 13-validate_mac_addr.patch - 20-stable_branch_updates_r2652.patch - 21-endianess_fix_r2754.patch - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - 23-rfkill_return_type.patch - 24-get_mode_fix_r3122.patch - 25-libnl_unique_pid_r3155.patch - 26-libnl_1.0-pre8_r3206.patch - 27-dont_repeat_errors.patch * debian/patches/05-debian_backend.patch - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. ........ r2304 | sjoerd | 2008-06-18 15:05:11 +0200 (Mi, 18 Jun 2008) | 1 line Merge mbiebl's packaging ........ r2305 | sjoerd | 2008-06-18 15:39:30 +0200 (Mi, 18 Jun 2008) | 3 lines * New SVN snapshot * debian/patches/03-system-settings-conf.patch - Removed. Merged upstream ........ r2308 | sjoerd | 2008-06-18 16:54:57 +0200 (Mi, 18 Jun 2008) | 2 lines * Split out libnm-glib-vpn from libnm-glib * debian/rules: Use list-missing ........ r2317 | sjoerd | 2008-06-18 19:39:15 +0200 (Mi, 18 Jun 2008) | 1 line Ensure we install all header files ........ r2318 | sjoerd | 2008-06-18 19:47:38 +0200 (Mi, 18 Jun 2008) | 1 line Don't forget about nm-types.h ........ r2320 | biebl | 2008-06-19 00:18:13 +0200 (Do, 19 Jun 2008) | 2 lines Fix symbols files (remove Debian revision) ........ r2321 | biebl | 2008-06-19 00:20:07 +0200 (Do, 19 Jun 2008) | 5 lines - nm-vpn-properties was removed. Remove the now unnecessary build-deps. - Wrap lines in the long description. - libnm-glib-dev seems to required network-manager-dev ........ r2322 | biebl | 2008-06-19 00:21:18 +0200 (Do, 19 Jun 2008) | 3 lines Merge changelog. 0.7.0~svn3747-1 was never released. A more complete changelog will follow... ........ r2323 | biebl | 2008-06-19 00:23:48 +0200 (Do, 19 Jun 2008) | 2 lines Actually remove the NetworkManagerDispatcher init script. ........ r2325 | biebl | 2008-06-19 01:58:40 +0200 (Do, 19 Jun 2008) | 1 line Fix the package name in libnm-glib-vpn0.symbols ........ r2333 | sjoerd | 2008-06-22 23:27:01 +0200 (So, 22 Jun 2008) | 3 lines * debian/patches/10-execute_system_dhclient_script.patch - Added. Let NM's custom dhclient script execute the systems dhclient script. ........ r2405 | biebl | 2008-08-22 21:39:05 +0200 (Fr, 22 Aug 2008) | 2 lines Update symbols file for svn snapshot r4002 ........ r2406 | biebl | 2008-08-22 21:40:18 +0200 (Fr, 22 Aug 2008) | 2 lines Add "status" action. Requires lsb-base (>= 3.2-14). ........ r2407 | biebl | 2008-08-22 21:43:29 +0200 (Fr, 22 Aug 2008) | 5 lines Disable 05-debian_backend.patch and 10-execute_system_dhclient_script.patch The integration of resolvconf will have to be done differently. The current patches no longer apply. ........ r2408 | biebl | 2008-08-22 21:44:12 +0200 (Fr, 22 Aug 2008) | 2 lines Stop NM at priority 88, exclude private libs from dh_makeshlibs. ........ r2409 | biebl | 2008-08-22 21:46:43 +0200 (Fr, 22 Aug 2008) | 5 lines Update installed files/directories - Install avahi action script and dbus config file - Install nm-dhcp4-config.h header - Install dispatcher.d and system-connections directories created by upstream. ........ r2410 | biebl | 2008-08-22 21:47:21 +0200 (Fr, 22 Aug 2008) | 2 lines Copyright has to be revised. This is a first attempt to remove stale stuff. ........ r2411 | biebl | 2008-08-22 21:47:48 +0200 (Fr, 22 Aug 2008) | 2 lines Update to svn r4002 ........ r2412 | biebl | 2008-08-22 21:49:32 +0200 (Fr, 22 Aug 2008) | 4 lines - Bump Standards Version to 3.8.0 - Suggest avahi-autoipd, NM no longer does IPv4LL - Bump dependency on lsb-base, required by status_of_proc ........ r2413 | biebl | 2008-08-22 22:14:37 +0200 (Fr, 22 Aug 2008) | 1 line Remove, all relevant parts are upstream now ........ r2414 | biebl | 2008-08-22 22:15:21 +0200 (Fr, 22 Aug 2008) | 4 lines Remove 10-execute_system_dhclient_script.patch, patch no longer applies. Resolvconf intergration will have to be addressedd differently. ........ r2415 | biebl | 2008-08-22 22:16:09 +0200 (Fr, 22 Aug 2008) | 2 lines Update to r4004, which contains our custom backend changes. ........ r2426 | smcv | 2008-09-30 19:21:44 +0200 (Di, 30 Sep 2008) | 2 lines * Newer tarball * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf ........ r2427 | biebl | 2008-10-01 13:40:09 +0200 (Mi, 01 Okt 2008) | 5 lines Revert r2426 After a short discussion on irc, it deemed to be best to revert this change as upstream has added resolvconf in r4043 ........ r2428 | sjoerd | 2008-10-03 00:17:18 +0200 (Fr, 03 Okt 2008) | 1 line Update to svn version 4142 ........ r2429 | sjoerd | 2008-10-03 00:40:18 +0200 (Fr, 03 Okt 2008) | 1 line Update the various symbols files ........ r2431 | biebl | 2008-10-03 01:55:09 +0200 (Fr, 03 Okt 2008) | 2 lines Strip off debian revision ........ r2432 | biebl | 2008-10-03 01:57:04 +0200 (Fr, 03 Okt 2008) | 2 lines Pass the correct path of resolvconf and dhclient to ./configure ........ r2433 | biebl | 2008-10-03 01:57:25 +0200 (Fr, 03 Okt 2008) | 2 lines Install the ifupdown plugin and enable it by default. ........ r2434 | sjoerd | 2008-10-03 13:40:53 +0200 (Fr, 03 Okt 2008) | 3 lines * debian/patches/03-nm_get_debian_hostname.patch: - Added. Temporary minimal patch to get hostname from /etc/hostname. There is work being done upstream for a more extensive version. ........ r2456 | sjoerd | 2008-10-10 00:31:49 +0200 (Fr, 10 Okt 2008) | 1 line Update to svn revision 4160 ........ r2457 | sjoerd | 2008-10-10 00:34:20 +0200 (Fr, 10 Okt 2008) | 1 line remove 03-nm_get_debian_hostname.patch, a more complete implementation is merged upstream ........ r2458 | sjoerd | 2008-10-10 00:36:36 +0200 (Fr, 10 Okt 2008) | 1 line unfuck the changelog ........ r2460 | sjoerd | 2008-10-18 21:02:32 +0200 (Sa, 18 Okt 2008) | 1 line Update snapshot to svn version 4191 ........ r2464 | sjoerd | 2008-10-18 22:30:07 +0200 (Sa, 18 Okt 2008) | 1 line target experimental ........ r2507 | sjoerd | 2008-11-29 22:05:27 +0100 (Sa, 29 Nov 2008) | 1 line Start preparing new upstream release (0.7.0) ........ r2508 | sjoerd | 2008-11-29 22:22:54 +0100 (Sa, 29 Nov 2008) | 1 line debian/libnm-util0.symbols: Updated ........ r2510 | sjoerd | 2008-11-29 23:15:59 +0100 (Sa, 29 Nov 2008) | 1 line debian/libnm-glib0.symbols: Updated ........ r2513 | sjoerd | 2008-11-30 15:07:06 +0100 (So, 30 Nov 2008) | 2 lines * debian/patches/03-F3507g.patch - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards ........ r2514 | biebl | 2008-11-30 15:07:49 +0100 (So, 30 Nov 2008) | 6 lines Update all symbols files - Strip of debian revision number - Use the final 0.7.0 version number for the ~svn??? snapshots which were never released anyway. ........ r2515 | sjoerd | 2008-11-30 15:08:29 +0100 (So, 30 Nov 2008) | 1 line Fix typo in the name ........ r2517 | sjoerd | 2008-12-04 00:52:46 +0100 (Do, 04 Dez 2008) | 1 line debian/control: Recommend ppp ........ r2538 | biebl | 2008-12-06 00:53:36 +0100 (Sa, 06 Dez 2008) | 5 lines * 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. ........ r2539 | biebl | 2008-12-06 01:12:06 +0100 (Sa, 06 Dez 2008) | 2 lines * debian/patches/05-dhclient_lease_files.patch - Change the location of the dhclient lease files to /var/lib/dhcp3. ........ r2659 | biebl | 2008-12-16 07:48:51 +0100 (Di, 16 Dez 2008) | 4 lines Rework the changelog for (0.7.0~svn4191-1) List all changes between 0.6.6-2 and 0.7.0~svn4191-1 ........ r2660 | biebl | 2008-12-16 08:55:37 +0100 (Di, 16 Dez 2008) | 2 lines Close bug reports that are fixed by this new upstream release. ........ r2661 | biebl | 2008-12-16 09:03:46 +0100 (Di, 16 Dez 2008) | 5 lines * debian/control - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd plugin is now shipped by this package. - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) as the 0.6 versions of those packages do not work with network-manager 0.7. ........ r2662 | biebl | 2008-12-16 09:18:47 +0100 (Di, 16 Dez 2008) | 2 lines Add the vpn (core) plugins also to the Breaks list. ........ r2663 | biebl | 2008-12-16 09:28:27 +0100 (Di, 16 Dez 2008) | 3 lines * debian/network-manager.README.Debian - Merge the README.Debian from Ubuntu which describes the new managed/unmanaged modes. ........ r2664 | biebl | 2008-12-16 09:39:13 +0100 (Di, 16 Dez 2008) | 2 lines * debian/nm-system-settings.conf - Set default mode to unmanaged. ........ r2665 | biebl | 2008-12-16 09:42:40 +0100 (Di, 16 Dez 2008) | 1 line changelog tweaks ........ r2666 | biebl | 2008-12-16 09:55:59 +0100 (Di, 16 Dez 2008) | 3 lines * debian/copyright - Revised and updated. libnm-glib and libnm-util are licensed under the LGPL v2 or later. ........ r2667 | biebl | 2008-12-16 09:56:31 +0100 (Di, 16 Dez 2008) | 1 line Upload to experimental ........ r2668 | biebl | 2008-12-16 10:04:31 +0100 (Di, 16 Dez 2008) | 1 line Refresh 03-F3507g.patch with -p1 ........ r2734 | biebl | 2009-01-13 08:10:58 +0100 (Di, 13 Jan 2009) | 2 lines * debian/control - Add ${misc:Depends} to all binary packages. ........ r2735 | biebl | 2009-01-13 08:15:00 +0100 (Di, 13 Jan 2009) | 2 lines Let network-manager depend on dhcp3-client directly, as the dependency on dhcdbd has been removed. (Closes: #509655) ........ r2862 | biebl | 2009-02-20 02:47:38 +0100 (Fr, 20 Feb 2009) | 3 lines * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. ........ git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2884 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 120 +++++++ debian/control | 58 +++- debian/copyright | 122 ++++--- debian/libnm-glib-dev.install | 15 +- debian/libnm-glib-vpn-dev.install | 4 + debian/libnm-glib-vpn0.install | 1 + debian/libnm-glib-vpn0.symbols | 22 ++ debian/libnm-glib0.install | 2 +- debian/libnm-glib0.symbols | 116 +++++++ debian/libnm-util-dev.install | 12 +- debian/libnm-util0.install | 1 - debian/libnm-util1.install | 1 + debian/libnm-util1.symbols | 286 ++++++++++++++++ debian/network-manager-dev.install | 1 - debian/network-manager.README.Debian | 95 +++--- debian/network-manager.dirs | 1 - debian/network-manager.init | 12 +- debian/network-manager.install | 25 +- debian/network-manager.manpages | 4 +- ...network-manager.network-manager-dispatcher.init | 79 ----- debian/network-manager.postinst | 20 -- debian/network-manager.postrm | 85 ----- debian/network-manager.preinst | 21 +- debian/nm-system-settings.conf | 5 + debian/nm-vpn-properties.sgml | 95 ------ debian/patches/01-supplicant_timeout.patch | 11 - .../patches/02-dbus_access_network_manager.patch | 12 +- debian/patches/03-F3507g.patch | 128 +++++++ debian/patches/04-ltversioning.patch | 78 +++++ debian/patches/05-debian_backend.patch | 371 --------------------- debian/patches/05-dhclient_lease_files.patch | 16 + debian/patches/06-dispatch_more_events.patch | 99 ------ debian/patches/13-validate_mac_addr.patch | 33 -- debian/patches/series | 4 + debian/rules | 30 +- 35 files changed, 1003 insertions(+), 982 deletions(-) create mode 100644 debian/libnm-glib-vpn-dev.install create mode 100644 debian/libnm-glib-vpn0.install create mode 100644 debian/libnm-glib-vpn0.symbols create mode 100644 debian/libnm-glib0.symbols delete mode 100644 debian/libnm-util0.install create mode 100644 debian/libnm-util1.install create mode 100644 debian/libnm-util1.symbols delete mode 100644 debian/network-manager.network-manager-dispatcher.init delete mode 100644 debian/network-manager.postrm create mode 100644 debian/nm-system-settings.conf delete mode 100644 debian/nm-vpn-properties.sgml delete mode 100644 debian/patches/01-supplicant_timeout.patch create mode 100644 debian/patches/03-F3507g.patch create mode 100644 debian/patches/04-ltversioning.patch delete mode 100644 debian/patches/05-debian_backend.patch create mode 100644 debian/patches/05-dhclient_lease_files.patch delete mode 100644 debian/patches/06-dispatch_more_events.patch delete mode 100644 debian/patches/13-validate_mac_addr.patch create mode 100644 debian/patches/series 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 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 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 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 Uploaders: Riccardo Setti , Michael Biebl -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, 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 -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 -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 , -Dan Willemsen , 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 and it's released under the terms of -the GNU General Public License. (see below). - -src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams , -Kay Sievers , Robert Love 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 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 and -are released under the terms of the GNU General Public License. (see below). - -initscript/Debian/NetworkManager is copyright of , -Mark Roach , Thom May - -gnome/nm-vpn-properties.c, nm-vpn-properties.h are copyright of -David Zeuthen, 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 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-util0.install deleted file mode 100644 index 051d4901..00000000 --- a/debian/libnm-util0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libnm-util.so.* diff --git a/debian/libnm-util1.install b/debian/libnm-util1.install new file mode 100644 index 00000000..051d4901 --- /dev/null +++ b/debian/libnm-util1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-util.so.* 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 @@ # abort-remove in-favour -# 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: -# remove -# -# After the package was purged: -# purge -# -# After the package was upgraded: -# upgrade -# if that fails: -# failed-upgrade -# -# -# After all of the packages files have been replaced: -# disappear -# -# -# If preinst fails during install: -# abort-install -# -# If preinst fails during upgrade of removed package: -# abort-install -# -# If preinst fails during upgrade: -# abort-upgrade - - -# 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 @@ # abort-upgrade -# 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 @@ - 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. - - --> - - - 8 February, 2006"> - - - GNU"> - GPL"> -]> - - - -
- giskard@autistici.org; -
- - Riccardo - Setti - - - 2006 - Riccardo Setti - - &date; - - - nm-vpn-properties - 1 - - - &package; - - Network management framework - - - - &package; - - - - DESCRIPTION - - &package; is the gnome front-end for the NetworkManager VPN handler - - - SEE ALSO - - NetworkManager (1), nm-applet (1) - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Riccardo Setti giskard@autistici.org for - the Debian system. - - - - - - 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 @@ - - +--- 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 @@ + + + + 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 - -- cgit 1.3.0-6-gf8a5 From ad27914bae2e19325c2293f1729567ce8d636b71 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:16:41 +0000 Subject: * Merge experimental branch into unstable. Remaining changes: - Remove 07-domain_search.patch, merged upstream. - Remove 08-hal_deprecated_keys.patch, fixed upstream. - Remove 09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch, obsolete. - Disable 20-manual_means_always_online.patch, needs to be ported to 0.7 first. - Drop libdbus-glib-1-dev Depends from libnm-util-dev. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2885 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 + debian/patches/07-domain_search.patch | 281 --------------------- debian/patches/08-hal_deprecated_keys.patch | 34 --- ...dbus_get_ap_from_object_path-mem_leak_fix.patch | 13 - 4 files changed, 7 insertions(+), 328 deletions(-) delete mode 100644 debian/patches/07-domain_search.patch delete mode 100644 debian/patches/08-hal_deprecated_keys.patch delete mode 100644 debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch diff --git a/debian/changelog b/debian/changelog index bc870f99..d2d3f4f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ network-manager (0.7.0-2) UNRELEASED; urgency=low + * Merge experimental branch into unstable. Remaining changes: + - Remove 07-domain_search.patch, merged upstream. + - Remove 08-hal_deprecated_keys.patch, fixed upstream. + - Remove 09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch, obsolete. + - Disable 20-manual_means_always_online.patch, needs to be ported to 0.7 + first. + - Drop libdbus-glib-1-dev Depends from libnm-util-dev. * debian/control - Add ${misc:Depends} to all binary packages. - Let network-manager depend on dhcp3-client directly, as the dependency diff --git a/debian/patches/07-domain_search.patch b/debian/patches/07-domain_search.patch deleted file mode 100644 index cf614a0d..00000000 --- a/debian/patches/07-domain_search.patch +++ /dev/null @@ -1,281 +0,0 @@ -Index: NetworkManager-0.6/src/dhcp-manager/nm-dhcp-manager.c -=================================================================== ---- NetworkManager-0.6.orig/src/dhcp-manager/nm-dhcp-manager.c 2008-03-02 09:25:16.000000000 +0100 -+++ NetworkManager-0.6/src/dhcp-manager/nm-dhcp-manager.c 2008-03-02 09:26:33.000000000 +0100 -@@ -472,6 +472,7 @@ - guint32 num_ip4_nis_servers = 0; - char * hostname = NULL; - char * domain_names = NULL; -+ char * domain_searches = NULL; - char * nis_domain = NULL; - guint32 * ip4_nis_servers = NULL; - struct in_addr temp_addr; -@@ -520,6 +521,7 @@ - get_ip4_string (manager, dev, "host_name", &hostname, TRUE); - get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers, FALSE); - get_ip4_string (manager, dev, "domain_name", &domain_names, TRUE); -+ get_ip4_string (manager, dev, "domain_search", &domain_searches, TRUE); - get_ip4_string (manager, dev, "nis_domain", &nis_domain, TRUE); - get_ip4_uint32s (manager, dev, "nis_servers", &ip4_nis_servers, &num_ip4_nis_servers, TRUE); - -@@ -557,14 +559,27 @@ - - if (domain_names) - { -- char **searches = g_strsplit (domain_names, " ", 0); -+ char **domains = g_strsplit (domain_names, " ", 0); - char **s; - -- for (s = searches; *s; s++) -+ for (s = domains; *s; s++) - { - nm_info (" domain name '%s'", *s); - nm_ip4_config_add_domain (ip4_config, *s); - } -+ g_strfreev (domains); -+ } -+ -+ if (domain_searches) -+ { -+ char **searches = g_strsplit (domain_searches, " ", 0); -+ char **s; -+ -+ for (s = searches; *s; s++) -+ { -+ nm_info (" domain search '%s'", *s); -+ nm_ip4_config_add_search (ip4_config, *s); -+ } - g_strfreev (searches); - } - -Index: NetworkManager-0.6/src/named-manager/nm-named-manager.c -=================================================================== ---- NetworkManager-0.6.orig/src/named-manager/nm-named-manager.c 2008-03-02 09:25:16.000000000 +0100 -+++ NetworkManager-0.6/src/named-manager/nm-named-manager.c 2008-03-02 09:26:33.000000000 +0100 -@@ -319,7 +319,7 @@ - static char * - compute_searches (NMNamedManager *mgr, NMIP4Config *config) - { -- int i, num_searches; -+ int i, num_searches, num_domains; - GString *str = NULL; - - g_return_val_if_fail (mgr != NULL, g_strdup ("")); -@@ -328,14 +328,54 @@ - if (!config) - return g_strdup (""); - -- num_searches = nm_ip4_config_get_num_domains (config); -- for (i = 0; i < num_searches; i++) -- { -- if (!str) -- str = g_string_new ("search"); -+ num_searches = nm_ip4_config_get_num_searches (config); -+ num_domains = nm_ip4_config_get_num_domains (config); -+ -+ /* ISC DHCP 3.1 provides support for the domain-search option. This is the -+ * correct way for a DHCP server to provide a domain search list. Wedging -+ * multiple domains into the domain-name option is a horrible hack. -+ * -+ * So, we handle it like this (as proposed by Andrew Pollock at -+ * http://bugs.debian.org/465158): -+ * -+ * - if the domain-search option is present in the data received via DHCP, -+ * use it in favour of the domain-name option for setting the search -+ * directive in /etc/resolv.conf -+ * -+ * - if the domain-name option is present in the data received via DHCP, use -+ * it to set the domain directive in /etc/resolv.conf -+ * (this is handled in compute_domain() below) -+ * -+ * - if only the domain-name option is present in the data received via DHCP -+ * (and domain-search is not), for backwards compatibility, set the search -+ * directive in /etc/resolv.conf to the specified domain names -+ */ - -- g_string_append_c (str, ' '); -- g_string_append (str, nm_ip4_config_get_domain (config, i)); -+ if ( num_searches == 0 && num_domains > 0 ) -+ { -+ /* old, pre-ISC-3.1 fallback: -+ * use (possibly multiple entries from) domain-name for the search entry */ -+ str = g_string_new ("search"); -+ for (i = 0; i < num_domains; i++) -+ { -+ g_string_append_c (str, ' '); -+ g_string_append (str, nm_ip4_config_get_domain (config, i)); -+ } -+ } -+ else if ( num_searches > 0 ) -+ { -+ /* the "correct", post-ISC-3.1 situation: use searches just as received */ -+ str = g_string_new ("search"); -+ for (i = 0; i < num_searches; i++) -+ { -+ g_string_append_c (str, ' '); -+ g_string_append (str, nm_ip4_config_get_search (config, i)); -+ } -+ } -+ else /* num_searches == 0 && num_domains == 0 */ -+ { -+ /* no info available at all */ -+ return g_strdup (""); - } - - if (!str) -@@ -346,11 +386,41 @@ - return g_string_free (str, FALSE); - } - -+static char * -+compute_domain (NMNamedManager *mgr, NMIP4Config *config) -+{ -+ int num_domains; -+ GString *str = NULL; -+ -+ g_return_val_if_fail (mgr != NULL, g_strdup ("")); -+ -+ /* config can be NULL */ -+ if (!config) -+ return g_strdup (""); -+ -+ num_domains = nm_ip4_config_get_num_domains (config); -+ -+ /* warn the user that he should change his config -+ * (see comments above in compute_search() ) */ -+ if ( num_domains > 1 ) -+ nm_warning ("DHCP server sent multiple entries in domain-name; this is obsolete behaviour; please fix or update your DHCP server"); -+ -+ if (num_domains == 0) -+ return g_strdup (""); -+ -+ str = g_string_new ("domain "); -+ g_string_append (str, nm_ip4_config_get_domain (config, 0)); -+ g_string_append_c (str, '\n'); -+ -+ return g_string_free (str, FALSE); -+} -+ - static gboolean - rewrite_resolv_conf (NMNamedManager *mgr, NMIP4Config *config, GError **error) - { - const char * tmp_resolv_conf = RESOLV_CONF ".tmp"; - char * searches = NULL; -+ char * domain = NULL; - FILE * f; - NMIP4Config *ns_config = config; - -@@ -388,23 +458,27 @@ - } - g_return_val_if_fail (ns_config != NULL, FALSE); - -+ domain = compute_domain (mgr, ns_config); - searches = compute_searches (mgr, ns_config); - - if (mgr->priv->use_named == TRUE) { - /* Using caching-nameserver & local DNS */ -- if (fprintf (f, "%s%s%s", "; Use a local caching nameserver controlled by NetworkManager\n\n", searches, "\nnameserver 127.0.0.1\n") < 0) -+ if (fprintf (f, "%s%s%s%s", "; Use a local caching nameserver controlled by NetworkManager\n\n", domain, searches, "\nnameserver 127.0.0.1\n") < 0) - goto lose; - } else { - /* Using glibc resolver */ - char *nameservers = compute_nameservers (mgr, ns_config); - -+ fprintf (f, "%s\n\n", domain); - fprintf (f, "%s\n\n", searches); -- g_free (searches); -- - fprintf (f, "%s\n\n", nameservers); -+ - g_free (nameservers); - } - -+ g_free (domain); -+ g_free (searches); -+ - if (fclose (f) < 0) - goto lose; - -@@ -414,6 +488,7 @@ - return TRUE; - - lose: -+ g_free (domain); - g_free (searches); - fclose (f); - g_set_error (error, -Index: NetworkManager-0.6/src/nm-ip4-config.c -=================================================================== ---- NetworkManager-0.6.orig/src/nm-ip4-config.c 2008-03-02 09:25:16.000000000 +0100 -+++ NetworkManager-0.6/src/nm-ip4-config.c 2008-03-02 09:26:33.000000000 +0100 -@@ -46,6 +46,7 @@ - - GSList * nameservers; - GSList * domains; -+ GSList * searches; - - gchar * hostname; - gchar * nis_domain; -@@ -275,6 +276,17 @@ - config->domains = g_slist_append (config->domains, g_strdup (domain)); - } - -+void nm_ip4_config_add_search (NMIP4Config *config, const char *search) -+{ -+ g_return_if_fail (config != NULL); -+ g_return_if_fail (search != NULL); -+ -+ if (!strlen (search)) -+ return; -+ -+ config->searches = g_slist_append (config->searches, g_strdup (search)); -+} -+ - void nm_ip4_config_set_hostname (NMIP4Config *config, const char *hostname) - { - g_return_if_fail (config != NULL); -@@ -329,6 +341,25 @@ - return (g_slist_length (config->domains)); - } - -+const char *nm_ip4_config_get_search (NMIP4Config *config, guint i) -+{ -+ const char *search; -+ -+ g_return_val_if_fail (config != NULL, NULL); -+ g_return_val_if_fail (i < g_slist_length (config->searches), NULL); -+ -+ if ((search = (const char *) g_slist_nth_data (config->searches, i))) -+ return search; -+ return NULL; -+} -+ -+guint32 nm_ip4_config_get_num_searches (NMIP4Config *config) -+{ -+ g_return_val_if_fail (config != NULL, 0); -+ -+ return (g_slist_length (config->searches)); -+} -+ - guint32 nm_ip4_config_get_mtu (NMIP4Config *config) - { - g_return_val_if_fail (config != NULL, 0); -Index: NetworkManager-0.6/src/nm-ip4-config.h -=================================================================== ---- NetworkManager-0.6.orig/src/nm-ip4-config.h 2008-03-02 09:25:16.000000000 +0100 -+++ NetworkManager-0.6/src/nm-ip4-config.h 2008-03-02 09:26:33.000000000 +0100 -@@ -68,6 +68,14 @@ - const char * nm_ip4_config_get_domain (NMIP4Config *config, guint i); - guint32 nm_ip4_config_get_num_domains (NMIP4Config *config); - -+void nm_ip4_config_add_search (NMIP4Config *config, const char *search); -+const char * nm_ip4_config_get_search (NMIP4Config *config, guint i); -+guint32 nm_ip4_config_get_num_searches (NMIP4Config *config); -+ -+void nm_ip4_config_add_domain (NMIP4Config *config, const char *search); -+const char * nm_ip4_config_get_domain (NMIP4Config *config, guint i); -+guint32 nm_ip4_config_get_num_searches (NMIP4Config *config); -+ - guint32 nm_ip4_config_get_mtu (NMIP4Config *config); - void nm_ip4_config_set_mtu (NMIP4Config *config, guint32 mtu); - diff --git a/debian/patches/08-hal_deprecated_keys.patch b/debian/patches/08-hal_deprecated_keys.patch deleted file mode 100644 index 5e09f8c2..00000000 --- a/debian/patches/08-hal_deprecated_keys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: src/nm-device.c -=================================================================== ---- src/nm-device.c (Revision 3527) -+++ src/nm-device.c (Arbeitskopie) -@@ -115,19 +115,24 @@ - nm_get_device_driver_name (LibHalContext *ctx, const char *udi) - { - char * driver_name = NULL; -- char * physdev_udi = NULL; -+ char * origdev_udi = NULL; - - g_return_val_if_fail (ctx != NULL, NULL); - g_return_val_if_fail (udi != NULL, NULL); - -- physdev_udi = libhal_device_get_property_string (ctx, udi, "net.physical_device", NULL); -- if (physdev_udi && libhal_device_property_exists (ctx, physdev_udi, "info.linux.driver", NULL)) -+ origdev_udi = libhal_device_get_property_string (ctx, udi, "net.originating_device", NULL); -+ if (!origdev_udi) { -+ /* Older HAL uses 'physical_device' */ -+ origdev_udi = libhal_device_get_property_string (ctx, udi, "net.physical_device", NULL); -+ } -+ -+ if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) - { -- char *drv = libhal_device_get_property_string (ctx, physdev_udi, "info.linux.driver", NULL); -+ char *drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); - driver_name = g_strdup (drv); - g_free (drv); - } -- g_free (physdev_udi); -+ g_free (origdev_udi); - - return driver_name; - } diff --git a/debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch b/debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch deleted file mode 100644 index c3bf1011..00000000 --- a/debian/patches/09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/nm-dbus-net.c -=================================================================== ---- src/nm-dbus-net.c (Revision 3769) -+++ src/nm-dbus-net.c (Revision 3770) -@@ -69,6 +69,8 @@ - - compare_path = g_strdup_printf ("%s/%s/Networks/%s", - NM_DBUS_PATH_DEVICES, escaped_dev, escaped_ssid); -+ g_free (escaped_dev); -+ g_free (escaped_ssid); - - len = strlen (compare_path); - if (strncmp (path, compare_path, len) == 0) { -- cgit 1.3.0-6-gf8a5 From 679ccce894e93d216fa8f5a66c410c6939367113 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:18:13 +0000 Subject: New upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2886 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d2d3f4f1..f4037ed3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -network-manager (0.7.0-2) UNRELEASED; urgency=low +network-manager (0.7.0.97-1) UNRELEASED; urgency=low + * New upstream release. * Merge experimental branch into unstable. Remaining changes: - Remove 07-domain_search.patch, merged upstream. - Remove 08-hal_deprecated_keys.patch, fixed upstream. -- cgit 1.3.0-6-gf8a5 From 44f99c811e83a362fe04beec41d33333dcc33940 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:28:28 +0000 Subject: - Update 02-dbus_access_network_manager.patch for the latest upstream changes which fixes non-deterministic allow/deny for D-Bus messages with no interface. (Closes: #510729) - Disable 03-F3507g.patch for now, patch no longer applies and should be replaced by ModemManager anyway. - Remove 04-ltversioning.patch, merged upstream. - Remove 05-dhclient_lease_files.patch, merged upstream. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2887 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++ .../patches/02-dbus_access_network_manager.patch | 18 ++--- debian/patches/04-ltversioning.patch | 78 ---------------------- debian/patches/05-dhclient_lease_files.patch | 16 ----- debian/patches/series | 5 +- 5 files changed, 19 insertions(+), 105 deletions(-) delete mode 100644 debian/patches/04-ltversioning.patch delete mode 100644 debian/patches/05-dhclient_lease_files.patch diff --git a/debian/changelog b/debian/changelog index f4037ed3..07bf17f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low * New upstream release. + - Update 02-dbus_access_network_manager.patch for the latest upstream + changes which fixes non-deterministic allow/deny for D-Bus messages with + no interface. (Closes: #510729) + - Disable 03-F3507g.patch for now, patch no longer applies and should be + replaced by ModemManager anyway. + - Remove 04-ltversioning.patch, merged upstream. + - Remove 05-dhclient_lease_files.patch, merged upstream. * Merge experimental branch into unstable. Remaining changes: - Remove 07-domain_search.patch, merged upstream. - Remove 08-hal_deprecated_keys.patch, fixed upstream. diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index ad1ed08f..a96c6c0b 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,10 +1,10 @@ -Index: NetworkManager/src/NetworkManager.conf +Index: network-manager-0.7.0.97/src/NetworkManager.conf =================================================================== ---- 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 @@ - - +--- network-manager-0.7.0.97.orig/src/NetworkManager.conf 2009-02-17 16:45:44.000000000 +0100 ++++ network-manager-0.7.0.97/src/NetworkManager.conf 2009-02-22 03:20:14.000000000 +0100 +@@ -9,6 +9,16 @@ + + + @@ -12,8 +12,10 @@ Index: NetworkManager/src/NetworkManager.conf + + + -+ ++ ++ + - + diff --git a/debian/patches/04-ltversioning.patch b/debian/patches/04-ltversioning.patch deleted file mode 100644 index e88f8750..00000000 --- a/debian/patches/04-ltversioning.patch +++ /dev/null @@ -1,78 +0,0 @@ -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-dhclient_lease_files.patch b/debian/patches/05-dhclient_lease_files.patch deleted file mode 100644 index 8f0597f3..00000000 --- a/debian/patches/05-dhclient_lease_files.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/series b/debian/patches/series index c38d933a..3ad97cdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 02-dbus_access_network_manager.patch -03-F3507g.patch -04-ltversioning.patch -05-dhclient_lease_files.patch +#03-F3507g.patch +#20-manual_means_always_online.patch -- cgit 1.3.0-6-gf8a5 From 1a28272689f4b9e83baee8f72a1186f9e63e4c13 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:31:46 +0000 Subject: minor changelog nit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2888 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07bf17f1..0aee9184 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,7 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low - Remove 07-domain_search.patch, merged upstream. - Remove 08-hal_deprecated_keys.patch, fixed upstream. - Remove 09-nm_dbus_get_ap_from_object_path-mem_leak_fix.patch, obsolete. - - Disable 20-manual_means_always_online.patch, needs to be ported to 0.7 - first. + - Disable 20-manual_means_always_online.patch, needs to be ported to 0.7. - Drop libdbus-glib-1-dev Depends from libnm-util-dev. * debian/control - Add ${misc:Depends} to all binary packages. -- cgit 1.3.0-6-gf8a5 From 5334f044123dd93d2872528eed1c888137ad6ac9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:41:27 +0000 Subject: Update symbols file for libnm-util and libnm-glib due to API additions. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2889 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/libnm-glib0.symbols | 1 + debian/libnm-util1.symbols | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0aee9184..6fbb9afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. + * Update symbols file for libnm-util and libnm-glib due to API additions. -- Michael Biebl Tue, 13 Jan 2009 08:10:22 +0100 diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols index aed61ada..129fbab0 100644 --- a/debian/libnm-glib0.symbols +++ b/debian/libnm-glib0.symbols @@ -95,6 +95,7 @@ libnm_glib.so.0 libnm-glib0 #MINVER# 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_get_wins_servers@Base 0.7.0.97 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 diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols index 94922a5e..de4ad758 100644 --- a/debian/libnm-util1.symbols +++ b/debian/libnm-util1.symbols @@ -143,6 +143,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_never_default@Base 0.7.0.97 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 -- cgit 1.3.0-6-gf8a5 From 8682eda043b3c7767bc16cb19375a879423baec3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:48:39 +0000 Subject: Wrap Build-Depends. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2890 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fbb9afa..b4dabdbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low - 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) + - Wrap Build-Depends. * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. diff --git a/debian/control b/debian/control index 573414c9..6c20160b 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,21 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -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 +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 -- cgit 1.3.0-6-gf8a5 From d14e17a5f2026cf76cdb88ff0b84b9f8ebf1fcc1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:49:52 +0000 Subject: - Bump Build-Depends on debhelper to (>= 7). * debian/compat - Bump debhelper compat level to 7. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2891 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4dabdbf..5521f16d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low - Let network-manager depend on dhcp3-client directly, as the dependency on dhcdbd has been removed. (Closes: #509655) - Wrap Build-Depends. + - Bump Build-Depends on debhelper to (>= 7). + * debian/compat + - Bump debhelper compat level to 7. * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. diff --git a/debian/compat b/debian/compat index 7ed6ff82..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 6c20160b..faddc9a3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), +Build-Depends: debhelper (>= 7), cdbs, autotools-dev, pkg-config, -- cgit 1.3.0-6-gf8a5 From c767a17e6ab1681994fd64cdcd84b90277f931eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Feb 2009 21:55:18 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2894 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5521f16d..e9d7c1d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0.97-1) UNRELEASED; urgency=low +network-manager (0.7.0.97-1) unstable; urgency=low * New upstream release. - Update 02-dbus_access_network_manager.patch for the latest upstream @@ -27,7 +27,7 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low documentation. * Update symbols file for libnm-util and libnm-glib due to API additions. - -- Michael Biebl Tue, 13 Jan 2009 08:10:22 +0100 + -- Michael Biebl Tue, 24 Feb 2009 22:47:20 +0100 network-manager (0.7.0-1) experimental; urgency=low -- cgit 1.3.0-6-gf8a5 From 2ad0a3177ddc550380810bb6ab9805d3bf48d050 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 07:01:44 +0000 Subject: New upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2927 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e9d7c1d5..a587cfc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.7.0.99-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Michael Biebl Thu, 05 Mar 2009 08:01:23 +0100 + network-manager (0.7.0.97-1) unstable; urgency=low * New upstream release. -- cgit 1.3.0-6-gf8a5 From 3cb5c87edd3e353610ce84a66c1fa19606bd66c4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 07:04:07 +0000 Subject: * debian/network-manager.install - Install modem prober and corresponding udev rules file. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2928 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/network-manager.install | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index a587cfc3..0937c22e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ network-manager (0.7.0.99-1) UNRELEASED; urgency=low * New upstream release. + * debian/network-manager.install + - Install modem prober and corresponding udev rules file. -- Michael Biebl Thu, 05 Mar 2009 08:01:23 +0100 diff --git a/debian/network-manager.install b/debian/network-manager.install index f861ce48..f606770d 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -19,3 +19,5 @@ 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/ +debian/tmp/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules etc/udev/rules.d/ +debian/tmp/lib/udev/nm-modem-probe -- cgit 1.3.0-6-gf8a5 From 16b2c29bbd657da417fa580064feb740e9545179 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 11:24:23 +0000 Subject: Update changelog for upstream changes git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2929 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0937c22e..e00db08e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ network-manager (0.7.0.99-1) UNRELEASED; urgency=low - * New upstream release. + * New upstream release (0.7.1 rc3). + - Fix FTBFS for older GCC versions. (Closes: #517520) + - Fix crash for wireless-ssid setting in ifupdown plugin which also caused + hostname to be set incorrectly. (Closes: #513852) + - Handle unsupported format for wifi keys in ifupdown plugin. + (Closes: #513874) * debian/network-manager.install - Install modem prober and corresponding udev rules file. -- cgit 1.3.0-6-gf8a5 From abf8d09a2210d3c3ce7467615825769848f1b1b7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 12:00:05 +0000 Subject: * debian/control - Add Recommends on dnsmasq-base and iptables which are required for creating Ad-hoc connections and connection sharing. (Closes: #513151) - Document optional dependencies, like avahi-autoipd or policykit, in the package description. (Closes: #504455) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2930 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++++ debian/control | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e00db08e..c1a1103d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ network-manager (0.7.0.99-1) UNRELEASED; urgency=low (Closes: #513874) * debian/network-manager.install - Install modem prober and corresponding udev rules file. + * debian/control + - Add Recommends on dnsmasq-base and iptables which are required for + creating Ad-hoc connections and connection sharing. (Closes: #513151) + - Document optional dependencies, like avahi-autoipd or policykit, in the + package description. (Closes: #504455) -- Michael Biebl Thu, 05 Mar 2009 08:01:23 +0100 diff --git a/debian/control b/debian/control index faddc9a3..2cc6c329 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any 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 +Recommends: network-manager-gnome | network-manager-kde, policykit, ppp, dnsmasq-base, iptables 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~~) @@ -40,6 +40,14 @@ Description: network management framework daemon from a DHCP server, and change nameservers whenever it sees fit. . This package provides the userspace daemons. + . + Optional dependencies: + * policykit: Required for reading and writing system connections. + * ppp: Required for establishing dial-up connections (e.g. via GSM). + * dnsmasq-base/iptables: Required for creating Ad-hoc connections and + connection sharing. + * avahi-autoipd: Used for IPv4LL, a protocol for automatic Link-Local IP + address configuration. Package: network-manager-dev Architecture: any -- cgit 1.3.0-6-gf8a5 From 2a409a8968343f9ca31f1b9a3fc81d35560a3b64 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 12:20:17 +0000 Subject: * debian/rules - Update stop priorites for 0 1 6 from K14 to K88. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2932 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/network-manager.postinst | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index c1a1103d..02b1b34d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ network-manager (0.7.0.99-1) UNRELEASED; urgency=low creating Ad-hoc connections and connection sharing. (Closes: #513151) - Document optional dependencies, like avahi-autoipd or policykit, in the package description. (Closes: #504455) + * debian/rules + - Update stop priorites for 0 1 6 from K14 to K88. -- Michael Biebl Thu, 05 Mar 2009 08:01:23 +0100 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c7694427..7666aa1f 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -35,6 +35,15 @@ case "$1" in fi fi + # Update init script priorities + if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then + for i in 0 1 6 ; do + if [ -e /etc/rc$i.d/K14network-manager ]; then + mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager + fi + done + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) -- cgit 1.3.0-6-gf8a5 From 9165c2278f65616033201835b39a9a875b1f6522 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 12:21:08 +0000 Subject: fix small typo in changelog git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2933 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 02b1b34d..57fac9a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ network-manager (0.7.0.99-1) UNRELEASED; urgency=low - Document optional dependencies, like avahi-autoipd or policykit, in the package description. (Closes: #504455) * debian/rules - - Update stop priorites for 0 1 6 from K14 to K88. + - Update stop priorities for 0 1 6 from K14 to K88. -- Michael Biebl Thu, 05 Mar 2009 08:01:23 +0100 -- cgit 1.3.0-6-gf8a5 From b867cdc2477a79ca372b00397703bee40eff6abc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 12:21:57 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2934 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57fac9a4..b73312eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0.99-1) UNRELEASED; urgency=low +network-manager (0.7.0.99-1) unstable; urgency=low * New upstream release (0.7.1 rc3). - Fix FTBFS for older GCC versions. (Closes: #517520) @@ -16,7 +16,7 @@ network-manager (0.7.0.99-1) UNRELEASED; urgency=low * debian/rules - Update stop priorities for 0 1 6 from K14 to K88. - -- Michael Biebl Thu, 05 Mar 2009 08:01:23 +0100 + -- Michael Biebl Thu, 05 Mar 2009 13:21:13 +0100 network-manager (0.7.0.97-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From a8c1789e99842b7a0dd6ee7aeb5fec6511fb29a4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 03:59:45 +0000 Subject: New upstream release (0.7.1 rc4). git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3035 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b73312eb..2af5d2c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.7.0.100-1) UNRELEASED; urgency=low + + * New upstream release (0.7.1 rc4). + + -- Michael Biebl Mon, 06 Apr 2009 10:13:04 +0200 + network-manager (0.7.0.99-1) unstable; urgency=low * New upstream release (0.7.1 rc3). -- cgit 1.3.0-6-gf8a5 From b3413934a91f67a78dee334adb9886e5bc2fe86c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 04:05:13 +0000 Subject: * debian/network-manager.install - Install modem prober udev rules file into /lib/udev/rules.d. * debian/network-manager.preinst - Remove obsolete conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3036 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++++ debian/network-manager.install | 2 +- debian/network-manager.preinst | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2af5d2c4..6ae1b8d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low * New upstream release (0.7.1 rc4). + * debian/network-manager.install + - Install modem prober udev rules file into /lib/udev/rules.d. + * debian/network-manager.preinst + - Remove obsolete conffile + /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules. -- Michael Biebl Mon, 06 Apr 2009 10:13:04 +0200 diff --git a/debian/network-manager.install b/debian/network-manager.install index f606770d..6340fdaf 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -19,5 +19,5 @@ 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/ -debian/tmp/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules etc/udev/rules.d/ +debian/tmp/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules debian/tmp/lib/udev/nm-modem-probe diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 8b64b293..0dddcb3a 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -56,6 +56,9 @@ case "$1" in rm_conffile network-manager /etc/init.d/network-manager-dispatcher update-rc.d network-manager-dispatcher remove >/dev/null fi + if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then + rm_conffile network-manager /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules + fi ;; abort-upgrade) -- cgit 1.3.0-6-gf8a5 From 26b28e491ae69bd4e0727b28cbd84e7efa98f328 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 04:24:45 +0000 Subject: * debian/network-manager.dirs,init - Do no longer install the /var/run/NetworkManager directory. * debian/network-manager.init - Store the NetworkManager pid file directly in /var/run. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3037 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/network-manager.dirs | 1 - debian/network-manager.init | 10 ++-------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ae1b8d8..45478743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low * debian/network-manager.preinst - Remove obsolete conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules. + * debian/network-manager.dirs,init + - Do no longer install the /var/run/NetworkManager directory. + * debian/network-manager.init + - Store the NetworkManager pid file directly in /var/run. -- Michael Biebl Mon, 06 Apr 2009 10:13:04 +0200 diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 35ce9986..233c3b50 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,2 +1 @@ var/lib/NetworkManager -var/run/NetworkManager diff --git a/debian/network-manager.init b/debian/network-manager.init index 18797994..3fc396db 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -20,8 +20,7 @@ NAME="NetworkManager" DAEMON=/usr/sbin/$NAME -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid +PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/network-manager USER=root @@ -37,13 +36,8 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # 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 + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS } -- cgit 1.3.0-6-gf8a5 From 53c2354058f8bf4cc1db672bad0e36ad0e26abeb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 04:31:08 +0000 Subject: * debian/control - Bump Standards-Version to 3.8.1. See the changes above wrt the /var/run directory. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3038 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 45478743..2ef7c1c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low - Do no longer install the /var/run/NetworkManager directory. * debian/network-manager.init - Store the NetworkManager pid file directly in /var/run. + * debian/control + - Bump Standards-Version to 3.8.1. See the changes above wrt the /var/run + directory. -- Michael Biebl Mon, 06 Apr 2009 10:13:04 +0200 diff --git a/debian/control b/debian/control index 2cc6c329..55854afa 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 7), libpolkit-dbus-dev, libgnutls-dev, uuid-dev -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 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/ -- cgit 1.3.0-6-gf8a5 From 3ada820bcaa98d84d88b991e3e2179ca13bdfd8d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 05:01:55 +0000 Subject: Move the old pid file from /var/run/NetworkManager to /var/run on upgrades so the daemon can be stopped correctly in postinst and the obsolete run directory is removed automatically. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3039 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/network-manager.preinst | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2ef7c1c5..5ca47847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low * debian/network-manager.preinst - Remove obsolete conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules. + - Move the old pid file from /var/run/NetworkManager to /var/run on + upgrades so the daemon can be stopped correctly in postinst and the + obsolete run directory is removed automatically. * debian/network-manager.dirs,init - Do no longer install the /var/run/NetworkManager directory. * debian/network-manager.init diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 0dddcb3a..9a18984e 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -58,6 +58,11 @@ case "$1" in fi if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then rm_conffile network-manager /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules + # Move old pid file to /var/run, so /var/run/NetworkManager can be removed + # cleanly on upgrades and the daemon can be stopped correctly in postinst + if [ -f /var/run/NetworkManager/NetworkManager.pid ]; then + mv /var/run/NetworkManager/NetworkManager.pid /var/run/ + fi fi ;; -- cgit 1.3.0-6-gf8a5 From 9b404b2db4af6ce29156d10a3ff6f0a436b94c8d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 05:06:14 +0000 Subject: * debian/patches/02-dbus_access_network_manager.patch - Remove haldaemon section, obsolete. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3040 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/patches/02-dbus_access_network_manager.patch | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ca47847..5ab55801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low * debian/control - Bump Standards-Version to 3.8.1. See the changes above wrt the /var/run directory. + * debian/patches/02-dbus_access_network_manager.patch + - Remove haldaemon section, obsolete. -- Michael Biebl Mon, 06 Apr 2009 10:13:04 +0200 diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index a96c6c0b..c96a0de1 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -2,14 +2,10 @@ Index: network-manager-0.7.0.97/src/NetworkManager.conf =================================================================== --- network-manager-0.7.0.97.orig/src/NetworkManager.conf 2009-02-17 16:45:44.000000000 +0100 +++ network-manager-0.7.0.97/src/NetworkManager.conf 2009-02-22 03:20:14.000000000 +0100 -@@ -9,6 +9,16 @@ +@@ -9,6 +9,12 @@ -+ -+ -+ -+ + + + -- cgit 1.3.0-6-gf8a5 From deeb8d38b9e038e55acc419e0b47e7d6210dde16 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Apr 2009 05:06:29 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3041 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ab55801..00c2442c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.0.100-1) UNRELEASED; urgency=low +network-manager (0.7.0.100-1) unstable; urgency=low * New upstream release (0.7.1 rc4). * debian/network-manager.install @@ -19,7 +19,7 @@ network-manager (0.7.0.100-1) UNRELEASED; urgency=low * debian/patches/02-dbus_access_network_manager.patch - Remove haldaemon section, obsolete. - -- Michael Biebl Mon, 06 Apr 2009 10:13:04 +0200 + -- Michael Biebl Wed, 08 Apr 2009 07:06:19 +0200 network-manager (0.7.0.99-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 0b0d0a2cb51ff51b1f291182043a9af13013a07b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Apr 2009 07:31:00 +0000 Subject: * Use set -e instead of #!/bin/sh -e for all maintainer scripts. * debian/network-manager.dirs git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3062 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++++- debian/network-manager.postinst | 5 ++++- debian/network-manager.preinst | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 00c2442c..9ec1b2c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.7.0.100-2) UNRELEASED; urgency=low + + * Use set -e instead of #!/bin/sh -e for all maintainer scripts. + + -- Michael Biebl Wed, 08 Apr 2009 08:02:10 +0200 + network-manager (0.7.0.100-1) unstable; urgency=low * New upstream release (0.7.1 rc4). @@ -9,7 +15,7 @@ network-manager (0.7.0.100-1) unstable; urgency=low - Move the old pid file from /var/run/NetworkManager to /var/run on upgrades so the daemon can be stopped correctly in postinst and the obsolete run directory is removed automatically. - * debian/network-manager.dirs,init + * debian/network-manager.dirs - Do no longer install the /var/run/NetworkManager directory. * debian/network-manager.init - Store the NetworkManager pid file directly in /var/run. diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 7666aa1f..f91886f5 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,4 +1,7 @@ -#!/bin/sh -e +#!/bin/sh + +set -e + # This script can be called in the following ways: # # After the package was installed: diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 9a18984e..5bfef656 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -1,4 +1,7 @@ -#!/bin/sh -e +#!/bin/sh + +set -e + # This script can be called in the following ways: # # Before the package is installed: -- cgit 1.3.0-6-gf8a5 From 7588068fb1e23b484099ebe5c729b6115317435e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Apr 2009 07:39:24 +0000 Subject: * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem capabilites without having to spawn udevadm. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3063 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ec1b2c6..52909b6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ network-manager (0.7.0.100-2) UNRELEASED; urgency=low * Use set -e instead of #!/bin/sh -e for all maintainer scripts. + * debian/control + - Add Build-Depends on libudev-dev. This allows to query udev for modem + capabilites without having to spawn udevadm. -- Michael Biebl Wed, 08 Apr 2009 08:02:10 +0200 diff --git a/debian/control b/debian/control index 55854afa..d2779520 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 7), ppp-dev, libpolkit-dbus-dev, libgnutls-dev, - uuid-dev + uuid-dev, + libudev-dev Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 From d60fc364dbf648fb5941cbaf60f99ec136206d99 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 16 Apr 2009 22:47:34 +0000 Subject: New upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3079 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52909b6f..25bc81e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -network-manager (0.7.0.100-2) UNRELEASED; urgency=low +network-manager (0.7.1-1) UNRELEASED; urgency=low + * New upstream release. * Use set -e instead of #!/bin/sh -e for all maintainer scripts. * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem capabilites without having to spawn udevadm. - -- Michael Biebl Wed, 08 Apr 2009 08:02:10 +0200 + -- Michael Biebl Fri, 17 Apr 2009 00:47:03 +0200 network-manager (0.7.0.100-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 606657e54820437d470c39669ff78e44a5532dbf Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 16 Apr 2009 22:54:37 +0000 Subject: Revert r3063 for now as this will entangle us in yet another library transition (i.e. libudev) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3080 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 --- debian/control | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25bc81e7..ebf11001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,6 @@ network-manager (0.7.1-1) UNRELEASED; urgency=low * New upstream release. * Use set -e instead of #!/bin/sh -e for all maintainer scripts. - * debian/control - - Add Build-Depends on libudev-dev. This allows to query udev for modem - capabilites without having to spawn udevadm. -- Michael Biebl Fri, 17 Apr 2009 00:47:03 +0200 diff --git a/debian/control b/debian/control index d2779520..55854afa 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,7 @@ Build-Depends: debhelper (>= 7), ppp-dev, libpolkit-dbus-dev, libgnutls-dev, - uuid-dev, - libudev-dev + uuid-dev Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 From 8e53ede36fa39a43a4aa5ec7c980e5be877bb2ea Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 16 Apr 2009 23:54:55 +0000 Subject: * debian/patches/04-struct_termios.patch - Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead of the obsolete struct termio ioctl interface. (Closes: #524161) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3081 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++ debian/patches/04-struct_termios.patch | 66 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 70 insertions(+) create mode 100644 debian/patches/04-struct_termios.patch diff --git a/debian/changelog b/debian/changelog index ebf11001..606713d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ network-manager (0.7.1-1) UNRELEASED; urgency=low * New upstream release. * Use set -e instead of #!/bin/sh -e for all maintainer scripts. + * debian/patches/04-struct_termios.patch + - Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead + of the obsolete struct termio ioctl interface. (Closes: #524161) -- Michael Biebl Fri, 17 Apr 2009 00:47:03 +0200 diff --git a/debian/patches/04-struct_termios.patch b/debian/patches/04-struct_termios.patch new file mode 100644 index 00000000..9b38e0bf --- /dev/null +++ b/debian/patches/04-struct_termios.patch @@ -0,0 +1,66 @@ +# Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead +# of the obsolete struct termio ioctl interface. (Closes: #524161) +diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c +index 1cba1ca..afdc6a6 100644 +--- a/src/nm-serial-device.c ++++ b/src/nm-serial-device.c +@@ -21,13 +21,12 @@ + + #define _GNU_SOURCE /* for strcasestr() */ + +-#include ++#include + #include + #include + #include + #include + #include +-#include + #include + #include + #include +@@ -346,7 +345,7 @@ static gboolean + config_fd (NMSerialDevice *device, NMSettingSerial *setting) + { + NMSerialDevicePrivate *priv = NM_SERIAL_DEVICE_GET_PRIVATE (device); +- struct termio stbuf; ++ struct termios stbuf; + int speed; + int bits; + int parity; +@@ -357,7 +356,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting) + parity = parse_parity (nm_setting_serial_get_parity (setting)); + stopbits = parse_stopbits (nm_setting_serial_get_stopbits (setting)); + +- ioctl (priv->fd, TCGETA, &stbuf); ++ tcgetattr (priv->fd, &stbuf); + + stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR ); + stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET); +@@ -370,7 +369,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting) + stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB); + stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits); + +- if (ioctl (priv->fd, TCSETA, &stbuf) < 0) { ++ if (tcgetattr (priv->fd, &stbuf) < 0) { + nm_warning ("(%s) cannot control device (errno %d)", + nm_device_get_iface (NM_DEVICE (device)), errno); + return FALSE; +@@ -404,7 +403,7 @@ nm_serial_device_open (NMSerialDevice *device, + return FALSE; + } + +- if (ioctl (priv->fd, TCGETA, &priv->old_t) < 0) { ++ if (tcgetattr (priv->fd, &priv->old_t) < 0) { + nm_warning ("(%s) cannot control device (errno %d)", iface, errno); + close (priv->fd); + return FALSE; +@@ -447,7 +446,7 @@ nm_serial_device_close (NMSerialDevice *device) + priv->channel = NULL; + } + +- ioctl (priv->fd, TCSETA, &priv->old_t); ++ tcsetattr (priv->fd, TCSANOW, &priv->old_t); + close (priv->fd); + priv->fd = 0; + } diff --git a/debian/patches/series b/debian/patches/series index 3ad97cdd..9f9fb610 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02-dbus_access_network_manager.patch #03-F3507g.patch #20-manual_means_always_online.patch +04-struct_termios.patch -- cgit 1.3.0-6-gf8a5 From f4178f17d962b6d1684a64c4686c20e3face8ed8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 17 Apr 2009 00:39:24 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3082 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 606713d4..03c99085 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.1-1) UNRELEASED; urgency=low +network-manager (0.7.1-1) unstable; urgency=low * New upstream release. * Use set -e instead of #!/bin/sh -e for all maintainer scripts. -- cgit 1.3.0-6-gf8a5 From 341c103f61914e99e7c01784d1f78153fd3b57eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 17 Apr 2009 10:51:19 +0000 Subject: * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem capabilites without having to spawn udevadm. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3085 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/control | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03c99085..afa4a4cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.7.1-2) UNRELEASED; urgency=low + + * debian/control + - Add Build-Depends on libudev-dev. This allows to query udev for modem + capabilites without having to spawn udevadm. + + -- Michael Biebl Fri, 17 Apr 2009 11:39:35 +0200 + network-manager (0.7.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 55854afa..d2779520 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 7), ppp-dev, libpolkit-dbus-dev, libgnutls-dev, - uuid-dev + uuid-dev, + libudev-dev Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 From 889825bc82129ab7563785ffbb2870b87dd80b45 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 30 Jun 2009 15:18:50 +0000 Subject: * debian/control - Add libnm-util-dev to the depends of libnm-glib-dev git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3148 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++++++- debian/control | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index afa4a4cb..7ddaad1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low + [ Michael Biebl ] * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem capabilites without having to spawn udevadm. - -- Michael Biebl Fri, 17 Apr 2009 11:39:35 +0200 + [ Sjoerd Simons ] + * debian/control + - Add libnm-util-dev to the depends of libnm-glib-dev + + -- Sjoerd Simons Tue, 30 Jun 2009 16:18:28 +0100 network-manager (0.7.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index d2779520..dff12ed6 100644 --- a/debian/control +++ b/debian/control @@ -76,7 +76,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, 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 -- cgit 1.3.0-6-gf8a5 From 1d9798ef284edc4d614832296362cbe6462aa5ff Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Jul 2009 20:15:19 +0000 Subject: debian/patches/05-response-buffer-filled.patch: new, from upstream git 0.7 branch. Fixes "response buffer filled before repsonse received" (sic) during communication with serial modems. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3151 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++++ debian/patches/05-response-buffer-filled.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/05-response-buffer-filled.patch diff --git a/debian/changelog b/debian/changelog index 7ddaad1f..7e351dcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,11 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low * debian/control - Add libnm-util-dev to the depends of libnm-glib-dev + [ Simon McVittie ] + * debian/patches/05-response-buffer-filled.patch: new, from upstream git + 0.7 branch. Fixes "response buffer filled before repsonse received" (sic) + during communication with serial modems. + -- Sjoerd Simons Tue, 30 Jun 2009 16:18:28 +0100 network-manager (0.7.1-1) unstable; urgency=low diff --git a/debian/patches/05-response-buffer-filled.patch b/debian/patches/05-response-buffer-filled.patch new file mode 100644 index 00000000..3a8a731a --- /dev/null +++ b/debian/patches/05-response-buffer-filled.patch @@ -0,0 +1,19 @@ +commit 793cc30b5d20d728719c568f5bfac98f3bca3dca +Author: Robert Piasek +Date: 2009-06-22 11:57:28 -0400 + + serial: fix serial port settings bug caused by 31a34fa7ffbceb79d5e6c16158e5dcce285dcff1 + +diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c +index 54dd176..ad481d3 100644 +--- a/src/nm-serial-device.c ++++ b/src/nm-serial-device.c +@@ -368,7 +368,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting) + stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB); + stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits); + +- if (tcgetattr (priv->fd, &stbuf) < 0) { ++ if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) { + nm_warning ("(%s) cannot control device (errno %d)", + nm_device_get_iface (NM_DEVICE (device)), errno); + return FALSE; diff --git a/debian/patches/series b/debian/patches/series index 9f9fb610..15d456d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ #03-F3507g.patch #20-manual_means_always_online.patch 04-struct_termios.patch +05-response-buffer-filled.patch -- cgit 1.3.0-6-gf8a5 From fd4c5aecc5b778167744f43c19b1a3ad0a7e6115 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Aug 2009 00:43:08 +0000 Subject: #539888 is fixed by r3148 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3216 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7e351dcd..98aeb5d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low [ Sjoerd Simons ] * debian/control - - Add libnm-util-dev to the depends of libnm-glib-dev + - Add libnm-util-dev to the depends of libnm-glib-dev. (Closes: #539888) [ Simon McVittie ] * debian/patches/05-response-buffer-filled.patch: new, from upstream git -- cgit 1.3.0-6-gf8a5 From 58e3fe9fb934d4790a20cd911d95d80e36191d72 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Aug 2009 00:54:57 +0000 Subject: * debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch - HAL 0.5.13 added support for the ssb bus type which is internally used on most Broadcom ethernet and wifi chipsets. Update NM to detect the driver for the changed device layout. (Closes: #540613) Patch pulled from upstream git. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3217 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++ .../06-handle-new-ssb-bus-from-HAL-0.5.13.patch | 50 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 56 insertions(+) create mode 100644 debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch diff --git a/debian/changelog b/debian/changelog index 98aeb5d0..4f419677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem capabilites without having to spawn udevadm. + * debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch + - HAL 0.5.13 added support for the ssb bus type which is internally used + on most Broadcom ethernet and wifi chipsets. Update NM to detect the + driver for the changed device layout. (Closes: #540613) + Patch pulled from upstream git. [ Sjoerd Simons ] * debian/control diff --git a/debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch b/debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch new file mode 100644 index 00000000..aa19d5d1 --- /dev/null +++ b/debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch @@ -0,0 +1,50 @@ +From d185695d80b248354dd7a95fd896daa5c45085e5 Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Fri, 14 Aug 2009 09:44:02 -0500 +Subject: [PATCH] core: handle new 'ssb' bus from HAL 0.5.13 (deb #540613) + +HAL added 'ssb' (Silicon Sonics Backplane, used internally on most +Broadcom ethernet and wifi chipsets) in 0.5.13, which changed the +device list layout and made NM unable to get the driver for the +wifi device. Fix that. +--- + src/nm-hal-manager.c | 16 +++++++++++----- + 1 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c +index 581d79e..a49e9e6 100644 +--- a/src/nm-hal-manager.c ++++ b/src/nm-hal-manager.c +@@ -146,9 +146,14 @@ nm_get_device_driver_name (LibHalContext *ctx, const char *origdev_udi) + + /* s390 driver name is on the grandparent of the net device */ + subsystem = hal_get_subsystem (ctx, origdev_udi); +- if (subsystem && !strcmp (subsystem, "ibmebus")) { +- od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); +- origdev_udi = (const char *) od_parent; ++ if (subsystem) { ++ if (!strcmp (subsystem, "ibmebus")) { ++ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); ++ origdev_udi = (const char *) od_parent; ++ } else if (!strcmp (subsystem, "ssb")) { ++ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); ++ origdev_udi = (const char *) od_parent; ++ } + } + + drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); +@@ -1214,8 +1219,9 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) + libhal_free_string (subsys); + libhal_free_string (parent); + +- /* For non-USB devices, and ss a fallback, just use the originating device +- * of the tty; though this might result in more than one modem being detected by NM. ++ /* For non-USB devices, and as a fallback, just use the originating device ++ * of the tty; though this might result in more than one modem being ++ * detected by NM. + */ + if (!od) + od = hal_get_originating_device (priv->hal_ctx, udi, creator->category); +-- +1.6.3.3 + diff --git a/debian/patches/series b/debian/patches/series index 15d456d1..f718a5d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ #20-manual_means_always_online.patch 04-struct_termios.patch 05-response-buffer-filled.patch +06-handle-new-ssb-bus-from-HAL-0.5.13.patch -- cgit 1.3.0-6-gf8a5 From c3c5a459732cf6643ae2cf39790bbb0438fc9d31 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Aug 2009 01:00:26 +0000 Subject: * debian/network-manager.init - Update LSB header. Add "network-manager" to Provides as this name is apparently used within the gdm init script and to be more in line with the recommend practice to name the Provides like the init script. Don't remove the "NetworkManager" Provides as other scripts might already depend on that name. (Closes: #539753) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3218 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ debian/network-manager.init | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4f419677..c3897795 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,12 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low on most Broadcom ethernet and wifi chipsets. Update NM to detect the driver for the changed device layout. (Closes: #540613) Patch pulled from upstream git. + * debian/network-manager.init + - Update LSB header. Add "network-manager" to Provides as this name is + apparently used within the gdm init script and to be more in line with + the recommend practice to name the Provides like the init script. + Don't remove the "NetworkManager" Provides as other scripts might + already depend on that name. (Closes: #539753) [ Sjoerd Simons ] * debian/control diff --git a/debian/network-manager.init b/debian/network-manager.init index 3fc396db..058dbd24 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,6 +1,6 @@ #! /bin/sh ### BEGIN INIT INFO -# Provides: NetworkManager +# Provides: NetworkManager network-manager # Required-Start: $remote_fs dbus hal # Required-Stop: $remote_fs dbus hal # Should-Start: $syslog -- cgit 1.3.0-6-gf8a5 From f1a05e2818355d7d1d3ad0c2bfe3c5e74a9bbd85 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Aug 2009 01:01:28 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3219 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3897795..d9473813 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.1-2) UNRELEASED; urgency=low +network-manager (0.7.1-2) unstable; urgency=low [ Michael Biebl ] * debian/control @@ -25,7 +25,7 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low 0.7 branch. Fixes "response buffer filled before repsonse received" (sic) during communication with serial modems. - -- Sjoerd Simons Tue, 30 Jun 2009 16:18:28 +0100 + -- Michael Biebl Sun, 16 Aug 2009 03:00:50 +0200 network-manager (0.7.1-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 850be32402cbc83e43ab817e50df0acfe4ad1433 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 16 Aug 2009 01:03:56 +0000 Subject: Back to UNRELEASED git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3220 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d9473813..5d490c72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.1-2) unstable; urgency=low +network-manager (0.7.1-2) UNRELEASED; urgency=low [ Michael Biebl ] * debian/control -- cgit 1.3.0-6-gf8a5 From fba09b2ea9a3c4d861a06886d8f668b8e6a6d412 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:34:38 +0000 Subject: Just fix our patch 04-struct_termios.patch instead of adding a new patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3221 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ----- debian/patches/04-struct_termios.patch | 2 +- debian/patches/05-response-buffer-filled.patch | 19 ------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 debian/patches/05-response-buffer-filled.patch diff --git a/debian/changelog b/debian/changelog index 5d490c72..acb1c1aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,11 +20,6 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low * debian/control - Add libnm-util-dev to the depends of libnm-glib-dev. (Closes: #539888) - [ Simon McVittie ] - * debian/patches/05-response-buffer-filled.patch: new, from upstream git - 0.7 branch. Fixes "response buffer filled before repsonse received" (sic) - during communication with serial modems. - -- Michael Biebl Sun, 16 Aug 2009 03:00:50 +0200 network-manager (0.7.1-1) unstable; urgency=low diff --git a/debian/patches/04-struct_termios.patch b/debian/patches/04-struct_termios.patch index 9b38e0bf..bddb0394 100644 --- a/debian/patches/04-struct_termios.patch +++ b/debian/patches/04-struct_termios.patch @@ -42,7 +42,7 @@ index 1cba1ca..afdc6a6 100644 stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits); - if (ioctl (priv->fd, TCSETA, &stbuf) < 0) { -+ if (tcgetattr (priv->fd, &stbuf) < 0) { ++ if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) { nm_warning ("(%s) cannot control device (errno %d)", nm_device_get_iface (NM_DEVICE (device)), errno); return FALSE; diff --git a/debian/patches/05-response-buffer-filled.patch b/debian/patches/05-response-buffer-filled.patch deleted file mode 100644 index 3a8a731a..00000000 --- a/debian/patches/05-response-buffer-filled.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 793cc30b5d20d728719c568f5bfac98f3bca3dca -Author: Robert Piasek -Date: 2009-06-22 11:57:28 -0400 - - serial: fix serial port settings bug caused by 31a34fa7ffbceb79d5e6c16158e5dcce285dcff1 - -diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c -index 54dd176..ad481d3 100644 ---- a/src/nm-serial-device.c -+++ b/src/nm-serial-device.c -@@ -368,7 +368,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting) - stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB); - stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits); - -- if (tcgetattr (priv->fd, &stbuf) < 0) { -+ if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) { - nm_warning ("(%s) cannot control device (errno %d)", - nm_device_get_iface (NM_DEVICE (device)), errno); - return FALSE; -- cgit 1.3.0-6-gf8a5 From e8a4d63183e34701d4dd29e1ae9830fefb9c3f95 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:35:43 +0000 Subject: Fix a typo in the changelog git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3222 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index acb1c1aa..dd83d420 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low [ Michael Biebl ] * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem - capabilites without having to spawn udevadm. + capabilities without having to spawn udevadm. * debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch - HAL 0.5.13 added support for the ssb bus type which is internally used on most Broadcom ethernet and wifi chipsets. Update NM to detect the -- cgit 1.3.0-6-gf8a5 From cd438d370a65c2e1354cad95b3596b2b52fbdbbf Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:38:13 +0000 Subject: Squashed the following upstream commits d0cdbf3525b105de6dc0ca4ce02801bfe8fe2222 4c36f7c0b607813753072acf1bec14414494948c d185695d80b248354dd7a95fd896daa5c45085e5 to produce a working patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3223 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- .../05-handle-new-ssb-bus-from-HAL-0.5.13.patch | 253 +++++++++++++++++++++ .../06-handle-new-ssb-bus-from-HAL-0.5.13.patch | 50 ---- debian/patches/series | 3 +- 3 files changed, 254 insertions(+), 52 deletions(-) create mode 100644 debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch delete mode 100644 debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch diff --git a/debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch b/debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch new file mode 100644 index 00000000..25949e82 --- /dev/null +++ b/debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch @@ -0,0 +1,253 @@ +Squash the following commits into one patch + +d0cdbf3525b105de6dc0ca4ce02801bfe8fe2222 +4c36f7c0b607813753072acf1bec14414494948c +d185695d80b248354dd7a95fd896daa5c45085e5 + +modem: handle newer HAL versions where info.bus is no longer present + +hal: find driver for ibmebus-type 'ehea' devices + +core: handle new 'ssb' bus from HAL 0.5.13 (deb #540613) + +HAL added 'ssb' (Silicon Sonics Backplane, used internally on most +Broadcom ethernet and wifi chipsets) in 0.5.13, which changed the +device list layout and made NM unable to get the driver for the +wifi device. Fix that. +--- + src/nm-hal-manager.c | 133 +++++++++++++++++++++++++++++-------------------- + 1 files changed, 79 insertions(+), 54 deletions(-) + +diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c +index 647fe21..a01b4e2 100644 +--- a/src/nm-hal-manager.c ++++ b/src/nm-hal-manager.c +@@ -124,19 +124,45 @@ get_creator (NMHalManager *self, const char *udi) + /* Common helpers for built-in device creators */ + + static char * ++hal_get_subsystem (LibHalContext *ctx, const char *udi) ++{ ++ char *subsys; ++ ++ subsys = libhal_device_get_property_string (ctx, udi, "info.subsystem", NULL); ++ if (!subsys) { ++ /* info.bus is deprecated */ ++ subsys = libhal_device_get_property_string (ctx, udi, "info.bus", NULL); ++ } ++ return subsys; ++} ++ ++static char * + nm_get_device_driver_name (LibHalContext *ctx, const char *origdev_udi) + { +- char *driver_name = NULL; ++ char *driver_name = NULL, *subsystem, *drv, *od_parent = NULL; + +- if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) { +- char *drv; ++ if (!origdev_udi) ++ return NULL; + +- drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); +- if (drv) { +- driver_name = g_strdup (drv); +- libhal_free_string (drv); ++ /* s390 driver name is on the grandparent of the net device */ ++ subsystem = hal_get_subsystem (ctx, origdev_udi); ++ if (subsystem) { ++ if (!strcmp (subsystem, "ibmebus")) { ++ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); ++ origdev_udi = (const char *) od_parent; ++ } else if (!strcmp (subsystem, "ssb")) { ++ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); ++ origdev_udi = (const char *) od_parent; + } + } ++ ++ drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); ++ if (drv) ++ driver_name = g_strdup (drv); ++ ++ libhal_free_string (drv); ++ libhal_free_string (od_parent); ++ libhal_free_string (subsystem); + return driver_name; + } + +@@ -292,18 +318,34 @@ is_modem_device (NMHalManager *self, const char *udi) + } + + static char * ++hal_get_originating_device (LibHalContext *ctx, const char *udi, const char *prefix) ++{ ++ char *od_key = g_strdup_printf ("%s.originating_device", prefix); ++ char *pd_key = g_strdup_printf ("%s.physical_device", prefix); ++ char *od; ++ ++ od = libhal_device_get_property_string (ctx, udi, od_key, NULL); ++ if (!od) { ++ /* physical_device is deprecated */ ++ od = libhal_device_get_property_string (ctx, udi, pd_key, NULL); ++ } ++ ++ g_free (od_key); ++ g_free (pd_key); ++ return od; ++} ++ ++static char * + get_hso_netdev (LibHalContext *ctx, const char *udi) + { +- char *serial_od = NULL, *serial_od_parent = NULL, *netdev = NULL, *bus; ++ char *serial_od = NULL, *serial_od_parent = NULL, *netdev = NULL, *subsys; + char **netdevs = NULL; + int num, i; + + /* Get the serial interface's originating device UDI, used to find the + * originating device's netdev. + */ +- serial_od = libhal_device_get_property_string (ctx, udi, "serial.originating_device", NULL); +- if (!serial_od) +- serial_od = libhal_device_get_property_string (ctx, udi, "serial.physical_device", NULL); ++ serial_od = hal_get_originating_device (ctx, udi, "serial"); + if (!serial_od) + goto out; + +@@ -312,21 +354,19 @@ get_hso_netdev (LibHalContext *ctx, const char *udi) + goto out; + + /* Check to ensure we've got the actual "USB Device" */ +- bus = libhal_device_get_property_string (ctx, serial_od_parent, "info.bus", NULL); +- if (!bus || strcmp (bus, "usb_device")) { +- libhal_free_string (bus); ++ subsys = hal_get_subsystem (ctx, serial_od_parent); ++ if (!subsys || strcmp (subsys, "usb_device")) { ++ libhal_free_string (subsys); + goto out; + } +- libhal_free_string (bus); ++ libhal_free_string (subsys); + + /* Look for the originating device's netdev */ + netdevs = libhal_find_device_by_capability (ctx, "net", &num, NULL); + for (i = 0; netdevs && !netdev && (i < num); i++) { + char *net_od = NULL, *net_od_parent = NULL, *tmp; + +- net_od = libhal_device_get_property_string (ctx, netdevs[i], "net.originating_device", NULL); +- if (!net_od) +- net_od = libhal_device_get_property_string (ctx, netdevs[i], "net.physical_device", NULL); ++ net_od = hal_get_originating_device (ctx, netdevs[i], "net"); + if (!net_od) + goto next; + +@@ -335,12 +375,12 @@ get_hso_netdev (LibHalContext *ctx, const char *udi) + goto next; + + /* Check to ensure we've got the actual "USB Device" */ +- bus = libhal_device_get_property_string (ctx, net_od_parent, "info.bus", NULL); +- if (!bus || strcmp (bus, "usb_device")) { +- libhal_free_string (bus); ++ subsys = hal_get_subsystem (ctx, net_od_parent); ++ if (!subsys || strcmp (subsys, "usb_device")) { ++ libhal_free_string (subsys); + goto next; + } +- libhal_free_string (bus); ++ libhal_free_string (subsys); + + if (!strcmp (net_od_parent, serial_od_parent)) { + /* We found it */ +@@ -851,22 +891,16 @@ new_modem_device (const char *udi, + static char * + nm_get_modem_device_driver_name (LibHalContext *ctx, const char *udi) + { +- char *driver_name = NULL; +- char *origdev_udi; ++ char *driver_name = NULL, *origdev_udi, *driver; + +- origdev_udi = libhal_device_get_property_string (ctx, udi, "serial.originating_device", NULL); +- /* Older HAL uses "physical_device" */ ++ origdev_udi = hal_get_originating_device (ctx, udi, "serial"); + if (!origdev_udi) +- origdev_udi = libhal_device_get_property_string (ctx, udi, "serial.physical_device", NULL); +- +- if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) { +- char *drv; ++ return NULL; + +- drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); +- if (drv) { +- driver_name = g_strdup (drv); +- libhal_free_string (drv); +- } ++ driver = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); ++ if (driver) { ++ driver_name = g_strdup (driver); ++ libhal_free_string (driver); + } + libhal_free_string (origdev_udi); + return driver_name; +@@ -1039,7 +1073,7 @@ static void + emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) + { + NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self); +- char *od = NULL, *tmp, *parent, *bus = NULL; ++ char *od = NULL, *tmp, *parent, *subsys = NULL; + + g_return_if_fail (self != NULL); + g_return_if_fail (udi != NULL); +@@ -1056,8 +1090,8 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) + */ + parent = libhal_device_get_property_string (priv->hal_ctx, udi, "info.parent", NULL); + if (parent) +- bus = libhal_device_get_property_string (priv->hal_ctx, parent, "info.bus", NULL); +- if (bus && !strcmp (bus, "usb")) { ++ subsys = hal_get_subsystem (priv->hal_ctx, parent); ++ if (subsys && !strcmp (subsys, "usb")) { + char *usb_intf_udi; + + usb_intf_udi = libhal_device_get_property_string (priv->hal_ctx, udi, "info.parent", NULL); +@@ -1066,7 +1100,7 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) + + /* Ensure the grandparent really is the "USB Device" */ + if (od) { +- tmp = libhal_device_get_property_string (priv->hal_ctx, od, "info.bus", NULL); ++ tmp = hal_get_subsystem (priv->hal_ctx, od); + if (!tmp || strcmp (tmp, "usb_device")) { + libhal_free_string (od); + od = NULL; +@@ -1077,24 +1111,15 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) + libhal_free_string (usb_intf_udi); + } + } +- libhal_free_string (bus); ++ libhal_free_string (subsys); + libhal_free_string (parent); + +- /* For non-USB devices, and ss a fallback, just use the originating device +- * of the tty; though this might result in more than one modem being detected by NM. ++ /* For non-USB devices, and as a fallback, just use the originating device ++ * of the tty; though this might result in more than one modem being ++ * detected by NM. + */ +- if (!od) { +- tmp = g_strdup_printf ("%s.originating_device", creator->category); +- od = libhal_device_get_property_string (priv->hal_ctx, udi, tmp, NULL); +- g_free (tmp); +- } +- +- if (!od) { +- /* Older HAL uses 'physical_device' */ +- tmp = g_strdup_printf ("%s.physical_device", creator->category); +- od = libhal_device_get_property_string (priv->hal_ctx, udi, tmp, NULL); +- g_free (tmp); +- } ++ if (!od) ++ od = hal_get_originating_device (priv->hal_ctx, udi, creator->category); + + g_signal_emit (self, signals[UDI_ADDED], 0, + udi, +-- +1.6.3.3 + diff --git a/debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch b/debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch deleted file mode 100644 index aa19d5d1..00000000 --- a/debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d185695d80b248354dd7a95fd896daa5c45085e5 Mon Sep 17 00:00:00 2001 -From: Dan Williams -Date: Fri, 14 Aug 2009 09:44:02 -0500 -Subject: [PATCH] core: handle new 'ssb' bus from HAL 0.5.13 (deb #540613) - -HAL added 'ssb' (Silicon Sonics Backplane, used internally on most -Broadcom ethernet and wifi chipsets) in 0.5.13, which changed the -device list layout and made NM unable to get the driver for the -wifi device. Fix that. ---- - src/nm-hal-manager.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c -index 581d79e..a49e9e6 100644 ---- a/src/nm-hal-manager.c -+++ b/src/nm-hal-manager.c -@@ -146,9 +146,14 @@ nm_get_device_driver_name (LibHalContext *ctx, const char *origdev_udi) - - /* s390 driver name is on the grandparent of the net device */ - subsystem = hal_get_subsystem (ctx, origdev_udi); -- if (subsystem && !strcmp (subsystem, "ibmebus")) { -- od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); -- origdev_udi = (const char *) od_parent; -+ if (subsystem) { -+ if (!strcmp (subsystem, "ibmebus")) { -+ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); -+ origdev_udi = (const char *) od_parent; -+ } else if (!strcmp (subsystem, "ssb")) { -+ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); -+ origdev_udi = (const char *) od_parent; -+ } - } - - drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); -@@ -1214,8 +1219,9 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) - libhal_free_string (subsys); - libhal_free_string (parent); - -- /* For non-USB devices, and ss a fallback, just use the originating device -- * of the tty; though this might result in more than one modem being detected by NM. -+ /* For non-USB devices, and as a fallback, just use the originating device -+ * of the tty; though this might result in more than one modem being -+ * detected by NM. - */ - if (!od) - od = hal_get_originating_device (priv->hal_ctx, udi, creator->category); --- -1.6.3.3 - diff --git a/debian/patches/series b/debian/patches/series index f718a5d7..6a732b2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ #03-F3507g.patch #20-manual_means_always_online.patch 04-struct_termios.patch -05-response-buffer-filled.patch -06-handle-new-ssb-bus-from-HAL-0.5.13.patch +05-handle-new-ssb-bus-from-HAL-0.5.13.patch -- cgit 1.3.0-6-gf8a5 From bb9609f8be78310f6e531997d12a3e6d0b8342d4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:41:55 +0000 Subject: Remove NetworkManager from Provides According to pere no init script in the archive is using it. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3224 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 13 ++++++------- debian/network-manager.init | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd83d420..b7c09c49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,17 +4,16 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low * debian/control - Add Build-Depends on libudev-dev. This allows to query udev for modem capabilities without having to spawn udevadm. - * debian/patches/06-handle-new-ssb-bus-from-HAL-0.5.13.patch + * debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch - HAL 0.5.13 added support for the ssb bus type which is internally used on most Broadcom ethernet and wifi chipsets. Update NM to detect the driver for the changed device layout. (Closes: #540613) - Patch pulled from upstream git. + Patch backported from upstream git. * debian/network-manager.init - - Update LSB header. Add "network-manager" to Provides as this name is - apparently used within the gdm init script and to be more in line with - the recommend practice to name the Provides like the init script. - Don't remove the "NetworkManager" Provides as other scripts might - already depend on that name. (Closes: #539753) + - Update LSB header. Provide the "network-manager" facility instead of + "NetworkManager" as gdm is depending on the former and to be more in + line with the recommended practice to name the Provides like the init + script itself. (Closes: #539753) [ Sjoerd Simons ] * debian/control diff --git a/debian/network-manager.init b/debian/network-manager.init index 058dbd24..0771e530 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,6 +1,6 @@ #! /bin/sh ### BEGIN INIT INFO -# Provides: NetworkManager network-manager +# Provides: network-manager # Required-Start: $remote_fs dbus hal # Required-Stop: $remote_fs dbus hal # Should-Start: $syslog -- cgit 1.3.0-6-gf8a5 From 6710bf12e2613df90e168bd367fd1b38c7eec5f1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:47:12 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3225 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7c09c49..c0d92c29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.1-2) UNRELEASED; urgency=low +network-manager (0.7.1-2) unstable; urgency=low [ Michael Biebl ] * debian/control @@ -19,7 +19,7 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low * debian/control - Add libnm-util-dev to the depends of libnm-glib-dev. (Closes: #539888) - -- Michael Biebl Sun, 16 Aug 2009 03:00:50 +0200 + -- Michael Biebl Mon, 17 Aug 2009 23:47:01 +0200 network-manager (0.7.1-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 1084f4b75741f672015198ac958f2caa4cb7fc99 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Nov 2009 23:34:57 +0000 Subject: New upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3272 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c0d92c29..64576848 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.7.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 + network-manager (0.7.1-2) unstable; urgency=low [ Michael Biebl ] -- cgit 1.3.0-6-gf8a5 From 2197e852526abc628a32322fad940897499664dd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Nov 2009 23:47:29 +0000 Subject: * debian/patches/02-dbus_access_network_manager.patch - Update group="netdev" policy based on the upstream changes for at_console. The updated D-Bus policy also fixes communication failures between pppd and NetworkManager. (Closes: #555624) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3273 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++ .../patches/02-dbus_access_network_manager.patch | 51 +++++++++++++++++++--- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64576848..146f71b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low * New upstream release. + * debian/patches/02-dbus_access_network_manager.patch + - Update group="netdev" policy based on the upstream changes for + at_console. The updated D-Bus policy also fixes communication failures + between pppd and NetworkManager. (Closes: #555624) -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index c96a0de1..8c90bfd7 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,16 +1,55 @@ -Index: network-manager-0.7.0.97/src/NetworkManager.conf +Index: NetworkManager-0.7.2/src/NetworkManager.conf =================================================================== ---- network-manager-0.7.0.97.orig/src/NetworkManager.conf 2009-02-17 16:45:44.000000000 +0100 -+++ network-manager-0.7.0.97/src/NetworkManager.conf 2009-02-22 03:20:14.000000000 +0100 -@@ -9,6 +9,12 @@ +--- NetworkManager-0.7.2.orig/src/NetworkManager.conf 2009-11-23 20:17:47.000000000 +0100 ++++ NetworkManager-0.7.2/src/NetworkManager.conf 2009-11-24 00:38:15.416687481 +0100 +@@ -9,6 +9,51 @@ + + + -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + -- cgit 1.3.0-6-gf8a5 From cfae2d2412095b104b158b90a6e5cdb3058b4b92 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Nov 2009 23:49:03 +0000 Subject: * Drop patches that have been merged upstream - debian/patches/04-struct_termios.patch - debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3274 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 + debian/patches/04-struct_termios.patch | 66 ------ .../05-handle-new-ssb-bus-from-HAL-0.5.13.patch | 253 --------------------- debian/patches/series | 2 - 4 files changed, 3 insertions(+), 321 deletions(-) delete mode 100644 debian/patches/04-struct_termios.patch delete mode 100644 debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch diff --git a/debian/changelog b/debian/changelog index 146f71b4..b4b2565b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low - Update group="netdev" policy based on the upstream changes for at_console. The updated D-Bus policy also fixes communication failures between pppd and NetworkManager. (Closes: #555624) + * Drop patches that have been merged upstream + - debian/patches/04-struct_termios.patch + - debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 diff --git a/debian/patches/04-struct_termios.patch b/debian/patches/04-struct_termios.patch deleted file mode 100644 index bddb0394..00000000 --- a/debian/patches/04-struct_termios.patch +++ /dev/null @@ -1,66 +0,0 @@ -# Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead -# of the obsolete struct termio ioctl interface. (Closes: #524161) -diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c -index 1cba1ca..afdc6a6 100644 ---- a/src/nm-serial-device.c -+++ b/src/nm-serial-device.c -@@ -21,13 +21,12 @@ - - #define _GNU_SOURCE /* for strcasestr() */ - --#include -+#include - #include - #include - #include - #include - #include --#include - #include - #include - #include -@@ -346,7 +345,7 @@ static gboolean - config_fd (NMSerialDevice *device, NMSettingSerial *setting) - { - NMSerialDevicePrivate *priv = NM_SERIAL_DEVICE_GET_PRIVATE (device); -- struct termio stbuf; -+ struct termios stbuf; - int speed; - int bits; - int parity; -@@ -357,7 +356,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting) - parity = parse_parity (nm_setting_serial_get_parity (setting)); - stopbits = parse_stopbits (nm_setting_serial_get_stopbits (setting)); - -- ioctl (priv->fd, TCGETA, &stbuf); -+ tcgetattr (priv->fd, &stbuf); - - stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR ); - stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET); -@@ -370,7 +369,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting) - stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB); - stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits); - -- if (ioctl (priv->fd, TCSETA, &stbuf) < 0) { -+ if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) { - nm_warning ("(%s) cannot control device (errno %d)", - nm_device_get_iface (NM_DEVICE (device)), errno); - return FALSE; -@@ -404,7 +403,7 @@ nm_serial_device_open (NMSerialDevice *device, - return FALSE; - } - -- if (ioctl (priv->fd, TCGETA, &priv->old_t) < 0) { -+ if (tcgetattr (priv->fd, &priv->old_t) < 0) { - nm_warning ("(%s) cannot control device (errno %d)", iface, errno); - close (priv->fd); - return FALSE; -@@ -447,7 +446,7 @@ nm_serial_device_close (NMSerialDevice *device) - priv->channel = NULL; - } - -- ioctl (priv->fd, TCSETA, &priv->old_t); -+ tcsetattr (priv->fd, TCSANOW, &priv->old_t); - close (priv->fd); - priv->fd = 0; - } diff --git a/debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch b/debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch deleted file mode 100644 index 25949e82..00000000 --- a/debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch +++ /dev/null @@ -1,253 +0,0 @@ -Squash the following commits into one patch - -d0cdbf3525b105de6dc0ca4ce02801bfe8fe2222 -4c36f7c0b607813753072acf1bec14414494948c -d185695d80b248354dd7a95fd896daa5c45085e5 - -modem: handle newer HAL versions where info.bus is no longer present - -hal: find driver for ibmebus-type 'ehea' devices - -core: handle new 'ssb' bus from HAL 0.5.13 (deb #540613) - -HAL added 'ssb' (Silicon Sonics Backplane, used internally on most -Broadcom ethernet and wifi chipsets) in 0.5.13, which changed the -device list layout and made NM unable to get the driver for the -wifi device. Fix that. ---- - src/nm-hal-manager.c | 133 +++++++++++++++++++++++++++++-------------------- - 1 files changed, 79 insertions(+), 54 deletions(-) - -diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c -index 647fe21..a01b4e2 100644 ---- a/src/nm-hal-manager.c -+++ b/src/nm-hal-manager.c -@@ -124,19 +124,45 @@ get_creator (NMHalManager *self, const char *udi) - /* Common helpers for built-in device creators */ - - static char * -+hal_get_subsystem (LibHalContext *ctx, const char *udi) -+{ -+ char *subsys; -+ -+ subsys = libhal_device_get_property_string (ctx, udi, "info.subsystem", NULL); -+ if (!subsys) { -+ /* info.bus is deprecated */ -+ subsys = libhal_device_get_property_string (ctx, udi, "info.bus", NULL); -+ } -+ return subsys; -+} -+ -+static char * - nm_get_device_driver_name (LibHalContext *ctx, const char *origdev_udi) - { -- char *driver_name = NULL; -+ char *driver_name = NULL, *subsystem, *drv, *od_parent = NULL; - -- if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) { -- char *drv; -+ if (!origdev_udi) -+ return NULL; - -- drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); -- if (drv) { -- driver_name = g_strdup (drv); -- libhal_free_string (drv); -+ /* s390 driver name is on the grandparent of the net device */ -+ subsystem = hal_get_subsystem (ctx, origdev_udi); -+ if (subsystem) { -+ if (!strcmp (subsystem, "ibmebus")) { -+ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); -+ origdev_udi = (const char *) od_parent; -+ } else if (!strcmp (subsystem, "ssb")) { -+ od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL); -+ origdev_udi = (const char *) od_parent; - } - } -+ -+ drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); -+ if (drv) -+ driver_name = g_strdup (drv); -+ -+ libhal_free_string (drv); -+ libhal_free_string (od_parent); -+ libhal_free_string (subsystem); - return driver_name; - } - -@@ -292,18 +318,34 @@ is_modem_device (NMHalManager *self, const char *udi) - } - - static char * -+hal_get_originating_device (LibHalContext *ctx, const char *udi, const char *prefix) -+{ -+ char *od_key = g_strdup_printf ("%s.originating_device", prefix); -+ char *pd_key = g_strdup_printf ("%s.physical_device", prefix); -+ char *od; -+ -+ od = libhal_device_get_property_string (ctx, udi, od_key, NULL); -+ if (!od) { -+ /* physical_device is deprecated */ -+ od = libhal_device_get_property_string (ctx, udi, pd_key, NULL); -+ } -+ -+ g_free (od_key); -+ g_free (pd_key); -+ return od; -+} -+ -+static char * - get_hso_netdev (LibHalContext *ctx, const char *udi) - { -- char *serial_od = NULL, *serial_od_parent = NULL, *netdev = NULL, *bus; -+ char *serial_od = NULL, *serial_od_parent = NULL, *netdev = NULL, *subsys; - char **netdevs = NULL; - int num, i; - - /* Get the serial interface's originating device UDI, used to find the - * originating device's netdev. - */ -- serial_od = libhal_device_get_property_string (ctx, udi, "serial.originating_device", NULL); -- if (!serial_od) -- serial_od = libhal_device_get_property_string (ctx, udi, "serial.physical_device", NULL); -+ serial_od = hal_get_originating_device (ctx, udi, "serial"); - if (!serial_od) - goto out; - -@@ -312,21 +354,19 @@ get_hso_netdev (LibHalContext *ctx, const char *udi) - goto out; - - /* Check to ensure we've got the actual "USB Device" */ -- bus = libhal_device_get_property_string (ctx, serial_od_parent, "info.bus", NULL); -- if (!bus || strcmp (bus, "usb_device")) { -- libhal_free_string (bus); -+ subsys = hal_get_subsystem (ctx, serial_od_parent); -+ if (!subsys || strcmp (subsys, "usb_device")) { -+ libhal_free_string (subsys); - goto out; - } -- libhal_free_string (bus); -+ libhal_free_string (subsys); - - /* Look for the originating device's netdev */ - netdevs = libhal_find_device_by_capability (ctx, "net", &num, NULL); - for (i = 0; netdevs && !netdev && (i < num); i++) { - char *net_od = NULL, *net_od_parent = NULL, *tmp; - -- net_od = libhal_device_get_property_string (ctx, netdevs[i], "net.originating_device", NULL); -- if (!net_od) -- net_od = libhal_device_get_property_string (ctx, netdevs[i], "net.physical_device", NULL); -+ net_od = hal_get_originating_device (ctx, netdevs[i], "net"); - if (!net_od) - goto next; - -@@ -335,12 +375,12 @@ get_hso_netdev (LibHalContext *ctx, const char *udi) - goto next; - - /* Check to ensure we've got the actual "USB Device" */ -- bus = libhal_device_get_property_string (ctx, net_od_parent, "info.bus", NULL); -- if (!bus || strcmp (bus, "usb_device")) { -- libhal_free_string (bus); -+ subsys = hal_get_subsystem (ctx, net_od_parent); -+ if (!subsys || strcmp (subsys, "usb_device")) { -+ libhal_free_string (subsys); - goto next; - } -- libhal_free_string (bus); -+ libhal_free_string (subsys); - - if (!strcmp (net_od_parent, serial_od_parent)) { - /* We found it */ -@@ -851,22 +891,16 @@ new_modem_device (const char *udi, - static char * - nm_get_modem_device_driver_name (LibHalContext *ctx, const char *udi) - { -- char *driver_name = NULL; -- char *origdev_udi; -+ char *driver_name = NULL, *origdev_udi, *driver; - -- origdev_udi = libhal_device_get_property_string (ctx, udi, "serial.originating_device", NULL); -- /* Older HAL uses "physical_device" */ -+ origdev_udi = hal_get_originating_device (ctx, udi, "serial"); - if (!origdev_udi) -- origdev_udi = libhal_device_get_property_string (ctx, udi, "serial.physical_device", NULL); -- -- if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) { -- char *drv; -+ return NULL; - -- drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); -- if (drv) { -- driver_name = g_strdup (drv); -- libhal_free_string (drv); -- } -+ driver = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL); -+ if (driver) { -+ driver_name = g_strdup (driver); -+ libhal_free_string (driver); - } - libhal_free_string (origdev_udi); - return driver_name; -@@ -1039,7 +1073,7 @@ static void - emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) - { - NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self); -- char *od = NULL, *tmp, *parent, *bus = NULL; -+ char *od = NULL, *tmp, *parent, *subsys = NULL; - - g_return_if_fail (self != NULL); - g_return_if_fail (udi != NULL); -@@ -1056,8 +1090,8 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) - */ - parent = libhal_device_get_property_string (priv->hal_ctx, udi, "info.parent", NULL); - if (parent) -- bus = libhal_device_get_property_string (priv->hal_ctx, parent, "info.bus", NULL); -- if (bus && !strcmp (bus, "usb")) { -+ subsys = hal_get_subsystem (priv->hal_ctx, parent); -+ if (subsys && !strcmp (subsys, "usb")) { - char *usb_intf_udi; - - usb_intf_udi = libhal_device_get_property_string (priv->hal_ctx, udi, "info.parent", NULL); -@@ -1066,7 +1100,7 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) - - /* Ensure the grandparent really is the "USB Device" */ - if (od) { -- tmp = libhal_device_get_property_string (priv->hal_ctx, od, "info.bus", NULL); -+ tmp = hal_get_subsystem (priv->hal_ctx, od); - if (!tmp || strcmp (tmp, "usb_device")) { - libhal_free_string (od); - od = NULL; -@@ -1077,24 +1111,15 @@ emit_udi_added (NMHalManager *self, const char *udi, DeviceCreator *creator) - libhal_free_string (usb_intf_udi); - } - } -- libhal_free_string (bus); -+ libhal_free_string (subsys); - libhal_free_string (parent); - -- /* For non-USB devices, and ss a fallback, just use the originating device -- * of the tty; though this might result in more than one modem being detected by NM. -+ /* For non-USB devices, and as a fallback, just use the originating device -+ * of the tty; though this might result in more than one modem being -+ * detected by NM. - */ -- if (!od) { -- tmp = g_strdup_printf ("%s.originating_device", creator->category); -- od = libhal_device_get_property_string (priv->hal_ctx, udi, tmp, NULL); -- g_free (tmp); -- } -- -- if (!od) { -- /* Older HAL uses 'physical_device' */ -- tmp = g_strdup_printf ("%s.physical_device", creator->category); -- od = libhal_device_get_property_string (priv->hal_ctx, udi, tmp, NULL); -- g_free (tmp); -- } -+ if (!od) -+ od = hal_get_originating_device (priv->hal_ctx, udi, creator->category); - - g_signal_emit (self, signals[UDI_ADDED], 0, - udi, --- -1.6.3.3 - diff --git a/debian/patches/series b/debian/patches/series index 6a732b2f..3ad97cdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 02-dbus_access_network_manager.patch #03-F3507g.patch #20-manual_means_always_online.patch -04-struct_termios.patch -05-handle-new-ssb-bus-from-HAL-0.5.13.patch -- cgit 1.3.0-6-gf8a5 From 5ea0bef8a3442e5b83971516247ed9d61d9dd176 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Nov 2009 23:58:48 +0000 Subject: * debian/libnm-util1.symbols - Add new symbol nm_setting_wireless_security_get_wep_key_type. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3275 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/libnm-util1.symbols | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index b4b2565b..9f14e9ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low * Drop patches that have been merged upstream - debian/patches/04-struct_termios.patch - debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch + * debian/libnm-util1.symbols + - Add new symbol nm_setting_wireless_security_get_wep_key_type. -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols index de4ad758..375db04f 100644 --- a/debian/libnm-util1.symbols +++ b/debian/libnm-util1.symbols @@ -262,6 +262,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_key_type@Base 0.7.2 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 -- cgit 1.3.0-6-gf8a5 From a763446d8a57fd04b25899a12ebcecc42cf4549b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Nov 2009 23:59:56 +0000 Subject: * debian/control - Bump Standards-Version to 3.8.3. No further changes. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3276 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9f14e9ea..b67935e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low - debian/patches/05-handle-new-ssb-bus-from-HAL-0.5.13.patch * debian/libnm-util1.symbols - Add new symbol nm_setting_wireless_security_get_wep_key_type. + * debian/control + - Bump Standards-Version to 3.8.3. No further changes. -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 diff --git a/debian/control b/debian/control index dff12ed6..fc068015 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 7), libgnutls-dev, uuid-dev, libudev-dev -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 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/ -- cgit 1.3.0-6-gf8a5 From f88ddee64361a04a8c58391f80fe50e0bd7e1a3f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 00:14:46 +0000 Subject: Fixes segfault of nm-system-settings for empty SSIDs. (Closes: #531605) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3277 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index b67935e1..f9f39efa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low * New upstream release. + - Fixes segfault of nm-system-settings for empty SSIDs. (Closes: #531605) * debian/patches/02-dbus_access_network_manager.patch - Update group="netdev" policy based on the upstream changes for at_console. The updated D-Bus policy also fixes communication failures -- cgit 1.3.0-6-gf8a5 From 0605e1364e2c417d549c066da51a589c2f0137b9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 00:21:22 +0000 Subject: * debian/network-manager.install - Make sure we install all udev rules files. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3278 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/network-manager.install | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9f39efa..8fb7f578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low - Add new symbol nm_setting_wireless_security_get_wep_key_type. * debian/control - Bump Standards-Version to 3.8.3. No further changes. + * debian/network-manager.install + - Make sure we install all udev rules files. -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 diff --git a/debian/network-manager.install b/debian/network-manager.install index 6340fdaf..9daceb24 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,4 +1,4 @@ -debian/tmp/usr/sbin/NetworkManager +debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/nm-system-settings debian/tmp/usr/bin/nm-tool debian/tmp/usr/lib/NetworkManager/nm-crash-logger @@ -19,5 +19,5 @@ 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/ -debian/tmp/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules +debian/tmp/lib/udev/rules.d/*.rules debian/tmp/lib/udev/nm-modem-probe -- cgit 1.3.0-6-gf8a5 From ca3311755909b5922ce1b50c867084f2fbdd8035 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 02:07:14 +0000 Subject: Fixes build failures with binutils-gold. (Closes: #555770) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3279 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 8fb7f578..5e77d3a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low * New upstream release. - Fixes segfault of nm-system-settings for empty SSIDs. (Closes: #531605) + - Fixes build failures with binutils-gold. (Closes: #555770) * debian/patches/02-dbus_access_network_manager.patch - Update group="netdev" policy based on the upstream changes for at_console. The updated D-Bus policy also fixes communication failures -- cgit 1.3.0-6-gf8a5 From 0b265d3872935190e2d36d606e5ac93dae81c725 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 18:25:40 +0000 Subject: Adds support for GTC (WPA2 Enterprise/PEAP). (Closes: #543454) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3280 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 5e77d3a4..feb11ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low * New upstream release. - Fixes segfault of nm-system-settings for empty SSIDs. (Closes: #531605) - Fixes build failures with binutils-gold. (Closes: #555770) + - Adds support for GTC (WPA2 Enterprise/PEAP). (Closes: #543454) * debian/patches/02-dbus_access_network_manager.patch - Update group="netdev" policy based on the upstream changes for at_console. The updated D-Bus policy also fixes communication failures -- cgit 1.3.0-6-gf8a5 From 2d3b33c7d6b8147ac643c4a21426f311ec22b090 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 23:04:23 +0000 Subject: trivial whitespace cleanup git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3292 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index fc068015..97b98c27 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,7 @@ Architecture: any Section: devel Depends: ${misc:Depends} Description: network management framework (development files) - this package provides header files that are needed to + this package provides header files that are needed to compile VPN Plugins for NetworkManager. Package: libnm-glib0 -- cgit 1.3.0-6-gf8a5 From 1ad150b02b1ac1ac15175159d9a295c2eb16d35b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 23:09:32 +0000 Subject: * debian/network-manager.init - Kill the D-Bus activated nm-system-settings daemon on "stop". Update README.Debian accordingly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3293 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/network-manager.README.Debian | 3 ++- debian/network-manager.init | 11 ++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index feb11ab7..ef78bb5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low - Bump Standards-Version to 3.8.3. No further changes. * debian/network-manager.install - Make sure we install all udev rules files. + * debian/network-manager.init + - Kill the D-Bus activated nm-system-settings daemon on "stop". Update + README.Debian accordingly. -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index 0f52b41e..90c3aa6d 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -37,7 +37,8 @@ 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. +"sudo killall nm-system-settings" or by running +"sudo service network-manager restart". Dial-up configuration diff --git a/debian/network-manager.init b/debian/network-manager.init index 0771e530..250971bb 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/network-manager -USER=root # Gracefully exit if the package has been removed. test -x $DAEMON || exit 0 @@ -37,8 +36,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # d_start() { start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS - + --oknodo --exec $DAEMON -- $DAEMON_OPTS } # @@ -46,8 +44,11 @@ d_start() { # d_stop() { start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON - + --oknodo --exec $DAEMON + + # kill the system settings daemon + start-stop-daemon --stop --retry 5 --quiet \ + --oknodo --exec /usr/sbin/nm-system-settings } -- cgit 1.3.0-6-gf8a5 From cf2c0238e8bf2e185d8f42df06bdcee298892e3f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2009 23:13:10 +0000 Subject: Release version 0.7.2-1 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3294 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef78bb5e..c4171326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.2-1) UNRELEASED; urgency=low +network-manager (0.7.2-1) unstable; urgency=low * New upstream release. - Fixes segfault of nm-system-settings for empty SSIDs. (Closes: #531605) @@ -21,7 +21,7 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low - Kill the D-Bus activated nm-system-settings daemon on "stop". Update README.Debian accordingly. - -- Michael Biebl Tue, 24 Nov 2009 00:34:08 +0100 + -- Michael Biebl Wed, 25 Nov 2009 00:12:29 +0100 network-manager (0.7.1-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From d5db28b9e1afe4dd3fcd47abdb0dfb24e03b1c02 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 Nov 2009 06:21:56 +0000 Subject: A few more smaller updates to README.Debian git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3303 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.README.Debian | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index 90c3aa6d..74221a38 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -1,14 +1,14 @@ NetworkManager consists of two parts: one is on the system level daemon that -manages the connections and gathers information about new networks. The other -is a systray applet that users can use to interact with the NetworkManager -daemon. +manages the connections and gathers information about new networks. The other +is a systray applet that users can use to interact with the NetworkManager +daemon. Security ~~~~~~~~ To allow users to connect to the NetworkManager daemon they have to be in the 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". +After that you have to reload D-Bus with the command "service dbus reload". Alternatively you can install the "consolekit" package which will grant access for all locally logged in users. @@ -35,10 +35,8 @@ 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" or by running -"sudo service network-manager restart". +/etc/network/interfaces you may want to tell NetworkManager about the changes +by running "service network-manager restart". Dial-up configuration -- cgit 1.3.0-6-gf8a5 From 7949d0626c4721d33f75f5302d1c824428f6a675 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 Nov 2009 06:25:56 +0000 Subject: * debian/rules - Disable -Werror (more-warnings) for now as it causes build failures on sparc. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3304 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/rules | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c4171326..5fa00f39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.7.2-2) UNRELEASED; urgency=low + + * debian/rules + - Disable -Werror (more-warnings) for now as it causes build failures on + sparc. + + -- Michael Biebl Fri, 27 Nov 2009 07:24:51 +0100 + network-manager (0.7.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index 8e81f9b1..03cb830b 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ --with-dhcp-client=/sbin/dhclient \ - --with-crypto=gnutls + --with-crypto=gnutls \ + --disable-more-warnings DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . -- cgit 1.3.0-6-gf8a5 From 13d5718cff04fc4a3bfc1caa5091b76135ad68c6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 27 Nov 2009 06:26:51 +0000 Subject: Release version 0.7.2-2 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3305 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5fa00f39..afabdfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -network-manager (0.7.2-2) UNRELEASED; urgency=low +network-manager (0.7.2-2) unstable; urgency=low * debian/rules - Disable -Werror (more-warnings) for now as it causes build failures on sparc. - -- Michael Biebl Fri, 27 Nov 2009 07:24:51 +0100 + -- Michael Biebl Fri, 27 Nov 2009 07:26:23 +0100 network-manager (0.7.2-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 8bdc9a2f1a99f9b047e8bbfb553f1ee2a7fb578a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 29 Nov 2009 09:20:08 +0000 Subject: * debian/rules - Don't ship empty TODO file. (Closes: #558471) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3319 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index afabdfaf..d4e7075b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.7.2-3) UNRELEASED; urgency=low + + * debian/rules + - Don't ship empty TODO file. (Closes: #558471) + + -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 + network-manager (0.7.2-2) unstable; urgency=low * debian/rules diff --git a/debian/rules b/debian/rules index 03cb830b..35f0ec9c 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ 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_INSTALL_DOCS_ALL := README AUTHORS DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" -- cgit 1.3.0-6-gf8a5 From b5d2e0cfd434c6ab6a387f7f0c9a917a40820116 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 17 Dec 2009 15:45:27 +0000 Subject: Git snapshot (0.7.997) of the upcoming 0.8 release. (Closes: #553320) * Git snapshot (0.7.997) of the upcoming 0.8 release. (Closes: #553320) - Much improved bluetooth support. - Support for IPv6. - Port to PolicyKit 1. (Closes: #549502) - Drop hal dependency, use udev directly. - Mobile broadband assistant. - Use ModemManager for modem handling. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3359 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4e7075b..1e982f3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -network-manager (0.7.2-3) UNRELEASED; urgency=low - +network-manager (0.7.997-1) UNRELEASED; urgency=low + + * Git snapshot (0.7.997) of the upcoming 0.8 release. (Closes: #553320) + - Much improved bluetooth support. + - Support for IPv6. + - Port to PolicyKit 1. (Closes: #549502) + - Drop hal dependency, use udev directly. + - Mobile broadband assistant. + - Use ModemManager for modem handling. * debian/rules - Don't ship empty TODO file. (Closes: #558471) -- cgit 1.3.0-6-gf8a5 From 16a000c6ebda211aa3f15e58cdd9ee3901c4756b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 17 Dec 2009 15:53:44 +0000 Subject: Update *.install, *.symbols and debian/control for library soname changes: libnm-glib0 → libnm-glib2 and libnm-glib-vpn0 → libnm-glib-vpn1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3360 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 + debian/control | 8 +-- debian/libnm-glib-vpn0.install | 1 - debian/libnm-glib-vpn0.symbols | 22 -------- debian/libnm-glib-vpn1.install | 1 + debian/libnm-glib-vpn1.symbols | 22 ++++++++ debian/libnm-glib0.install | 1 - debian/libnm-glib0.symbols | 117 ----------------------------------------- debian/libnm-glib2.install | 1 + debian/libnm-glib2.symbols | 117 +++++++++++++++++++++++++++++++++++++++++ 10 files changed, 147 insertions(+), 145 deletions(-) delete mode 100644 debian/libnm-glib-vpn0.install delete mode 100644 debian/libnm-glib-vpn0.symbols create mode 100644 debian/libnm-glib-vpn1.install create mode 100644 debian/libnm-glib-vpn1.symbols delete mode 100644 debian/libnm-glib0.install delete mode 100644 debian/libnm-glib0.symbols create mode 100644 debian/libnm-glib2.install create mode 100644 debian/libnm-glib2.symbols diff --git a/debian/changelog b/debian/changelog index 1e982f3c..d0195ce1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ network-manager (0.7.997-1) UNRELEASED; urgency=low - Use ModemManager for modem handling. * debian/rules - Don't ship empty TODO file. (Closes: #558471) + * Update *.install, *.symbols and debian/control for library soname changes: + libnm-glib0 → libnm-glib2 and libnm-glib-vpn0 → libnm-glib-vpn1. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/control b/debian/control index 97b98c27..52d57893 100644 --- a/debian/control +++ b/debian/control @@ -58,7 +58,7 @@ Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. -Package: libnm-glib0 +Package: libnm-glib2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -76,7 +76,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-glib2 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, 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 @@ -88,7 +88,7 @@ Description: network management framework (GLib interface) This package provides the interface that applications can use to query connection status via NetworkManager. -Package: libnm-glib-vpn0 +Package: libnm-glib-vpn1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -106,7 +106,7 @@ Description: network management framework (GLib VPN shared library) Package: libnm-glib-vpn-dev Section: libdevel Architecture: any -Depends: libnm-glib-vpn0 (= ${binary:Version}), ${misc:Depends}, libnm-glib-dev +Depends: libnm-glib-vpn1 (= ${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 diff --git a/debian/libnm-glib-vpn0.install b/debian/libnm-glib-vpn0.install deleted file mode 100644 index ff687642..00000000 --- a/debian/libnm-glib-vpn0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libnm_glib_vpn.so.* diff --git a/debian/libnm-glib-vpn0.symbols b/debian/libnm-glib-vpn0.symbols deleted file mode 100644 index 0fd8a139..00000000 --- a/debian/libnm-glib-vpn0.symbols +++ /dev/null @@ -1,22 +0,0 @@ -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-glib-vpn1.install b/debian/libnm-glib-vpn1.install new file mode 100644 index 00000000..ff687642 --- /dev/null +++ b/debian/libnm-glib-vpn1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm_glib_vpn.so.* diff --git a/debian/libnm-glib-vpn1.symbols b/debian/libnm-glib-vpn1.symbols new file mode 100644 index 00000000..0fd8a139 --- /dev/null +++ b/debian/libnm-glib-vpn1.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 deleted file mode 100644 index 58f7295e..00000000 --- a/debian/libnm-glib0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libnm_glib.so.* diff --git a/debian/libnm-glib0.symbols b/debian/libnm-glib0.symbols deleted file mode 100644 index 129fbab0..00000000 --- a/debian/libnm-glib0.symbols +++ /dev/null @@ -1,117 +0,0 @@ -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_get_wins_servers@Base 0.7.0.97 - 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-glib2.install b/debian/libnm-glib2.install new file mode 100644 index 00000000..58f7295e --- /dev/null +++ b/debian/libnm-glib2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm_glib.so.* diff --git a/debian/libnm-glib2.symbols b/debian/libnm-glib2.symbols new file mode 100644 index 00000000..129fbab0 --- /dev/null +++ b/debian/libnm-glib2.symbols @@ -0,0 +1,117 @@ +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_get_wins_servers@Base 0.7.0.97 + 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 -- cgit 1.3.0-6-gf8a5 From c758d6f85ad89c339ad1608883e65da86e2ad88e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 19 Jan 2010 07:47:52 +0000 Subject: Update to 0.7.998 / 0.8.0 RC2 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3381 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0195ce1..4c373457 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -network-manager (0.7.997-1) UNRELEASED; urgency=low +network-manager (0.7.998-1) UNRELEASED; urgency=low - * Git snapshot (0.7.997) of the upcoming 0.8 release. (Closes: #553320) + * RC2 snapshot (0.7.998) of the upcoming 0.8 release. (Closes: #553320) - Much improved bluetooth support. - Support for IPv6. - Port to PolicyKit 1. (Closes: #549502) -- cgit 1.3.0-6-gf8a5 From bd9c2f4c3db18cfb2273112d64b92f66b4c87596 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:18 +0000 Subject: Update symbols files. Reset versions for libnm-glib2 and libnm-glib-vpn1 due to their soname bump. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3382 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn1.symbols | 44 +++---- debian/libnm-glib2.symbols | 253 ++++++++++++++++++++++------------------- debian/libnm-util1.symbols | 95 ++++++++++++++++ 3 files changed, 253 insertions(+), 139 deletions(-) diff --git a/debian/libnm-glib-vpn1.symbols b/debian/libnm-glib-vpn1.symbols index 0fd8a139..b417718c 100644 --- a/debian/libnm-glib-vpn1.symbols +++ b/debian/libnm-glib-vpn1.symbols @@ -1,22 +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 +libnm-glib-vpn.so.1 libnm-glib-vpn1 #MINVER# + nm_vpn_plugin_disconnect@Base 0.7.997 + nm_vpn_plugin_error_get_type@Base 0.7.997 + nm_vpn_plugin_error_quark@Base 0.7.997 + nm_vpn_plugin_failure@Base 0.7.997 + nm_vpn_plugin_get_connection@Base 0.7.997 + nm_vpn_plugin_get_state@Base 0.7.997 + nm_vpn_plugin_get_type@Base 0.7.997 + nm_vpn_plugin_set_ip4_config@Base 0.7.997 + nm_vpn_plugin_set_login_banner@Base 0.7.997 + nm_vpn_plugin_set_state@Base 0.7.997 + nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.997 + nm_vpn_plugin_ui_interface_export@Base 0.7.997 + nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.997 + nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.997 + nm_vpn_plugin_ui_interface_get_type@Base 0.7.997 + nm_vpn_plugin_ui_interface_import@Base 0.7.997 + nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.997 + nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.997 + nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.997 + nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.997 + nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.997 diff --git a/debian/libnm-glib2.symbols b/debian/libnm-glib2.symbols index 129fbab0..cf743306 100644 --- a/debian/libnm-glib2.symbols +++ b/debian/libnm-glib2.symbols @@ -1,117 +1,136 @@ -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_get_wins_servers@Base 0.7.0.97 - 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 +libnm-glib.so.2 libnm-glib2 #MINVER# + libnm_glib_get_network_state@Base 0.7.997 + libnm_glib_init@Base 0.7.997 + libnm_glib_register_callback@Base 0.7.997 + libnm_glib_shutdown@Base 0.7.997 + libnm_glib_unregister_callback@Base 0.7.997 + nm_access_point_get_flags@Base 0.7.997 + nm_access_point_get_frequency@Base 0.7.997 + nm_access_point_get_hw_address@Base 0.7.997 + nm_access_point_get_max_bitrate@Base 0.7.997 + nm_access_point_get_mode@Base 0.7.997 + nm_access_point_get_rsn_flags@Base 0.7.997 + nm_access_point_get_ssid@Base 0.7.997 + nm_access_point_get_strength@Base 0.7.997 + nm_access_point_get_type@Base 0.7.997 + nm_access_point_get_wpa_flags@Base 0.7.997 + nm_access_point_new@Base 0.7.997 + nm_active_connection_get_connection@Base 0.7.997 + nm_active_connection_get_default@Base 0.7.997 + nm_active_connection_get_devices@Base 0.7.997 + nm_active_connection_get_scope@Base 0.7.997 + nm_active_connection_get_service_name@Base 0.7.997 + nm_active_connection_get_specific_object@Base 0.7.997 + nm_active_connection_get_state@Base 0.7.997 + nm_active_connection_get_type@Base 0.7.997 + nm_active_connection_new@Base 0.7.997 + nm_cdma_device_get_type@Base 0.7.997 + nm_cdma_device_new@Base 0.7.997 + nm_client_activate_connection@Base 0.7.997 + nm_client_deactivate_connection@Base 0.7.997 + nm_client_get_active_connections@Base 0.7.997 + nm_client_get_device_by_path@Base 0.7.997 + nm_client_get_devices@Base 0.7.997 + nm_client_get_manager_running@Base 0.7.997 + nm_client_get_state@Base 0.7.997 + nm_client_get_type@Base 0.7.997 + nm_client_new@Base 0.7.997 + nm_client_sleep@Base 0.7.997 + nm_client_wireless_get_enabled@Base 0.7.997 + nm_client_wireless_hardware_get_enabled@Base 0.7.997 + nm_client_wireless_set_enabled@Base 0.7.997 + nm_device_bt_get_capabilities@Base 0.7.997 + nm_device_bt_get_hw_address@Base 0.7.997 + nm_device_bt_get_name@Base 0.7.997 + nm_device_bt_get_type@Base 0.7.997 + nm_device_bt_new@Base 0.7.997 + nm_device_disconnect@Base 0.7.997 + nm_device_ethernet_get_carrier@Base 0.7.997 + nm_device_ethernet_get_hw_address@Base 0.7.997 + nm_device_ethernet_get_speed@Base 0.7.997 + nm_device_ethernet_get_type@Base 0.7.997 + nm_device_ethernet_new@Base 0.7.997 + nm_device_get_capabilities@Base 0.7.997 + nm_device_get_dhcp4_config@Base 0.7.997 + nm_device_get_driver@Base 0.7.997 + nm_device_get_iface@Base 0.7.997 + nm_device_get_ip4_config@Base 0.7.997 + nm_device_get_ip6_config@Base 0.7.997 + nm_device_get_managed@Base 0.7.997 + nm_device_get_product@Base 0.7.997 + nm_device_get_state@Base 0.7.997 + nm_device_get_type@Base 0.7.997 + nm_device_get_udi@Base 0.7.997 + nm_device_get_vendor@Base 0.7.997 + nm_device_new@Base 0.7.997 + nm_device_wifi_get_access_point_by_path@Base 0.7.997 + nm_device_wifi_get_access_points@Base 0.7.997 + nm_device_wifi_get_active_access_point@Base 0.7.997 + nm_device_wifi_get_bitrate@Base 0.7.997 + nm_device_wifi_get_capabilities@Base 0.7.997 + nm_device_wifi_get_hw_address@Base 0.7.997 + nm_device_wifi_get_mode@Base 0.7.997 + nm_device_wifi_get_type@Base 0.7.997 + nm_device_wifi_new@Base 0.7.997 + nm_dhcp4_config_get_one_option@Base 0.7.997 + nm_dhcp4_config_get_options@Base 0.7.997 + nm_dhcp4_config_get_type@Base 0.7.997 + nm_dhcp4_config_new@Base 0.7.997 + nm_exported_connection_get_type@Base 0.7.997 + nm_exported_connection_new@Base 0.7.997 + nm_gsm_device_get_type@Base 0.7.997 + nm_gsm_device_new@Base 0.7.997 + nm_ip4_config_get_addresses@Base 0.7.997 + nm_ip4_config_get_domains@Base 0.7.997 + nm_ip4_config_get_hostname@Base 0.7.997 + nm_ip4_config_get_nameservers@Base 0.7.997 + nm_ip4_config_get_routes@Base 0.7.997 + nm_ip4_config_get_type@Base 0.7.997 + nm_ip4_config_get_wins_servers@Base 0.7.997 + nm_ip4_config_new@Base 0.7.997 + nm_ip6_address_array_get_type@Base 0.7.997 + nm_ip6_address_object_array_get_type@Base 0.7.997 + nm_ip6_config_get_addresses@Base 0.7.997 + nm_ip6_config_get_domains@Base 0.7.997 + nm_ip6_config_get_nameservers@Base 0.7.997 + nm_ip6_config_get_routes@Base 0.7.997 + nm_ip6_config_get_type@Base 0.7.997 + nm_ip6_config_new@Base 0.7.997 + nm_ip6_route_object_array_get_type@Base 0.7.997 + nm_object_array_get_type@Base 0.7.997 + nm_object_get_connection@Base 0.7.997 + nm_object_get_path@Base 0.7.997 + nm_object_get_type@Base 0.7.997 + nm_remote_connection_get_type@Base 0.7.997 + nm_remote_connection_new@Base 0.7.997 + nm_remote_settings_get_type@Base 0.7.997 + nm_remote_settings_new@Base 0.7.997 + nm_remote_settings_system_get_type@Base 0.7.997 + nm_remote_settings_system_new@Base 0.7.997 + nm_serial_device_get_bytes_received@Base 0.7.997 + nm_serial_device_get_bytes_sent@Base 0.7.997 + nm_serial_device_get_type@Base 0.7.997 + nm_settings_connection_interface_delete@Base 0.7.997 + nm_settings_connection_interface_emit_updated@Base 0.7.997 + nm_settings_connection_interface_get_secrets@Base 0.7.997 + nm_settings_connection_interface_get_type@Base 0.7.997 + nm_settings_connection_interface_update@Base 0.7.997 + nm_settings_interface_add_connection@Base 0.7.997 + nm_settings_interface_error_quark@Base 0.7.997 + nm_settings_interface_get_connection_by_path@Base 0.7.997 + nm_settings_interface_get_type@Base 0.7.997 + nm_settings_interface_list_connections@Base 0.7.997 + nm_settings_service_export@Base 0.7.997 + nm_settings_service_export_connection@Base 0.7.997 + nm_settings_service_get_connection_by_path@Base 0.7.997 + nm_settings_service_get_type@Base 0.7.997 + nm_settings_system_interface_get_permissions@Base 0.7.997 + nm_settings_system_interface_get_type@Base 0.7.997 + nm_settings_system_interface_save_hostname@Base 0.7.997 + nm_ssid_get_type@Base 0.7.997 + nm_string_array_get_type@Base 0.7.997 + nm_uint_array_get_type@Base 0.7.997 + nm_vpn_connection_get_banner@Base 0.7.997 + nm_vpn_connection_get_type@Base 0.7.997 + nm_vpn_connection_get_vpn_state@Base 0.7.997 + nm_vpn_connection_new@Base 0.7.997 diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols index 375db04f..ae319252 100644 --- a/debian/libnm-util1.symbols +++ b/debian/libnm-util1.symbols @@ -49,14 +49,42 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_address_compare@Base 0.7.997 + nm_ip6_address_dup@Base 0.7.997 + nm_ip6_address_get_address@Base 0.7.997 + nm_ip6_address_get_prefix@Base 0.7.997 + nm_ip6_address_new@Base 0.7.997 + nm_ip6_address_ref@Base 0.7.997 + nm_ip6_address_set_address@Base 0.7.997 + nm_ip6_address_set_prefix@Base 0.7.997 + nm_ip6_address_unref@Base 0.7.997 + nm_ip6_route_compare@Base 0.7.997 + nm_ip6_route_dup@Base 0.7.997 + nm_ip6_route_get_dest@Base 0.7.997 + nm_ip6_route_get_metric@Base 0.7.997 + nm_ip6_route_get_next_hop@Base 0.7.997 + nm_ip6_route_get_prefix@Base 0.7.997 + nm_ip6_route_new@Base 0.7.997 + nm_ip6_route_ref@Base 0.7.997 + nm_ip6_route_set_dest@Base 0.7.997 + nm_ip6_route_set_metric@Base 0.7.997 + nm_ip6_route_set_next_hop@Base 0.7.997 + nm_ip6_route_set_prefix@Base 0.7.997 + nm_ip6_route_unref@Base 0.7.997 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_cert_blob@Base 0.7.997 + nm_setting_802_1x_get_ca_cert_path@Base 0.7.997 + nm_setting_802_1x_get_ca_cert_scheme@Base 0.7.997 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_client_cert_blob@Base 0.7.997 + nm_setting_802_1x_get_client_cert_path@Base 0.7.997 + nm_setting_802_1x_get_client_cert_scheme@Base 0.7.997 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 @@ -67,26 +95,52 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_cert_blob@Base 0.7.997 + nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.7.997 + nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.7.997 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_client_cert_blob@Base 0.7.997 + nm_setting_802_1x_get_phase2_client_cert_path@Base 0.7.997 + nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.7.997 nm_setting_802_1x_get_phase2_private_key@Base 0.7.0 + nm_setting_802_1x_get_phase2_private_key_blob@Base 0.7.997 + nm_setting_802_1x_get_phase2_private_key_format@Base 0.7.997 nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0 + nm_setting_802_1x_get_phase2_private_key_path@Base 0.7.997 + nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.7.997 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_blob@Base 0.7.997 + nm_setting_802_1x_get_private_key_format@Base 0.7.997 nm_setting_802_1x_get_private_key_password@Base 0.7.0 + nm_setting_802_1x_get_private_key_path@Base 0.7.997 + nm_setting_802_1x_get_private_key_scheme@Base 0.7.997 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@Base 0.7.997 nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_client_cert@Base 0.7.997 nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.997 nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_phase2_client_cert@Base 0.7.997 nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0 + nm_setting_802_1x_set_phase2_private_key@Base 0.7.997 nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0 + nm_setting_802_1x_set_private_key@Base 0.7.997 nm_setting_802_1x_set_private_key_from_file@Base 0.7.0 + nm_setting_bluetooth_error_get_type@Base 0.7.997 + nm_setting_bluetooth_error_quark@Base 0.7.997 + nm_setting_bluetooth_get_bdaddr@Base 0.7.997 + nm_setting_bluetooth_get_connection_type@Base 0.7.997 + nm_setting_bluetooth_get_type@Base 0.7.997 + nm_setting_bluetooth_new@Base 0.7.997 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 @@ -138,6 +192,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_dhcp_send_hostname@Base 0.7.997 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 @@ -155,8 +210,43 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_config_add_address@Base 0.7.997 + nm_setting_ip6_config_add_dns@Base 0.7.997 + nm_setting_ip6_config_add_dns_search@Base 0.7.997 + nm_setting_ip6_config_add_route@Base 0.7.997 + nm_setting_ip6_config_clear_addresses@Base 0.7.997 + nm_setting_ip6_config_clear_dns@Base 0.7.997 + nm_setting_ip6_config_clear_dns_searches@Base 0.7.997 + nm_setting_ip6_config_clear_routes@Base 0.7.997 + nm_setting_ip6_config_error_get_type@Base 0.7.997 + nm_setting_ip6_config_error_quark@Base 0.7.997 + nm_setting_ip6_config_get_address@Base 0.7.997 + nm_setting_ip6_config_get_dns@Base 0.7.997 + nm_setting_ip6_config_get_dns_search@Base 0.7.997 + nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.997 + nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.997 + nm_setting_ip6_config_get_method@Base 0.7.997 + nm_setting_ip6_config_get_never_default@Base 0.7.997 + nm_setting_ip6_config_get_num_addresses@Base 0.7.997 + nm_setting_ip6_config_get_num_dns@Base 0.7.997 + nm_setting_ip6_config_get_num_dns_searches@Base 0.7.997 + nm_setting_ip6_config_get_num_routes@Base 0.7.997 + nm_setting_ip6_config_get_route@Base 0.7.997 + nm_setting_ip6_config_get_type@Base 0.7.997 + nm_setting_ip6_config_new@Base 0.7.997 + nm_setting_ip6_config_remove_address@Base 0.7.997 + nm_setting_ip6_config_remove_dns@Base 0.7.997 + nm_setting_ip6_config_remove_dns_search@Base 0.7.997 + nm_setting_ip6_config_remove_route@Base 0.7.997 nm_setting_need_secrets@Base 0.7.0 nm_setting_new_from_hash@Base 0.7.0 + nm_setting_olpc_mesh_error_get_type@Base 0.7.997 + nm_setting_olpc_mesh_error_quark@Base 0.7.997 + nm_setting_olpc_mesh_get_channel@Base 0.7.997 + nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.7.997 + nm_setting_olpc_mesh_get_ssid@Base 0.7.997 + nm_setting_olpc_mesh_get_type@Base 0.7.997 + nm_setting_olpc_mesh_new@Base 0.7.997 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 @@ -279,7 +369,12 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_addresses_from_gvalue@Base 0.7.997 + nm_utils_ip6_addresses_to_gvalue@Base 0.7.997 + nm_utils_ip6_routes_from_gvalue@Base 0.7.997 + nm_utils_ip6_routes_to_gvalue@Base 0.7.997 nm_utils_is_empty_ssid@Base 0.7.0 + nm_utils_rsa_key_encrypt@Base 0.7.997 nm_utils_same_ssid@Base 0.7.0 nm_utils_security_valid@Base 0.7.0 nm_utils_slist_free@Base 0.7.0 -- cgit 1.3.0-6-gf8a5 From b688d9e002378345a74e201889267485650a416a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:23 +0000 Subject: Update install files for libnm-glib and libnm-glib-vpn Upstream has changed the library names from libnm_glib(_vpn) to libnm-glib(-vpn). git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3383 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-dev.install | 8 ++++---- debian/libnm-glib-vpn-dev.install | 6 +++--- debian/libnm-glib-vpn1.install | 2 +- debian/libnm-glib2.install | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index ddf3366a..ad791296 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -1,12 +1,12 @@ -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/lib/pkgconfig/libnm-glib.pc +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-ip*-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 diff --git a/debian/libnm-glib-vpn-dev.install b/debian/libnm-glib-vpn-dev.install index 22d858b9..edb5d659 100644 --- a/debian/libnm-glib-vpn-dev.install +++ b/debian/libnm-glib-vpn-dev.install @@ -1,4 +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/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-vpn1.install b/debian/libnm-glib-vpn1.install index ff687642..568a32ca 100644 --- a/debian/libnm-glib-vpn1.install +++ b/debian/libnm-glib-vpn1.install @@ -1 +1 @@ -debian/tmp/usr/lib/libnm_glib_vpn.so.* +debian/tmp/usr/lib/libnm-glib-vpn.so.* diff --git a/debian/libnm-glib2.install b/debian/libnm-glib2.install index 58f7295e..631c5150 100644 --- a/debian/libnm-glib2.install +++ b/debian/libnm-glib2.install @@ -1 +1 @@ -debian/tmp/usr/lib/libnm_glib.so.* +debian/tmp/usr/lib/libnm-glib.so.* -- cgit 1.3.0-6-gf8a5 From 4daee1faed80a66fcb59634d55a30d61f9792a2b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:27 +0000 Subject: Update network-manager.install * debian/network-manager.install - Remove nm-system-settings files. - Install PolicyKit files to new location. - Remove udev modem prober. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3384 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/network-manager.install | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c373457..0c25c20c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Don't ship empty TODO file. (Closes: #558471) * Update *.install, *.symbols and debian/control for library soname changes: libnm-glib0 → libnm-glib2 and libnm-glib-vpn0 → libnm-glib-vpn1. + * debian/network-manager.install + - Remove nm-system-settings files. + - Install PolicyKit files to new location. + - Remove udev modem prober. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/network-manager.install b/debian/network-manager.install index 9daceb24..5c8acab9 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,5 +1,4 @@ debian/tmp/usr/sbin/NetworkManager -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 @@ -10,14 +9,12 @@ 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//usr/share/polkit-1/ debian/tmp/etc/dbus-1/system.d/NetworkManager.conf 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/ debian/tmp/lib/udev/rules.d/*.rules -debian/tmp/lib/udev/nm-modem-probe -- cgit 1.3.0-6-gf8a5 From 11a02207fc25e2eefdb66b66c569c7eac5251cdc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:31 +0000 Subject: Add trailing / to URL so WebSVN behaves better. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3385 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 52d57893..c9570a67 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Build-Depends: debhelper (>= 7), uuid-dev, libudev-dev Standards-Version: 3.8.3 -Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager -Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager +Vcs-Svn: svn://svn.debian.org/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 -- cgit 1.3.0-6-gf8a5 From ca85ca4f231f37f9d52386eefeab95f2dbc81b6c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:33 +0000 Subject: cosmetic fixes to debian/rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3386 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 35f0ec9c..4a3a7992 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,13 @@ 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_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/ DEB_INSTALL_DOCS_ALL := README AUTHORS DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" -DEB_CONFIGURE_EXTRA_FLAGS += \ +DEB_CONFIGURE_EXTRA_FLAGS := \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ -- cgit 1.3.0-6-gf8a5 From 7e27973f74bedcba84cc2f3aad3036cb87461c37 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:36 +0000 Subject: Create compat symlinks for the '_' → '-' change. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * debian/libnm-glib-{vpn-}dev.links - The name of the pkg-config files has changed ('_' → '-'). Create compat symlinks so existing configure scripts keep working, allowing for a smoother transition to the new library names. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3387 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/libnm-glib-dev.links | 1 + debian/libnm-glib-vpn-dev.links | 1 + 3 files changed, 6 insertions(+) create mode 100644 debian/libnm-glib-dev.links create mode 100644 debian/libnm-glib-vpn-dev.links diff --git a/debian/changelog b/debian/changelog index 0c25c20c..22a7f9f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Remove nm-system-settings files. - Install PolicyKit files to new location. - Remove udev modem prober. + * debian/libnm-glib-{vpn-}dev.links + - The name of the pkg-config files has changed ('_' → '-'). Create compat + symlinks so existing configure scripts keep working, allowing for a + smoother transition to the new library names. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/libnm-glib-dev.links b/debian/libnm-glib-dev.links new file mode 100644 index 00000000..0b299825 --- /dev/null +++ b/debian/libnm-glib-dev.links @@ -0,0 +1 @@ +usr/lib/pkgconfig/libnm-glib.pc usr/lib/pkgconfig/libnm_glib.pc diff --git a/debian/libnm-glib-vpn-dev.links b/debian/libnm-glib-vpn-dev.links new file mode 100644 index 00000000..d74ba252 --- /dev/null +++ b/debian/libnm-glib-vpn-dev.links @@ -0,0 +1 @@ +usr/lib/pkgconfig/libnm-glib-vpn.pc usr/lib/pkgconfig/libnm_glib_vpn.pc -- cgit 1.3.0-6-gf8a5 From ae678b6c5e8668b365c5b771c4cfa05de9628a2e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:40 +0000 Subject: Update symbols files to 0.7.998, as 0.7.997 was never released git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3388 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib-vpn1.symbols | 42 +++---- debian/libnm-glib2.symbols | 270 ++++++++++++++++++++--------------------- debian/libnm-util1.symbols | 190 ++++++++++++++--------------- 3 files changed, 251 insertions(+), 251 deletions(-) diff --git a/debian/libnm-glib-vpn1.symbols b/debian/libnm-glib-vpn1.symbols index b417718c..e52f76df 100644 --- a/debian/libnm-glib-vpn1.symbols +++ b/debian/libnm-glib-vpn1.symbols @@ -1,22 +1,22 @@ libnm-glib-vpn.so.1 libnm-glib-vpn1 #MINVER# - nm_vpn_plugin_disconnect@Base 0.7.997 - nm_vpn_plugin_error_get_type@Base 0.7.997 - nm_vpn_plugin_error_quark@Base 0.7.997 - nm_vpn_plugin_failure@Base 0.7.997 - nm_vpn_plugin_get_connection@Base 0.7.997 - nm_vpn_plugin_get_state@Base 0.7.997 - nm_vpn_plugin_get_type@Base 0.7.997 - nm_vpn_plugin_set_ip4_config@Base 0.7.997 - nm_vpn_plugin_set_login_banner@Base 0.7.997 - nm_vpn_plugin_set_state@Base 0.7.997 - nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.997 - nm_vpn_plugin_ui_interface_export@Base 0.7.997 - nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.997 - nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.997 - nm_vpn_plugin_ui_interface_get_type@Base 0.7.997 - nm_vpn_plugin_ui_interface_import@Base 0.7.997 - nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.997 - nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.997 - nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.997 - nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.997 - nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.997 + nm_vpn_plugin_disconnect@Base 0.7.998 + nm_vpn_plugin_error_get_type@Base 0.7.998 + nm_vpn_plugin_error_quark@Base 0.7.998 + nm_vpn_plugin_failure@Base 0.7.998 + nm_vpn_plugin_get_connection@Base 0.7.998 + nm_vpn_plugin_get_state@Base 0.7.998 + nm_vpn_plugin_get_type@Base 0.7.998 + nm_vpn_plugin_set_ip4_config@Base 0.7.998 + nm_vpn_plugin_set_login_banner@Base 0.7.998 + nm_vpn_plugin_set_state@Base 0.7.998 + nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.998 + nm_vpn_plugin_ui_interface_export@Base 0.7.998 + nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.998 + nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.998 + nm_vpn_plugin_ui_interface_get_type@Base 0.7.998 + nm_vpn_plugin_ui_interface_import@Base 0.7.998 + nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.998 + nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.998 + nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.998 + nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.998 + nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.998 diff --git a/debian/libnm-glib2.symbols b/debian/libnm-glib2.symbols index cf743306..6c617437 100644 --- a/debian/libnm-glib2.symbols +++ b/debian/libnm-glib2.symbols @@ -1,136 +1,136 @@ libnm-glib.so.2 libnm-glib2 #MINVER# - libnm_glib_get_network_state@Base 0.7.997 - libnm_glib_init@Base 0.7.997 - libnm_glib_register_callback@Base 0.7.997 - libnm_glib_shutdown@Base 0.7.997 - libnm_glib_unregister_callback@Base 0.7.997 - nm_access_point_get_flags@Base 0.7.997 - nm_access_point_get_frequency@Base 0.7.997 - nm_access_point_get_hw_address@Base 0.7.997 - nm_access_point_get_max_bitrate@Base 0.7.997 - nm_access_point_get_mode@Base 0.7.997 - nm_access_point_get_rsn_flags@Base 0.7.997 - nm_access_point_get_ssid@Base 0.7.997 - nm_access_point_get_strength@Base 0.7.997 - nm_access_point_get_type@Base 0.7.997 - nm_access_point_get_wpa_flags@Base 0.7.997 - nm_access_point_new@Base 0.7.997 - nm_active_connection_get_connection@Base 0.7.997 - nm_active_connection_get_default@Base 0.7.997 - nm_active_connection_get_devices@Base 0.7.997 - nm_active_connection_get_scope@Base 0.7.997 - nm_active_connection_get_service_name@Base 0.7.997 - nm_active_connection_get_specific_object@Base 0.7.997 - nm_active_connection_get_state@Base 0.7.997 - nm_active_connection_get_type@Base 0.7.997 - nm_active_connection_new@Base 0.7.997 - nm_cdma_device_get_type@Base 0.7.997 - nm_cdma_device_new@Base 0.7.997 - nm_client_activate_connection@Base 0.7.997 - nm_client_deactivate_connection@Base 0.7.997 - nm_client_get_active_connections@Base 0.7.997 - nm_client_get_device_by_path@Base 0.7.997 - nm_client_get_devices@Base 0.7.997 - nm_client_get_manager_running@Base 0.7.997 - nm_client_get_state@Base 0.7.997 - nm_client_get_type@Base 0.7.997 - nm_client_new@Base 0.7.997 - nm_client_sleep@Base 0.7.997 - nm_client_wireless_get_enabled@Base 0.7.997 - nm_client_wireless_hardware_get_enabled@Base 0.7.997 - nm_client_wireless_set_enabled@Base 0.7.997 - nm_device_bt_get_capabilities@Base 0.7.997 - nm_device_bt_get_hw_address@Base 0.7.997 - nm_device_bt_get_name@Base 0.7.997 - nm_device_bt_get_type@Base 0.7.997 - nm_device_bt_new@Base 0.7.997 - nm_device_disconnect@Base 0.7.997 - nm_device_ethernet_get_carrier@Base 0.7.997 - nm_device_ethernet_get_hw_address@Base 0.7.997 - nm_device_ethernet_get_speed@Base 0.7.997 - nm_device_ethernet_get_type@Base 0.7.997 - nm_device_ethernet_new@Base 0.7.997 - nm_device_get_capabilities@Base 0.7.997 - nm_device_get_dhcp4_config@Base 0.7.997 - nm_device_get_driver@Base 0.7.997 - nm_device_get_iface@Base 0.7.997 - nm_device_get_ip4_config@Base 0.7.997 - nm_device_get_ip6_config@Base 0.7.997 - nm_device_get_managed@Base 0.7.997 - nm_device_get_product@Base 0.7.997 - nm_device_get_state@Base 0.7.997 - nm_device_get_type@Base 0.7.997 - nm_device_get_udi@Base 0.7.997 - nm_device_get_vendor@Base 0.7.997 - nm_device_new@Base 0.7.997 - nm_device_wifi_get_access_point_by_path@Base 0.7.997 - nm_device_wifi_get_access_points@Base 0.7.997 - nm_device_wifi_get_active_access_point@Base 0.7.997 - nm_device_wifi_get_bitrate@Base 0.7.997 - nm_device_wifi_get_capabilities@Base 0.7.997 - nm_device_wifi_get_hw_address@Base 0.7.997 - nm_device_wifi_get_mode@Base 0.7.997 - nm_device_wifi_get_type@Base 0.7.997 - nm_device_wifi_new@Base 0.7.997 - nm_dhcp4_config_get_one_option@Base 0.7.997 - nm_dhcp4_config_get_options@Base 0.7.997 - nm_dhcp4_config_get_type@Base 0.7.997 - nm_dhcp4_config_new@Base 0.7.997 - nm_exported_connection_get_type@Base 0.7.997 - nm_exported_connection_new@Base 0.7.997 - nm_gsm_device_get_type@Base 0.7.997 - nm_gsm_device_new@Base 0.7.997 - nm_ip4_config_get_addresses@Base 0.7.997 - nm_ip4_config_get_domains@Base 0.7.997 - nm_ip4_config_get_hostname@Base 0.7.997 - nm_ip4_config_get_nameservers@Base 0.7.997 - nm_ip4_config_get_routes@Base 0.7.997 - nm_ip4_config_get_type@Base 0.7.997 - nm_ip4_config_get_wins_servers@Base 0.7.997 - nm_ip4_config_new@Base 0.7.997 - nm_ip6_address_array_get_type@Base 0.7.997 - nm_ip6_address_object_array_get_type@Base 0.7.997 - nm_ip6_config_get_addresses@Base 0.7.997 - nm_ip6_config_get_domains@Base 0.7.997 - nm_ip6_config_get_nameservers@Base 0.7.997 - nm_ip6_config_get_routes@Base 0.7.997 - nm_ip6_config_get_type@Base 0.7.997 - nm_ip6_config_new@Base 0.7.997 - nm_ip6_route_object_array_get_type@Base 0.7.997 - nm_object_array_get_type@Base 0.7.997 - nm_object_get_connection@Base 0.7.997 - nm_object_get_path@Base 0.7.997 - nm_object_get_type@Base 0.7.997 - nm_remote_connection_get_type@Base 0.7.997 - nm_remote_connection_new@Base 0.7.997 - nm_remote_settings_get_type@Base 0.7.997 - nm_remote_settings_new@Base 0.7.997 - nm_remote_settings_system_get_type@Base 0.7.997 - nm_remote_settings_system_new@Base 0.7.997 - nm_serial_device_get_bytes_received@Base 0.7.997 - nm_serial_device_get_bytes_sent@Base 0.7.997 - nm_serial_device_get_type@Base 0.7.997 - nm_settings_connection_interface_delete@Base 0.7.997 - nm_settings_connection_interface_emit_updated@Base 0.7.997 - nm_settings_connection_interface_get_secrets@Base 0.7.997 - nm_settings_connection_interface_get_type@Base 0.7.997 - nm_settings_connection_interface_update@Base 0.7.997 - nm_settings_interface_add_connection@Base 0.7.997 - nm_settings_interface_error_quark@Base 0.7.997 - nm_settings_interface_get_connection_by_path@Base 0.7.997 - nm_settings_interface_get_type@Base 0.7.997 - nm_settings_interface_list_connections@Base 0.7.997 - nm_settings_service_export@Base 0.7.997 - nm_settings_service_export_connection@Base 0.7.997 - nm_settings_service_get_connection_by_path@Base 0.7.997 - nm_settings_service_get_type@Base 0.7.997 - nm_settings_system_interface_get_permissions@Base 0.7.997 - nm_settings_system_interface_get_type@Base 0.7.997 - nm_settings_system_interface_save_hostname@Base 0.7.997 - nm_ssid_get_type@Base 0.7.997 - nm_string_array_get_type@Base 0.7.997 - nm_uint_array_get_type@Base 0.7.997 - nm_vpn_connection_get_banner@Base 0.7.997 - nm_vpn_connection_get_type@Base 0.7.997 - nm_vpn_connection_get_vpn_state@Base 0.7.997 - nm_vpn_connection_new@Base 0.7.997 + libnm_glib_get_network_state@Base 0.7.998 + libnm_glib_init@Base 0.7.998 + libnm_glib_register_callback@Base 0.7.998 + libnm_glib_shutdown@Base 0.7.998 + libnm_glib_unregister_callback@Base 0.7.998 + nm_access_point_get_flags@Base 0.7.998 + nm_access_point_get_frequency@Base 0.7.998 + nm_access_point_get_hw_address@Base 0.7.998 + nm_access_point_get_max_bitrate@Base 0.7.998 + nm_access_point_get_mode@Base 0.7.998 + nm_access_point_get_rsn_flags@Base 0.7.998 + nm_access_point_get_ssid@Base 0.7.998 + nm_access_point_get_strength@Base 0.7.998 + nm_access_point_get_type@Base 0.7.998 + nm_access_point_get_wpa_flags@Base 0.7.998 + nm_access_point_new@Base 0.7.998 + nm_active_connection_get_connection@Base 0.7.998 + nm_active_connection_get_default@Base 0.7.998 + nm_active_connection_get_devices@Base 0.7.998 + nm_active_connection_get_scope@Base 0.7.998 + nm_active_connection_get_service_name@Base 0.7.998 + nm_active_connection_get_specific_object@Base 0.7.998 + nm_active_connection_get_state@Base 0.7.998 + nm_active_connection_get_type@Base 0.7.998 + nm_active_connection_new@Base 0.7.998 + nm_cdma_device_get_type@Base 0.7.998 + nm_cdma_device_new@Base 0.7.998 + nm_client_activate_connection@Base 0.7.998 + nm_client_deactivate_connection@Base 0.7.998 + nm_client_get_active_connections@Base 0.7.998 + nm_client_get_device_by_path@Base 0.7.998 + nm_client_get_devices@Base 0.7.998 + nm_client_get_manager_running@Base 0.7.998 + nm_client_get_state@Base 0.7.998 + nm_client_get_type@Base 0.7.998 + nm_client_new@Base 0.7.998 + nm_client_sleep@Base 0.7.998 + nm_client_wireless_get_enabled@Base 0.7.998 + nm_client_wireless_hardware_get_enabled@Base 0.7.998 + nm_client_wireless_set_enabled@Base 0.7.998 + nm_device_bt_get_capabilities@Base 0.7.998 + nm_device_bt_get_hw_address@Base 0.7.998 + nm_device_bt_get_name@Base 0.7.998 + nm_device_bt_get_type@Base 0.7.998 + nm_device_bt_new@Base 0.7.998 + nm_device_disconnect@Base 0.7.998 + nm_device_ethernet_get_carrier@Base 0.7.998 + nm_device_ethernet_get_hw_address@Base 0.7.998 + nm_device_ethernet_get_speed@Base 0.7.998 + nm_device_ethernet_get_type@Base 0.7.998 + nm_device_ethernet_new@Base 0.7.998 + nm_device_get_capabilities@Base 0.7.998 + nm_device_get_dhcp4_config@Base 0.7.998 + nm_device_get_driver@Base 0.7.998 + nm_device_get_iface@Base 0.7.998 + nm_device_get_ip4_config@Base 0.7.998 + nm_device_get_ip6_config@Base 0.7.998 + nm_device_get_managed@Base 0.7.998 + nm_device_get_product@Base 0.7.998 + nm_device_get_state@Base 0.7.998 + nm_device_get_type@Base 0.7.998 + nm_device_get_udi@Base 0.7.998 + nm_device_get_vendor@Base 0.7.998 + nm_device_new@Base 0.7.998 + nm_device_wifi_get_access_point_by_path@Base 0.7.998 + nm_device_wifi_get_access_points@Base 0.7.998 + nm_device_wifi_get_active_access_point@Base 0.7.998 + nm_device_wifi_get_bitrate@Base 0.7.998 + nm_device_wifi_get_capabilities@Base 0.7.998 + nm_device_wifi_get_hw_address@Base 0.7.998 + nm_device_wifi_get_mode@Base 0.7.998 + nm_device_wifi_get_type@Base 0.7.998 + nm_device_wifi_new@Base 0.7.998 + nm_dhcp4_config_get_one_option@Base 0.7.998 + nm_dhcp4_config_get_options@Base 0.7.998 + nm_dhcp4_config_get_type@Base 0.7.998 + nm_dhcp4_config_new@Base 0.7.998 + nm_exported_connection_get_type@Base 0.7.998 + nm_exported_connection_new@Base 0.7.998 + nm_gsm_device_get_type@Base 0.7.998 + nm_gsm_device_new@Base 0.7.998 + nm_ip4_config_get_addresses@Base 0.7.998 + nm_ip4_config_get_domains@Base 0.7.998 + nm_ip4_config_get_hostname@Base 0.7.998 + nm_ip4_config_get_nameservers@Base 0.7.998 + nm_ip4_config_get_routes@Base 0.7.998 + nm_ip4_config_get_type@Base 0.7.998 + nm_ip4_config_get_wins_servers@Base 0.7.998 + nm_ip4_config_new@Base 0.7.998 + nm_ip6_address_array_get_type@Base 0.7.998 + nm_ip6_address_object_array_get_type@Base 0.7.998 + nm_ip6_config_get_addresses@Base 0.7.998 + nm_ip6_config_get_domains@Base 0.7.998 + nm_ip6_config_get_nameservers@Base 0.7.998 + nm_ip6_config_get_routes@Base 0.7.998 + nm_ip6_config_get_type@Base 0.7.998 + nm_ip6_config_new@Base 0.7.998 + nm_ip6_route_object_array_get_type@Base 0.7.998 + nm_object_array_get_type@Base 0.7.998 + nm_object_get_connection@Base 0.7.998 + nm_object_get_path@Base 0.7.998 + nm_object_get_type@Base 0.7.998 + nm_remote_connection_get_type@Base 0.7.998 + nm_remote_connection_new@Base 0.7.998 + nm_remote_settings_get_type@Base 0.7.998 + nm_remote_settings_new@Base 0.7.998 + nm_remote_settings_system_get_type@Base 0.7.998 + nm_remote_settings_system_new@Base 0.7.998 + nm_serial_device_get_bytes_received@Base 0.7.998 + nm_serial_device_get_bytes_sent@Base 0.7.998 + nm_serial_device_get_type@Base 0.7.998 + nm_settings_connection_interface_delete@Base 0.7.998 + nm_settings_connection_interface_emit_updated@Base 0.7.998 + nm_settings_connection_interface_get_secrets@Base 0.7.998 + nm_settings_connection_interface_get_type@Base 0.7.998 + nm_settings_connection_interface_update@Base 0.7.998 + nm_settings_interface_add_connection@Base 0.7.998 + nm_settings_interface_error_quark@Base 0.7.998 + nm_settings_interface_get_connection_by_path@Base 0.7.998 + nm_settings_interface_get_type@Base 0.7.998 + nm_settings_interface_list_connections@Base 0.7.998 + nm_settings_service_export@Base 0.7.998 + nm_settings_service_export_connection@Base 0.7.998 + nm_settings_service_get_connection_by_path@Base 0.7.998 + nm_settings_service_get_type@Base 0.7.998 + nm_settings_system_interface_get_permissions@Base 0.7.998 + nm_settings_system_interface_get_type@Base 0.7.998 + nm_settings_system_interface_save_hostname@Base 0.7.998 + nm_ssid_get_type@Base 0.7.998 + nm_string_array_get_type@Base 0.7.998 + nm_uint_array_get_type@Base 0.7.998 + nm_vpn_connection_get_banner@Base 0.7.998 + nm_vpn_connection_get_type@Base 0.7.998 + nm_vpn_connection_get_vpn_state@Base 0.7.998 + nm_vpn_connection_new@Base 0.7.998 diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols index ae319252..9de83d74 100644 --- a/debian/libnm-util1.symbols +++ b/debian/libnm-util1.symbols @@ -49,42 +49,42 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_address_compare@Base 0.7.997 - nm_ip6_address_dup@Base 0.7.997 - nm_ip6_address_get_address@Base 0.7.997 - nm_ip6_address_get_prefix@Base 0.7.997 - nm_ip6_address_new@Base 0.7.997 - nm_ip6_address_ref@Base 0.7.997 - nm_ip6_address_set_address@Base 0.7.997 - nm_ip6_address_set_prefix@Base 0.7.997 - nm_ip6_address_unref@Base 0.7.997 - nm_ip6_route_compare@Base 0.7.997 - nm_ip6_route_dup@Base 0.7.997 - nm_ip6_route_get_dest@Base 0.7.997 - nm_ip6_route_get_metric@Base 0.7.997 - nm_ip6_route_get_next_hop@Base 0.7.997 - nm_ip6_route_get_prefix@Base 0.7.997 - nm_ip6_route_new@Base 0.7.997 - nm_ip6_route_ref@Base 0.7.997 - nm_ip6_route_set_dest@Base 0.7.997 - nm_ip6_route_set_metric@Base 0.7.997 - nm_ip6_route_set_next_hop@Base 0.7.997 - nm_ip6_route_set_prefix@Base 0.7.997 - nm_ip6_route_unref@Base 0.7.997 + nm_ip6_address_compare@Base 0.7.998 + nm_ip6_address_dup@Base 0.7.998 + nm_ip6_address_get_address@Base 0.7.998 + nm_ip6_address_get_prefix@Base 0.7.998 + nm_ip6_address_new@Base 0.7.998 + nm_ip6_address_ref@Base 0.7.998 + nm_ip6_address_set_address@Base 0.7.998 + nm_ip6_address_set_prefix@Base 0.7.998 + nm_ip6_address_unref@Base 0.7.998 + nm_ip6_route_compare@Base 0.7.998 + nm_ip6_route_dup@Base 0.7.998 + nm_ip6_route_get_dest@Base 0.7.998 + nm_ip6_route_get_metric@Base 0.7.998 + nm_ip6_route_get_next_hop@Base 0.7.998 + nm_ip6_route_get_prefix@Base 0.7.998 + nm_ip6_route_new@Base 0.7.998 + nm_ip6_route_ref@Base 0.7.998 + nm_ip6_route_set_dest@Base 0.7.998 + nm_ip6_route_set_metric@Base 0.7.998 + nm_ip6_route_set_next_hop@Base 0.7.998 + nm_ip6_route_set_prefix@Base 0.7.998 + nm_ip6_route_unref@Base 0.7.998 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_cert_blob@Base 0.7.997 - nm_setting_802_1x_get_ca_cert_path@Base 0.7.997 - nm_setting_802_1x_get_ca_cert_scheme@Base 0.7.997 + nm_setting_802_1x_get_ca_cert_blob@Base 0.7.998 + nm_setting_802_1x_get_ca_cert_path@Base 0.7.998 + nm_setting_802_1x_get_ca_cert_scheme@Base 0.7.998 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_client_cert_blob@Base 0.7.997 - nm_setting_802_1x_get_client_cert_path@Base 0.7.997 - nm_setting_802_1x_get_client_cert_scheme@Base 0.7.997 + nm_setting_802_1x_get_client_cert_blob@Base 0.7.998 + nm_setting_802_1x_get_client_cert_path@Base 0.7.998 + nm_setting_802_1x_get_client_cert_scheme@Base 0.7.998 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 @@ -95,52 +95,52 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_cert_blob@Base 0.7.997 - nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.7.997 - nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.7.997 + nm_setting_802_1x_get_phase2_ca_cert_blob@Base 0.7.998 + nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.7.998 + nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.7.998 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_client_cert_blob@Base 0.7.997 - nm_setting_802_1x_get_phase2_client_cert_path@Base 0.7.997 - nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.7.997 + nm_setting_802_1x_get_phase2_client_cert_blob@Base 0.7.998 + nm_setting_802_1x_get_phase2_client_cert_path@Base 0.7.998 + nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.7.998 nm_setting_802_1x_get_phase2_private_key@Base 0.7.0 - nm_setting_802_1x_get_phase2_private_key_blob@Base 0.7.997 - nm_setting_802_1x_get_phase2_private_key_format@Base 0.7.997 + nm_setting_802_1x_get_phase2_private_key_blob@Base 0.7.998 + nm_setting_802_1x_get_phase2_private_key_format@Base 0.7.998 nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0 - nm_setting_802_1x_get_phase2_private_key_path@Base 0.7.997 - nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.7.997 + nm_setting_802_1x_get_phase2_private_key_path@Base 0.7.998 + nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.7.998 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_blob@Base 0.7.997 - nm_setting_802_1x_get_private_key_format@Base 0.7.997 + nm_setting_802_1x_get_private_key_blob@Base 0.7.998 + nm_setting_802_1x_get_private_key_format@Base 0.7.998 nm_setting_802_1x_get_private_key_password@Base 0.7.0 - nm_setting_802_1x_get_private_key_path@Base 0.7.997 - nm_setting_802_1x_get_private_key_scheme@Base 0.7.997 + nm_setting_802_1x_get_private_key_path@Base 0.7.998 + nm_setting_802_1x_get_private_key_scheme@Base 0.7.998 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@Base 0.7.997 + nm_setting_802_1x_set_ca_cert@Base 0.7.998 nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_client_cert@Base 0.7.997 + nm_setting_802_1x_set_client_cert@Base 0.7.998 nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.997 + nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.998 nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_phase2_client_cert@Base 0.7.997 + nm_setting_802_1x_set_phase2_client_cert@Base 0.7.998 nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_phase2_private_key@Base 0.7.997 + nm_setting_802_1x_set_phase2_private_key@Base 0.7.998 nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0 - nm_setting_802_1x_set_private_key@Base 0.7.997 + nm_setting_802_1x_set_private_key@Base 0.7.998 nm_setting_802_1x_set_private_key_from_file@Base 0.7.0 - nm_setting_bluetooth_error_get_type@Base 0.7.997 - nm_setting_bluetooth_error_quark@Base 0.7.997 - nm_setting_bluetooth_get_bdaddr@Base 0.7.997 - nm_setting_bluetooth_get_connection_type@Base 0.7.997 - nm_setting_bluetooth_get_type@Base 0.7.997 - nm_setting_bluetooth_new@Base 0.7.997 + nm_setting_bluetooth_error_get_type@Base 0.7.998 + nm_setting_bluetooth_error_quark@Base 0.7.998 + nm_setting_bluetooth_get_bdaddr@Base 0.7.998 + nm_setting_bluetooth_get_connection_type@Base 0.7.998 + nm_setting_bluetooth_get_type@Base 0.7.998 + nm_setting_bluetooth_new@Base 0.7.998 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 @@ -192,7 +192,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_dhcp_send_hostname@Base 0.7.997 + nm_setting_ip4_config_get_dhcp_send_hostname@Base 0.7.998 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 @@ -210,43 +210,43 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_config_add_address@Base 0.7.997 - nm_setting_ip6_config_add_dns@Base 0.7.997 - nm_setting_ip6_config_add_dns_search@Base 0.7.997 - nm_setting_ip6_config_add_route@Base 0.7.997 - nm_setting_ip6_config_clear_addresses@Base 0.7.997 - nm_setting_ip6_config_clear_dns@Base 0.7.997 - nm_setting_ip6_config_clear_dns_searches@Base 0.7.997 - nm_setting_ip6_config_clear_routes@Base 0.7.997 - nm_setting_ip6_config_error_get_type@Base 0.7.997 - nm_setting_ip6_config_error_quark@Base 0.7.997 - nm_setting_ip6_config_get_address@Base 0.7.997 - nm_setting_ip6_config_get_dns@Base 0.7.997 - nm_setting_ip6_config_get_dns_search@Base 0.7.997 - nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.997 - nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.997 - nm_setting_ip6_config_get_method@Base 0.7.997 - nm_setting_ip6_config_get_never_default@Base 0.7.997 - nm_setting_ip6_config_get_num_addresses@Base 0.7.997 - nm_setting_ip6_config_get_num_dns@Base 0.7.997 - nm_setting_ip6_config_get_num_dns_searches@Base 0.7.997 - nm_setting_ip6_config_get_num_routes@Base 0.7.997 - nm_setting_ip6_config_get_route@Base 0.7.997 - nm_setting_ip6_config_get_type@Base 0.7.997 - nm_setting_ip6_config_new@Base 0.7.997 - nm_setting_ip6_config_remove_address@Base 0.7.997 - nm_setting_ip6_config_remove_dns@Base 0.7.997 - nm_setting_ip6_config_remove_dns_search@Base 0.7.997 - nm_setting_ip6_config_remove_route@Base 0.7.997 + nm_setting_ip6_config_add_address@Base 0.7.998 + nm_setting_ip6_config_add_dns@Base 0.7.998 + nm_setting_ip6_config_add_dns_search@Base 0.7.998 + nm_setting_ip6_config_add_route@Base 0.7.998 + nm_setting_ip6_config_clear_addresses@Base 0.7.998 + nm_setting_ip6_config_clear_dns@Base 0.7.998 + nm_setting_ip6_config_clear_dns_searches@Base 0.7.998 + nm_setting_ip6_config_clear_routes@Base 0.7.998 + nm_setting_ip6_config_error_get_type@Base 0.7.998 + nm_setting_ip6_config_error_quark@Base 0.7.998 + nm_setting_ip6_config_get_address@Base 0.7.998 + nm_setting_ip6_config_get_dns@Base 0.7.998 + nm_setting_ip6_config_get_dns_search@Base 0.7.998 + nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.998 + nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.998 + nm_setting_ip6_config_get_method@Base 0.7.998 + nm_setting_ip6_config_get_never_default@Base 0.7.998 + nm_setting_ip6_config_get_num_addresses@Base 0.7.998 + nm_setting_ip6_config_get_num_dns@Base 0.7.998 + nm_setting_ip6_config_get_num_dns_searches@Base 0.7.998 + nm_setting_ip6_config_get_num_routes@Base 0.7.998 + nm_setting_ip6_config_get_route@Base 0.7.998 + nm_setting_ip6_config_get_type@Base 0.7.998 + nm_setting_ip6_config_new@Base 0.7.998 + nm_setting_ip6_config_remove_address@Base 0.7.998 + nm_setting_ip6_config_remove_dns@Base 0.7.998 + nm_setting_ip6_config_remove_dns_search@Base 0.7.998 + nm_setting_ip6_config_remove_route@Base 0.7.998 nm_setting_need_secrets@Base 0.7.0 nm_setting_new_from_hash@Base 0.7.0 - nm_setting_olpc_mesh_error_get_type@Base 0.7.997 - nm_setting_olpc_mesh_error_quark@Base 0.7.997 - nm_setting_olpc_mesh_get_channel@Base 0.7.997 - nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.7.997 - nm_setting_olpc_mesh_get_ssid@Base 0.7.997 - nm_setting_olpc_mesh_get_type@Base 0.7.997 - nm_setting_olpc_mesh_new@Base 0.7.997 + nm_setting_olpc_mesh_error_get_type@Base 0.7.998 + nm_setting_olpc_mesh_error_quark@Base 0.7.998 + nm_setting_olpc_mesh_get_channel@Base 0.7.998 + nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.7.998 + nm_setting_olpc_mesh_get_ssid@Base 0.7.998 + nm_setting_olpc_mesh_get_type@Base 0.7.998 + nm_setting_olpc_mesh_new@Base 0.7.998 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 @@ -369,12 +369,12 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_addresses_from_gvalue@Base 0.7.997 - nm_utils_ip6_addresses_to_gvalue@Base 0.7.997 - nm_utils_ip6_routes_from_gvalue@Base 0.7.997 - nm_utils_ip6_routes_to_gvalue@Base 0.7.997 + nm_utils_ip6_addresses_from_gvalue@Base 0.7.998 + nm_utils_ip6_addresses_to_gvalue@Base 0.7.998 + nm_utils_ip6_routes_from_gvalue@Base 0.7.998 + nm_utils_ip6_routes_to_gvalue@Base 0.7.998 nm_utils_is_empty_ssid@Base 0.7.0 - nm_utils_rsa_key_encrypt@Base 0.7.997 + nm_utils_rsa_key_encrypt@Base 0.7.998 nm_utils_same_ssid@Base 0.7.0 nm_utils_security_valid@Base 0.7.0 nm_utils_slist_free@Base 0.7.0 -- cgit 1.3.0-6-gf8a5 From 91499fdede95b428a104743134bd61ee2233f424 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:43 +0000 Subject: Wrap dependencies. * debian/control - Wrap dependencies. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3389 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 66 +++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22a7f9f6..69a73426 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - The name of the pkg-config files has changed ('_' → '-'). Create compat symlinks so existing configure scripts keep working, allowing for a smoother transition to the new library names. + * debian/control + - Wrap dependencies. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/control b/debian/control index c9570a67..7e017e3b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 7), +Build-Depends: + debhelper (>= 7), cdbs, autotools-dev, pkg-config, @@ -26,12 +27,35 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -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, dnsmasq-base, iptables +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, + dnsmasq-base, + iptables 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~~) +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 @@ -61,7 +85,9 @@ Description: network management framework (development files) Package: libnm-glib2 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc: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 @@ -76,7 +102,13 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib2 (= ${binary:Version}), ${misc:Depends}, libnm-util-dev, network-manager-dev, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: + libnm-glib2 (= ${binary:Version}), + ${misc:Depends}, + libnm-util-dev, + 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 @@ -91,7 +123,9 @@ Description: network management framework (GLib interface) Package: libnm-glib-vpn1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc: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 @@ -106,7 +140,10 @@ Description: network management framework (GLib VPN shared library) Package: libnm-glib-vpn-dev Section: libdevel Architecture: any -Depends: libnm-glib-vpn1 (= ${binary:Version}), ${misc:Depends}, libnm-glib-dev +Depends: + libnm-glib-vpn1 (= ${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 @@ -121,7 +158,9 @@ Description: network management framework (GLib interface) Package: libnm-util1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +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 @@ -136,7 +175,10 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, libglib2.0-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 -- cgit 1.3.0-6-gf8a5 From a647d714037be5309cab2c3d8c705c98772e8ff8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:46 +0000 Subject: Update build dependencies - Drop Build-Depends on libhal-dev and libpolkit-dbus-dev. - Add Build-Depends on libdbus-1-dev (>= 1.1), libpolkit-gobject-1-dev and libgudev-1.0-dev. - Bump Build-Depends on libglib2.0-dev to (>= 2.18). git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3390 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/control | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69a73426..c6f62ef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low smoother transition to the new library names. * debian/control - Wrap dependencies. + - Drop Build-Depends on libhal-dev and libpolkit-dbus-dev. + - Add Build-Depends on libdbus-1-dev (>= 1.1), libpolkit-gobject-1-dev and + libgudev-1.0-dev. + - Bump Build-Depends on libglib2.0-dev to (>= 2.18). -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/control b/debian/control index 7e017e3b..ba6b42c5 100644 --- a/debian/control +++ b/debian/control @@ -11,15 +11,16 @@ Build-Depends: intltool, quilt, libdbus-glib-1-dev (>= 0.75), + libdbus-1-dev (>= 1.1), libiw-dev(>= 27+28pre9), - libglib2.0-dev, - libhal-dev (>= 0.5.0), + libglib2.0-dev (>= 2.18), libnl-dev (>= 1.0~pre8), ppp-dev, - libpolkit-dbus-dev, + libpolkit-gobject-1-dev, libgnutls-dev, uuid-dev, - libudev-dev + libudev-dev, + libgudev-1.0-dev Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/ -- cgit 1.3.0-6-gf8a5 From d1f2ba42f4f732c70bd92b10d05ba73befefaabd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:52 +0000 Subject: Update dependencies and package description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace hal Depends with udev. - Replace policykit Recommends with policykit-1. - Update package description: policykit → policykit-1. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3391 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c6f62ef9..e99e1716 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Add Build-Depends on libdbus-1-dev (>= 1.1), libpolkit-gobject-1-dev and libgudev-1.0-dev. - Bump Build-Depends on libglib2.0-dev to (>= 2.18). + - Replace hal Depends with udev. + - Replace policykit Recommends with policykit-1. + - Update package description: policykit → policykit-1. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/control b/debian/control index ba6b42c5..0cabc958 100644 --- a/debian/control +++ b/debian/control @@ -34,13 +34,13 @@ Depends: lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), - hal (>= 0.5.7.1), + udev, ifupdown, adduser, dhcp3-client Recommends: network-manager-gnome | network-manager-kde, - policykit, + policykit-1, ppp, dnsmasq-base, iptables @@ -68,7 +68,7 @@ Description: network management framework daemon This package provides the userspace daemons. . Optional dependencies: - * policykit: Required for reading and writing system connections. + * policykit-1: Required for reading and writing system connections. * ppp: Required for establishing dial-up connections (e.g. via GSM). * dnsmasq-base/iptables: Required for creating Ad-hoc connections and connection sharing. -- cgit 1.3.0-6-gf8a5 From 371a0def16f9a44de724bf34496fb70524f37161 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:37:57 +0000 Subject: Specify the path to the iptables binary. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3392 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index e99e1716..54d712f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Use ModemManager for modem handling. * debian/rules - Don't ship empty TODO file. (Closes: #558471) + - Specify the path to the iptables binary. * Update *.install, *.symbols and debian/control for library soname changes: libnm-glib0 → libnm-glib2 and libnm-glib-vpn0 → libnm-glib-vpn1. * debian/network-manager.install diff --git a/debian/rules b/debian/rules index 4a3a7992..0fefb1de 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ --with-dhcp-client=/sbin/dhclient \ + --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ --disable-more-warnings -- cgit 1.3.0-6-gf8a5 From db348dabb3bad31bb00bc967aa44fb4a5e0321d3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:01 +0000 Subject: Update init script * debian/network-manager.init - Update LSB header: Replace hal dependency with udev. - The nm-system-settings daemon has been merged into the NetworkManager daemon, so we no longer need to kill nm-system-settings on "stop". git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3393 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/network-manager.init | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54d712f9..5f4d5fab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Replace hal Depends with udev. - Replace policykit Recommends with policykit-1. - Update package description: policykit → policykit-1. + * debian/network-manager.init + - Update LSB header: Replace hal dependency with udev. + - The nm-system-settings daemon has been merged into the NetworkManager + daemon, so we no longer need to kill nm-system-settings on "stop". -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/network-manager.init b/debian/network-manager.init index 250971bb..ea6d2ee9 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,8 +1,8 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: network-manager -# Required-Start: $remote_fs dbus hal -# Required-Stop: $remote_fs dbus hal +# Required-Start: $remote_fs dbus udev +# Required-Stop: $remote_fs dbus udev # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 @@ -44,11 +44,7 @@ d_start() { # d_stop() { start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --oknodo --exec $DAEMON - - # kill the system settings daemon - start-stop-daemon --stop --retry 5 --quiet \ - --oknodo --exec /usr/sbin/nm-system-settings + --oknodo $USER --exec $DAEMON } -- cgit 1.3.0-6-gf8a5 From 0f230e471cf9c331949bd599121f7982ed4dfbbe Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:04 +0000 Subject: Remove the obsolete conffile /etc/dbus-1/system.d/nm-system-settings.conf on upgrades. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3394 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/network-manager.preinst | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f4d5fab..5ad5ad3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,9 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Update LSB header: Replace hal dependency with udev. - The nm-system-settings daemon has been merged into the NetworkManager daemon, so we no longer need to kill nm-system-settings on "stop". + * debian/network-manager.preinst + - Remove the obsolete conffile + /etc/dbus-1/system.d/nm-system-settings.conf on upgrades. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 5bfef656..c00618e7 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -44,10 +44,10 @@ case "$1" in # Upgrade from previous versions if dpkg --compare-versions "$2" lt "0.6.4-8"; then if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager stop + /etc/dbus-1/event.d/25NetworkManager stop fi if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher stop + /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher @@ -67,6 +67,9 @@ case "$1" in mv /var/run/NetworkManager/NetworkManager.pid /var/run/ fi fi + if dpkg --compare-versions "$2" lt "0.7.998-1"; then + rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf + fi ;; abort-upgrade) -- cgit 1.3.0-6-gf8a5 From eea01b4ae98928210c768fd90d1336a0dc8b1160 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:07 +0000 Subject: Kill nm-system-settings on upgrades * network-manager.postinst - Kill any running nm-system-settings daemon on upgrades before the new NetworkManager daemon is started. Its functionality has been merged into NetworkManager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3395 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/network-manager.postinst | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5ad5ad3c..7834e807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,10 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low * debian/network-manager.preinst - Remove the obsolete conffile /etc/dbus-1/system.d/nm-system-settings.conf on upgrades. + * network-manager.postinst + - Kill any running nm-system-settings daemon on upgrades before the new + NetworkManager daemon is started. Its functionality has been merged + into NetworkManager. -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index f91886f5..f5b2cdda 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -47,8 +47,13 @@ case "$1" in done fi + # Kill nm-system-settings service as in 0.8 it is no longer a separate process + if dpkg --compare-versions "$2" lt "0.7.998-1"; then + kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true + fi + ;; - + abort-upgrade|abort-deconfigure|abort-remove) ;; -- cgit 1.3.0-6-gf8a5 From 0f28ae7f4c00829b3ab82dff69fe50b252bb9e0e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:11 +0000 Subject: Drop obsolete patch. Modem handling is handled in modemmanager now git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3396 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/03-F3507g.patch | 128 ----------------------------------------- debian/patches/series | 1 - 2 files changed, 129 deletions(-) delete mode 100644 debian/patches/03-F3507g.patch diff --git a/debian/patches/03-F3507g.patch b/debian/patches/03-F3507g.patch deleted file mode 100644 index d475a874..00000000 --- a/debian/patches/03-F3507g.patch +++ /dev/null @@ -1,128 +0,0 @@ -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/series b/debian/patches/series index 3ad97cdd..629d0956 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 02-dbus_access_network_manager.patch -#03-F3507g.patch #20-manual_means_always_online.patch -- cgit 1.3.0-6-gf8a5 From 7b7b2003842e49d19ac1724e66bac1c0e74732d8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:15 +0000 Subject: Add Recommends on modemmanager which is required for mobile broadband support. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3397 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7834e807..a3d25841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Bump Build-Depends on libglib2.0-dev to (>= 2.18). - Replace hal Depends with udev. - Replace policykit Recommends with policykit-1. + - Add Recommends on modemmanager which is required for mobile broadband + support. - Update package description: policykit → policykit-1. * debian/network-manager.init - Update LSB header: Replace hal dependency with udev. diff --git a/debian/control b/debian/control index 0cabc958..72c4378c 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,8 @@ Recommends: policykit-1, ppp, dnsmasq-base, - iptables + iptables, + modemmanager Suggests: avahi-autoipd Conflicts: network-manager-gnome (<< 0.6.5-1), -- cgit 1.3.0-6-gf8a5 From e62914164db8db7073520713bed4ab55b6422390 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:18 +0000 Subject: Small update to copyright years, gfilemonitor/ is gone git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3398 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/copyright | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/debian/copyright b/debian/copyright index 681bb9b2..58e38447 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,8 +8,8 @@ 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. + Copyright (C) 2006 - 2009 Red Hat, Inc. + Copyright (C) 2006 - 2009 Novell, Inc. License: @@ -17,7 +17,7 @@ License: 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 @@ -32,40 +32,12 @@ 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 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 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 - 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'. - - - libnm-util/*.[ch], libnm-glib/*.[ch]: Copyright: - Copyright (C) 2005 - 2008 Red Hat, Inc. - Copyright (C) 2005 - 2008 Novell, Inc. + Copyright (C) 2005 - 2009 Red Hat, Inc. + Copyright (C) 2005 - 2009 Novell, Inc. License: -- cgit 1.3.0-6-gf8a5 From f95bb9ace31934f1c3d60344b76f399934073d8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:21 +0000 Subject: Update to 0.7.999 (RC3) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3399 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +- debian/libnm-glib-vpn1.symbols | 42 +++---- debian/libnm-glib2.symbols | 270 ++++++++++++++++++++-------------------- debian/libnm-util1.symbols | 190 ++++++++++++++-------------- debian/network-manager.postinst | 2 +- debian/network-manager.preinst | 2 +- 6 files changed, 255 insertions(+), 255 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3d25841..dc52d870 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -network-manager (0.7.998-1) UNRELEASED; urgency=low +network-manager (0.7.999-1) UNRELEASED; urgency=low - * RC2 snapshot (0.7.998) of the upcoming 0.8 release. (Closes: #553320) + * RC3 snapshot (0.7.999) of the upcoming 0.8 release. (Closes: #553320) - Much improved bluetooth support. - Support for IPv6. - Port to PolicyKit 1. (Closes: #549502) diff --git a/debian/libnm-glib-vpn1.symbols b/debian/libnm-glib-vpn1.symbols index e52f76df..a2512368 100644 --- a/debian/libnm-glib-vpn1.symbols +++ b/debian/libnm-glib-vpn1.symbols @@ -1,22 +1,22 @@ libnm-glib-vpn.so.1 libnm-glib-vpn1 #MINVER# - nm_vpn_plugin_disconnect@Base 0.7.998 - nm_vpn_plugin_error_get_type@Base 0.7.998 - nm_vpn_plugin_error_quark@Base 0.7.998 - nm_vpn_plugin_failure@Base 0.7.998 - nm_vpn_plugin_get_connection@Base 0.7.998 - nm_vpn_plugin_get_state@Base 0.7.998 - nm_vpn_plugin_get_type@Base 0.7.998 - nm_vpn_plugin_set_ip4_config@Base 0.7.998 - nm_vpn_plugin_set_login_banner@Base 0.7.998 - nm_vpn_plugin_set_state@Base 0.7.998 - nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.998 - nm_vpn_plugin_ui_interface_export@Base 0.7.998 - nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.998 - nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.998 - nm_vpn_plugin_ui_interface_get_type@Base 0.7.998 - nm_vpn_plugin_ui_interface_import@Base 0.7.998 - nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.998 - nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.998 - nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.998 - nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.998 - nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.998 + nm_vpn_plugin_disconnect@Base 0.7.999 + nm_vpn_plugin_error_get_type@Base 0.7.999 + nm_vpn_plugin_error_quark@Base 0.7.999 + nm_vpn_plugin_failure@Base 0.7.999 + nm_vpn_plugin_get_connection@Base 0.7.999 + nm_vpn_plugin_get_state@Base 0.7.999 + nm_vpn_plugin_get_type@Base 0.7.999 + nm_vpn_plugin_set_ip4_config@Base 0.7.999 + nm_vpn_plugin_set_login_banner@Base 0.7.999 + nm_vpn_plugin_set_state@Base 0.7.999 + nm_vpn_plugin_ui_interface_delete_connection@Base 0.7.999 + nm_vpn_plugin_ui_interface_export@Base 0.7.999 + nm_vpn_plugin_ui_interface_get_capabilities@Base 0.7.999 + nm_vpn_plugin_ui_interface_get_suggested_name@Base 0.7.999 + nm_vpn_plugin_ui_interface_get_type@Base 0.7.999 + nm_vpn_plugin_ui_interface_import@Base 0.7.999 + nm_vpn_plugin_ui_interface_ui_factory@Base 0.7.999 + nm_vpn_plugin_ui_widget_interface_get_type@Base 0.7.999 + nm_vpn_plugin_ui_widget_interface_get_widget@Base 0.7.999 + nm_vpn_plugin_ui_widget_interface_save_secrets@Base 0.7.999 + nm_vpn_plugin_ui_widget_interface_update_connection@Base 0.7.999 diff --git a/debian/libnm-glib2.symbols b/debian/libnm-glib2.symbols index 6c617437..8a4f4fa5 100644 --- a/debian/libnm-glib2.symbols +++ b/debian/libnm-glib2.symbols @@ -1,136 +1,136 @@ libnm-glib.so.2 libnm-glib2 #MINVER# - libnm_glib_get_network_state@Base 0.7.998 - libnm_glib_init@Base 0.7.998 - libnm_glib_register_callback@Base 0.7.998 - libnm_glib_shutdown@Base 0.7.998 - libnm_glib_unregister_callback@Base 0.7.998 - nm_access_point_get_flags@Base 0.7.998 - nm_access_point_get_frequency@Base 0.7.998 - nm_access_point_get_hw_address@Base 0.7.998 - nm_access_point_get_max_bitrate@Base 0.7.998 - nm_access_point_get_mode@Base 0.7.998 - nm_access_point_get_rsn_flags@Base 0.7.998 - nm_access_point_get_ssid@Base 0.7.998 - nm_access_point_get_strength@Base 0.7.998 - nm_access_point_get_type@Base 0.7.998 - nm_access_point_get_wpa_flags@Base 0.7.998 - nm_access_point_new@Base 0.7.998 - nm_active_connection_get_connection@Base 0.7.998 - nm_active_connection_get_default@Base 0.7.998 - nm_active_connection_get_devices@Base 0.7.998 - nm_active_connection_get_scope@Base 0.7.998 - nm_active_connection_get_service_name@Base 0.7.998 - nm_active_connection_get_specific_object@Base 0.7.998 - nm_active_connection_get_state@Base 0.7.998 - nm_active_connection_get_type@Base 0.7.998 - nm_active_connection_new@Base 0.7.998 - nm_cdma_device_get_type@Base 0.7.998 - nm_cdma_device_new@Base 0.7.998 - nm_client_activate_connection@Base 0.7.998 - nm_client_deactivate_connection@Base 0.7.998 - nm_client_get_active_connections@Base 0.7.998 - nm_client_get_device_by_path@Base 0.7.998 - nm_client_get_devices@Base 0.7.998 - nm_client_get_manager_running@Base 0.7.998 - nm_client_get_state@Base 0.7.998 - nm_client_get_type@Base 0.7.998 - nm_client_new@Base 0.7.998 - nm_client_sleep@Base 0.7.998 - nm_client_wireless_get_enabled@Base 0.7.998 - nm_client_wireless_hardware_get_enabled@Base 0.7.998 - nm_client_wireless_set_enabled@Base 0.7.998 - nm_device_bt_get_capabilities@Base 0.7.998 - nm_device_bt_get_hw_address@Base 0.7.998 - nm_device_bt_get_name@Base 0.7.998 - nm_device_bt_get_type@Base 0.7.998 - nm_device_bt_new@Base 0.7.998 - nm_device_disconnect@Base 0.7.998 - nm_device_ethernet_get_carrier@Base 0.7.998 - nm_device_ethernet_get_hw_address@Base 0.7.998 - nm_device_ethernet_get_speed@Base 0.7.998 - nm_device_ethernet_get_type@Base 0.7.998 - nm_device_ethernet_new@Base 0.7.998 - nm_device_get_capabilities@Base 0.7.998 - nm_device_get_dhcp4_config@Base 0.7.998 - nm_device_get_driver@Base 0.7.998 - nm_device_get_iface@Base 0.7.998 - nm_device_get_ip4_config@Base 0.7.998 - nm_device_get_ip6_config@Base 0.7.998 - nm_device_get_managed@Base 0.7.998 - nm_device_get_product@Base 0.7.998 - nm_device_get_state@Base 0.7.998 - nm_device_get_type@Base 0.7.998 - nm_device_get_udi@Base 0.7.998 - nm_device_get_vendor@Base 0.7.998 - nm_device_new@Base 0.7.998 - nm_device_wifi_get_access_point_by_path@Base 0.7.998 - nm_device_wifi_get_access_points@Base 0.7.998 - nm_device_wifi_get_active_access_point@Base 0.7.998 - nm_device_wifi_get_bitrate@Base 0.7.998 - nm_device_wifi_get_capabilities@Base 0.7.998 - nm_device_wifi_get_hw_address@Base 0.7.998 - nm_device_wifi_get_mode@Base 0.7.998 - nm_device_wifi_get_type@Base 0.7.998 - nm_device_wifi_new@Base 0.7.998 - nm_dhcp4_config_get_one_option@Base 0.7.998 - nm_dhcp4_config_get_options@Base 0.7.998 - nm_dhcp4_config_get_type@Base 0.7.998 - nm_dhcp4_config_new@Base 0.7.998 - nm_exported_connection_get_type@Base 0.7.998 - nm_exported_connection_new@Base 0.7.998 - nm_gsm_device_get_type@Base 0.7.998 - nm_gsm_device_new@Base 0.7.998 - nm_ip4_config_get_addresses@Base 0.7.998 - nm_ip4_config_get_domains@Base 0.7.998 - nm_ip4_config_get_hostname@Base 0.7.998 - nm_ip4_config_get_nameservers@Base 0.7.998 - nm_ip4_config_get_routes@Base 0.7.998 - nm_ip4_config_get_type@Base 0.7.998 - nm_ip4_config_get_wins_servers@Base 0.7.998 - nm_ip4_config_new@Base 0.7.998 - nm_ip6_address_array_get_type@Base 0.7.998 - nm_ip6_address_object_array_get_type@Base 0.7.998 - nm_ip6_config_get_addresses@Base 0.7.998 - nm_ip6_config_get_domains@Base 0.7.998 - nm_ip6_config_get_nameservers@Base 0.7.998 - nm_ip6_config_get_routes@Base 0.7.998 - nm_ip6_config_get_type@Base 0.7.998 - nm_ip6_config_new@Base 0.7.998 - nm_ip6_route_object_array_get_type@Base 0.7.998 - nm_object_array_get_type@Base 0.7.998 - nm_object_get_connection@Base 0.7.998 - nm_object_get_path@Base 0.7.998 - nm_object_get_type@Base 0.7.998 - nm_remote_connection_get_type@Base 0.7.998 - nm_remote_connection_new@Base 0.7.998 - nm_remote_settings_get_type@Base 0.7.998 - nm_remote_settings_new@Base 0.7.998 - nm_remote_settings_system_get_type@Base 0.7.998 - nm_remote_settings_system_new@Base 0.7.998 - nm_serial_device_get_bytes_received@Base 0.7.998 - nm_serial_device_get_bytes_sent@Base 0.7.998 - nm_serial_device_get_type@Base 0.7.998 - nm_settings_connection_interface_delete@Base 0.7.998 - nm_settings_connection_interface_emit_updated@Base 0.7.998 - nm_settings_connection_interface_get_secrets@Base 0.7.998 - nm_settings_connection_interface_get_type@Base 0.7.998 - nm_settings_connection_interface_update@Base 0.7.998 - nm_settings_interface_add_connection@Base 0.7.998 - nm_settings_interface_error_quark@Base 0.7.998 - nm_settings_interface_get_connection_by_path@Base 0.7.998 - nm_settings_interface_get_type@Base 0.7.998 - nm_settings_interface_list_connections@Base 0.7.998 - nm_settings_service_export@Base 0.7.998 - nm_settings_service_export_connection@Base 0.7.998 - nm_settings_service_get_connection_by_path@Base 0.7.998 - nm_settings_service_get_type@Base 0.7.998 - nm_settings_system_interface_get_permissions@Base 0.7.998 - nm_settings_system_interface_get_type@Base 0.7.998 - nm_settings_system_interface_save_hostname@Base 0.7.998 - nm_ssid_get_type@Base 0.7.998 - nm_string_array_get_type@Base 0.7.998 - nm_uint_array_get_type@Base 0.7.998 - nm_vpn_connection_get_banner@Base 0.7.998 - nm_vpn_connection_get_type@Base 0.7.998 - nm_vpn_connection_get_vpn_state@Base 0.7.998 - nm_vpn_connection_new@Base 0.7.998 + libnm_glib_get_network_state@Base 0.7.999 + libnm_glib_init@Base 0.7.999 + libnm_glib_register_callback@Base 0.7.999 + libnm_glib_shutdown@Base 0.7.999 + libnm_glib_unregister_callback@Base 0.7.999 + nm_access_point_get_flags@Base 0.7.999 + nm_access_point_get_frequency@Base 0.7.999 + nm_access_point_get_hw_address@Base 0.7.999 + nm_access_point_get_max_bitrate@Base 0.7.999 + nm_access_point_get_mode@Base 0.7.999 + nm_access_point_get_rsn_flags@Base 0.7.999 + nm_access_point_get_ssid@Base 0.7.999 + nm_access_point_get_strength@Base 0.7.999 + nm_access_point_get_type@Base 0.7.999 + nm_access_point_get_wpa_flags@Base 0.7.999 + nm_access_point_new@Base 0.7.999 + nm_active_connection_get_connection@Base 0.7.999 + nm_active_connection_get_default@Base 0.7.999 + nm_active_connection_get_devices@Base 0.7.999 + nm_active_connection_get_scope@Base 0.7.999 + nm_active_connection_get_service_name@Base 0.7.999 + nm_active_connection_get_specific_object@Base 0.7.999 + nm_active_connection_get_state@Base 0.7.999 + nm_active_connection_get_type@Base 0.7.999 + nm_active_connection_new@Base 0.7.999 + nm_cdma_device_get_type@Base 0.7.999 + nm_cdma_device_new@Base 0.7.999 + nm_client_activate_connection@Base 0.7.999 + nm_client_deactivate_connection@Base 0.7.999 + nm_client_get_active_connections@Base 0.7.999 + nm_client_get_device_by_path@Base 0.7.999 + nm_client_get_devices@Base 0.7.999 + nm_client_get_manager_running@Base 0.7.999 + nm_client_get_state@Base 0.7.999 + nm_client_get_type@Base 0.7.999 + nm_client_new@Base 0.7.999 + nm_client_sleep@Base 0.7.999 + nm_client_wireless_get_enabled@Base 0.7.999 + nm_client_wireless_hardware_get_enabled@Base 0.7.999 + nm_client_wireless_set_enabled@Base 0.7.999 + nm_device_bt_get_capabilities@Base 0.7.999 + nm_device_bt_get_hw_address@Base 0.7.999 + nm_device_bt_get_name@Base 0.7.999 + nm_device_bt_get_type@Base 0.7.999 + nm_device_bt_new@Base 0.7.999 + nm_device_disconnect@Base 0.7.999 + nm_device_ethernet_get_carrier@Base 0.7.999 + nm_device_ethernet_get_hw_address@Base 0.7.999 + nm_device_ethernet_get_speed@Base 0.7.999 + nm_device_ethernet_get_type@Base 0.7.999 + nm_device_ethernet_new@Base 0.7.999 + nm_device_get_capabilities@Base 0.7.999 + nm_device_get_dhcp4_config@Base 0.7.999 + nm_device_get_driver@Base 0.7.999 + nm_device_get_iface@Base 0.7.999 + nm_device_get_ip4_config@Base 0.7.999 + nm_device_get_ip6_config@Base 0.7.999 + nm_device_get_managed@Base 0.7.999 + nm_device_get_product@Base 0.7.999 + nm_device_get_state@Base 0.7.999 + nm_device_get_type@Base 0.7.999 + nm_device_get_udi@Base 0.7.999 + nm_device_get_vendor@Base 0.7.999 + nm_device_new@Base 0.7.999 + nm_device_wifi_get_access_point_by_path@Base 0.7.999 + nm_device_wifi_get_access_points@Base 0.7.999 + nm_device_wifi_get_active_access_point@Base 0.7.999 + nm_device_wifi_get_bitrate@Base 0.7.999 + nm_device_wifi_get_capabilities@Base 0.7.999 + nm_device_wifi_get_hw_address@Base 0.7.999 + nm_device_wifi_get_mode@Base 0.7.999 + nm_device_wifi_get_type@Base 0.7.999 + nm_device_wifi_new@Base 0.7.999 + nm_dhcp4_config_get_one_option@Base 0.7.999 + nm_dhcp4_config_get_options@Base 0.7.999 + nm_dhcp4_config_get_type@Base 0.7.999 + nm_dhcp4_config_new@Base 0.7.999 + nm_exported_connection_get_type@Base 0.7.999 + nm_exported_connection_new@Base 0.7.999 + nm_gsm_device_get_type@Base 0.7.999 + nm_gsm_device_new@Base 0.7.999 + nm_ip4_config_get_addresses@Base 0.7.999 + nm_ip4_config_get_domains@Base 0.7.999 + nm_ip4_config_get_hostname@Base 0.7.999 + nm_ip4_config_get_nameservers@Base 0.7.999 + nm_ip4_config_get_routes@Base 0.7.999 + nm_ip4_config_get_type@Base 0.7.999 + nm_ip4_config_get_wins_servers@Base 0.7.999 + nm_ip4_config_new@Base 0.7.999 + nm_ip6_address_array_get_type@Base 0.7.999 + nm_ip6_address_object_array_get_type@Base 0.7.999 + nm_ip6_config_get_addresses@Base 0.7.999 + nm_ip6_config_get_domains@Base 0.7.999 + nm_ip6_config_get_nameservers@Base 0.7.999 + nm_ip6_config_get_routes@Base 0.7.999 + nm_ip6_config_get_type@Base 0.7.999 + nm_ip6_config_new@Base 0.7.999 + nm_ip6_route_object_array_get_type@Base 0.7.999 + nm_object_array_get_type@Base 0.7.999 + nm_object_get_connection@Base 0.7.999 + nm_object_get_path@Base 0.7.999 + nm_object_get_type@Base 0.7.999 + nm_remote_connection_get_type@Base 0.7.999 + nm_remote_connection_new@Base 0.7.999 + nm_remote_settings_get_type@Base 0.7.999 + nm_remote_settings_new@Base 0.7.999 + nm_remote_settings_system_get_type@Base 0.7.999 + nm_remote_settings_system_new@Base 0.7.999 + nm_serial_device_get_bytes_received@Base 0.7.999 + nm_serial_device_get_bytes_sent@Base 0.7.999 + nm_serial_device_get_type@Base 0.7.999 + nm_settings_connection_interface_delete@Base 0.7.999 + nm_settings_connection_interface_emit_updated@Base 0.7.999 + nm_settings_connection_interface_get_secrets@Base 0.7.999 + nm_settings_connection_interface_get_type@Base 0.7.999 + nm_settings_connection_interface_update@Base 0.7.999 + nm_settings_interface_add_connection@Base 0.7.999 + nm_settings_interface_error_quark@Base 0.7.999 + nm_settings_interface_get_connection_by_path@Base 0.7.999 + nm_settings_interface_get_type@Base 0.7.999 + nm_settings_interface_list_connections@Base 0.7.999 + nm_settings_service_export@Base 0.7.999 + nm_settings_service_export_connection@Base 0.7.999 + nm_settings_service_get_connection_by_path@Base 0.7.999 + nm_settings_service_get_type@Base 0.7.999 + nm_settings_system_interface_get_permissions@Base 0.7.999 + nm_settings_system_interface_get_type@Base 0.7.999 + nm_settings_system_interface_save_hostname@Base 0.7.999 + nm_ssid_get_type@Base 0.7.999 + nm_string_array_get_type@Base 0.7.999 + nm_uint_array_get_type@Base 0.7.999 + nm_vpn_connection_get_banner@Base 0.7.999 + nm_vpn_connection_get_type@Base 0.7.999 + nm_vpn_connection_get_vpn_state@Base 0.7.999 + nm_vpn_connection_new@Base 0.7.999 diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols index 9de83d74..6045e97d 100644 --- a/debian/libnm-util1.symbols +++ b/debian/libnm-util1.symbols @@ -49,42 +49,42 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_address_compare@Base 0.7.998 - nm_ip6_address_dup@Base 0.7.998 - nm_ip6_address_get_address@Base 0.7.998 - nm_ip6_address_get_prefix@Base 0.7.998 - nm_ip6_address_new@Base 0.7.998 - nm_ip6_address_ref@Base 0.7.998 - nm_ip6_address_set_address@Base 0.7.998 - nm_ip6_address_set_prefix@Base 0.7.998 - nm_ip6_address_unref@Base 0.7.998 - nm_ip6_route_compare@Base 0.7.998 - nm_ip6_route_dup@Base 0.7.998 - nm_ip6_route_get_dest@Base 0.7.998 - nm_ip6_route_get_metric@Base 0.7.998 - nm_ip6_route_get_next_hop@Base 0.7.998 - nm_ip6_route_get_prefix@Base 0.7.998 - nm_ip6_route_new@Base 0.7.998 - nm_ip6_route_ref@Base 0.7.998 - nm_ip6_route_set_dest@Base 0.7.998 - nm_ip6_route_set_metric@Base 0.7.998 - nm_ip6_route_set_next_hop@Base 0.7.998 - nm_ip6_route_set_prefix@Base 0.7.998 - nm_ip6_route_unref@Base 0.7.998 + nm_ip6_address_compare@Base 0.7.999 + nm_ip6_address_dup@Base 0.7.999 + nm_ip6_address_get_address@Base 0.7.999 + nm_ip6_address_get_prefix@Base 0.7.999 + nm_ip6_address_new@Base 0.7.999 + nm_ip6_address_ref@Base 0.7.999 + nm_ip6_address_set_address@Base 0.7.999 + nm_ip6_address_set_prefix@Base 0.7.999 + nm_ip6_address_unref@Base 0.7.999 + nm_ip6_route_compare@Base 0.7.999 + nm_ip6_route_dup@Base 0.7.999 + nm_ip6_route_get_dest@Base 0.7.999 + nm_ip6_route_get_metric@Base 0.7.999 + nm_ip6_route_get_next_hop@Base 0.7.999 + nm_ip6_route_get_prefix@Base 0.7.999 + nm_ip6_route_new@Base 0.7.999 + nm_ip6_route_ref@Base 0.7.999 + nm_ip6_route_set_dest@Base 0.7.999 + nm_ip6_route_set_metric@Base 0.7.999 + nm_ip6_route_set_next_hop@Base 0.7.999 + nm_ip6_route_set_prefix@Base 0.7.999 + nm_ip6_route_unref@Base 0.7.999 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_cert_blob@Base 0.7.998 - nm_setting_802_1x_get_ca_cert_path@Base 0.7.998 - nm_setting_802_1x_get_ca_cert_scheme@Base 0.7.998 + nm_setting_802_1x_get_ca_cert_blob@Base 0.7.999 + nm_setting_802_1x_get_ca_cert_path@Base 0.7.999 + nm_setting_802_1x_get_ca_cert_scheme@Base 0.7.999 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_client_cert_blob@Base 0.7.998 - nm_setting_802_1x_get_client_cert_path@Base 0.7.998 - nm_setting_802_1x_get_client_cert_scheme@Base 0.7.998 + nm_setting_802_1x_get_client_cert_blob@Base 0.7.999 + nm_setting_802_1x_get_client_cert_path@Base 0.7.999 + nm_setting_802_1x_get_client_cert_scheme@Base 0.7.999 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 @@ -95,52 +95,52 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_cert_blob@Base 0.7.998 - nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.7.998 - nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.7.998 + nm_setting_802_1x_get_phase2_ca_cert_blob@Base 0.7.999 + nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.7.999 + nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.7.999 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_client_cert_blob@Base 0.7.998 - nm_setting_802_1x_get_phase2_client_cert_path@Base 0.7.998 - nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.7.998 + nm_setting_802_1x_get_phase2_client_cert_blob@Base 0.7.999 + nm_setting_802_1x_get_phase2_client_cert_path@Base 0.7.999 + nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.7.999 nm_setting_802_1x_get_phase2_private_key@Base 0.7.0 - nm_setting_802_1x_get_phase2_private_key_blob@Base 0.7.998 - nm_setting_802_1x_get_phase2_private_key_format@Base 0.7.998 + nm_setting_802_1x_get_phase2_private_key_blob@Base 0.7.999 + nm_setting_802_1x_get_phase2_private_key_format@Base 0.7.999 nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.0 - nm_setting_802_1x_get_phase2_private_key_path@Base 0.7.998 - nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.7.998 + nm_setting_802_1x_get_phase2_private_key_path@Base 0.7.999 + nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.7.999 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_blob@Base 0.7.998 - nm_setting_802_1x_get_private_key_format@Base 0.7.998 + nm_setting_802_1x_get_private_key_blob@Base 0.7.999 + nm_setting_802_1x_get_private_key_format@Base 0.7.999 nm_setting_802_1x_get_private_key_password@Base 0.7.0 - nm_setting_802_1x_get_private_key_path@Base 0.7.998 - nm_setting_802_1x_get_private_key_scheme@Base 0.7.998 + nm_setting_802_1x_get_private_key_path@Base 0.7.999 + nm_setting_802_1x_get_private_key_scheme@Base 0.7.999 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@Base 0.7.998 + nm_setting_802_1x_set_ca_cert@Base 0.7.999 nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_client_cert@Base 0.7.998 + nm_setting_802_1x_set_client_cert@Base 0.7.999 nm_setting_802_1x_set_client_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.998 + nm_setting_802_1x_set_phase2_ca_cert@Base 0.7.999 nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_phase2_client_cert@Base 0.7.998 + nm_setting_802_1x_set_phase2_client_cert@Base 0.7.999 nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.0 - nm_setting_802_1x_set_phase2_private_key@Base 0.7.998 + nm_setting_802_1x_set_phase2_private_key@Base 0.7.999 nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.0 - nm_setting_802_1x_set_private_key@Base 0.7.998 + nm_setting_802_1x_set_private_key@Base 0.7.999 nm_setting_802_1x_set_private_key_from_file@Base 0.7.0 - nm_setting_bluetooth_error_get_type@Base 0.7.998 - nm_setting_bluetooth_error_quark@Base 0.7.998 - nm_setting_bluetooth_get_bdaddr@Base 0.7.998 - nm_setting_bluetooth_get_connection_type@Base 0.7.998 - nm_setting_bluetooth_get_type@Base 0.7.998 - nm_setting_bluetooth_new@Base 0.7.998 + nm_setting_bluetooth_error_get_type@Base 0.7.999 + nm_setting_bluetooth_error_quark@Base 0.7.999 + nm_setting_bluetooth_get_bdaddr@Base 0.7.999 + nm_setting_bluetooth_get_connection_type@Base 0.7.999 + nm_setting_bluetooth_get_type@Base 0.7.999 + nm_setting_bluetooth_new@Base 0.7.999 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 @@ -192,7 +192,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_dhcp_send_hostname@Base 0.7.998 + nm_setting_ip4_config_get_dhcp_send_hostname@Base 0.7.999 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 @@ -210,43 +210,43 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_config_add_address@Base 0.7.998 - nm_setting_ip6_config_add_dns@Base 0.7.998 - nm_setting_ip6_config_add_dns_search@Base 0.7.998 - nm_setting_ip6_config_add_route@Base 0.7.998 - nm_setting_ip6_config_clear_addresses@Base 0.7.998 - nm_setting_ip6_config_clear_dns@Base 0.7.998 - nm_setting_ip6_config_clear_dns_searches@Base 0.7.998 - nm_setting_ip6_config_clear_routes@Base 0.7.998 - nm_setting_ip6_config_error_get_type@Base 0.7.998 - nm_setting_ip6_config_error_quark@Base 0.7.998 - nm_setting_ip6_config_get_address@Base 0.7.998 - nm_setting_ip6_config_get_dns@Base 0.7.998 - nm_setting_ip6_config_get_dns_search@Base 0.7.998 - nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.998 - nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.998 - nm_setting_ip6_config_get_method@Base 0.7.998 - nm_setting_ip6_config_get_never_default@Base 0.7.998 - nm_setting_ip6_config_get_num_addresses@Base 0.7.998 - nm_setting_ip6_config_get_num_dns@Base 0.7.998 - nm_setting_ip6_config_get_num_dns_searches@Base 0.7.998 - nm_setting_ip6_config_get_num_routes@Base 0.7.998 - nm_setting_ip6_config_get_route@Base 0.7.998 - nm_setting_ip6_config_get_type@Base 0.7.998 - nm_setting_ip6_config_new@Base 0.7.998 - nm_setting_ip6_config_remove_address@Base 0.7.998 - nm_setting_ip6_config_remove_dns@Base 0.7.998 - nm_setting_ip6_config_remove_dns_search@Base 0.7.998 - nm_setting_ip6_config_remove_route@Base 0.7.998 + nm_setting_ip6_config_add_address@Base 0.7.999 + nm_setting_ip6_config_add_dns@Base 0.7.999 + nm_setting_ip6_config_add_dns_search@Base 0.7.999 + nm_setting_ip6_config_add_route@Base 0.7.999 + nm_setting_ip6_config_clear_addresses@Base 0.7.999 + nm_setting_ip6_config_clear_dns@Base 0.7.999 + nm_setting_ip6_config_clear_dns_searches@Base 0.7.999 + nm_setting_ip6_config_clear_routes@Base 0.7.999 + nm_setting_ip6_config_error_get_type@Base 0.7.999 + nm_setting_ip6_config_error_quark@Base 0.7.999 + nm_setting_ip6_config_get_address@Base 0.7.999 + nm_setting_ip6_config_get_dns@Base 0.7.999 + nm_setting_ip6_config_get_dns_search@Base 0.7.999 + nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.999 + nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.999 + nm_setting_ip6_config_get_method@Base 0.7.999 + nm_setting_ip6_config_get_never_default@Base 0.7.999 + nm_setting_ip6_config_get_num_addresses@Base 0.7.999 + nm_setting_ip6_config_get_num_dns@Base 0.7.999 + nm_setting_ip6_config_get_num_dns_searches@Base 0.7.999 + nm_setting_ip6_config_get_num_routes@Base 0.7.999 + nm_setting_ip6_config_get_route@Base 0.7.999 + nm_setting_ip6_config_get_type@Base 0.7.999 + nm_setting_ip6_config_new@Base 0.7.999 + nm_setting_ip6_config_remove_address@Base 0.7.999 + nm_setting_ip6_config_remove_dns@Base 0.7.999 + nm_setting_ip6_config_remove_dns_search@Base 0.7.999 + nm_setting_ip6_config_remove_route@Base 0.7.999 nm_setting_need_secrets@Base 0.7.0 nm_setting_new_from_hash@Base 0.7.0 - nm_setting_olpc_mesh_error_get_type@Base 0.7.998 - nm_setting_olpc_mesh_error_quark@Base 0.7.998 - nm_setting_olpc_mesh_get_channel@Base 0.7.998 - nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.7.998 - nm_setting_olpc_mesh_get_ssid@Base 0.7.998 - nm_setting_olpc_mesh_get_type@Base 0.7.998 - nm_setting_olpc_mesh_new@Base 0.7.998 + nm_setting_olpc_mesh_error_get_type@Base 0.7.999 + nm_setting_olpc_mesh_error_quark@Base 0.7.999 + nm_setting_olpc_mesh_get_channel@Base 0.7.999 + nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.7.999 + nm_setting_olpc_mesh_get_ssid@Base 0.7.999 + nm_setting_olpc_mesh_get_type@Base 0.7.999 + nm_setting_olpc_mesh_new@Base 0.7.999 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 @@ -369,12 +369,12 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_ip6_addresses_from_gvalue@Base 0.7.998 - nm_utils_ip6_addresses_to_gvalue@Base 0.7.998 - nm_utils_ip6_routes_from_gvalue@Base 0.7.998 - nm_utils_ip6_routes_to_gvalue@Base 0.7.998 + nm_utils_ip6_addresses_from_gvalue@Base 0.7.999 + nm_utils_ip6_addresses_to_gvalue@Base 0.7.999 + nm_utils_ip6_routes_from_gvalue@Base 0.7.999 + nm_utils_ip6_routes_to_gvalue@Base 0.7.999 nm_utils_is_empty_ssid@Base 0.7.0 - nm_utils_rsa_key_encrypt@Base 0.7.998 + nm_utils_rsa_key_encrypt@Base 0.7.999 nm_utils_same_ssid@Base 0.7.0 nm_utils_security_valid@Base 0.7.0 nm_utils_slist_free@Base 0.7.0 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index f5b2cdda..47d06d42 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -48,7 +48,7 @@ case "$1" in fi # Kill nm-system-settings service as in 0.8 it is no longer a separate process - if dpkg --compare-versions "$2" lt "0.7.998-1"; then + if dpkg --compare-versions "$2" lt "0.7.999-1"; then kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true fi diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index c00618e7..445c05ca 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -67,7 +67,7 @@ case "$1" in mv /var/run/NetworkManager/NetworkManager.pid /var/run/ fi fi - if dpkg --compare-versions "$2" lt "0.7.998-1"; then + if dpkg --compare-versions "$2" lt "0.7.999-1"; then rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf fi ;; -- cgit 1.3.0-6-gf8a5 From 0f2fd358cc2e719c3292b6ca7d1a99678205e71e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:24 +0000 Subject: Add new symbols for libnm-glib introduced in 0.7.999 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3400 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-glib2.symbols | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/libnm-glib2.symbols b/debian/libnm-glib2.symbols index 8a4f4fa5..ce1b0fc1 100644 --- a/debian/libnm-glib2.symbols +++ b/debian/libnm-glib2.symbols @@ -39,6 +39,9 @@ libnm-glib.so.2 libnm-glib2 #MINVER# nm_client_wireless_get_enabled@Base 0.7.999 nm_client_wireless_hardware_get_enabled@Base 0.7.999 nm_client_wireless_set_enabled@Base 0.7.999 + nm_client_wwan_get_enabled@Base 0.7.999 + nm_client_wwan_hardware_get_enabled@Base 0.7.999 + nm_client_wwan_set_enabled@Base 0.7.999 nm_device_bt_get_capabilities@Base 0.7.999 nm_device_bt_get_hw_address@Base 0.7.999 nm_device_bt_get_name@Base 0.7.999 -- cgit 1.3.0-6-gf8a5 From 27e6774f085bf7e7daf78ae2f5b6ebaae85f468d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Jan 2010 00:08:12 +0000 Subject: Add -dbg package. (Closes: #380626) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3401 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index dc52d870..f6285b56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ network-manager (0.7.999-1) UNRELEASED; urgency=low - Add Recommends on modemmanager which is required for mobile broadband support. - Update package description: policykit → policykit-1. + - Add -dbg package. (Closes: #380626) * debian/network-manager.init - Update LSB header: Replace hal dependency with udev. - The nm-system-settings daemon has been merged into the NetworkManager diff --git a/debian/control b/debian/control index 72c4378c..84f13100 100644 --- a/debian/control +++ b/debian/control @@ -191,3 +191,19 @@ Description: network management framework (development files) . This package contains header and development files. +Package: network-manager-dbg +Architecture: any +Section: debug +Priority: extra +Depends: + network-manager (= ${binary:Version}) | libnm-util1 (= ${binary:Version}) | libnm-glib2 (= ${binary:Version}) | libnm-glib-vpn1 (= ${binary:Version}), + ${misc:Depends} +Description: network management framework daemon - debugging symbols + 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 contains detached debugging symbols. -- cgit 1.3.0-6-gf8a5 From e783b4bcf18796a5d93920d4e0e4a726b275110a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Jan 2010 00:28:30 +0000 Subject: Refresh patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3402 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- .../patches/02-dbus_access_network_manager.patch | 64 +++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index 8c90bfd7..c2d741e5 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,55 +1,55 @@ -Index: NetworkManager-0.7.2/src/NetworkManager.conf +Index: network-manager-0.7.999/src/NetworkManager.conf =================================================================== ---- NetworkManager-0.7.2.orig/src/NetworkManager.conf 2009-11-23 20:17:47.000000000 +0100 -+++ NetworkManager-0.7.2/src/NetworkManager.conf 2009-11-24 00:38:15.416687481 +0100 -@@ -9,6 +9,51 @@ +--- network-manager-0.7.999.orig/src/NetworkManager.conf 2010-01-22 01:27:48.273977786 +0100 ++++ network-manager-0.7.999/src/NetworkManager.conf 2010-01-22 01:28:01.153983423 +0100 +@@ -12,6 +12,51 @@ + + + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -+ ++ + -- cgit 1.3.0-6-gf8a5 From f8707819400c572f43a7e12faa47df9f18a1740e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Jan 2010 00:33:44 +0000 Subject: Changelog tweak git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3403 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6285b56..c2cfbe10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,7 @@ network-manager (0.7.999-1) UNRELEASED; urgency=low - Support for IPv6. - Port to PolicyKit 1. (Closes: #549502) - Drop hal dependency, use udev directly. - - Mobile broadband assistant. - - Use ModemManager for modem handling. + - Use ModemManager for better mobile broadband. * debian/rules - Don't ship empty TODO file. (Closes: #558471) - Specify the path to the iptables binary. -- cgit 1.3.0-6-gf8a5 From 6cde9f233750a2b9678e110a2ef8f5ec5f06ae00 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Jan 2010 00:45:08 +0000 Subject: Release version 0.7.999-1 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3404 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2cfbe10..2ac6c246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.999-1) UNRELEASED; urgency=low +network-manager (0.7.999-1) unstable; urgency=low * RC3 snapshot (0.7.999) of the upcoming 0.8 release. (Closes: #553320) - Much improved bluetooth support. @@ -43,7 +43,7 @@ network-manager (0.7.999-1) UNRELEASED; urgency=low NetworkManager daemon is started. Its functionality has been merged into NetworkManager. - -- Michael Biebl Sun, 29 Nov 2009 10:19:59 +0100 + -- Michael Biebl Fri, 22 Jan 2010 01:43:20 +0100 network-manager (0.7.2-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 25a49908f24703a325fe0854fcd90b79ae0f06f1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Jan 2010 00:53:38 +0000 Subject: One more changelog tweak git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3405 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ac6c246..17fb4ccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -network-manager (0.7.999-1) unstable; urgency=low +network-manager (0.7.999-1) UNRELEASED; urgency=low - * RC3 snapshot (0.7.999) of the upcoming 0.8 release. (Closes: #553320) + * New upstream release (0.8 rc3). (Closes: #553320) - Much improved bluetooth support. - Support for IPv6. - Port to PolicyKit 1. (Closes: #549502) -- cgit 1.3.0-6-gf8a5 From 79ce8fa32f409b7902c08e1a666000c9a3adf3ec Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Jan 2010 00:54:39 +0000 Subject: Release version 0.7.999-1 to experimental git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3406 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17fb4ccd..fedefe73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.999-1) UNRELEASED; urgency=low +network-manager (0.7.999-1) experimental; urgency=low * New upstream release (0.8 rc3). (Closes: #553320) - Much improved bluetooth support. @@ -43,7 +43,7 @@ network-manager (0.7.999-1) UNRELEASED; urgency=low NetworkManager daemon is started. Its functionality has been merged into NetworkManager. - -- Michael Biebl Fri, 22 Jan 2010 01:43:20 +0100 + -- Michael Biebl Fri, 22 Jan 2010 01:53:46 +0100 network-manager (0.7.2-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 8d1419fe5af3cf1dbef08180f64275abcc2ce98f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Jan 2010 16:16:43 +0000 Subject: Release version 0.7.999-2 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3455 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fedefe73..0002d6ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.7.999-2) unstable; urgency=low + + * Upload to unstable. + + -- Michael Biebl Tue, 26 Jan 2010 17:03:35 +0100 + network-manager (0.7.999-1) experimental; urgency=low * New upstream release (0.8 rc3). (Closes: #553320) -- cgit 1.3.0-6-gf8a5 From 3b72b1eb327563ab2eb89857c439476dd9aa4a1e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 14:39:38 +0000 Subject: * debian/patches/03-hostname-fallback.patch - If dhcp does not return a valid hostname and none of the system settings plugins provides a hostname, fallback to the hostname that was set when NetworkManager was started. Patch pulled from upstream Git. (Closes: #567207) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3505 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 10 ++ debian/patches/03-hostname-fallback.patch | 207 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 218 insertions(+) create mode 100644 debian/patches/03-hostname-fallback.patch diff --git a/debian/changelog b/debian/changelog index 0002d6ed..f716666d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (0.7.999-3) UNRELEASED; urgency=low + + * debian/patches/03-hostname-fallback.patch + - If dhcp does not return a valid hostname and none of the system settings + plugins provides a hostname, fallback to the hostname that was set when + NetworkManager was started. Patch pulled from upstream Git. + (Closes: #567207) + + -- Michael Biebl Mon, 08 Feb 2010 15:35:45 +0100 + network-manager (0.7.999-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/patches/03-hostname-fallback.patch b/debian/patches/03-hostname-fallback.patch new file mode 100644 index 00000000..40136ba5 --- /dev/null +++ b/debian/patches/03-hostname-fallback.patch @@ -0,0 +1,207 @@ +commit 395a0abd2f8a3a65b2e4a0664ccf48078d07346f +Author: Dan Williams +Date: Wed Jan 27 17:13:35 2010 -0800 + + policy: fall back to original hostname before trying reverse DNS + + Having the original hostname checks in the settings-service code + didn't allow the policy enough granularity to differentiate between + a plugin-provided hostname and the original hostname. We want to + fall back to the original hostname if there isn't a persistent + hostname (from a plugin) and if there isn't a DHCP-provided + hostname. Moving the original hostname checks to the policy + makes that possible. Clarify the precedence order at the same + time, and minimally validate the DHCP hostname as well. + + trivial: clearer hostname fallback message + +diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c +index 5c5ae40..7034520 100644 +--- a/src/NetworkManagerPolicy.c ++++ b/src/NetworkManagerPolicy.c +@@ -74,6 +74,8 @@ struct NMPolicy { + NMDevice *default_device; + + LookupThread *lookup; ++ ++ char *orig_hostname; /* hostname at NM start time */ + }; + + static gboolean +@@ -416,15 +418,16 @@ update_system_hostname (NMPolicy *policy, NMDevice *best) + policy->lookup = NULL; + } + +- /* A configured hostname (via the system-settings service) overrides +- * all automatic hostname determination. If there is no configured hostname, +- * the best device's automatically determined hostname (from DHCP, VPN, PPP, +- * etc) is used. If there is no automatically determined hostname, reverse +- * DNS lookup using the best device's IP address is started to determined the +- * the hostname. ++ /* Hostname precedence order: ++ * ++ * 1) a configured hostname (from system-settings) ++ * 2) automatic hostname from the default device's config (DHCP, VPN, etc) ++ * 3) the original hostname when NM started ++ * 4) reverse-DNS of the best device's IPv4 address ++ * + */ + +- /* Try a configured hostname first */ ++ /* Try a persistent hostname first */ + g_object_get (G_OBJECT (policy->manager), NM_MANAGER_HOSTNAME, &configured_hostname, NULL); + if (configured_hostname) { + set_system_hostname (configured_hostname, "from system configuration"); +@@ -437,25 +440,42 @@ update_system_hostname (NMPolicy *policy, NMDevice *best) + best = get_best_device (policy->manager, &best_req); + + if (!best) { +- /* No best device; fall back to localhost.localdomain */ +- set_system_hostname (NULL, "no default device"); ++ /* No best device; fall back to original hostname or if there wasn't ++ * one, 'localhost.localdomain' ++ */ ++ set_system_hostname (policy->orig_hostname, "no default device"); + return; + } + + /* Grab a hostname out of the device's DHCP4 config */ + dhcp4_config = nm_device_get_dhcp4_config (best); + if (dhcp4_config) { +- const char *dhcp4_hostname; ++ const char *dhcp4_hostname, *p; + +- dhcp4_hostname = nm_dhcp4_config_get_option (dhcp4_config, "host_name"); ++ p = dhcp4_hostname = nm_dhcp4_config_get_option (dhcp4_config, "host_name"); + if (dhcp4_hostname && strlen (dhcp4_hostname)) { +- set_system_hostname (dhcp4_hostname, "from DHCP"); +- return; ++ /* Sanity check */ ++ while (*p) { ++ if (!isblank (*p++)) { ++ set_system_hostname (dhcp4_hostname, "from DHCP"); ++ return; ++ } ++ } ++ nm_warning ("%s: DHCP-provided hostname '%s' looks invalid; ignoring it", ++ __func__, dhcp4_hostname); + } + } + +- /* No configured hostname, no automatically determined hostname either. Start +- * reverse DNS of the current IP address to try and find it. ++ /* If no automatically-configured hostname, try using the hostname from ++ * when NM started up. ++ */ ++ if (policy->orig_hostname) { ++ set_system_hostname (policy->orig_hostname, "from system startup"); ++ return; ++ } ++ ++ /* No configured hostname, no automatically determined hostname, and ++ * no bootup hostname. Start reverse DNS of the current IP address. + */ + ip4_config = nm_device_get_ip4_config (best); + if ( !ip4_config +@@ -988,6 +1008,7 @@ nm_policy_new (NMManager *manager, NMVPNManager *vpn_manager) + NMPolicy *policy; + static gboolean initialized = FALSE; + gulong id; ++ char hostname[HOST_NAME_MAX + 2]; + + g_return_val_if_fail (NM_IS_MANAGER (manager), NULL); + g_return_val_if_fail (initialized == FALSE, NULL); +@@ -996,6 +1017,14 @@ nm_policy_new (NMManager *manager, NMVPNManager *vpn_manager) + policy->manager = g_object_ref (manager); + policy->update_state_id = 0; + ++ /* Grab hostname on startup and use that if nothing provides one */ ++ memset (hostname, 0, sizeof (hostname)); ++ if (gethostname (&hostname[0], HOST_NAME_MAX) == 0) { ++ /* only cache it if it's a valid hostname */ ++ if (strlen (hostname) && strcmp (hostname, "localhost") && strcmp (hostname, "localhost.localdomain")) ++ policy->orig_hostname = g_strdup (hostname); ++ } ++ + policy->vpn_manager = g_object_ref (vpn_manager); + id = g_signal_connect (policy->vpn_manager, "connection-activated", + G_CALLBACK (vpn_connection_activated), policy); +@@ -1086,6 +1115,8 @@ nm_policy_destroy (NMPolicy *policy) + } + g_slist_free (policy->dev_signal_ids); + ++ g_free (policy->orig_hostname); ++ + g_object_unref (policy->manager); + g_free (policy); + } +diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c +index 7580319..0498fe7 100644 +--- a/src/system-settings/nm-sysconfig-settings.c ++++ b/src/system-settings/nm-sysconfig-settings.c +@@ -90,7 +90,6 @@ typedef struct { + gboolean connections_loaded; + GHashTable *connections; + GSList *unmanaged_specs; +- char *orig_hostname; + } NMSysconfigSettingsPrivate; + + static void settings_system_interface_init (NMSettingsSystemInterface *klass); +@@ -254,7 +253,6 @@ nm_sysconfig_settings_get_hostname (NMSysconfigSettings *self) + NMSysconfigSettingsPrivate *priv = NM_SYSCONFIG_SETTINGS_GET_PRIVATE (self); + GSList *iter; + char *hostname = NULL; +- gboolean have_hostname_providers = FALSE; + + /* Hostname returned is the hostname returned from the first plugin + * that provides one. +@@ -264,8 +262,6 @@ nm_sysconfig_settings_get_hostname (NMSysconfigSettings *self) + + g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_CAPABILITIES, &caps, NULL); + if (caps & NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME) { +- have_hostname_providers = TRUE; +- + g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL); + if (hostname && strlen (hostname)) + return hostname; +@@ -273,10 +269,6 @@ nm_sysconfig_settings_get_hostname (NMSysconfigSettings *self) + } + } + +- /* If no plugin provided a hostname, try the original hostname of the machine */ +- if (!have_hostname_providers && priv->orig_hostname) +- hostname = g_strdup (priv->orig_hostname); +- + return hostname; + } + +@@ -1378,7 +1370,6 @@ finalize (GObject *object) + g_slist_foreach (priv->plugins, (GFunc) g_object_unref, NULL); + g_slist_free (priv->plugins); + +- g_free (priv->orig_hostname); + g_free (priv->config_file); + + G_OBJECT_CLASS (nm_sysconfig_settings_parent_class)->finalize (object); +@@ -1476,7 +1467,6 @@ static void + nm_sysconfig_settings_init (NMSysconfigSettings *self) + { + NMSysconfigSettingsPrivate *priv = NM_SYSCONFIG_SETTINGS_GET_PRIVATE (self); +- char hostname[HOST_NAME_MAX + 2]; + + priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL); + +@@ -1488,13 +1478,5 @@ nm_sysconfig_settings_init (NMSysconfigSettings *self) + self); + } else + g_warning ("%s: failed to create PolicyKit authority.", __func__); +- +- /* Grab hostname on startup and use that if no plugins provide one */ +- memset (hostname, 0, sizeof (hostname)); +- if (gethostname (&hostname[0], HOST_NAME_MAX) == 0) { +- /* only cache it if it's a valid hostname */ +- if (strlen (hostname) && strcmp (hostname, "localhost") && strcmp (hostname, "localhost.localdomain")) +- priv->orig_hostname = g_strdup (hostname); +- } + } + diff --git a/debian/patches/series b/debian/patches/series index 629d0956..060d8cd0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02-dbus_access_network_manager.patch +03-hostname-fallback.patch #20-manual_means_always_online.patch -- cgit 1.3.0-6-gf8a5 From c7a5f91abbea2a0b09a03503e972eee7b1f3e008 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 14:47:47 +0000 Subject: * debian/patches/04-etc-hosts-rewrite.patch - Be more selective when adding hostname to /etc/hosts. Patch pulled from upstream Git. (Closes: #567411) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3506 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 + debian/patches/04-etc-hosts-rewrite.patch | 172 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 176 insertions(+) create mode 100644 debian/patches/04-etc-hosts-rewrite.patch diff --git a/debian/changelog b/debian/changelog index f716666d..b9663f54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low plugins provides a hostname, fallback to the hostname that was set when NetworkManager was started. Patch pulled from upstream Git. (Closes: #567207) + * debian/patches/04-etc-hosts-rewrite.patch + - Be more selective when adding hostname to /etc/hosts. + Patch pulled from upstream Git. (Closes: #567411) -- Michael Biebl Mon, 08 Feb 2010 15:35:45 +0100 diff --git a/debian/patches/04-etc-hosts-rewrite.patch b/debian/patches/04-etc-hosts-rewrite.patch new file mode 100644 index 00000000..3e640f69 --- /dev/null +++ b/debian/patches/04-etc-hosts-rewrite.patch @@ -0,0 +1,172 @@ +commit f6c383ff14412ea264fa8740dec84f92a89bd385 +Author: Dan Williams +Date: Mon Feb 1 17:29:58 2010 -0800 + + policy: be more selective when adding hostname to /etc/hosts (debian #567411) + + If the user has already mapped the hostname to some other address, + assume the user knows what they are doing (since they probably do) + and leave that mapping alone, and create a minimal 127.0.0.1 entry. + If there was no hostname mapping, add it to the 127.0.0.1 entry + like NM did before. + +diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c +index 7034520..1b7801c 100644 +--- a/src/NetworkManagerPolicy.c ++++ b/src/NetworkManagerPolicy.c +@@ -252,13 +252,84 @@ get_best_device (NMManager *manager, NMActRequest **out_req) + return best; + } + ++static gboolean ++is_localhost_mapping (const char *str) ++{ ++ return (!strncmp (str, "127.0.0.1", strlen ("127.0.0.1")) && strstr (str, "localhost")); ++} ++ ++static gboolean ++find_token (const char *line, const char *token) ++{ ++ const char *start = line, *p = line; ++ ++ g_return_val_if_fail (line != NULL, FALSE); ++ g_return_val_if_fail (token != NULL, FALSE); ++ g_return_val_if_fail (strlen (token) > 0, FALSE); ++ ++ /* Walk through the line to find the next whitespace character */ ++ while (p <= line + strlen (line)) { ++ if (isblank (*p) || (*p == '\0')) { ++ /* Token starts with 'start' and ends with 'end' */ ++ if ((p > start) && *start && !strncmp (start, token, (p - start))) ++ return TRUE; /* found */ ++ ++ /* not found; advance start and continue looking */ ++ start = p + 1; ++ } ++ p++; ++ } ++ ++ return FALSE; ++} ++ ++#if 0 ++/* Testcase for find_token; break it out and add it to the testsuite */ ++ ++typedef struct { ++ const char *line; ++ const char *token; ++ gboolean expected; ++} Foo; ++ ++static Foo foo[] = { ++ { "127.0.0.1\tfoobar\tblah", "blah", TRUE }, ++ { "", "blah", FALSE }, ++ { "1.1.1.1\tbork\tfoo", "blah", FALSE }, ++ { "127.0.0.1 foobar\tblah", "blah", TRUE }, ++ { "127.0.0.1 foobar blah", "blah", TRUE }, ++ { "192.168.1.1 blah borkbork", "blah", TRUE }, ++ { "192.168.1.1 foobar\tblah borkbork", "blah", TRUE }, ++ { "192.168.1.1\tfoobar\tblah\tborkbork", "blah", TRUE }, ++ { "192.168.1.1 \tfoobar \tblah \tborkbork\t ", "blah", TRUE }, ++ { "\t\t\t\t \t\t\tasdfadf a\t\t\t\t\t \t\t\t\t\t ", "blah", FALSE }, ++ { NULL, NULL, FALSE } ++}; ++ ++int main(int argc, char **argv) ++{ ++ Foo *iter = &foo[0]; ++ ++ while (iter->line) { ++ if (find_token (iter->line, iter->token) != iter->expected) { ++ g_message ("Failed: '%s' <= '%s' (%d)", iter->line, iter->token, iter->expected); ++ return 1; ++ } ++ iter++; ++ } ++ ++ g_message ("Success"); ++ return 0; ++} ++#endif ++ + #define FALLBACK_HOSTNAME "localhost.localdomain" + + static gboolean + update_etc_hosts (const char *hostname) + { + char *contents = NULL; +- char **lines = NULL, **line; ++ char **lines = NULL, **line, **host_mapping = NULL; + GError *error = NULL; + gboolean initial_comments = TRUE; + gboolean added = FALSE; +@@ -285,25 +356,62 @@ update_etc_hosts (const char *hostname) + return FALSE; + } + +- /* Replace any 127.0.0.1 entry that is at the beginning of the file or right +- * after initial comments. If there is no 127.0.0.1 entry at the beginning +- * or after initial comments, add one there and ignore any other 127.0.0.1 +- * entries. ++ /* Two-pass modification of /etc/hosts: ++ * ++ * 1) Look for a non-comment, non-localhost line that contains the current ++ * hostname. Mark that line. ++ * ++ * 2) For each line in the existing /etc/hosts, add it to the new /etc/hosts ++ * unless it starts with 127.0.0.1 and is right after the initial comments ++ * (if any) and contains "localhost". + */ ++ ++ /* Find any existing hostname mapping */ + for (line = lines; lines && *line; line++) { ++ /* Look for any line that (a) contains the current hostname, and ++ * (b) does not start with '127.0.0.1' and contain 'localhost'. ++ */ ++ if ( strlen (*line) ++ && (*line[0] != '#') ++ && find_token (*line, hostname) ++ && !is_localhost_mapping (*line)) { ++ host_mapping = line; ++ break; ++ } ++ } ++ ++ /* Construct the new hosts file; replace any 127.0.0.1 entry that is at the ++ * beginning of the file or right after initial comments and contains ++ * the string 'localhost'. If there is no 127.0.0.1 entry at the beginning ++ * or after initial comments that contains 'localhost', add one there ++ * and ignore any other 127.0.0.1 entries that contain 'localhost'. ++ */ ++ for (line = lines, initial_comments = TRUE; lines && *line; line++) { + gboolean add_line = TRUE; + + /* This is the first line after the initial comments */ +- if (initial_comments && (*line[0] != '#')) { ++ if (strlen (*line) && initial_comments && (*line[0] != '#')) { + initial_comments = FALSE; +- g_string_append_printf (new_contents, "127.0.0.1\t%s", hostname); ++ ++ /* If some other line contained the hostname, make a simple ++ * localhost mapping and assume the user knows what they are doing ++ * with their manual hostname entry. Otherwise if the hostname ++ * wasn't found somewhere else, add it to the localhost mapping line ++ * to make sure it's mapped to something. ++ */ ++ if (host_mapping) ++ g_string_append (new_contents, "127.0.0.1"); ++ else ++ g_string_append_printf (new_contents, "127.0.0.1\t%s", hostname); ++ + if (strcmp (hostname, FALLBACK_HOSTNAME)) + g_string_append_printf (new_contents, "\t" FALLBACK_HOSTNAME); ++ + g_string_append (new_contents, "\tlocalhost\n"); + added = TRUE; + + /* Don't add the entry if it's supposed to be the actual localhost reverse mapping */ +- if (!strncmp (*line, "127.0.0.1", strlen ("127.0.0.1")) && strstr (*line, "localhost")) ++ if (is_localhost_mapping (*line)) + add_line = FALSE; + } + diff --git a/debian/patches/series b/debian/patches/series index 060d8cd0..08786385 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02-dbus_access_network_manager.patch 03-hostname-fallback.patch +04-etc-hosts-rewrite.patch #20-manual_means_always_online.patch -- cgit 1.3.0-6-gf8a5 From 2c6d0af5348f2b9165a6240a173679537d98ed18 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 14:48:37 +0000 Subject: * debian/control - Remove Riccardo from Uploaders with Riccardo's consent. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3507 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b9663f54..c2f4ab82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low * debian/patches/04-etc-hosts-rewrite.patch - Be more selective when adding hostname to /etc/hosts. Patch pulled from upstream Git. (Closes: #567411) + * debian/control + - Remove Riccardo from Uploaders with Riccardo's consent. -- Michael Biebl Mon, 08 Feb 2010 15:35:45 +0100 diff --git a/debian/control b/debian/control index 84f13100..0b560466 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Utopia Maintenance Team -Uploaders: Riccardo Setti , Michael Biebl +Uploaders: Michael Biebl Build-Depends: debhelper (>= 7), cdbs, -- cgit 1.3.0-6-gf8a5 From 2900f5299c07a8935b336fe1362dbbb51063b250 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 14:52:32 +0000 Subject: Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no longer works correctly with this version of network-manager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3508 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c2f4ab82..0185f15f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low Patch pulled from upstream Git. (Closes: #567411) * debian/control - Remove Riccardo from Uploaders with Riccardo's consent. + - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no + longer works correctly with this version of network-manager. -- Michael Biebl Mon, 08 Feb 2010 15:35:45 +0100 diff --git a/debian/control b/debian/control index 0b560466..65e72dba 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Replaces: network-manager-pptp (<< 0.7~~) Breaks: network-manager-gnome (<< 0.7~~), - network-manager-kde (<< 1:0.7~~), + network-manager-kde (<< 1:0.9~~), network-manager-openvpn (<< 0.7~~), network-manager-vpnc (<< 0.7~~), network-manager-pptp (<< 0.7~~) -- cgit 1.3.0-6-gf8a5 From d765345df65158e553fda164453cf360a70edb8f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 15:37:32 +0000 Subject: * debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch - Set autoconnect=true for devices marked as allow-hotplug in /etc/network/interfaces. (Closes: #568784) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3509 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch | 13 +++++++++++++ debian/patches/series | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch diff --git a/debian/changelog b/debian/changelog index 0185f15f..8dcdb98b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low * debian/patches/04-etc-hosts-rewrite.patch - Be more selective when adding hostname to /etc/hosts. Patch pulled from upstream Git. (Closes: #567411) + * debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch + - Set autoconnect=true for devices marked as allow-hotplug in + /etc/network/interfaces. (Closes: #568784) * debian/control - Remove Riccardo from Uploaders with Riccardo's consent. - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no diff --git a/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch b/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch new file mode 100644 index 00000000..d27dfe35 --- /dev/null +++ b/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch @@ -0,0 +1,13 @@ +Index: NetworkManager-0.7.999/system-settings/plugins/ifupdown/plugin.c +=================================================================== +--- NetworkManager-0.7.999.orig/system-settings/plugins/ifupdown/plugin.c 2010-02-08 16:07:48.379559508 +0100 ++++ NetworkManager-0.7.999/system-settings/plugins/ifupdown/plugin.c 2010-02-08 16:08:04.255557965 +0100 +@@ -355,7 +355,7 @@ + ifparser_init (); + block = ifparser_getfirst (); + while (block) { +- if(!strcmp ("auto", block->type)) ++ if(!strcmp ("auto", block->type) || !strcmp ("allow-hotplug", block->type)) + g_hash_table_insert (auto_ifaces, block->name, GUINT_TO_POINTER (1)); + else if (!strcmp ("iface", block->type) && strcmp ("lo", block->name)) { + NMIfupdownConnection *exported; diff --git a/debian/patches/series b/debian/patches/series index 08786385..f1e83cf1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 02-dbus_access_network_manager.patch 03-hostname-fallback.patch 04-etc-hosts-rewrite.patch -#20-manual_means_always_online.patch +05-ifupdown-allow-hotplug-autoconnect.patch -- cgit 1.3.0-6-gf8a5 From 1a21b8d555164f30ad5dedbfb13e13a813096273 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 15:38:39 +0000 Subject: Bump Standards-Version to 3.8.4. No further changes. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3510 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8dcdb98b..276ad5a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low - Remove Riccardo from Uploaders with Riccardo's consent. - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no longer works correctly with this version of network-manager. + - Bump Standards-Version to 3.8.4. No further changes. -- Michael Biebl Mon, 08 Feb 2010 15:35:45 +0100 diff --git a/debian/control b/debian/control index 65e72dba..3d3a947b 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: uuid-dev, libudev-dev, libgudev-1.0-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/ Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From 67fba941f1920bf5eaef33e1d39efe08bb808c0c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 15:42:15 +0000 Subject: Release version 0.7.999-3 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3511 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 276ad5a1..67057f3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.999-3) UNRELEASED; urgency=low +network-manager (0.7.999-3) unstable; urgency=low * debian/patches/03-hostname-fallback.patch - If dhcp does not return a valid hostname and none of the system settings @@ -17,7 +17,7 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low longer works correctly with this version of network-manager. - Bump Standards-Version to 3.8.4. No further changes. - -- Michael Biebl Mon, 08 Feb 2010 15:35:45 +0100 + -- Michael Biebl Mon, 08 Feb 2010 16:41:20 +0100 network-manager (0.7.999-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 40b065691bfa03d6cd3124c567d2a101731d1fe3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 15:59:21 +0000 Subject: Back to UNRELEASED git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3512 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 67057f3e..fe123400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.999-3) unstable; urgency=low +network-manager (0.7.999-3) UNRELEASED; urgency=low * debian/patches/03-hostname-fallback.patch - If dhcp does not return a valid hostname and none of the system settings -- cgit 1.3.0-6-gf8a5 From 9c4894900c0d7856c344c5bbb47c68fcc0960b75 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 16:01:27 +0000 Subject: * debian/network-manager.init - Don't use "set -e". - Print meaningful messages on start and stop in case the daemon is already running resp. already stopped. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3513 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/network-manager.init | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe123400..e295df75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low - Bump Breaks for network-manager-kde to (<< 1:0.9~~). The KDE3 version no longer works correctly with this version of network-manager. - Bump Standards-Version to 3.8.4. No further changes. + * debian/network-manager.init + - Don't use "set -e". + - Print meaningful messages on start and stop in case the daemon is already + running resp. already stopped. -- Michael Biebl Mon, 08 Feb 2010 16:41:20 +0100 diff --git a/debian/network-manager.init b/debian/network-manager.init index ea6d2ee9..18323a88 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -12,8 +12,6 @@ # connections to the best available connection. ### END INIT INFO -set -e - PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DESC="network connection manager" NAME="NetworkManager" @@ -36,7 +34,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # d_start() { start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --oknodo --exec $DAEMON -- $DAEMON_OPTS + --exec $DAEMON -- $DAEMON_OPTS } # @@ -44,7 +42,7 @@ d_start() { # d_stop() { start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ - --oknodo $USER --exec $DAEMON + --exec $DAEMON } @@ -52,18 +50,26 @@ case "$1" in start) log_daemon_msg "Starting $DESC" "$NAME" d_start - log_end_msg $? + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already started" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac ;; stop) log_daemon_msg "Stopping $DESC" "$NAME" d_stop - log_end_msg $? + case "$?" in + 0) log_end_msg 0 ;; + 1) log_progress_msg "already stopped" + log_end_msg 0 ;; + *) log_end_msg 1 ;; + esac ;; restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - d_stop - d_start - log_end_msg $? + $0 stop + $0 start ;; status) status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? -- cgit 1.3.0-6-gf8a5 From 2f9add05533b9f25277f1ab251f85906121f3f8f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 Feb 2010 16:29:37 +0000 Subject: Release version 0.7.999-3 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3514 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e295df75..1944718c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.7.999-3) UNRELEASED; urgency=low +network-manager (0.7.999-3) unstable; urgency=low * debian/patches/03-hostname-fallback.patch - If dhcp does not return a valid hostname and none of the system settings @@ -21,7 +21,7 @@ network-manager (0.7.999-3) UNRELEASED; urgency=low - Print meaningful messages on start and stop in case the daemon is already running resp. already stopped. - -- Michael Biebl Mon, 08 Feb 2010 16:41:20 +0100 + -- Michael Biebl Mon, 08 Feb 2010 17:27:54 +0100 network-manager (0.7.999-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 7628406ee8021a01b3a513ab60ab2912a4a9ef12 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 19 Feb 2010 20:41:41 +0000 Subject: New upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3519 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1944718c..1dc4fc9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.8-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Michael Biebl Fri, 19 Feb 2010 21:41:06 +0100 + network-manager (0.7.999-3) unstable; urgency=low * debian/patches/03-hostname-fallback.patch -- cgit 1.3.0-6-gf8a5 From fa06dda22dd91e4b4763292666e8456435bb4e8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 19 Feb 2010 20:46:27 +0000 Subject: * Remove patches, all merged upstream - debian/patches/04-etc-hosts-rewrite.patch - debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch - debian/patches/03-hostname-fallback.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3520 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 + debian/patches/03-hostname-fallback.patch | 207 --------------------- debian/patches/04-etc-hosts-rewrite.patch | 172 ----------------- .../05-ifupdown-allow-hotplug-autoconnect.patch | 13 -- debian/patches/series | 3 - 5 files changed, 4 insertions(+), 395 deletions(-) delete mode 100644 debian/patches/03-hostname-fallback.patch delete mode 100644 debian/patches/04-etc-hosts-rewrite.patch delete mode 100644 debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch diff --git a/debian/changelog b/debian/changelog index 1dc4fc9d..782bf775 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ network-manager (0.8-1) UNRELEASED; urgency=low * New upstream release. + * Remove patches, all merged upstream + - debian/patches/04-etc-hosts-rewrite.patch + - debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch + - debian/patches/03-hostname-fallback.patch -- Michael Biebl Fri, 19 Feb 2010 21:41:06 +0100 diff --git a/debian/patches/03-hostname-fallback.patch b/debian/patches/03-hostname-fallback.patch deleted file mode 100644 index 40136ba5..00000000 --- a/debian/patches/03-hostname-fallback.patch +++ /dev/null @@ -1,207 +0,0 @@ -commit 395a0abd2f8a3a65b2e4a0664ccf48078d07346f -Author: Dan Williams -Date: Wed Jan 27 17:13:35 2010 -0800 - - policy: fall back to original hostname before trying reverse DNS - - Having the original hostname checks in the settings-service code - didn't allow the policy enough granularity to differentiate between - a plugin-provided hostname and the original hostname. We want to - fall back to the original hostname if there isn't a persistent - hostname (from a plugin) and if there isn't a DHCP-provided - hostname. Moving the original hostname checks to the policy - makes that possible. Clarify the precedence order at the same - time, and minimally validate the DHCP hostname as well. - - trivial: clearer hostname fallback message - -diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c -index 5c5ae40..7034520 100644 ---- a/src/NetworkManagerPolicy.c -+++ b/src/NetworkManagerPolicy.c -@@ -74,6 +74,8 @@ struct NMPolicy { - NMDevice *default_device; - - LookupThread *lookup; -+ -+ char *orig_hostname; /* hostname at NM start time */ - }; - - static gboolean -@@ -416,15 +418,16 @@ update_system_hostname (NMPolicy *policy, NMDevice *best) - policy->lookup = NULL; - } - -- /* A configured hostname (via the system-settings service) overrides -- * all automatic hostname determination. If there is no configured hostname, -- * the best device's automatically determined hostname (from DHCP, VPN, PPP, -- * etc) is used. If there is no automatically determined hostname, reverse -- * DNS lookup using the best device's IP address is started to determined the -- * the hostname. -+ /* Hostname precedence order: -+ * -+ * 1) a configured hostname (from system-settings) -+ * 2) automatic hostname from the default device's config (DHCP, VPN, etc) -+ * 3) the original hostname when NM started -+ * 4) reverse-DNS of the best device's IPv4 address -+ * - */ - -- /* Try a configured hostname first */ -+ /* Try a persistent hostname first */ - g_object_get (G_OBJECT (policy->manager), NM_MANAGER_HOSTNAME, &configured_hostname, NULL); - if (configured_hostname) { - set_system_hostname (configured_hostname, "from system configuration"); -@@ -437,25 +440,42 @@ update_system_hostname (NMPolicy *policy, NMDevice *best) - best = get_best_device (policy->manager, &best_req); - - if (!best) { -- /* No best device; fall back to localhost.localdomain */ -- set_system_hostname (NULL, "no default device"); -+ /* No best device; fall back to original hostname or if there wasn't -+ * one, 'localhost.localdomain' -+ */ -+ set_system_hostname (policy->orig_hostname, "no default device"); - return; - } - - /* Grab a hostname out of the device's DHCP4 config */ - dhcp4_config = nm_device_get_dhcp4_config (best); - if (dhcp4_config) { -- const char *dhcp4_hostname; -+ const char *dhcp4_hostname, *p; - -- dhcp4_hostname = nm_dhcp4_config_get_option (dhcp4_config, "host_name"); -+ p = dhcp4_hostname = nm_dhcp4_config_get_option (dhcp4_config, "host_name"); - if (dhcp4_hostname && strlen (dhcp4_hostname)) { -- set_system_hostname (dhcp4_hostname, "from DHCP"); -- return; -+ /* Sanity check */ -+ while (*p) { -+ if (!isblank (*p++)) { -+ set_system_hostname (dhcp4_hostname, "from DHCP"); -+ return; -+ } -+ } -+ nm_warning ("%s: DHCP-provided hostname '%s' looks invalid; ignoring it", -+ __func__, dhcp4_hostname); - } - } - -- /* No configured hostname, no automatically determined hostname either. Start -- * reverse DNS of the current IP address to try and find it. -+ /* If no automatically-configured hostname, try using the hostname from -+ * when NM started up. -+ */ -+ if (policy->orig_hostname) { -+ set_system_hostname (policy->orig_hostname, "from system startup"); -+ return; -+ } -+ -+ /* No configured hostname, no automatically determined hostname, and -+ * no bootup hostname. Start reverse DNS of the current IP address. - */ - ip4_config = nm_device_get_ip4_config (best); - if ( !ip4_config -@@ -988,6 +1008,7 @@ nm_policy_new (NMManager *manager, NMVPNManager *vpn_manager) - NMPolicy *policy; - static gboolean initialized = FALSE; - gulong id; -+ char hostname[HOST_NAME_MAX + 2]; - - g_return_val_if_fail (NM_IS_MANAGER (manager), NULL); - g_return_val_if_fail (initialized == FALSE, NULL); -@@ -996,6 +1017,14 @@ nm_policy_new (NMManager *manager, NMVPNManager *vpn_manager) - policy->manager = g_object_ref (manager); - policy->update_state_id = 0; - -+ /* Grab hostname on startup and use that if nothing provides one */ -+ memset (hostname, 0, sizeof (hostname)); -+ if (gethostname (&hostname[0], HOST_NAME_MAX) == 0) { -+ /* only cache it if it's a valid hostname */ -+ if (strlen (hostname) && strcmp (hostname, "localhost") && strcmp (hostname, "localhost.localdomain")) -+ policy->orig_hostname = g_strdup (hostname); -+ } -+ - policy->vpn_manager = g_object_ref (vpn_manager); - id = g_signal_connect (policy->vpn_manager, "connection-activated", - G_CALLBACK (vpn_connection_activated), policy); -@@ -1086,6 +1115,8 @@ nm_policy_destroy (NMPolicy *policy) - } - g_slist_free (policy->dev_signal_ids); - -+ g_free (policy->orig_hostname); -+ - g_object_unref (policy->manager); - g_free (policy); - } -diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c -index 7580319..0498fe7 100644 ---- a/src/system-settings/nm-sysconfig-settings.c -+++ b/src/system-settings/nm-sysconfig-settings.c -@@ -90,7 +90,6 @@ typedef struct { - gboolean connections_loaded; - GHashTable *connections; - GSList *unmanaged_specs; -- char *orig_hostname; - } NMSysconfigSettingsPrivate; - - static void settings_system_interface_init (NMSettingsSystemInterface *klass); -@@ -254,7 +253,6 @@ nm_sysconfig_settings_get_hostname (NMSysconfigSettings *self) - NMSysconfigSettingsPrivate *priv = NM_SYSCONFIG_SETTINGS_GET_PRIVATE (self); - GSList *iter; - char *hostname = NULL; -- gboolean have_hostname_providers = FALSE; - - /* Hostname returned is the hostname returned from the first plugin - * that provides one. -@@ -264,8 +262,6 @@ nm_sysconfig_settings_get_hostname (NMSysconfigSettings *self) - - g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_CAPABILITIES, &caps, NULL); - if (caps & NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME) { -- have_hostname_providers = TRUE; -- - g_object_get (G_OBJECT (iter->data), NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME, &hostname, NULL); - if (hostname && strlen (hostname)) - return hostname; -@@ -273,10 +269,6 @@ nm_sysconfig_settings_get_hostname (NMSysconfigSettings *self) - } - } - -- /* If no plugin provided a hostname, try the original hostname of the machine */ -- if (!have_hostname_providers && priv->orig_hostname) -- hostname = g_strdup (priv->orig_hostname); -- - return hostname; - } - -@@ -1378,7 +1370,6 @@ finalize (GObject *object) - g_slist_foreach (priv->plugins, (GFunc) g_object_unref, NULL); - g_slist_free (priv->plugins); - -- g_free (priv->orig_hostname); - g_free (priv->config_file); - - G_OBJECT_CLASS (nm_sysconfig_settings_parent_class)->finalize (object); -@@ -1476,7 +1467,6 @@ static void - nm_sysconfig_settings_init (NMSysconfigSettings *self) - { - NMSysconfigSettingsPrivate *priv = NM_SYSCONFIG_SETTINGS_GET_PRIVATE (self); -- char hostname[HOST_NAME_MAX + 2]; - - priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL); - -@@ -1488,13 +1478,5 @@ nm_sysconfig_settings_init (NMSysconfigSettings *self) - self); - } else - g_warning ("%s: failed to create PolicyKit authority.", __func__); -- -- /* Grab hostname on startup and use that if no plugins provide one */ -- memset (hostname, 0, sizeof (hostname)); -- if (gethostname (&hostname[0], HOST_NAME_MAX) == 0) { -- /* only cache it if it's a valid hostname */ -- if (strlen (hostname) && strcmp (hostname, "localhost") && strcmp (hostname, "localhost.localdomain")) -- priv->orig_hostname = g_strdup (hostname); -- } - } - diff --git a/debian/patches/04-etc-hosts-rewrite.patch b/debian/patches/04-etc-hosts-rewrite.patch deleted file mode 100644 index 3e640f69..00000000 --- a/debian/patches/04-etc-hosts-rewrite.patch +++ /dev/null @@ -1,172 +0,0 @@ -commit f6c383ff14412ea264fa8740dec84f92a89bd385 -Author: Dan Williams -Date: Mon Feb 1 17:29:58 2010 -0800 - - policy: be more selective when adding hostname to /etc/hosts (debian #567411) - - If the user has already mapped the hostname to some other address, - assume the user knows what they are doing (since they probably do) - and leave that mapping alone, and create a minimal 127.0.0.1 entry. - If there was no hostname mapping, add it to the 127.0.0.1 entry - like NM did before. - -diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c -index 7034520..1b7801c 100644 ---- a/src/NetworkManagerPolicy.c -+++ b/src/NetworkManagerPolicy.c -@@ -252,13 +252,84 @@ get_best_device (NMManager *manager, NMActRequest **out_req) - return best; - } - -+static gboolean -+is_localhost_mapping (const char *str) -+{ -+ return (!strncmp (str, "127.0.0.1", strlen ("127.0.0.1")) && strstr (str, "localhost")); -+} -+ -+static gboolean -+find_token (const char *line, const char *token) -+{ -+ const char *start = line, *p = line; -+ -+ g_return_val_if_fail (line != NULL, FALSE); -+ g_return_val_if_fail (token != NULL, FALSE); -+ g_return_val_if_fail (strlen (token) > 0, FALSE); -+ -+ /* Walk through the line to find the next whitespace character */ -+ while (p <= line + strlen (line)) { -+ if (isblank (*p) || (*p == '\0')) { -+ /* Token starts with 'start' and ends with 'end' */ -+ if ((p > start) && *start && !strncmp (start, token, (p - start))) -+ return TRUE; /* found */ -+ -+ /* not found; advance start and continue looking */ -+ start = p + 1; -+ } -+ p++; -+ } -+ -+ return FALSE; -+} -+ -+#if 0 -+/* Testcase for find_token; break it out and add it to the testsuite */ -+ -+typedef struct { -+ const char *line; -+ const char *token; -+ gboolean expected; -+} Foo; -+ -+static Foo foo[] = { -+ { "127.0.0.1\tfoobar\tblah", "blah", TRUE }, -+ { "", "blah", FALSE }, -+ { "1.1.1.1\tbork\tfoo", "blah", FALSE }, -+ { "127.0.0.1 foobar\tblah", "blah", TRUE }, -+ { "127.0.0.1 foobar blah", "blah", TRUE }, -+ { "192.168.1.1 blah borkbork", "blah", TRUE }, -+ { "192.168.1.1 foobar\tblah borkbork", "blah", TRUE }, -+ { "192.168.1.1\tfoobar\tblah\tborkbork", "blah", TRUE }, -+ { "192.168.1.1 \tfoobar \tblah \tborkbork\t ", "blah", TRUE }, -+ { "\t\t\t\t \t\t\tasdfadf a\t\t\t\t\t \t\t\t\t\t ", "blah", FALSE }, -+ { NULL, NULL, FALSE } -+}; -+ -+int main(int argc, char **argv) -+{ -+ Foo *iter = &foo[0]; -+ -+ while (iter->line) { -+ if (find_token (iter->line, iter->token) != iter->expected) { -+ g_message ("Failed: '%s' <= '%s' (%d)", iter->line, iter->token, iter->expected); -+ return 1; -+ } -+ iter++; -+ } -+ -+ g_message ("Success"); -+ return 0; -+} -+#endif -+ - #define FALLBACK_HOSTNAME "localhost.localdomain" - - static gboolean - update_etc_hosts (const char *hostname) - { - char *contents = NULL; -- char **lines = NULL, **line; -+ char **lines = NULL, **line, **host_mapping = NULL; - GError *error = NULL; - gboolean initial_comments = TRUE; - gboolean added = FALSE; -@@ -285,25 +356,62 @@ update_etc_hosts (const char *hostname) - return FALSE; - } - -- /* Replace any 127.0.0.1 entry that is at the beginning of the file or right -- * after initial comments. If there is no 127.0.0.1 entry at the beginning -- * or after initial comments, add one there and ignore any other 127.0.0.1 -- * entries. -+ /* Two-pass modification of /etc/hosts: -+ * -+ * 1) Look for a non-comment, non-localhost line that contains the current -+ * hostname. Mark that line. -+ * -+ * 2) For each line in the existing /etc/hosts, add it to the new /etc/hosts -+ * unless it starts with 127.0.0.1 and is right after the initial comments -+ * (if any) and contains "localhost". - */ -+ -+ /* Find any existing hostname mapping */ - for (line = lines; lines && *line; line++) { -+ /* Look for any line that (a) contains the current hostname, and -+ * (b) does not start with '127.0.0.1' and contain 'localhost'. -+ */ -+ if ( strlen (*line) -+ && (*line[0] != '#') -+ && find_token (*line, hostname) -+ && !is_localhost_mapping (*line)) { -+ host_mapping = line; -+ break; -+ } -+ } -+ -+ /* Construct the new hosts file; replace any 127.0.0.1 entry that is at the -+ * beginning of the file or right after initial comments and contains -+ * the string 'localhost'. If there is no 127.0.0.1 entry at the beginning -+ * or after initial comments that contains 'localhost', add one there -+ * and ignore any other 127.0.0.1 entries that contain 'localhost'. -+ */ -+ for (line = lines, initial_comments = TRUE; lines && *line; line++) { - gboolean add_line = TRUE; - - /* This is the first line after the initial comments */ -- if (initial_comments && (*line[0] != '#')) { -+ if (strlen (*line) && initial_comments && (*line[0] != '#')) { - initial_comments = FALSE; -- g_string_append_printf (new_contents, "127.0.0.1\t%s", hostname); -+ -+ /* If some other line contained the hostname, make a simple -+ * localhost mapping and assume the user knows what they are doing -+ * with their manual hostname entry. Otherwise if the hostname -+ * wasn't found somewhere else, add it to the localhost mapping line -+ * to make sure it's mapped to something. -+ */ -+ if (host_mapping) -+ g_string_append (new_contents, "127.0.0.1"); -+ else -+ g_string_append_printf (new_contents, "127.0.0.1\t%s", hostname); -+ - if (strcmp (hostname, FALLBACK_HOSTNAME)) - g_string_append_printf (new_contents, "\t" FALLBACK_HOSTNAME); -+ - g_string_append (new_contents, "\tlocalhost\n"); - added = TRUE; - - /* Don't add the entry if it's supposed to be the actual localhost reverse mapping */ -- if (!strncmp (*line, "127.0.0.1", strlen ("127.0.0.1")) && strstr (*line, "localhost")) -+ if (is_localhost_mapping (*line)) - add_line = FALSE; - } - diff --git a/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch b/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch deleted file mode 100644 index d27dfe35..00000000 --- a/debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: NetworkManager-0.7.999/system-settings/plugins/ifupdown/plugin.c -=================================================================== ---- NetworkManager-0.7.999.orig/system-settings/plugins/ifupdown/plugin.c 2010-02-08 16:07:48.379559508 +0100 -+++ NetworkManager-0.7.999/system-settings/plugins/ifupdown/plugin.c 2010-02-08 16:08:04.255557965 +0100 -@@ -355,7 +355,7 @@ - ifparser_init (); - block = ifparser_getfirst (); - while (block) { -- if(!strcmp ("auto", block->type)) -+ if(!strcmp ("auto", block->type) || !strcmp ("allow-hotplug", block->type)) - g_hash_table_insert (auto_ifaces, block->name, GUINT_TO_POINTER (1)); - else if (!strcmp ("iface", block->type) && strcmp ("lo", block->name)) { - NMIfupdownConnection *exported; diff --git a/debian/patches/series b/debian/patches/series index f1e83cf1..5bb8c3f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ 02-dbus_access_network_manager.patch -03-hostname-fallback.patch -04-etc-hosts-rewrite.patch -05-ifupdown-allow-hotplug-autoconnect.patch -- cgit 1.3.0-6-gf8a5 From 03b378dd2f1f59325f006bf8487ba90b9e35538c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Feb 2010 23:17:26 +0000 Subject: ifupdown: don't export connections until "managed" state is checked. (Closes: #568287) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3531 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 782bf775..42bdb494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ network-manager (0.8-1) UNRELEASED; urgency=low * New upstream release. + - ifupdown: don't export connections until "managed" state is checked. + (Closes: #568287) * Remove patches, all merged upstream - debian/patches/04-etc-hosts-rewrite.patch - debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch -- cgit 1.3.0-6-gf8a5 From a6b6ba5627670f6e872164feac97c2d958c2142a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Feb 2010 23:27:07 +0000 Subject: * debian/network-manager-dispatcher.script - Map NetworkManager down event to ifupdown post-down phase. (Closes: #562811) - Map vpn-up/vpn-down event to ifupdown post-up/post-down phase. (Closes: #518530) - Comment out pre-up/pre-down events as they are not supported upstream. - Add hostname event but don't hook it up with a particular action. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3532 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/network-manager-dispatcher.script | 29 +++++++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 42bdb494..71a8380b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,13 @@ network-manager (0.8-1) UNRELEASED; urgency=low - debian/patches/04-etc-hosts-rewrite.patch - debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch - debian/patches/03-hostname-fallback.patch + * debian/network-manager-dispatcher.script + - Map NetworkManager down event to ifupdown post-down phase. + (Closes: #562811) + - Map vpn-up/vpn-down event to ifupdown post-up/post-down phase. + (Closes: #518530) + - Comment out pre-up/pre-down events as they are not supported upstream. + - Add hostname event but don't hook it up with a particular action. -- Michael Biebl Fri, 19 Feb 2010 21:41:06 +0100 diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script index fd182853..9cd12d06 100644 --- a/debian/network-manager-dispatcher.script +++ b/debian/network-manager-dispatcher.script @@ -2,6 +2,7 @@ # Script to dispatch NetworkManager events # # Runs ifupdown scripts when NetworkManager fiddles with interfaces. +# See NetworkManager(8) for further documentation of the dispatcher events. if [ -z "$1" ]; then echo "$0: called with no interface" 1>&2 @@ -17,26 +18,30 @@ export VERBOSITY="0" # Run the right scripts case "$2" in - up) + up|vpn-up) export MODE="start" export PHASE="post-up" exec run-parts /etc/network/if-up.d ;; - down) - export MODE="stop" - export PHASE="pre-down" - exec run-parts /etc/network/if-down.d - ;; - pre-up) - export MODE="start" - export PHASE="pre-up" - exec run-parts /etc/network/if-pre-up.d - ;; - post-down) + down|vpn-down) export MODE="stop" export PHASE="post-down" exec run-parts /etc/network/if-post-down.d ;; +# pre-up/pre-down not implemented. See +# https://bugzilla.gnome.org/show_bug.cgi?id=387832 +# pre-up) +# export MODE="start" +# export PHASE="pre-up" +# exec run-parts /etc/network/if-pre-up.d +# ;; +# pre-down) +# export MODE="stop" +# export PHASE="pre-down" +# exec run-parts /etc/network/if-down.d +# ;; + hostname) + ;; *) echo "$0: called with unknown action \`$2'" 1>&2 exit 1 -- cgit 1.3.0-6-gf8a5 From a147b64785f4ca6ad1f8a1905486a2b723c7bf95 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Feb 2010 23:32:31 +0000 Subject: Release version 0.8-1 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3533 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71a8380b..862ae01e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -network-manager (0.8-1) UNRELEASED; urgency=low +network-manager (0.8-1) unstable; urgency=low * New upstream release. - ifupdown: don't export connections until "managed" state is checked. (Closes: #568287) * Remove patches, all merged upstream + - debian/patches/03-hostname-fallback.patch - debian/patches/04-etc-hosts-rewrite.patch - debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch - - debian/patches/03-hostname-fallback.patch * debian/network-manager-dispatcher.script - Map NetworkManager down event to ifupdown post-down phase. (Closes: #562811) @@ -15,7 +15,7 @@ network-manager (0.8-1) UNRELEASED; urgency=low - Comment out pre-up/pre-down events as they are not supported upstream. - Add hostname event but don't hook it up with a particular action. - -- Michael Biebl Fri, 19 Feb 2010 21:41:06 +0100 + -- Michael Biebl Mon, 22 Feb 2010 00:31:22 +0100 network-manager (0.7.999-3) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 3239537bbf991c6cb7580e482cc49fb461e04ca7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:25:14 +0000 Subject: * New upstream release (0.8.1 rc1). (Closes: #582822) - Bluetooth Dial-Up Networking support. - Command line interface via nmcli. - IPv6 DHCP support. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3617 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 862ae01e..6a58b487 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (0.8.0.999-1) UNRELEASED; urgency=low + + * New upstream release (0.8.1 rc1). (Closes: #582822) + - Bluetooth Dial-Up Networking support. + - Command line interface via nmcli. + - IPv6 DHCP support. + + -- Michael Biebl Thu, 20 May 2010 02:38:38 +0200 + network-manager (0.8-1) unstable; urgency=low * New upstream release. -- cgit 1.3.0-6-gf8a5 From 51e010e658bc92cae2acba858f32f069b71dfae6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:36:08 +0000 Subject: * Switch to source format 3.0 (quilt). - Add debian/source/format. - Drop Build-Depends on quilt. - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3618 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +++++- debian/control | 1 - debian/rules | 1 - debian/source/format | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 6a58b487..436a66bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Bluetooth Dial-Up Networking support. - Command line interface via nmcli. - IPv6 DHCP support. + * Switch to source format 3.0 (quilt). + - Add debian/source/format. + - Drop Build-Depends on quilt. + - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules. - -- Michael Biebl Thu, 20 May 2010 02:38:38 +0200 + -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 network-manager (0.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 3d3a947b..6ce0bc84 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: autotools-dev, pkg-config, intltool, - quilt, libdbus-glib-1-dev (>= 0.75), libdbus-1-dev (>= 1.1), libiw-dev(>= 27+28pre9), diff --git a/debian/rules b/debian/rules index 0fefb1de..dc57d45c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit 1.3.0-6-gf8a5 From bebcd9f0d1287544a13f8a7c34747d6e60923d51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:38:52 +0000 Subject: * debian/libnm-{glib2,util1}.symbols - Update symbols files for new API additions. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3619 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/libnm-glib2.symbols | 4 ++++ debian/libnm-util1.symbols | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 436a66bb..89c6ec10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Add debian/source/format. - Drop Build-Depends on quilt. - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules. + * debian/libnm-{glib2,util1}.symbols + - Update symbols files for new API additions. -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/libnm-glib2.symbols b/debian/libnm-glib2.symbols index ce1b0fc1..d5e072c9 100644 --- a/debian/libnm-glib2.symbols +++ b/debian/libnm-glib2.symbols @@ -16,6 +16,7 @@ libnm-glib.so.2 libnm-glib2 #MINVER# nm_access_point_get_wpa_flags@Base 0.7.999 nm_access_point_new@Base 0.7.999 nm_active_connection_get_connection@Base 0.7.999 + nm_active_connection_get_default6@Base 0.8.0.999 nm_active_connection_get_default@Base 0.7.999 nm_active_connection_get_devices@Base 0.7.999 nm_active_connection_get_scope@Base 0.7.999 @@ -34,6 +35,8 @@ libnm-glib.so.2 libnm-glib2 #MINVER# nm_client_get_manager_running@Base 0.7.999 nm_client_get_state@Base 0.7.999 nm_client_get_type@Base 0.7.999 + nm_client_networking_get_enabled@Base 0.8.0.999 + nm_client_networking_set_enabled@Base 0.8.0.999 nm_client_new@Base 0.7.999 nm_client_sleep@Base 0.7.999 nm_client_wireless_get_enabled@Base 0.7.999 @@ -119,6 +122,7 @@ libnm-glib.so.2 libnm-glib2 #MINVER# nm_settings_connection_interface_get_type@Base 0.7.999 nm_settings_connection_interface_update@Base 0.7.999 nm_settings_interface_add_connection@Base 0.7.999 + nm_settings_interface_error_get_type@Base 0.8.0.999 nm_settings_interface_error_quark@Base 0.7.999 nm_settings_interface_get_connection_by_path@Base 0.7.999 nm_settings_interface_get_type@Base 0.7.999 diff --git a/debian/libnm-util1.symbols b/debian/libnm-util1.symbols index 6045e97d..67d6bf27 100644 --- a/debian/libnm-util1.symbols +++ b/debian/libnm-util1.symbols @@ -52,10 +52,12 @@ libnm-util.so.1 libnm-util1 #MINVER# nm_ip6_address_compare@Base 0.7.999 nm_ip6_address_dup@Base 0.7.999 nm_ip6_address_get_address@Base 0.7.999 + nm_ip6_address_get_gateway@Base 0.8.0.999 nm_ip6_address_get_prefix@Base 0.7.999 nm_ip6_address_new@Base 0.7.999 nm_ip6_address_ref@Base 0.7.999 nm_ip6_address_set_address@Base 0.7.999 + nm_ip6_address_set_gateway@Base 0.8.0.999 nm_ip6_address_set_prefix@Base 0.7.999 nm_ip6_address_unref@Base 0.7.999 nm_ip6_route_compare@Base 0.7.999 @@ -168,8 +170,10 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_allowed_bands@Base 0.8.0.999 nm_setting_gsm_get_apn@Base 0.7.0 nm_setting_gsm_get_band@Base 0.7.0 + nm_setting_gsm_get_home_only@Base 0.8.0.999 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 @@ -197,6 +201,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_may_fail@Base 0.8.0.999 nm_setting_ip4_config_get_method@Base 0.7.0 nm_setting_ip4_config_get_never_default@Base 0.7.0.97 nm_setting_ip4_config_get_num_addresses@Base 0.7.0 @@ -225,6 +230,7 @@ libnm-util.so.1 libnm-util1 #MINVER# nm_setting_ip6_config_get_dns_search@Base 0.7.999 nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.999 nm_setting_ip6_config_get_ignore_auto_routes@Base 0.7.999 + nm_setting_ip6_config_get_may_fail@Base 0.8.0.999 nm_setting_ip6_config_get_method@Base 0.7.999 nm_setting_ip6_config_get_never_default@Base 0.7.999 nm_setting_ip6_config_get_num_addresses@Base 0.7.999 @@ -365,6 +371,7 @@ libnm-util.so.1 libnm-util1 #MINVER# 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_get_default_prefix@Base 0.8.0.999 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 -- cgit 1.3.0-6-gf8a5 From 78058a57beb557e6eec817f3b8711e6fd417b9e1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:40:07 +0000 Subject: * debian/network-manager.{install,manpages} - Install nmcli binary and man page. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3620 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/network-manager.install | 1 + debian/network-manager.manpages | 3 +++ 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 89c6ec10..b38e0201 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules. * debian/libnm-{glib2,util1}.symbols - Update symbols files for new API additions. + * debian/network-manager.{install,manpages} + - Install nmcli binary and man page. -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/network-manager.install b/debian/network-manager.install index 5c8acab9..46061932 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,5 +1,6 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/bin/nm-tool +debian/tmp/usr/bin/nmcli 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 diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 7f4f19b0..4bc312cc 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,2 +1,5 @@ man/NetworkManager.8 +man/NetworkManager.conf.5 +man/nm-system-settings.conf.5 man/nm-tool.1 +man/nmcli.1 -- cgit 1.3.0-6-gf8a5 From 363b89b21dccb2f2624502f74de5f8a911bf8ec8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:55:53 +0000 Subject: Correctly reset state after a failed suspend/resume cycle. (Closes: #620806) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3621 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index b38e0201..e018e170 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Bluetooth Dial-Up Networking support. - Command line interface via nmcli. - IPv6 DHCP support. + - Correctly reset state after a failed suspend/resume cycle. + (Closes: #620806) * Switch to source format 3.0 (quilt). - Add debian/source/format. - Drop Build-Depends on quilt. -- cgit 1.3.0-6-gf8a5 From ccc7e9dfa9f45b46e23fb9e44a5fc8ced914d7db Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:56:37 +0000 Subject: Use correct BTS bug # git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3622 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e018e170..c3b1120d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Command line interface via nmcli. - IPv6 DHCP support. - Correctly reset state after a failed suspend/resume cycle. - (Closes: #620806) + (Closes: #566891) * Switch to source format 3.0 (quilt). - Add debian/source/format. - Drop Build-Depends on quilt. -- cgit 1.3.0-6-gf8a5 From 455bf819b5b9fcdef40a3fa418aa131ad770fbd3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 01:58:49 +0000 Subject: * debian/libnm-{glib,util}-dev.install - Install gtk-doc API documentation for libnm-glib and libnm-util. - Install nm-dhcp6-config.h for libnm-glib. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3623 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/libnm-glib-dev.install | 2 ++ debian/libnm-util-dev.install | 1 + 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c3b1120d..a708a180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Update symbols files for new API additions. * debian/network-manager.{install,manpages} - Install nmcli binary and man page. + * debian/libnm-{glib,util}-dev.install + - Install gtk-doc API documentation for libnm-glib and libnm-util. + - Install nm-dhcp6-config.h for libnm-glib. -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index ad791296..abbba845 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -8,6 +8,8 @@ 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-ip*-config.h debian/tmp/usr/include/libnm-glib/nm-dhcp4-config.h +debian/tmp/usr/include/libnm-glib/nm-dhcp6-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 +debian/tmp/usr/share/gtk-doc/html/libnm-glib/ diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install index 8a8e5486..fb6fb8a1 100644 --- a/debian/libnm-util-dev.install +++ b/debian/libnm-util-dev.install @@ -5,3 +5,4 @@ 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 +debian/tmp/usr/share/gtk-doc/html/libnm-util/ -- cgit 1.3.0-6-gf8a5 From 9947efda624e9ab95bb580f76804509e32fa3bf6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 02:06:36 +0000 Subject: * debian/control - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get DHCPv6 support. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3624 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a708a180..f8a00703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low * debian/libnm-{glib,util}-dev.install - Install gtk-doc API documentation for libnm-glib and libnm-util. - Install nm-dhcp6-config.h for libnm-glib. + * debian/control + - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get + DHCPv6 support. -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/control b/debian/control index 6ce0bc84..8dff7670 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Depends: udev, ifupdown, adduser, - dhcp3-client + isc-dhcp-client (>= 4.1.1-P1-4) Recommends: network-manager-gnome | network-manager-kde, policykit-1, -- cgit 1.3.0-6-gf8a5 From 6296b7f6d9a5eba36a5bb6d1509ae86fb5976737 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 02:19:21 +0000 Subject: * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch - Update dhclient.conf and lease directory path for isc-dhcp-client. (Closes: #587473) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3625 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/patches/30-fix_paths_for_isc_dhcp_v4.patch | 26 +++++++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 debian/patches/30-fix_paths_for_isc_dhcp_v4.patch diff --git a/debian/changelog b/debian/changelog index f8a00703..c2a79403 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low * debian/control - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get DHCPv6 support. + * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch + - Update dhclient.conf and lease directory path for isc-dhcp-client. + (Closes: #587473) -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch b/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch new file mode 100644 index 00000000..5a3e5336 --- /dev/null +++ b/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch @@ -0,0 +1,26 @@ +Index: b/src/dhcp-manager/nm-dhcp-dhclient.c +=================================================================== +--- a/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:18.421304546 +0200 ++++ b/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:31.369301275 +0200 +@@ -44,9 +44,7 @@ + + #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) + +-#if defined(TARGET_DEBIAN) +-#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" +-#elif defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) ++#if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) + #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" + #else + #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" +@@ -437,9 +435,7 @@ + + #if defined(TARGET_SUSE) + orig = g_strdup (SYSCONFDIR "/dhclient.conf"); +-#elif defined(TARGET_DEBIAN) +- orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); +-#elif defined(TARGET_GENTOO) ++#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) + orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); + #else + orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface); diff --git a/debian/patches/series b/debian/patches/series index 5bb8c3f1..b4d0a45e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +# Debian patches for network-manager 02-dbus_access_network_manager.patch +30-fix_paths_for_isc_dhcp_v4.patch -- cgit 1.3.0-6-gf8a5 From e8d5806e19934d6b2ef60bdfd45869baaba7dd2f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 02:23:02 +0000 Subject: * debian/libnm-glib-{vpn-}dev.links - Stop installing compat symlinks for the pkg-config files. (Closes: #569187) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3626 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/libnm-glib-dev.links | 1 - debian/libnm-glib-vpn-dev.links | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 debian/libnm-glib-dev.links delete mode 100644 debian/libnm-glib-vpn-dev.links diff --git a/debian/changelog b/debian/changelog index c2a79403..1985e3c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,9 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch - Update dhclient.conf and lease directory path for isc-dhcp-client. (Closes: #587473) + * debian/libnm-glib-{vpn-}dev.links + - Stop installing compat symlinks for the pkg-config files. + (Closes: #569187) -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/libnm-glib-dev.links b/debian/libnm-glib-dev.links deleted file mode 100644 index 0b299825..00000000 --- a/debian/libnm-glib-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/pkgconfig/libnm-glib.pc usr/lib/pkgconfig/libnm_glib.pc diff --git a/debian/libnm-glib-vpn-dev.links b/debian/libnm-glib-vpn-dev.links deleted file mode 100644 index d74ba252..00000000 --- a/debian/libnm-glib-vpn-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/pkgconfig/libnm-glib-vpn.pc usr/lib/pkgconfig/libnm_glib_vpn.pc -- cgit 1.3.0-6-gf8a5 From 9f7c174246ac2085be2129ca9c86eaded9e377cc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 02:27:02 +0000 Subject: * debian/rules - Set --with-pppd-plugin-dir configure option to /usr/lib/pppd/2.4.4. The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3627 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/rules | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1985e3c9..1a0d4211 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low * debian/libnm-glib-{vpn-}dev.links - Stop installing compat symlinks for the pkg-config files. (Closes: #569187) + * debian/rules + - Set --with-pppd-plugin-dir configure option to /usr/lib/pppd/2.4.4. + The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4. -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 diff --git a/debian/rules b/debian/rules index dc57d45c..2944e43a 100755 --- a/debian/rules +++ b/debian/rules @@ -20,13 +20,14 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-dhcp-client=/sbin/dhclient \ --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ + --with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \ --disable-more-warnings - + DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . clean:: rm -f po/*.gmo - + binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown -- cgit 1.3.0-6-gf8a5 From de8662539a39bf8a64fbf9781edf79199deaf87d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 02:35:08 +0000 Subject: Add Depends on libdbus-glib-1-dev for libnm-util-dev. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3628 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a0d4211..c18bb697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Install gtk-doc API documentation for libnm-glib and libnm-util. - Install nm-dhcp6-config.h for libnm-glib. * debian/control + - Add Depends on libdbus-glib-1-dev for libnm-util-dev. - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get DHCPv6 support. * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch diff --git a/debian/control b/debian/control index 8dff7670..8062fa1f 100644 --- a/debian/control +++ b/debian/control @@ -109,7 +109,7 @@ Depends: libnm-util-dev, network-manager-dev, libglib2.0-dev, - libdbus-glib-1-dev (>= 0.60) + libdbus-glib-1-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 @@ -179,7 +179,8 @@ Architecture: any Depends: libnm-util1 (= ${binary:Version}), ${misc:Depends}, - libglib2.0-dev + libglib2.0-dev, + libdbus-glib-1-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 -- cgit 1.3.0-6-gf8a5 From 841bfc48a7eb00c0a351c0f80de865a2638e7cab Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 14:40:15 +0000 Subject: Release version 0.8.0.999-1 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3631 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c18bb697..2f761d50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.0.999-1) UNRELEASED; urgency=low +network-manager (0.8.0.999-1) unstable; urgency=low * New upstream release (0.8.1 rc1). (Closes: #582822) - Bluetooth Dial-Up Networking support. @@ -31,7 +31,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Set --with-pppd-plugin-dir configure option to /usr/lib/pppd/2.4.4. The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4. - -- Michael Biebl Thu, 08 Jul 2010 03:32:37 +0200 + -- Michael Biebl Thu, 08 Jul 2010 16:39:38 +0200 network-manager (0.8-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 291f820df488d466bef73baaa91af97a1c1775a2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 14:55:08 +0000 Subject: Back to UNRELEASED git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3632 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2f761d50..f872776b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.0.999-1) unstable; urgency=low +network-manager (0.8.0.999-1) UNRELEASED; urgency=low * New upstream release (0.8.1 rc1). (Closes: #582822) - Bluetooth Dial-Up Networking support. -- cgit 1.3.0-6-gf8a5 From f2800b281229c72f183e2e430f071d6c6edf6d77 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 14:59:02 +0000 Subject: Set --with-dhclient configure option to /sbin/dhclient. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3633 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f872776b..2504bebf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low * debian/rules - Set --with-pppd-plugin-dir configure option to /usr/lib/pppd/2.4.4. The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4. + - Set --with-dhclient configure option to /sbin/dhclient. -- Michael Biebl Thu, 08 Jul 2010 16:39:38 +0200 diff --git a/debian/rules b/debian/rules index 2944e43a..89347de2 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,9 @@ DEB_INSTALL_DOCS_ALL := README AUTHORS DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager" DEB_CONFIGURE_EXTRA_FLAGS := \ - --with-dbus-sys=/etc/dbus-1/system.d \ --with-distro=debian \ --with-resolvconf=/sbin/resolvconf \ - --with-dhcp-client=/sbin/dhclient \ + --with-dhclient=/sbin/dhclient \ --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \ -- cgit 1.3.0-6-gf8a5 From 02b028c2ea7113f0014c07b8d6a9c44608f7858f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 15:01:46 +0000 Subject: Bump Standards-Version to 3.9.0. No further changes. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3634 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2504bebf..a7895b22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low - Install nm-dhcp6-config.h for libnm-glib. * debian/control - Add Depends on libdbus-glib-1-dev for libnm-util-dev. + - Bump Standards-Version to 3.9.0. No further changes. - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get DHCPv6 support. * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch diff --git a/debian/control b/debian/control index 8062fa1f..40d55c8b 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: uuid-dev, libudev-dev, libgudev-1.0-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/ Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From c97486c97ac8346927e4593be5dfce1c947ba2b3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jul 2010 15:03:44 +0000 Subject: Release version 0.8.0.999-1 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3635 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7895b22..098f8608 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.0.999-1) UNRELEASED; urgency=low +network-manager (0.8.0.999-1) unstable; urgency=low * New upstream release (0.8.1 rc1). (Closes: #582822) - Bluetooth Dial-Up Networking support. @@ -33,7 +33,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4. - Set --with-dhclient configure option to /sbin/dhclient. - -- Michael Biebl Thu, 08 Jul 2010 16:39:38 +0200 + -- Michael Biebl Thu, 08 Jul 2010 17:01:53 +0200 network-manager (0.8-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From fb17d6389872baef963a7c708842b287073896b1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 21 Jul 2010 23:50:39 +0000 Subject: New upstream release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3671 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 098f8608..efa7ae98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.8.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Michael Biebl Thu, 22 Jul 2010 01:50:20 +0200 + network-manager (0.8.0.999-1) unstable; urgency=low * New upstream release (0.8.1 rc1). (Closes: #582822) -- cgit 1.3.0-6-gf8a5 From 3bf6d0febfe10b70392af4756af3a1a2ff3055bc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 21 Jul 2010 23:53:41 +0000 Subject: * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch - Remove, merged upstream. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3672 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/patches/30-fix_paths_for_isc_dhcp_v4.patch | 26 ----------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/30-fix_paths_for_isc_dhcp_v4.patch diff --git a/debian/changelog b/debian/changelog index efa7ae98..2e34d77e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low * New upstream release. + * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch + - Remove, merged upstream. -- Michael Biebl Thu, 22 Jul 2010 01:50:20 +0200 diff --git a/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch b/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch deleted file mode 100644 index 5a3e5336..00000000 --- a/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: b/src/dhcp-manager/nm-dhcp-dhclient.c -=================================================================== ---- a/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:18.421304546 +0200 -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:31.369301275 +0200 -@@ -44,9 +44,7 @@ - - #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) - --#if defined(TARGET_DEBIAN) --#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" --#elif defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) -+#if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) - #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" - #else - #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" -@@ -437,9 +435,7 @@ - - #if defined(TARGET_SUSE) - orig = g_strdup (SYSCONFDIR "/dhclient.conf"); --#elif defined(TARGET_DEBIAN) -- orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); --#elif defined(TARGET_GENTOO) -+#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) - orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); - #else - orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface); diff --git a/debian/patches/series b/debian/patches/series index b4d0a45e..c40ab33b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch -30-fix_paths_for_isc_dhcp_v4.patch -- cgit 1.3.0-6-gf8a5 From fed4837b2b36b0a95a41059514466e67336094e9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 26 Jul 2010 22:46:04 +0000 Subject: Close #590139 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3679 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e34d77e..1710d3a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low - * New upstream release. + * New upstream release. (Closes: #590139) * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch - Remove, merged upstream. -- cgit 1.3.0-6-gf8a5 From 151876d0792f3017eee4601685a5806492e28326 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Jul 2010 00:02:43 +0000 Subject: * Build against ppp 2.4.5. (Closes: #589791) - Bump Build-Depends on ppp to (>= 2.4.5). - Bump Recommends on ppp to (>= 2.4.5). - Drop --with-pppd-plugin-dir configure option and use upstream default. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3680 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++++ debian/control | 4 ++-- debian/rules | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1710d3a1..5d345981 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low * New upstream release. (Closes: #590139) * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch - Remove, merged upstream. + * Build against ppp 2.4.5. (Closes: #589791) + - Bump Build-Depends on ppp to (>= 2.4.5). + - Bump Recommends on ppp to (>= 2.4.5). + - Drop --with-pppd-plugin-dir configure option and use upstream default. -- Michael Biebl Thu, 22 Jul 2010 01:50:20 +0200 diff --git a/debian/control b/debian/control index 40d55c8b..f126f87c 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: libiw-dev(>= 27+28pre9), libglib2.0-dev (>= 2.18), libnl-dev (>= 1.0~pre8), - ppp-dev, + ppp-dev (>= 2.4.5), libpolkit-gobject-1-dev, libgnutls-dev, uuid-dev, @@ -40,7 +40,7 @@ Depends: Recommends: network-manager-gnome | network-manager-kde, policykit-1, - ppp, + ppp (>= 2.4.5), dnsmasq-base, iptables, modemmanager diff --git a/debian/rules b/debian/rules index 89347de2..b1bbea63 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --with-dhclient=/sbin/dhclient \ --with-iptables=/sbin/iptables \ --with-crypto=gnutls \ - --with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \ --disable-more-warnings DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 . -- cgit 1.3.0-6-gf8a5 From 58f8c4a32886be19efcec9e00c52014bd63c0d5d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Jul 2010 00:12:04 +0000 Subject: * debian/network-manager.postrm - Clean up /var/lib/NetworkManager on purge. (Closes: #584854) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3681 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/network-manager.postrm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 debian/network-manager.postrm diff --git a/debian/changelog b/debian/changelog index 5d345981..c05ffd58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low - Bump Build-Depends on ppp to (>= 2.4.5). - Bump Recommends on ppp to (>= 2.4.5). - Drop --with-pppd-plugin-dir configure option and use upstream default. + * debian/network-manager.postrm + - Clean up /var/lib/NetworkManager on purge. (Closes: #584854) -- Michael Biebl Thu, 22 Jul 2010 01:50:20 +0200 diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm new file mode 100644 index 00000000..0c870c00 --- /dev/null +++ b/debian/network-manager.postrm @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + # Clean up state file on purge + rm -f /var/lib/NetworkManager/NetworkManager.state + rmdir --ignore-fail-on-non-empty /var/lib/NetworkManager + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 -- cgit 1.3.0-6-gf8a5 From fd6666a324e879666c272d77a6771f4fcaf00788 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Jul 2010 00:14:40 +0000 Subject: * debian/control - Bump Standards-Version to 3.9.1. No further changes. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3682 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c05ffd58..4426dd0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low - Drop --with-pppd-plugin-dir configure option and use upstream default. * debian/network-manager.postrm - Clean up /var/lib/NetworkManager on purge. (Closes: #584854) + * debian/control + - Bump Standards-Version to 3.9.1. No further changes. -- Michael Biebl Thu, 22 Jul 2010 01:50:20 +0200 diff --git a/debian/control b/debian/control index f126f87c..3fa8744b 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: uuid-dev, libudev-dev, libgudev-1.0-dev -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/ Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From 560b07f6a5b872b2cdb2b2f4030e30e6d79b84c9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 27 Jul 2010 00:27:35 +0000 Subject: Release version 0.8.1-1 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3683 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4426dd0b..0f03e480 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.1-1) UNRELEASED; urgency=low +network-manager (0.8.1-1) unstable; urgency=low * New upstream release. (Closes: #590139) * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch @@ -12,7 +12,7 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low * debian/control - Bump Standards-Version to 3.9.1. No further changes. - -- Michael Biebl Thu, 22 Jul 2010 01:50:20 +0200 + -- Michael Biebl Tue, 27 Jul 2010 02:26:59 +0200 network-manager (0.8.0.999-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 4c8902d6d92495b4ee774fef6f654617a2855175 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 29 Jul 2010 23:58:25 +0000 Subject: Move configuration file /etc/NetworkManager/nm-system-settings.conf to /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move the conffile without triggering a dpkg prompt. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3707 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.conf | 5 +++ debian/changelog | 8 ++++ debian/network-manager.install | 2 +- debian/network-manager.postinst | 84 ++++++++++++++++++++++++----------------- debian/network-manager.preinst | 42 +++++++++++++++------ debian/nm-system-settings.conf | 5 --- 6 files changed, 93 insertions(+), 53 deletions(-) create mode 100644 debian/NetworkManager.conf delete mode 100644 debian/nm-system-settings.conf diff --git a/debian/NetworkManager.conf b/debian/NetworkManager.conf new file mode 100644 index 00000000..d8b33d91 --- /dev/null +++ b/debian/NetworkManager.conf @@ -0,0 +1,5 @@ +[main] +plugins=ifupdown,keyfile + +[ifupdown] +managed=false diff --git a/debian/changelog b/debian/changelog index 0f03e480..0519f46b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.8.1-2) UNRELEASED; urgency=low + + * Move configuration file /etc/NetworkManager/nm-system-settings.conf to + /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move + the conffile without triggering a dpkg prompt. + + -- Michael Biebl Fri, 30 Jul 2010 01:53:34 +0200 + network-manager (0.8.1-1) unstable; urgency=low * New upstream release. (Closes: #590139) diff --git a/debian/network-manager.install b/debian/network-manager.install index 46061932..dbe43cfa 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -17,5 +17,5 @@ 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/ debian/tmp/lib/udev/rules.d/*.rules +debian/NetworkManager.conf etc/NetworkManager/ diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 47d06d42..fe0afb36 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -18,49 +18,63 @@ set -e # If prerm fails during replacement due to conflict: # abort-remove in-favour +# Move a conffile without triggering a dpkg question +mv_conffile() { + local OLDCONFFILE="$1" + local NEWCONFFILE="$2" + + [ -e "$OLDCONFFILE" ] || return 0 + + echo "Preserving user changes to $NEWCONFFILE ..." + mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new + mv -f "$OLDCONFFILE" "$NEWCONFFILE" +} case "$1" in configure) - - if ! getent group netdev > /dev/null; then - addgroup --quiet --system netdev - fi - - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi - - # Stop the service on upgrades before it is started again. - # dh_installinit -r will create the start code. - if [ -n "$2" ]; then - if [ -x "/etc/init.d/network-manager" ]; then - invoke-rc.d network-manager stop || true - fi - fi - - # Update init script priorities - if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then - for i in 0 1 6 ; do - if [ -e /etc/rc$i.d/K14network-manager ]; then - mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager - fi - done - fi - - # Kill nm-system-settings service as in 0.8 it is no longer a separate process - if dpkg --compare-versions "$2" lt "0.7.999-1"; then - kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true - fi - - ;; + + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + + # Stop the service on upgrades before it is started again. + # dh_installinit -r will create the start code. + if [ -n "$2" ]; then + if [ -x "/etc/init.d/network-manager" ]; then + invoke-rc.d network-manager stop || true + fi + fi + + # Update init script priorities + if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then + for i in 0 1 6 ; do + if [ -e /etc/rc$i.d/K14network-manager ]; then + mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager + fi + done + fi + + # Kill nm-system-settings service as in 0.8 it is no longer a separate process + if dpkg --compare-versions "$2" lt "0.7.999-1"; then + kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true + fi + + if dpkg --compare-versions "$2" lt "0.8.1-2"; then + mv_conffile "/etc/NetworkManager/nm-system-setttings.conf" "/etc/NetworkManager/NetworkManager.conf" + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) - ;; + ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 - exit 1 - ;; + exit 1 + ;; esac #DEBHELPER# diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 445c05ca..114ced74 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -18,26 +18,41 @@ set -e # abort-upgrade -# remove a no-longer used conffile +# Remove a no-longer used conffile rm_conffile() { PKGNAME="$1" CONFFILE="$2" - if [ -e "$CONFFILE" ]; then - 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." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi + [ -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 } +# Prepare to move a conffile without triggering a dpkg question +prep_mv_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 + rm -f "$CONFFILE" + fi +} case "$1" in install|upgrade) @@ -70,6 +85,9 @@ case "$1" in if dpkg --compare-versions "$2" lt "0.7.999-1"; then rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf fi + if dpkg --compare-versions "$2" lt "0.8.1-2"; then + prep_mv_conffile network-manager /etc/NetworkManager/nm-system-settings.conf + fi ;; abort-upgrade) diff --git a/debian/nm-system-settings.conf b/debian/nm-system-settings.conf deleted file mode 100644 index d8b33d91..00000000 --- a/debian/nm-system-settings.conf +++ /dev/null @@ -1,5 +0,0 @@ -[main] -plugins=ifupdown,keyfile - -[ifupdown] -managed=false -- cgit 1.3.0-6-gf8a5 From 6ca05706add4219eb62e00f5210f239513eaa38a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 30 Jul 2010 00:14:20 +0000 Subject: Fix a typo in postinst git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3708 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 2 +- debian/network-manager.preinst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index fe0afb36..5f372abe 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -64,7 +64,7 @@ case "$1" in fi if dpkg --compare-versions "$2" lt "0.8.1-2"; then - mv_conffile "/etc/NetworkManager/nm-system-setttings.conf" "/etc/NetworkManager/NetworkManager.conf" + mv_conffile "/etc/NetworkManager/nm-system-settings.conf" "/etc/NetworkManager/NetworkManager.conf" fi ;; diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 114ced74..80ab7a30 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -21,8 +21,8 @@ set -e # Remove a no-longer used conffile rm_conffile() { - PKGNAME="$1" - CONFFILE="$2" + local PKGNAME="$1" + local CONFFILE="$2" [ -e "$CONFFILE" ] || return 0 -- cgit 1.3.0-6-gf8a5 From db5a05790a559b4c2cead58d05ef34b7608d5a17 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 30 Jul 2010 21:29:51 +0000 Subject: Update README.Debian for the nm-system-setting.conf → NetworkManager.conf rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3709 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.README.Debian | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index 74221a38..d56a14b5 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -21,7 +21,7 @@ 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: +/etc/NetworkManager/NetworkManager.conf: [ifupdown] managed=true/false @@ -34,7 +34,7 @@ NetworkManager honour all dhcp and static configurations for wired and wireless devices. -After modifying /etc/NetworkManager/nm-systems-settings.conf _or_ +After modifying /etc/NetworkManager/NetworkManager.conf _or_ /etc/network/interfaces you may want to tell NetworkManager about the changes by running "service network-manager restart". -- cgit 1.3.0-6-gf8a5 From 73fc1d9cc2f663603bf2ef04e4f32bbf65ac0a75 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Aug 2010 02:09:48 +0000 Subject: * debian/network-manager.postrm - Don't fail on purge if /var/lib/NetworkManager directory does not exist. (Closes: #591861) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3715 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/network-manager.postrm | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0519f46b..b576b8a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ network-manager (0.8.1-2) UNRELEASED; urgency=low * Move configuration file /etc/NetworkManager/nm-system-settings.conf to /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move the conffile without triggering a dpkg prompt. + * debian/network-manager.postrm + - Don't fail on purge if /var/lib/NetworkManager directory does not exist. + (Closes: #591861) -- Michael Biebl Fri, 30 Jul 2010 01:53:34 +0200 diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm index 0c870c00..ad970dc8 100644 --- a/debian/network-manager.postrm +++ b/debian/network-manager.postrm @@ -19,8 +19,10 @@ set -e case "$1" in purge) # Clean up state file on purge - rm -f /var/lib/NetworkManager/NetworkManager.state - rmdir --ignore-fail-on-non-empty /var/lib/NetworkManager + if [ -d /var/lib/NetworkManager ]; then + rm -f /var/lib/NetworkManager/NetworkManager.state + rmdir --ignore-fail-on-non-empty /var/lib/NetworkManager + fi ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; -- cgit 1.3.0-6-gf8a5 From b57a63cd59e840932f12033efab39ef18a7b1149 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Aug 2010 02:15:54 +0000 Subject: * debian/patches/10-dont_require_ifup_for_lo.patch - Don't require ifup for enabling the loopback interface but use it if installed. Patch cherry-picked from upstream Git. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3716 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/patches/10-dont_require_ifup_for_lo.patch | 30 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 34 insertions(+) create mode 100644 debian/patches/10-dont_require_ifup_for_lo.patch diff --git a/debian/changelog b/debian/changelog index b576b8a9..c15d9824 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ network-manager (0.8.1-2) UNRELEASED; urgency=low * debian/network-manager.postrm - Don't fail on purge if /var/lib/NetworkManager directory does not exist. (Closes: #591861) + * debian/patches/10-dont_require_ifup_for_lo.patch + - Don't require ifup for enabling the loopback interface but use it if + installed. Patch cherry-picked from upstream Git. -- Michael Biebl Fri, 30 Jul 2010 01:53:34 +0200 diff --git a/debian/patches/10-dont_require_ifup_for_lo.patch b/debian/patches/10-dont_require_ifup_for_lo.patch new file mode 100644 index 00000000..ffea6ff0 --- /dev/null +++ b/debian/patches/10-dont_require_ifup_for_lo.patch @@ -0,0 +1,30 @@ +commit 7e87d79de6d1eeeb47c8e43fb44962bce9c70664 +Author: Dan Williams +Date: Tue Aug 3 11:36:59 2010 -0700 + + debian: don't require ifup for enabling loopback (bgo #625427) + + But use it if it's installed. + +diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c +index ef9475a..37eb645 100644 +--- a/src/backends/NetworkManagerDebian.c ++++ b/src/backends/NetworkManagerDebian.c +@@ -1,3 +1,4 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + /* NetworkManager -- Network link manager + * + * Matthew Garrett +@@ -44,7 +45,11 @@ + */ + void nm_system_enable_loopback (void) + { +- nm_spawn_process ("/sbin/ifup lo"); ++ /* ifupdown isn't always installed (bgo #625427) */ ++ if (g_file_test ("/sbin/ifup", G_FILE_TEST_EXISTS)) ++ nm_spawn_process ("/sbin/ifup lo"); ++ else ++ nm_generic_enable_loopback (); + } + + /* diff --git a/debian/patches/series b/debian/patches/series index c40ab33b..1fff2cd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch +10-dont_require_ifup_for_lo.patch -- cgit 1.3.0-6-gf8a5 From d53bebc3daef01a1d813b9d292cab71ee1bcc4d0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Aug 2010 02:19:26 +0000 Subject: * debian/control - Drop dependency on ifupdown as we have a fallback now for enabling the loopback interface. (Closes: #580309) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3717 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c15d9824..2e512ff4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ network-manager (0.8.1-2) UNRELEASED; urgency=low * debian/patches/10-dont_require_ifup_for_lo.patch - Don't require ifup for enabling the loopback interface but use it if installed. Patch cherry-picked from upstream Git. + * debian/control + - Drop dependency on ifupdown as we have a fallback now for enabling the + loopback interface. (Closes: #580309) -- Michael Biebl Fri, 30 Jul 2010 01:53:34 +0200 diff --git a/debian/control b/debian/control index 3fa8744b..282a43fe 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,6 @@ Depends: wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), udev, - ifupdown, adduser, isc-dhcp-client (>= 4.1.1-P1-4) Recommends: -- cgit 1.3.0-6-gf8a5 From 003de9d93604fe19457d9a9c534e43db3f357813 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 6 Aug 2010 02:20:43 +0000 Subject: Upload version 0.8.1-2 to unstable. urgency medium for the RC bug fix. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3718 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2e512ff4..f0d4d55d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.1-2) UNRELEASED; urgency=low +network-manager (0.8.1-2) unstable; urgency=medium * Move configuration file /etc/NetworkManager/nm-system-settings.conf to /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move @@ -13,7 +13,7 @@ network-manager (0.8.1-2) UNRELEASED; urgency=low - Drop dependency on ifupdown as we have a fallback now for enabling the loopback interface. (Closes: #580309) - -- Michael Biebl Fri, 30 Jul 2010 01:53:34 +0200 + -- Michael Biebl Fri, 06 Aug 2010 04:19:38 +0200 network-manager (0.8.1-1) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 660007796d04c98f1fdc5c60386d7cff5846fa59 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 00:34:54 +0000 Subject: * debian/control - Drop Recommends: network-manager-gnome | network-manager-kde, as this can have unwanted side-effects, like GNOME packages being installed on a KDE desktop. Instead let the desktop meta packages depend on their preferred frontend. (Closes: #596233) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3735 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 10 ++++++++++ debian/control | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f0d4d55d..8121584b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (0.8.1-3) UNRELEASED; urgency=low + + * debian/control + - Drop Recommends: network-manager-gnome | network-manager-kde, as this + can have unwanted side-effects, like GNOME packages being installed on + a KDE desktop. Instead let the desktop meta packages depend on their + preferred frontend. (Closes: #596233) + + -- Michael Biebl Fri, 06 Aug 2010 04:39:56 +0200 + network-manager (0.8.1-2) unstable; urgency=medium * Move configuration file /etc/NetworkManager/nm-system-settings.conf to diff --git a/debian/control b/debian/control index 282a43fe..41721ff1 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,6 @@ Depends: adduser, isc-dhcp-client (>= 4.1.1-P1-4) Recommends: - network-manager-gnome | network-manager-kde, policykit-1, ppp (>= 2.4.5), dnsmasq-base, -- cgit 1.3.0-6-gf8a5 From 33896cc3b9f8ebd62f58d177333448de5c1127e0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 00:39:31 +0000 Subject: Add Breaks: ppp (<< 2.4.5) to avoid partial upgrades. (Closes: #592444) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3736 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8121584b..2422b972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ network-manager (0.8.1-3) UNRELEASED; urgency=low can have unwanted side-effects, like GNOME packages being installed on a KDE desktop. Instead let the desktop meta packages depend on their preferred frontend. (Closes: #596233) + - Add Breaks: ppp (<< 2.4.5) to avoid partial upgrades. (Closes: #592444) -- Michael Biebl Fri, 06 Aug 2010 04:39:56 +0200 diff --git a/debian/control b/debian/control index 41721ff1..fbd2183f 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,8 @@ Breaks: network-manager-kde (<< 1:0.9~~), network-manager-openvpn (<< 0.7~~), network-manager-vpnc (<< 0.7~~), - network-manager-pptp (<< 0.7~~) + network-manager-pptp (<< 0.7~~), + ppp (<< 2.4.5) 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 -- cgit 1.3.0-6-gf8a5 From 73603cd2e3585aa0797004a2a148544dad0c0d9a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 01:09:33 +0000 Subject: * debian/network-manager.README.Debian - Add a section briefly explaining system settings and add references to the online documentation and the system settings spec. (Closes: #594849) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3737 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/network-manager.README.Debian | 28 +++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2422b972..90715833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ network-manager (0.8.1-3) UNRELEASED; urgency=low a KDE desktop. Instead let the desktop meta packages depend on their preferred frontend. (Closes: #596233) - Add Breaks: ppp (<< 2.4.5) to avoid partial upgrades. (Closes: #592444) + * debian/network-manager.README.Debian + - Add a section briefly explaining system settings and add references to + the online documentation and the system settings spec. (Closes: #594849) -- Michael Biebl Fri, 06 Aug 2010 04:39:56 +0200 diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index d56a14b5..43fad371 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -5,6 +5,7 @@ daemon. Security ~~~~~~~~ + To allow users to connect to the NetworkManager daemon they have to be in the 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. @@ -16,6 +17,7 @@ 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". @@ -33,11 +35,35 @@ 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/NetworkManager.conf _or_ /etc/network/interfaces you may want to tell NetworkManager about the changes by running "service network-manager restart". +System settings +~~~~~~~~~~~~~~~ + +System settings allow to setup network connections which are available at +boot time, before login and to all users of the machine. The settings are +stored in a system-wide location. +There are plugins for different configuration sources. +By default the ifupdown and keyfile plugin are enabled, see +/etc/NetworkManager/NetworkManager.conf: + + [main] + plugins=ifupdown,keyfile + +The ifupdown plugin is read-only and reads the native ifupdown configuration +file /etc/network/interfaces. + +The keyfile plugin is read-write. The configuration files for network +connections are stored in /etc/NetworkManager/system-connections/. + +For more information see NetworkManager.conf(5) or +http://live.gnome.org/NetworkManager/SystemSettings + +The keyfile specification is available at +http://projects.gnome.org/NetworkManager/developers/settings-spec-08.html + Dial-up configuration ~~~~~~~~~~~~~~~~~~~~~ -- cgit 1.3.0-6-gf8a5 From 5fafe576c889a551d206ee0fe1dc9fb6b2994dc5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 01:10:46 +0000 Subject: Release version 0.8.1-3 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3738 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90715833..59983202 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.1-3) UNRELEASED; urgency=low +network-manager (0.8.1-3) unstable; urgency=low * debian/control - Drop Recommends: network-manager-gnome | network-manager-kde, as this @@ -10,7 +10,7 @@ network-manager (0.8.1-3) UNRELEASED; urgency=low - Add a section briefly explaining system settings and add references to the online documentation and the system settings spec. (Closes: #594849) - -- Michael Biebl Fri, 06 Aug 2010 04:39:56 +0200 + -- Michael Biebl Wed, 22 Sep 2010 03:10:19 +0200 network-manager (0.8.1-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From c86c3905864535dc4ff8687a2bf1c19233821c07 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 01:21:32 +0000 Subject: Back to UNRELEASED. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3739 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 59983202..e6a3f473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.1-3) unstable; urgency=low +network-manager (0.8.1-3) UNRELEASED; urgency=low * debian/control - Drop Recommends: network-manager-gnome | network-manager-kde, as this -- cgit 1.3.0-6-gf8a5 From 7ab1c4e83ddc5e92bb22a8413642a846ef6d7362 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 01:25:00 +0000 Subject: * debian/patches/30-typo_fix.patch - Fix a small typo in README, and while at it, in other files too. Thanks Christian Perrier for spotting it. (Closes: #594850) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3740 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 + debian/patches/30-typo_fix.patch | 136 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 140 insertions(+) create mode 100644 debian/patches/30-typo_fix.patch diff --git a/debian/changelog b/debian/changelog index e6a3f473..7a5495a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ network-manager (0.8.1-3) UNRELEASED; urgency=low * debian/network-manager.README.Debian - Add a section briefly explaining system settings and add references to the online documentation and the system settings spec. (Closes: #594849) + * debian/patches/30-typo_fix.patch + - Fix a small typo in README, and while at it, in other files too. + Thanks Christian Perrier for spotting it. (Closes: #594850) -- Michael Biebl Wed, 22 Sep 2010 03:10:19 +0200 diff --git a/debian/patches/30-typo_fix.patch b/debian/patches/30-typo_fix.patch new file mode 100644 index 00000000..2d8edfaa --- /dev/null +++ b/debian/patches/30-typo_fix.patch @@ -0,0 +1,136 @@ +diff --git a/ChangeLog b/ChangeLog +index d529664..b611b3d 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1317,7 +1317,7 @@ + 2008-09-30 Dan Williams + + * src/NetworkManagerPolicy.c +- - (lookup_thread_worker): don't store the idle handler ID becuase the ++ - (lookup_thread_worker): don't store the idle handler ID because the + idle handler could have already run and freed the LookupThread + structure + +@@ -8391,7 +8391,7 @@ + internally; clients should provide a setting that applies to + the device with 'autoconnect: True'. Problem was that these + internally auto-created connections don't have a proxy or service +- name becuase they weren't created by a settings daemon, and therefore ++ name because they weren't created by a settings daemon, and therefore + clients have no idea what to do with them. + + 2007-10-03 Dan Williams +@@ -9794,7 +9794,7 @@ + * libnm-glib/nm-settings.c + libnm-glib/nm-settings.h + - make the dbus path a property of the object, and autogenerate it. +- It can't be composed of the 'id' field becuase that's not available ++ It can't be composed of the 'id' field because that's not available + yet during the GObject creation in nm_connection_settings_init() + + 2007-08-29 Dan Williams +diff --git a/README b/README +index acb807b..286cabc 100644 +--- a/README ++++ b/README +@@ -66,11 +66,11 @@ those drivers that are shipped with the upstream Linux kernel, because only + those drivers can be easily fixed and debugged. ndiswrapper, vendor binary + drivers, or other out-of-tree drivers may or may not work well with + NetworkManager, precisely because they have not been vetted and improved by the +-open-source community, and becuase problems in these drivers usually cannot ++open-source community, and because problems in these drivers usually cannot + be fixed. + + Sometimes, command-line tools like 'iwconfig' will work, but NetworkManager will +-fail. This is again often due to buggy drivers, becuase these drivers simply ++fail. This is again often due to buggy drivers, because these drivers simply + aren't expecting the dynamic requests that NetworkManager and wpa_supplicant + make. Driver bugs should be filed in the bug tracker of the distribution being + run, since often distributions customize their kernel and drivers. +diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c +index 5e9eb50..120be3f 100644 +--- a/libnm-glib/nm-device.c ++++ b/libnm-glib/nm-device.c +@@ -1084,7 +1084,7 @@ nm_device_update_description (NMDevice *device) + * vendor and device ID information off it. + */ + +- /* Ref the device again becuase we have to unref it each iteration, ++ /* Ref the device again because we have to unref it each iteration, + * as g_udev_device_get_parent() returns a ref-ed object. + */ + tmpdev = g_object_ref (udev_device); +diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c +index bb5cd2e..26a2b7b 100644 +--- a/src/dhcp-manager/nm-dhcp-dhclient.c ++++ b/src/dhcp-manager/nm-dhcp-dhclient.c +@@ -385,7 +385,7 @@ merge_dhclient_config (const char *iface, + } + + /* If the client ID is just hex digits and : then don't use quotes, +- * becuase dhclient expects either a quoted ASCII string, or a byte ++ * because dhclient expects either a quoted ASCII string, or a byte + * array formated as hex octets separated by : + */ + if (is_octets) +diff --git a/src/nm-device.c b/src/nm-device.c +index 176d90f..906abd4 100644 +--- a/src/nm-device.c ++++ b/src/nm-device.c +@@ -3683,7 +3683,7 @@ nm_device_state_changed (NMDevice *device, + case NM_DEVICE_STATE_UNAVAILABLE: + /* If the device can activate now (ie, it's got a carrier, the supplicant + * is active, or whatever) schedule a delayed transition to DISCONNECTED +- * to get things rolling. The device can't transition immediately becuase ++ * to get things rolling. The device can't transition immediately because + * we can't change states again from the state handler for a variety of + * reasons. + */ +@@ -3704,7 +3704,7 @@ nm_device_state_changed (NMDevice *device, + case NM_DEVICE_STATE_FAILED: + nm_log_warn (LOGD_DEVICE, "Activation (%s) failed.", nm_device_get_iface (device)); + /* Schedule the transition to DISCONNECTED. The device can't transition +- * immediately becuase we can't change states again from the state ++ * immediately because we can't change states again from the state + * handler for a variety of reasons. + */ + priv->failed_to_disconnected_id = g_idle_add (failed_to_disconnected, device); +diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c +index 1c7e8eb..3697737 100644 +--- a/system-settings/plugins/ifcfg-rh/reader.c ++++ b/system-settings/plugins/ifcfg-rh/reader.c +@@ -1874,7 +1874,7 @@ parse_wpa_psk (shvarFile *ifcfg, + char *psk = NULL, *p, *hashed = NULL; + gboolean quoted = FALSE; + +- /* Passphrase must be between 10 and 66 characters in length becuase WPA ++ /* Passphrase must be between 10 and 66 characters in length because WPA + * hex keys are exactly 64 characters (no quoting), and WPA passphrases + * are between 8 and 63 characters (inclusive), plus optional quoting if + * the passphrase contains spaces. +diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/io/reader.c +index 5582733..cbcb42c 100644 +--- a/system-settings/plugins/keyfile/io/reader.c ++++ b/system-settings/plugins/keyfile/io/reader.c +@@ -738,7 +738,7 @@ typedef struct { + void (*parser) (NMSetting *setting, const char *key, GKeyFile *keyfile); + } KeyParser; + +-/* A table of keys that require further parsing/conversion becuase they are ++/* A table of keys that require further parsing/conversion because they are + * stored in a format that can't be automatically read using the key's type. + * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are + * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored +diff --git a/system-settings/plugins/keyfile/io/writer.c b/system-settings/plugins/keyfile/io/writer.c +index 348fa51..06b5b85 100644 +--- a/system-settings/plugins/keyfile/io/writer.c ++++ b/system-settings/plugins/keyfile/io/writer.c +@@ -460,7 +460,7 @@ typedef struct { + void (*writer) (GKeyFile *keyfile, NMSetting *setting, const char *key, const GValue *value); + } KeyWriter; + +-/* A table of keys that require further parsing/conversion becuase they are ++/* A table of keys that require further parsing/conversion because they are + * stored in a format that can't be automatically read using the key's type. + * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are + * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored diff --git a/debian/patches/series b/debian/patches/series index 1fff2cd6..365331c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch 10-dont_require_ifup_for_lo.patch +30-typo_fix.patch -- cgit 1.3.0-6-gf8a5 From c3b3a3abf171490b6df155c8d8cd23bec4762c40 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 22 Sep 2010 01:32:08 +0000 Subject: Release version 0.8.1-3 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3741 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a5495a9..a504c238 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.1-3) UNRELEASED; urgency=low +network-manager (0.8.1-3) unstable; urgency=low * debian/control - Drop Recommends: network-manager-gnome | network-manager-kde, as this @@ -13,7 +13,7 @@ network-manager (0.8.1-3) UNRELEASED; urgency=low - Fix a small typo in README, and while at it, in other files too. Thanks Christian Perrier for spotting it. (Closes: #594850) - -- Michael Biebl Wed, 22 Sep 2010 03:10:19 +0200 + -- Michael Biebl Wed, 22 Sep 2010 03:31:48 +0200 network-manager (0.8.1-2) unstable; urgency=medium -- cgit 1.3.0-6-gf8a5 From b5ea3bfdeb0b6f2e1c53d0c565fd3636375d6712 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Nov 2010 21:58:42 +0000 Subject: Integrate debian/ifblacklist_migrate.sh from Ubuntu and install it in /usr/lib/NetworkManager. Improve it to disable the interfaces with a #NetworkManager# prefix and re-enable them when the package is removed. (Closes: #530024) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3768 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 10 +++++++ debian/ifblacklist_migrate.sh | 66 +++++++++++++++++++++++++++++++++++++++++ debian/network-manager.install | 1 + debian/network-manager.postinst | 6 +++- debian/network-manager.postrm | 12 ++++++-- debian/network-manager.preinst | 1 - 6 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 debian/ifblacklist_migrate.sh diff --git a/debian/changelog b/debian/changelog index a504c238..1ddc2ccc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (0.8.1-4) UNRELEASED; urgency=low + + [ Raphaël Hertzog ] + * Integrate debian/ifblacklist_migrate.sh from Ubuntu and install + it in /usr/lib/NetworkManager. Improve it to disable the interfaces + with a #NetworkManager# prefix and re-enable them when the package is + removed. (Closes: #530024) + + -- Michael Biebl Wed, 17 Nov 2010 22:55:44 +0100 + network-manager (0.8.1-3) unstable; urgency=low * debian/control diff --git a/debian/ifblacklist_migrate.sh b/debian/ifblacklist_migrate.sh new file mode 100644 index 00000000..1d41266c --- /dev/null +++ b/debian/ifblacklist_migrate.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +# (C) 2007 Canonical Ltd. +# Author: Alexander Sack +# License: GNU General Public License, version 2 or any later version + +if test x$NIF_FILE = x; then + NIF_FILE=/etc/network/interfaces +fi + +auto_ifs=$(cat $NIF_FILE | \ + egrep "^auto|^allow-" | \ + sed -e 's/auto//' | \ + sed -e 's/allow-[^ ].* //') + +ifaces_to_disable="" + +echo Auto interfaces found: $auto_ifs + +# iterate over all auto interfaces +for i in $auto_ifs; do + IFS_old=$IFS; IFS="" + + NIF_FILE_content=$(cat $NIF_FILE | \ + sed -e 's/^[ \t]*auto.*$//' | \ + sed -e 's/^[ \t]*allow-.*$//' | \ + sed -e 's/^[ \t]*#.*$//' | grep -v ^$) + + # '--' is inserted by grep -A1 if there are multiple iface blocks + lines=$(echo $NIF_FILE_content | grep -A1 "^iface.*$i.*dhcp" | grep -v '\--') + IFS=" +" + + # if there is no iface line for that interface, we would still get a line + # count of 1 ... so use word_count 0 below to exclude ifaces that have no + # configuration at all. + word_count=$(echo $lines | wc -w) + line_count=0 + for line in $lines; do + nulled_line=$(echo "$line" | sed -e 's/[# ]//' | grep -v ^iface) + if test x$nulled_line != x; then + line_count=$(expr $line_count + 1) + fi + done + + if test $line_count -eq 0 -a $word_count -gt 0; then + ifaces_to_disable="$ifaces_to_disable $i" + echo iface to disable = $i + fi + IFS=$IFS_old +done + +backup_suffix=0 +while test -e ${NIF_FILE}.bak-${backup_suffix}; do + backup_suffix=$(expr $backup_suffix + 1) +done + +if [ -n "$ifaces_to_disable" ]; then + cp $NIF_FILE "$NIF_FILE.bak-${backup_suffix}" + for i in $ifaces_to_disable; do + echo -n "Disabling interface: $i ... " + sed -i -e "s/^\([ \t]*iface.*$i.*\)$/#NetworkManager#\1/" $NIF_FILE + echo done. + done +fi + diff --git a/debian/network-manager.install b/debian/network-manager.install index dbe43cfa..20769cfe 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -18,4 +18,5 @@ debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf debian/tmp/etc/NetworkManager/dispatcher.d/ debian/tmp/etc/NetworkManager/system-connections/ debian/tmp/lib/udev/rules.d/*.rules +debian/ifblacklist_migrate.sh /usr/lib/NetworkManager debian/NetworkManager.conf etc/NetworkManager/ diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 5f372abe..2535f400 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -66,6 +66,11 @@ case "$1" in if dpkg --compare-versions "$2" lt "0.8.1-2"; then mv_conffile "/etc/NetworkManager/nm-system-settings.conf" "/etc/NetworkManager/NetworkManager.conf" fi + + if [ -z "$2" ] || dpkg --compare-versions "$2" lt-nl "0.8.1-4"; then + echo "Disabling interfaces configured with plain DHCP in /etc/network/interfaces so that NetworkManager can take them over" + sh /usr/lib/NetworkManager/ifblacklist_migrate.sh + fi ;; abort-upgrade|abort-deconfigure|abort-remove) @@ -78,5 +83,4 @@ case "$1" in esac #DEBHELPER# -exit 0 diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm index ad970dc8..cf67e431 100644 --- a/debian/network-manager.postrm +++ b/debian/network-manager.postrm @@ -24,7 +24,15 @@ case "$1" in rmdir --ignore-fail-on-non-empty /var/lib/NetworkManager fi ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + remove) + # Restore the ifupdown configuration that were disabled at installation + backup_suffix=0 + while test -e /etc/network/interfaces.bak-${backup_suffix}; do + backup_suffix=$(($backup_suffix + 1)) + done + sed -i.bak-${backup_suffix} -e "s/^#NetworkManager#//g" /etc/network/interfaces + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) @@ -34,5 +42,3 @@ case "$1" in esac #DEBHELPER# - -exit 0 diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 80ab7a30..c02aca66 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -100,4 +100,3 @@ case "$1" in esac #DEBHELPER# -exit 0 -- cgit 1.3.0-6-gf8a5 From fa6a85a275e4b11ceb1a725e64a52d9c260cf2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Nov 2010 22:10:12 +0000 Subject: Install migration script as executable shell script git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3769 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.install | 1 - debian/network-manager.postinst | 2 +- debian/rules | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/network-manager.install b/debian/network-manager.install index 20769cfe..dbe43cfa 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -18,5 +18,4 @@ debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf debian/tmp/etc/NetworkManager/dispatcher.d/ debian/tmp/etc/NetworkManager/system-connections/ debian/tmp/lib/udev/rules.d/*.rules -debian/ifblacklist_migrate.sh /usr/lib/NetworkManager debian/NetworkManager.conf etc/NetworkManager/ diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 2535f400..6ef57ff7 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -69,7 +69,7 @@ case "$1" in if [ -z "$2" ] || dpkg --compare-versions "$2" lt-nl "0.8.1-4"; then echo "Disabling interfaces configured with plain DHCP in /etc/network/interfaces so that NetworkManager can take them over" - sh /usr/lib/NetworkManager/ifblacklist_migrate.sh + /usr/lib/NetworkManager/ifblacklist_migrate.sh fi ;; diff --git a/debian/rules b/debian/rules index b1bbea63..fdcd499b 100755 --- a/debian/rules +++ b/debian/rules @@ -29,3 +29,5 @@ clean:: binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown + install -m 755 debian/ifblacklist_migrate.sh \ + debian/network-manager/usr/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From a38c18be91a727db6daf6055a2ed7996f148c8aa Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Nov 2010 22:28:37 +0000 Subject: Release version 0.8.1-4 to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3772 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ddc2ccc..f8484b99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.8.1-4) UNRELEASED; urgency=low +network-manager (0.8.1-4) unstable; urgency=low [ Raphaël Hertzog ] * Integrate debian/ifblacklist_migrate.sh from Ubuntu and install @@ -6,7 +6,7 @@ network-manager (0.8.1-4) UNRELEASED; urgency=low with a #NetworkManager# prefix and re-enable them when the package is removed. (Closes: #530024) - -- Michael Biebl Wed, 17 Nov 2010 22:55:44 +0100 + -- Michael Biebl Wed, 17 Nov 2010 23:28:19 +0100 network-manager (0.8.1-3) unstable; urgency=low -- cgit 1.3.0-6-gf8a5