--- network-manager-0.8.4~git.20110319t175609.d14809b.orig/aclocal.m4 +++ network-manager-0.8.4~git.20110319t175609.d14809b/aclocal.m4 @@ -0,0 +1 @@ +# empty file --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.manpages +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.manpages @@ -0,0 +1,3 @@ +man/nm-tool.1 +debian/nm-vpn-properties.1 +man/NetworkManager.8 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager-dispatcher.script +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager-dispatcher.script @@ -0,0 +1,65 @@ +#!/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|vpn-up) + export MODE="start" + export PHASE="up" + + if [ -d /var/run/network/ ] ; then + tmpfile=`mktemp -t` + if [ -e /var/run/network/ifstate ] ; then + cat /var/run/network/ifstate | grep -v ^$IFACE= > $tmpfile || true + fi + echo $IFACE=$IFACE >> $tmpfile + mv $tmpfile /var/run/network/ifstate + fi + + exec run-parts /etc/network/if-up.d + ;; + down|vpn-down) + export MODE="stop" + export PHASE="down" + + if [ -e /var/run/network/ifstate ] ; then + tmpfile=`mktemp -t` + cat /var/run/network/ifstate | grep -v ^$IFACE= > $tmpfile || true + mv $tmpfile /var/run/network/ifstate + fi + + 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 + ;; + hostname) + # do nothing here, the 'hostname' action is not handled by ifupdown scripts. + exit 0 + ;; + *) + echo "$0: called with unknown action \`$2'" 1>&2 + exit 1 + ;; +esac --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-util-dev.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-util-dev.install @@ -0,0 +1,22 @@ +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/nm-connection.h +debian/tmp/usr/include/NetworkManager/nm-setting.h +debian/tmp/usr/include/NetworkManager/nm-setting-8021x.h +debian/tmp/usr/include/NetworkManager/nm-setting-bluetooth.h +debian/tmp/usr/include/NetworkManager/nm-setting-cdma.h +debian/tmp/usr/include/NetworkManager/nm-setting-connection.h +debian/tmp/usr/include/NetworkManager/nm-setting-ip4-config.h +debian/tmp/usr/include/NetworkManager/nm-setting-ip6-config.h +debian/tmp/usr/include/NetworkManager/nm-setting-ppp.h +debian/tmp/usr/include/NetworkManager/nm-setting-pppoe.h +debian/tmp/usr/include/NetworkManager/nm-setting-serial.h +debian/tmp/usr/include/NetworkManager/nm-setting-gsm.h +debian/tmp/usr/include/NetworkManager/nm-setting-wired.h +debian/tmp/usr/include/NetworkManager/nm-setting-wireless.h +debian/tmp/usr/include/NetworkManager/nm-setting-wireless-security.h +debian/tmp/usr/include/NetworkManager/nm-setting-vpn.h +debian/tmp/usr/include/NetworkManager/nm-utils.h +debian/tmp/usr/share/gtk-doc/html/libnm-util/ + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/README.Debian +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/README.Debian @@ -0,0 +1,48 @@ +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. + +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". + +Note: in ubuntu/intrepid "Unmanaged mode" will be the default, but that is likely +to change in one of the following releases. + +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. + +The default mode shipped in Ubuntu/intrepid is "unmanaged". + +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 +~~~~~~~~~~~~~~~~~~~~~ + +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. + +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 connections +managed outside of NetworkManager itself (not that it ever worked nicely before). + + -- Alexander Sack , Mon, 6 Oct 2008 13:05:00 +0200 + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-glib-dev.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-glib-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/lib/pkgconfig/libnm-glib.pc +debian/tmp/usr/lib/pkgconfig/libnm-glib-vpn.pc +debian/tmp/usr/lib/libnm-glib*.a +debian/tmp/usr/lib/libnm-glib*.so +debian/tmp/usr/include/libnm-glib/*.h +debian/tmp/usr/share/gtk-doc/html/libnm-glib/ --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager-dev.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager-dev.install @@ -0,0 +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-version.h --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/nm-vpn-properties.sgml +++ network-manager-0.8.4~git.20110319t175609.d14809b/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. + + + + + + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/NetworkManager.conf +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/NetworkManager.conf @@ -0,0 +1,14 @@ +# This file is installed into /etc/NetworkManager, and is loaded by +# NetworkManager by default. To override, specify: '--config file' +# during NM startup. This can be done by appending to DAEMON_OPTS in +# the file: +# +# /etc/default/NetworkManager +# + +[main] +plugins=ifupdown,keyfile + +[ifupdown] +managed=false + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-glib-dev.links +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-glib-dev.links @@ -0,0 +1,2 @@ +usr/lib/pkgconfig/libnm-glib.pc usr/lib/pkgconfig/libnm_glib.pc +usr/lib/pkgconfig/libnm-glib-vpn.pc usr/lib/pkgconfig/libnm_glib_vpn.pc --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.install @@ -0,0 +1,18 @@ +debian/tmp/usr/sbin/NetworkManager +debian/tmp/usr/bin/nm-tool +debian/tmp/usr/bin/nmcli +debian/tmp/usr/lib/NetworkManager +debian/tmp/usr/lib/pppd/*/*.so +debian/tmp/usr/share/locale/ +debian/tmp/usr/share/dbus-1/system-services/ +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-dispatcher.conf +debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf +debian/NetworkManager.conf /etc/NetworkManager/ + +debian/tmp/usr/share/man/ +debian/tmp/usr/share/NetworkManager/ +debian/ifblacklist_migrate.sh /usr/lib/network-manager +debian/source_network-manager.py /usr/share/apport/package-hooks/ --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.links +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.links @@ -0,0 +1 @@ +/usr/share/apport/package-hooks/source_network-manager.py /usr/share/apport/package-hooks/source_network-manager-applet.py --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/control +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/control @@ -0,0 +1,172 @@ +Source: network-manager +Section: net +Priority: optional +Maintainer: Ubuntu Core Dev Team +XSBC-Original-Maintainer: Riccardo Setti +Uploaders: Michael Biebl +Build-Depends: debhelper (>= 7.3.15ubuntu2), + automake1.9, + cdbs, + quilt, + gnome-common, + intltool, + libgnome-keyring-dev, + libdbus-glib-1-dev (>= 0.74), + libiw-dev(>= 27+28pre9), + libgnomeui-dev, + libpanel-applet2-dev, + libglade2-dev, + libgconf2-dev, + libnl-dev (>= 1.0~pre8), + libnotify-dev (>= 0.3), + libpolkit-gobject-1-dev, + libnss3-dev, + docbook-to-man, + ppp-dev (>= 2.4.5~), + iproute, + gtk-doc-tools, + uuid-dev, + libudev-dev, + isc-dhcp-client (>= 4.1.1), + libgudev-1.0-dev +Standards-Version: 3.9.1 +Homepage: http://www.gnome.org/projects/NetworkManager/ +Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager/ubuntu.head + +Package: network-manager +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + iproute, + iputils-arping, + lsb-base (>= 3.2-14), + wpasupplicant (>= 0.6.1~), + dbus (>= 0.60) +Replaces: network-manager-pptp (<< 0.7~~) +Conflicts: network-manager-pptp (<< 0.7~~) +Breaks: dhcp3-client (<< 4.1.1-P1-11) +Recommends: network-manager-gnome | network-manager-kde | plasma-widget-networkmanagement, dnsmasq-base, modemmanager, iptables, network-manager-pptp, ppp +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. + +Package: network-manager-dev +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config, libnm-util-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 + 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 header files that are needed to + compile VPN Plugins for NetworkManager. + +Package: libnm-glib2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libnm-glib-vpn1 (>= 0.8.4~) +Replaces: libnm-glib2 (<< 0.8.4~git.20110319t175609.d14809b-0ubuntu2~) +Conflicts: libnm-glib2 (<< 0.8.4~git.20110319t175609.d14809b-0ubuntu2~) +Breaks: dhcp3-client (<< 4.1.1-P1-11) +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 + 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-dev +Section: libdevel +Architecture: any +Depends: libnm-glib2 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev, libdbus-glib-1-dev (>= 0.60), network-manager-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 interface that applications can use to query + connection status via NetworkManager. + +Package: libnm-glib-vpn1 +Section: libs +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Breaks: libnm-glib2 (<< 0.8.4~git.20110319t175609.d14809b-0ubuntu2~) +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-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 + 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} +Breaks: network-manager-gnome (<< 0.7~~), network-manager-kde (<< 1:0.2.3), dhcp3-client (<< 4.1.1-P1-11) +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-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 + 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. + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-glib2.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-glib2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-glib.so.* --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.preinst +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.preinst @@ -0,0 +1,79 @@ +#!/bin/sh + +set -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 + + +# Remove a no-longer used conffile +rm_conffile() +{ + local PKGNAME="$1" + local CONFFILE="$2" + + [ -e "$CONFFILE" ] || return 0 + + local md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + local old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | \ + sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi +} + +# 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) + # Upgrade from nm 0.6.x + if dpkg --compare-versions "$2" lt "0.7~~"; then + # dont stop the 0.6.x instance as we will ask for reboot + rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + rm_conffile /etc/dbus-1/event.d/25NetworkManager + fi + # debian moves the conf file starting from 0.8.1-2, but + # let's make sure upgrades from all ubuntu version will move it too + if dpkg --compare-versions "$2" lt "0.8.3+git.20110210t152733.00327fb"; then + prep_mv_conffile network-manager /etc/NetworkManager/nm-system-settings.conf + fi + + rm_conffile /etc/init.d/NetworkManager + ;; + + abort-upgrade) + ;; + +esac + +#DEBHELPER# --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/ifblacklist_migrate.sh +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/ifblacklist_migrate.sh @@ -0,0 +1,67 @@ +#!/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 + +for i in $ifaces_to_disable; do + echo -n "Disabling interface: $i ... " + sed -i.bak-${backup_suffix} -e " +s/^\([ \t]*iface.*$i.*\)$/#\1/" $NIF_FILE + # for now don't kill any auto lines + # s/^\([ \t]*auto.*$i.*\)$/#\1/ + # s/^\([ \t]*allow-.*$i.*\)$/#\1/ + + echo done. +done --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/rules +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/rules @@ -0,0 +1,124 @@ +#!/usr/bin/make -f + +DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //') +DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //') +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') +DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//') + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +#ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +# CFLAGS := $(CFLAGS:-O2=-Os) +# CXXFLAGS := $(CXXFLAGS:-O2=-Os) +#endif + +DEB_AUTO_UPDATE_LIBTOOL = pre +DEB_AUTO_UPDATE_AUTOHEADER = 2.50 +DEB_AUTO_UPDATE_ACLOCAL = 1.11 +DEB_AUTO_UPDATE_AUTOMAKE = 1.11 -a -c -f +DEB_AUTO_UPDATE_AUTOCONF = 2.50 + +DEB_INSTALL_DOCS_ALL := README AUTHORS TODO + +DEB_MAKE_CHECK_TARGET := check + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-dbus-sys=/etc/dbus-1/system.d \ + --with-distro=debian \ + --with-resolvconf=/sbin/resolvconf \ + --libexecdir=/usr/lib/NetworkManager \ + --with-pppd-plugindir=/usr/local/lib/pppd/2.4.5/ \ + --with-crypto=nss \ + --with-iptables=/sbin/iptables \ + --with-docs \ + --with-tests=yes \ + $(NULL) + +DEB_DH_INSTALLINIT_ARGS = --noscripts + +DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties + +DEB_DH_MAKESHLIBS_ARGS = -- -c4 + +GIT_URL := git://anongit.freedesktop.org/NetworkManager/NetworkManager +GIT_BRANCH := "NM_0_8" +GIT_BRANCH_NAME := NetworkManager + +ifneq (,$(LOCAL_BRANCH)) +LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) +endif + +clean:: + rm -f po/*.gmo + rm -f debian/*.1 + rm -f gtk-doc.make + echo "# empty file" > aclocal.m4 + +pre-build:: + intltoolize -f -c + gtkdocize --copy + +DHCP_CLIENT_PATH=/sbin/dhclient +export DHCP_CLIENT_PATH + +build/network-manager:: + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + +binary-install/network-manager:: + install -m 755 debian/network-manager-dispatcher.script \ + debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown + cd po; intltool-update -p + cd test; $(MAKE) install DESTDIR=$(CURDIR)/debian/network-manager + +binary-install/network-manager:: + +GET_SOURCE = \ + set -e; \ + tmpdir=`mktemp -d -t`; \ + cd $$tmpdir; \ + echo "cloning upstream repository ..."; \ + git clone -b $(GIT_BRANCH) $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \ + echo "getting specific upstream revision/tag: $(1)"; \ + cd `ls | head -n 1`; git checkout -b orig $(1); \ + commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //' | sed -e 's/\.\.\.$$//'`; \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \ + if echo $(2) | grep -q -c "orig" || echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \ + else \ + upstream_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + cd ..; tar --exclude=.git -czf $(CURDIR)/$(DEB_SOURCE)_$$upstream_version.orig.tar.gz `ls | head -n 1`; \ + cd $(CURDIR); rm -rf $$tmpdir; + +get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch) + set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + elif echo $(DEB_VERSION) | grep -q -c "~rc"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^\([0-9\.]*\)\(~rc\)\([0-9]\)-.*$$/\1-rc\3/'`; \ + else \ + git_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + $(call GET_SOURCE, $$git_version, "current") + +get-orig-source:: $(if $(LOCAL_BRANCH),update-local-branch) + $(call GET_SOURCE, "HEAD", "orig") + +update-local-branch:: + @echo "updating local branch ($(LOCAL_BRANCH))" + @set -e; if ! test -d $(LOCAL_BRANCH); then mkdir -p $(LOCAL_BRANCH); fi + @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); if ! `git branch | grep -q -c "$(GIT_BRANCH)"`; then git branch $(GIT_BRANCH) remotes/origin/$(GIT_BRANCH); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git checkout $(GIT_BRANCH); git pull -f + @echo "updated local branch ($(LOCAL_BRANCH))" + +get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch) + @set -e; \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc $$git_version | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y-%m-%d %H:%M:%S (GMT)"`; \ + git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n"; --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.dirs +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.dirs @@ -0,0 +1,5 @@ +etc/dbus-1/event.d +etc/NetworkManager/dispatcher.d +etc/NetworkManager/system-connections +var/lib/NetworkManager +usr/share/gnome-vpn-properties --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-util1.symbols +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-util1.symbols @@ -0,0 +1,415 @@ +libnm-util.so.1 libnm-util1 #MINVER# + nm_connection_add_setting@Base 0.7.1~20090213+gitf142e15 + nm_connection_clear_secrets@Base 0.7.1~20090213+gitf142e15 + nm_connection_compare@Base 0.7.1~20090213+gitf142e15 + nm_connection_create_setting@Base 0.7.1~20090213+gitf142e15 + nm_connection_diff@Base 0.8.4~git.20110228t143901.5cdded6 + nm_connection_dump@Base 0.7.1~20090213+gitf142e15 + nm_connection_duplicate@Base 0.7.1~20090213+gitf142e15 + nm_connection_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_connection_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_connection_for_each_setting_value@Base 0.7.1~20090213+gitf142e15 + nm_connection_get_path@Base 0.7.1~20090213+gitf142e15 + nm_connection_get_scope@Base 0.7.1~20090213+gitf142e15 + nm_connection_get_setting@Base 0.7.1~20090213+gitf142e15 + nm_connection_get_setting_by_name@Base 0.7.1~20090213+gitf142e15 + nm_connection_get_type@Base 0.7.1~20090213+gitf142e15 + nm_connection_lookup_setting_type@Base 0.7.1~20090213+gitf142e15 + nm_connection_lookup_setting_type_by_quark@Base 0.7.1~20090213+gitf142e15 + nm_connection_need_secrets@Base 0.7.1~20090213+gitf142e15 + nm_connection_new@Base 0.7.1~20090213+gitf142e15 + nm_connection_new_from_hash@Base 0.7.1~20090213+gitf142e15 + nm_connection_remove_setting@Base 0.7.1~20090213+gitf142e15 + nm_connection_replace_settings@Base 0.7.1~20090213+gitf142e15 + nm_connection_set_path@Base 0.7.1~20090213+gitf142e15 + nm_connection_set_scope@Base 0.7.1~20090213+gitf142e15 + nm_connection_to_hash@Base 0.7.1~20090213+gitf142e15 + nm_connection_update_secrets@Base 0.7.1~20090213+gitf142e15 + nm_connection_verify@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_compare@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_dup@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_get_address@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_get_gateway@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_get_prefix@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_new@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_ref@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_set_address@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_set_gateway@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_set_prefix@Base 0.7.1~20090213+gitf142e15 + nm_ip4_address_unref@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_compare@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_dup@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_get_dest@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_get_metric@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_get_next_hop@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_get_prefix@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_new@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_ref@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_set_dest@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_set_metric@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_set_next_hop@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_set_prefix@Base 0.7.1~20090213+gitf142e15 + nm_ip4_route_unref@Base 0.7.1~20090213+gitf142e15 + nm_ip6_address_compare@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_dup@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_get_address@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_get_gateway@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_ip6_address_get_prefix@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_new@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_ref@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_set_address@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_set_gateway@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_ip6_address_set_prefix@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_address_unref@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_compare@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_dup@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_get_dest@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_get_metric@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_get_next_hop@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_get_prefix@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_new@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_ref@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_set_dest@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_set_metric@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_set_next_hop@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_set_prefix@Base 0.8~a~git.20090804t185522.4bab334 + nm_ip6_route_unref@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_802_1x_add_eap_method@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_clear_eap_methods@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_anonymous_identity@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_ca_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_ca_cert_blob@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_ca_cert_path@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_ca_cert_scheme@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_ca_path@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_client_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_client_cert_blob@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_client_cert_path@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_client_cert_scheme@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_eap_method@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_identity@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_num_eap_methods@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase1_fast_provisioning@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase1_peaplabel@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase1_peapver@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_auth@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_autheap@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_ca_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_ca_cert_blob@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_ca_cert_path@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_ca_cert_scheme@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_ca_path@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_client_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_client_cert_blob@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_client_cert_path@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_client_cert_scheme@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_private_key@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_private_key_blob@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_private_key_format@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_private_key_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_phase2_private_key_path@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_private_key_scheme@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_phase2_private_key_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pin@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_ca_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_client_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_engine_path@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_module_init_args@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_module_path@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_phase2_ca_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_phase2_client_cert@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_phase2_private_key@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_private_key@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_pkcs11_slot@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_private_key@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_private_key_blob@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_private_key_format@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_private_key_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_private_key_path@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_private_key_scheme@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_get_private_key_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_psk@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_system_ca_certs@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_remove_eap_method@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_set_ca_cert@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_set_ca_cert_from_file@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_set_client_cert@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_set_client_cert_from_file@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_set_phase2_ca_cert@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_set_phase2_ca_cert_from_file@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_set_phase2_client_cert@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_set_phase2_client_cert_from_file@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_set_phase2_private_key@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_set_phase2_private_key_from_file@Base 0.7.1~20090213+gitf142e15 + nm_setting_802_1x_set_private_key@Base 0.8~a~git.20090930t162132.866d48b + nm_setting_802_1x_set_private_key_from_file@Base 0.7.1~20090213+gitf142e15 + nm_setting_bluetooth_error_get_type@Base 0.8~a~git.20090621t095302 + nm_setting_bluetooth_error_quark@Base 0.8~a~git.20090621t095302 + nm_setting_bluetooth_get_bdaddr@Base 0.8~a~git.20090621t095302 + nm_setting_bluetooth_get_connection_type@Base 0.8~a~git.20090621t095302 + nm_setting_bluetooth_get_type@Base 0.8~a~git.20090621t095302 + nm_setting_bluetooth_new@Base 0.8~a~git.20090621t095302 + nm_setting_cdma_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_cdma_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_cdma_get_number@Base 0.7.1~20090213+gitf142e15 + nm_setting_cdma_get_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_cdma_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_cdma_get_username@Base 0.7.1~20090213+gitf142e15 + nm_setting_cdma_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_clear_secrets@Base 0.7.1~20090213+gitf142e15 + nm_setting_compare@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_autoconnect@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_connection_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_id@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_read_only@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_timestamp@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_get_uuid@Base 0.7.1~20090213+gitf142e15 + nm_setting_connection_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_diff@Base 0.8.4~git.20110228t143901.5cdded6 + nm_setting_duplicate@Base 0.7.1~20090213+gitf142e15 + nm_setting_enumerate_values@Base 0.7.1~20090213+gitf142e15 + nm_setting_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_get_name@Base 0.7.1~20090213+gitf142e15 + nm_setting_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_allowed_bands@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_setting_gsm_get_apn@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_band@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_home_only@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_setting_gsm_get_network_id@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_network_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_number@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_pin@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_puk@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_get_username@Base 0.7.1~20090213+gitf142e15 + nm_setting_gsm_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_add_address@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_add_dns@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_add_dns_search@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_add_route@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_clear_addresses@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_clear_dns@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_clear_dns_searches@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_clear_routes@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_address@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_dhcp_client_id@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_dhcp_hostname@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_dhcp_send_hostname@Base 0.8~a~git.20090621t095302 + nm_setting_ip4_config_get_dns@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_dns_search@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_ignore_auto_dns@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_ignore_auto_routes@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_may_fail@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_setting_ip4_config_get_method@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_never_default@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_num_addresses@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_num_dns@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_num_dns_searches@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_num_routes@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_route@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_remove_address@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_remove_dns@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_remove_dns_search@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip4_config_remove_route@Base 0.7.1~20090213+gitf142e15 + nm_setting_ip6_config_add_address@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_add_dns@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_add_dns_search@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_add_route@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_clear_addresses@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_clear_dns@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_clear_dns_searches@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_clear_routes@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_error_get_type@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_error_quark@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_address@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_dns@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_dns_search@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_ignore_auto_dns@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_ignore_auto_routes@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_may_fail@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_setting_ip6_config_get_method@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_never_default@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_num_addresses@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_num_dns@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_num_dns_searches@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_num_routes@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_route@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_get_type@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_new@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_remove_address@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_remove_dns@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_remove_dns_search@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_ip6_config_remove_route@Base 0.8~a~git.20090804t185522.4bab334 + nm_setting_need_secrets@Base 0.7.1~20090213+gitf142e15 + nm_setting_new_from_hash@Base 0.7.1~20090213+gitf142e15 + nm_setting_olpc_mesh_error_get_type@Base 0.8~a~git.20090831t055002.74f125b + nm_setting_olpc_mesh_error_quark@Base 0.8~a~git.20090831t055002.74f125b + nm_setting_olpc_mesh_get_channel@Base 0.8~a~git.20090817t203502.3e22183 + nm_setting_olpc_mesh_get_dhcp_anycast_address@Base 0.8~a~git.20090817t203502.3e22183 + nm_setting_olpc_mesh_get_ssid@Base 0.8~a~git.20090817t203502.3e22183 + nm_setting_olpc_mesh_get_type@Base 0.8~a~git.20090817t203502.3e22183 + nm_setting_olpc_mesh_new@Base 0.8~a~git.20091112t012259.420ea02 + nm_setting_ppp_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_baud@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_crtscts@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_lcp_echo_failure@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_lcp_echo_interval@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_mppe_stateful@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_mru@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_mtu@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_no_vj_comp@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_noauth@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_nobsdcomp@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_nodeflate@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_refuse_chap@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_refuse_eap@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_refuse_mschap@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_refuse_mschapv2@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_refuse_pap@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_require_mppe@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_require_mppe_128@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_ppp_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_get_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_get_service@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_get_username@Base 0.7.1~20090213+gitf142e15 + nm_setting_pppoe_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_get_baud@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_get_bits@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_get_parity@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_get_send_delay@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_get_stopbits@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_serial_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_to_hash@Base 0.7.1~20090213+gitf142e15 + nm_setting_to_string@Base 0.7.1~20090213+gitf142e15 + nm_setting_update_secrets@Base 0.7.1~20090213+gitf142e15 + nm_setting_verify@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_add_data_item@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_add_secret@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_foreach_data_item@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_foreach_secret@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_get_data_item@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_get_secret@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_get_service_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_get_user_name@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_remove_data_item@Base 0.7.1~20090213+gitf142e15 + nm_setting_vpn_remove_secret@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_add_s390_option@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wired_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_auto_negotiate@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_cloned_mac_address@Base 0.8.1+git.20100627t160238.067ed11 + nm_setting_wired_get_duplex@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_mac_address@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_mtu@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_num_s390_options@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wired_get_port@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_s390_nettype@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wired_get_s390_option@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wired_get_s390_option_by_key@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wired_get_s390_subchannels@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wired_get_speed@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_wired_remove_s390_option@Base 0.8.1+git.20100809t193754.c72fbd6 + nm_setting_wireless_add_seen_bssid@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_ap_security_compatible@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_band@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_bssid@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_channel@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_cloned_mac_address@Base 0.8.1+git.20100627t160238.067ed11 + nm_setting_wireless_get_mac_address@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_mode@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_mtu@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_num_seen_bssids@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_rate@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_security@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_seen_bssid@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_ssid@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_tx_power@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_add_group@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_add_pairwise@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_add_proto@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_clear_groups@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_clear_pairwise@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_clear_protos@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_error_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_error_quark@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_auth_alg@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_group@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_key_mgmt@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_leap_password@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_leap_username@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_num_groups@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_num_pairwise@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_num_protos@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_pairwise@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_proto@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_psk@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_type@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_wep_key@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_get_wep_key_type@Base 0.8~a~git.20090621t095302 + nm_setting_wireless_security_get_wep_tx_keyidx@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_new@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_remove_group@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_remove_pairwise@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_remove_proto@Base 0.7.1~20090213+gitf142e15 + nm_setting_wireless_security_set_wep_key@Base 0.7.1~20090213+gitf142e15 + nm_utils_deinit@Base 0.7.1~20090213+gitf142e15 + nm_utils_escape_ssid@Base 0.7.1~20090213+gitf142e15 + nm_utils_gvalue_hash_dup@Base 0.7.1~20090213+gitf142e15 + nm_utils_init@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip4_addresses_from_gvalue@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip4_addresses_to_gvalue@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip4_get_default_prefix@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_utils_ip4_netmask_to_prefix@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip4_prefix_to_netmask@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip4_routes_from_gvalue@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip4_routes_to_gvalue@Base 0.7.1~20090213+gitf142e15 + nm_utils_ip6_addresses_from_gvalue@Base 0.8~a~git.20090804t185522.4bab334 + nm_utils_ip6_addresses_to_gvalue@Base 0.8~a~git.20090804t185522.4bab334 + nm_utils_ip6_routes_from_gvalue@Base 0.8~a~git.20090804t185522.4bab334 + nm_utils_ip6_routes_to_gvalue@Base 0.8~a~git.20090804t185522.4bab334 + nm_utils_is_empty_ssid@Base 0.7.1~20090213+gitf142e15 + nm_utils_rsa_key_encrypt@Base 0.8~a~git.20090930t162132.866d48b + nm_utils_same_ssid@Base 0.7.1~20090213+gitf142e15 + nm_utils_security_valid@Base 0.7.1~20090213+gitf142e15 + nm_utils_slist_free@Base 0.7.1~20090213+gitf142e15 + nm_utils_ssid_to_utf8@Base 0.7.1~20090213+gitf142e15 + nm_utils_uuid_generate@Base 0.7.1~20090213+gitf142e15 + nm_utils_uuid_generate_from_string@Base 0.7.1~20090213+gitf142e15 + nm_utils_wifi_channel_to_freq@Base 0.8.1+git.20100627t160238.067ed11 + nm_utils_wifi_find_next_channel@Base 0.8.1+git.20100627t160238.067ed11 + nm_utils_wifi_freq_to_channel@Base 0.8.1+git.20100627t160238.067ed11 + nm_utils_wifi_is_channel_valid@Base 0.8.1+git.20100627t160238.067ed11 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.NEWS +++ network-manager-0.8.4~git.20110319t175609.d14809b/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 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.postrm +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.postrm @@ -0,0 +1,54 @@ +#!/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 + +abort_rm_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE".dpkg-backup ]; then + mv -f "$CONFFILE".dpkg-backup "$CONFFILE" + elif [ -e "$CONFFILE".dpkg-removing ]; then + mv -f "$CONFFILE".dpkg-removing "$CONFFILE" + fi +} + +case "$1" in + purge) + # Clean up state file on purge + 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|disappear) + ;; + + abort-install|abort-upgrade) + if dpkg --compare-versions "$2" lt "0.7~~"; then + abort_rm_conffile /etc/dbus-1/event.d/25NetworkManager + + abort_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + + /etc/dbus-1/event.d/25NetworkManager start + fi + + abort_rm_conffile /etc/init.d/NetworkManager + ;; +esac + +#DEBHELPER# --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/compat +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/compat @@ -0,0 +1 @@ +7 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-glib-vpn1.symbols +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-glib-vpn1.symbols @@ -0,0 +1,22 @@ +libnm-glib-vpn.so.1 libnm-glib-vpn1 #MINVER# + 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 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.prerm +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.prerm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +case "$1" in + remove) + RESULT=0 + stop network-manager || : + ;; +esac + +#DEBHELPER# + +exit 0 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.upstart +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.upstart @@ -0,0 +1,15 @@ +# network-manager - network connection manager +# +# The Network Manager daemon manages the system's network connections, +# automatically switching between the best available. + +description "network connection manager" + +start on (local-filesystems + and started dbus) +stop on stopping dbus + +expect fork +respawn + +exec NetworkManager --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/source_network-manager.py +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/source_network-manager.py @@ -0,0 +1,86 @@ +'''Apport package hook for Network Manager + +(c) 2008 Canonical Ltd. +Contributors: +Matt Zimmerman +Martin Pitt +Mathieu Trudel-Lapierre + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +import os +import subprocess +from apport.hookutils import * + +def _network_interfaces(): + interfaces = [] + output = command_output(['ls', '-1', '/sys/class/net']) + for device in output.split('\n'): + interfaces.append(device) + + return interfaces + +def _device_details(device): + details = command_output(['udevadm', 'info', '--query=all', '--path', '/sys/class/net/%s' % device]) + + # add the only extra thing of use from hal we don't get from udev. + details = details + "\nX: INTERFACE_MAC=" + details = details + command_output(['cat', '/sys/class/net/%s/address' % device]) + return details + +def add_info(report, ui=None): + attach_network(report) + attach_wifi(report) + + attach_file_if_exists(report, '/etc/NetworkManager/nm-system-settings.conf', 'nm-system-settings.conf') + + # attach NetworkManager.state: it gives us good hints in rfkill-related bugs. + attach_file_if_exists(report, '/var/lib/NetworkManager/NetworkManager.state', 'NetworkManager.state') + + for interface in _network_interfaces(): + key = 'NetDevice.%s' % interface + report[key] = _device_details(interface) + + interesting_modules = { 'ndiswrapper' : 'driver-ndiswrapper', + 'ath_hal' : 'driver-madwifi', + 'b44' : 'driver-b44' } + interesting_modules_loaded = [] + tags = [] + for line in open('/proc/modules'): + module = line.split()[0] + if module in interesting_modules: + tags.append(interesting_modules[module]) + interesting_modules_loaded.append(module) + + if interesting_modules_loaded: + report['InterestingModules'] = ' '.join(interesting_modules_loaded) + report.setdefault('Tags', '') + report['Tags'] += ' ' + ' '.join(tags) + + try: + response = ui.yesno("You can also include scan results, GConf keys and " + "other configuration parameters which may greatly help in diagnosing " + "the issue you are seeing. However, these may contain sensitive " + "information. Do you want to include them?") + + if response: + report['Gconf'] = command_output(['gconftool-2','-R','/system/networking']) + report['Keyfiles'] = command_output(['ls -l','/etc/NetworkManager/system-connections/']) + # nm-tool happens to give a good snapshot of the client's state, so try to capture this + report['NMTool'] = command_output(['nm-tool']) + except: + pass + + +## Only for debugging ## +if __name__ == '__main__': + report = {} + report['CrashDB'] = 'ubuntu' + add_info(report, None) + for key in report: + print '%s: %s' % (key, report[key]) --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/copyright +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/copyright @@ -0,0 +1,101 @@ +This package was debianized by Thom May on +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 + +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, + 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'. + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-glib2.symbols +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-glib2.symbols @@ -0,0 +1,152 @@ +libnm-glib.so.2 libnm-glib2 #MINVER# + libnm_glib_get_network_state@Base 0.8~a~git.20090826t185111.79489be + libnm_glib_init@Base 0.8~a~git.20090826t185111.79489be + libnm_glib_register_callback@Base 0.8~a~git.20090826t185111.79489be + libnm_glib_shutdown@Base 0.8~a~git.20090826t185111.79489be + libnm_glib_unregister_callback@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_flags@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_frequency@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_hw_address@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_max_bitrate@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_mode@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_rsn_flags@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_ssid@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_strength@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_get_wpa_flags@Base 0.8~a~git.20090826t185111.79489be + nm_access_point_new@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_connection@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_default6@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_active_connection_get_default@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_devices@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_scope@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_service_name@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_specific_object@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_state@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_active_connection_new@Base 0.8~a~git.20090826t185111.79489be + nm_cdma_device_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_cdma_device_new@Base 0.8~a~git.20090826t185111.79489be + nm_client_activate_connection@Base 0.8~a~git.20090826t185111.79489be + nm_client_deactivate_connection@Base 0.8~a~git.20090826t185111.79489be + nm_client_get_active_connections@Base 0.8~a~git.20090826t185111.79489be + nm_client_get_device_by_path@Base 0.8~a~git.20090826t185111.79489be + nm_client_get_devices@Base 0.8~a~git.20090826t185111.79489be + nm_client_get_manager_running@Base 0.8~a~git.20090826t185111.79489be + nm_client_get_permission_result@Base 0.8.1~beta3~git.20100626t172728.44d2f9c + nm_client_get_state@Base 0.8~a~git.20090826t185111.79489be + nm_client_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_client_networking_get_enabled@Base 0.8.1~beta1~git.20100526t172505.0f494b2 + nm_client_networking_set_enabled@Base 0.8.1~beta1~git.20100526t172505.0f494b2 + nm_client_new@Base 0.8~a~git.20090826t185111.79489be + nm_client_sleep@Base 0.8~a~git.20090826t185111.79489be + nm_client_wireless_get_enabled@Base 0.8~a~git.20090826t185111.79489be + nm_client_wireless_hardware_get_enabled@Base 0.8~a~git.20090826t185111.79489be + nm_client_wireless_set_enabled@Base 0.8~a~git.20090826t185111.79489be + nm_client_wwan_get_enabled@Base 0.8~rc2~git.20091229t135236.302e62d + nm_client_wwan_hardware_get_enabled@Base 0.8~rc2~git.20091229t135236.302e62d + nm_client_wwan_set_enabled@Base 0.8~rc2~git.20091229t135236.302e62d + nm_device_bt_get_capabilities@Base 0.8~a~git.20090826t185111.79489be + nm_device_bt_get_hw_address@Base 0.8~a~git.20090826t185111.79489be + nm_device_bt_get_name@Base 0.8~a~git.20090826t185111.79489be + nm_device_bt_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_device_bt_new@Base 0.8~a~git.20090826t185111.79489be + nm_device_disconnect@Base 0.8~a~git.20090923t064445.b20cef2 + nm_device_ethernet_get_carrier@Base 0.8~a~git.20090826t185111.79489be + nm_device_ethernet_get_hw_address@Base 0.8~a~git.20090826t185111.79489be + nm_device_ethernet_get_permanent_hw_address@Base 0.8.1~beta3~git.20100626t172728.44d2f9c + nm_device_ethernet_get_speed@Base 0.8~a~git.20090826t185111.79489be + nm_device_ethernet_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_device_ethernet_new@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_capabilities@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_dhcp4_config@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_dhcp6_config@Base 0.8.4~git.20110319t175609.d14809b + nm_device_get_driver@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_firmware_missing@Base 0.8.1~beta1~git.20100526t172505.0f494b2 + nm_device_get_iface@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_ip4_config@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_ip6_config@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_managed@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_product@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_state@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_udi@Base 0.8~a~git.20090826t185111.79489be + nm_device_get_vendor@Base 0.8~a~git.20090826t185111.79489be + nm_device_new@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_access_point_by_path@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_access_points@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_active_access_point@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_bitrate@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_capabilities@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_hw_address@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_mode@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_get_permanent_hw_address@Base 0.8.1~beta3~git.20100626t172728.44d2f9c + nm_device_wifi_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_device_wifi_new@Base 0.8~a~git.20090826t185111.79489be + nm_dhcp4_config_get_one_option@Base 0.8~a~git.20090826t185111.79489be + nm_dhcp4_config_get_options@Base 0.8~a~git.20090826t185111.79489be + nm_dhcp4_config_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_dhcp4_config_new@Base 0.8~a~git.20090826t185111.79489be + nm_dhcp6_config_get_one_option@Base 0.8.3+git.20101219t181118.e919218 + nm_dhcp6_config_get_options@Base 0.8.3+git.20101219t181118.e919218 + nm_dhcp6_config_get_type@Base 0.8.3+git.20101219t181118.e919218 + nm_dhcp6_config_new@Base 0.8.3+git.20101219t181118.e919218 + nm_exported_connection_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_exported_connection_new@Base 0.8~a~git.20090826t185111.79489be + nm_gsm_device_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_gsm_device_new@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_addresses@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_domains@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_hostname@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_nameservers@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_routes@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_get_wins_servers@Base 0.8~a~git.20090826t185111.79489be + nm_ip4_config_new@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_address_array_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_address_object_array_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_config_get_addresses@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_config_get_domains@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_config_get_nameservers@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_config_get_routes@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_config_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_config_new@Base 0.8~a~git.20090826t185111.79489be + nm_ip6_route_object_array_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_object_array_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_object_get_connection@Base 0.8~a~git.20090826t185111.79489be + nm_object_get_path@Base 0.8~a~git.20090826t185111.79489be + nm_object_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_remote_connection_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_remote_connection_new@Base 0.8~a~git.20090826t185111.79489be + nm_remote_settings_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_remote_settings_new@Base 0.8~a~git.20090826t185111.79489be + nm_remote_settings_system_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_remote_settings_system_new@Base 0.8~a~git.20090826t185111.79489be + nm_serial_device_get_bytes_received@Base 0.8~a~git.20090826t185111.79489be + nm_serial_device_get_bytes_sent@Base 0.8~a~git.20090826t185111.79489be + nm_serial_device_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_settings_connection_interface_delete@Base 0.8~a~git.20090826t185111.79489be + nm_settings_connection_interface_emit_updated@Base 0.8~a~git.20090826t185111.79489be + nm_settings_connection_interface_get_secrets@Base 0.8~a~git.20090826t185111.79489be + nm_settings_connection_interface_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_settings_connection_interface_update@Base 0.8~a~git.20090826t185111.79489be + nm_settings_interface_add_connection@Base 0.8~a~git.20090826t185111.79489be + nm_settings_interface_error_get_type@Base 0.8.1~beta1~git.20100510t073507.f3057a6 + nm_settings_interface_error_quark@Base 0.8~a~git.20090826t185111.79489be + nm_settings_interface_get_connection_by_path@Base 0.8~a~git.20090826t185111.79489be + nm_settings_interface_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_settings_interface_list_connections@Base 0.8~a~git.20090826t185111.79489be + nm_settings_service_export@Base 0.8~a~git.20090826t185111.79489be + nm_settings_service_export_connection@Base 0.8~a~git.20090826t185111.79489be + nm_settings_service_get_connection_by_path@Base 0.8~a~git.20090826t185111.79489be + nm_settings_service_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_settings_system_interface_get_permissions@Base 0.8~a~git.20090826t185111.79489be + nm_settings_system_interface_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_settings_system_interface_save_hostname@Base 0.8~a~git.20090826t185111.79489be + nm_ssid_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_string_array_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_uint_array_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_vpn_connection_get_banner@Base 0.8~a~git.20090826t185111.79489be + nm_vpn_connection_get_type@Base 0.8~a~git.20090826t185111.79489be + nm_vpn_connection_get_vpn_state@Base 0.8~a~git.20090826t185111.79489be + nm_vpn_connection_new@Base 0.8~a~git.20090826t185111.79489be --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/changelog +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/changelog @@ -0,0 +1,2475 @@ +network-manager (0.8.4~git.20110319t175609.d14809b-0ubuntu2) natty; urgency=low + + * debian/control: split libnm-glib2 into a separate binary for the VPN parts + of the API, the new package will be called libnm-glib-vpn1. (LP: #745769) + * debian/libnm-glib2.install, debian/libnm-glib-vpn1.install: update to + correctly install just libnm-glib-vpn.so.* from libnm-glib-vpn1. + * debian/libnm-glib2.symbols, debian/libnm-glib-vpn1.symbols: move symbol + definitions for libnm-glib-vpn.so to their own package. + * debian/control: depend on libnm-glib-vpn1 from libnm-glib2, as a + transitional measure to maintain compatibility with the VPN plugins. + * debian/control: have libnm-glib2 and libnm-glib-vpn1 Breaks/Conflicts with + previous revisions of libnm-glib2, for upgrade purposes. + + -- Mathieu Trudel-Lapierre Mon, 04 Apr 2011 22:37:19 -0400 + +network-manager (0.8.4~git.20110319t175609.d14809b-0ubuntu1) natty; urgency=low + + * upstream snapshot 2011-03-19 17:56:09 (GMT) + + d14809b6ae1986372bc2bc25f2f92f501f0f678a + - logging: fix format string/argument disagreements + - logging: clean up logging macros and helper + - release: bump version to 0.8.3.998 (0.8.4-rc1) + - api: fix mistakenly absent Dhcp6Config device property + - libnm-glib: make sure nm_device_get_dhcp6_config() is visible + - arch: create /var/run/NetworkManager if doesn't exist in initscripts + (bgo #643902) + - po: remove useless ' ' for French translation (bgo #644110) + - ifupdown: normalize keys using - or _ (debian #609831) + - build: fix unresolved symbols when building gtk-doc scanner with GCC 4.5 + - dnsmasq: remove unused variable + - dnsmasq: send no config file instead of a bogus one (LP: #725041) + - core: fix some code that required glib 2.26 + - keyfile: trivial whitespace fixes + - settings: fix some code that required glib 2.26 + - release: bump version to 0.8.3.997 (0.8.4-beta3) + - build: fix bug tracker link + - dhcp: don't quit if we can't find a usable DHCP client (bgo #643575) + - keyfile: write certificates and keys in a human-readable manner + - ifcfg-rh: fix leak writing out certificate blobs + - keyfile: allow paths to be used for certificates and private keys + - include: add NM_CHECK_VERSION define + - core: fix sorting connections after timestamps handling change + - examples: simplify system wifi connection example + - examples: new example for adding system WPA EAP-TLS wifi connection + - ifcfg-rh: fix testcases now that timestamps are no longer written + * debian/patches/dnsmasq_conffile_conn_sharing.patch: drop, applied upstream. + * debian/patches/fix_sorting_connections_w_tstamp_3194cb9.patch: included. + * debian/patches/gtkdoc-build-requires-gobject.patch: drop, applied upstream. + * debian/libnm-glib2.symbols: add new nm_device_get_dhcp6_config@Base symbol. + * debian/patches/99_printf_formatting_fixes.patch: replace %zd formats with + the appropriate format modifiers for time_t and unsigned long. + * debian/network-manager-dev.install: install missing nm-version.h include. + + -- Mathieu Trudel-Lapierre Wed, 23 Mar 2011 12:00:10 -0400 + +network-manager (0.8.4~git.20110228t143901.5cdded6-0ubuntu1) natty; urgency=low + + * upstream snapshot 2011-02-28 14:39:01 (GMT) (LP: #726820) + + 5cdded6b66bdc371acb29e76187b174c55c11470 + - docs: explicitly list libnm-glib objects + - libnm-util: fix parameter name for docs generator + - api: add missing Settings.System D-Bus interface bits + - ifcfg-rh: get rid of LAST_CONNECT + - core/libnm-glib: don't touch files in /etc when updating timestamps + - release: bump version to 0.8.3.996 (0.8.4-beta2) + - api: document more VPN connection failure codes (bgo #643324) + - libnm-util: silently ignore non-secrets when updating connection secrets + - libnm-util: fix updating secrets (rh #680385) + - keyfile: fix tests for no-longer-required serial and PPP settings + - ip6: fail activation if addrconf fails to start + - core: don't require serial and PPP settings for mobile broadband + - ppp: fix warning when PPP support is disabled + - libnm-util: bump version for several recent changes + - release: bump version to 0.8.3.995 (0.8.4-beta1) + - release: update NEWS with changes since 0.8.2 + - libnm-util: fix updating secrets + - core: flush IPv6 routes even if configuration failed (bgo #641333) + (LP: #704812) + - libnm-util: remove GObject Introspection annotations + - gentoo: simplify OpenRC detection + - libnm-util: add nm_connection_diff() + - dns: fix up updating resolv.conf (rh #672282) + - Revert "libnm-glib: return enums for NMAccessPoint flags accessors" + - build: allow disabling PPP support at build time + - core: fix dbus-glib crash on shutdown with systemd + - libnm-glib: return enums for NMAccessPoint flags accessors + - libnm-util: fix description of bluetooth setting type property + - test: don't crash libnm-glib if there are no devices for an active + connection + - test: don't crash libnm-glib-test if there aren't any APs + * debian/patches/revert_52f2295.patch: dropped, fixed upstream. + * debian/libnm-util1.symbols: adding new symbols introduced upstream: + - nm_connection_diff + - nm_setting_diff + * debian/patches/fix_sorting_connections_w_tstamp_3194cb9.patch: fix sorting + connections following upstream commit 7d707bd, which is necessary for auto + activations. + * debian/patches/dnsmasq_conffile_conn_sharing.patch: don't pass a bogus conf + file to dnsmasq, just pass no file parameter (LP: #725041) + * debian/rules: enable build-time tests. (LP: #727395) + * debian/patches/70_lp145653_no_sigaction_for_crashes.patch: add .pc file + generated by quilt to POTFILES.skip, otherwise the build will fail due to + the tests we now run detecting a localizable file missing from templates. + + -- Mathieu Trudel-Lapierre Fri, 04 Mar 2011 10:53:59 -0500 + +network-manager (0.8.3+git.20110210t152733.00327fb-0ubuntu2) natty; urgency=low + + * debian/patches/revert_52f2295.patch: revert upstream commit 52f2295, + "libnm-util: fix possible crash in nm_setting_update_secrets()", + until it can be further investigated: it breaks at least PPTP VPNs. + + -- Mathieu Trudel-Lapierre Fri, 11 Feb 2011 15:03:12 -0500 + +network-manager (0.8.3+git.20110210t152733.00327fb-0ubuntu1) natty; urgency=low + + * upstream snapshot 2011-02-10 15:27:33 (GMT) + + 00327fb82d5cb9d9dc63abe6477baf819fcffdd9 + - cli: improve/add NM running checks + - cli: don't poke NetworkManager D-Bus service names when it's not running + - logging: don't print extraneous newline in syslog + - libnm-util: make NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME property TRUE + by default (rh #488975) + - settings: fix plugin capabilities max value + - vpn: fix memory leak when activating a VPN connection + - vpn: fix VPN active connection D-Bus API handling (bgo #569294) + - build: turn off set-but-not-used variable warnings in new GCC + - cli: add support for WWAN connections for 'nmcli con up' (bgo #640020) + - libnm-util: fix possible crash in nm_setting_update_secrets() + - wired: clear wired secrets tries counter when appropriate + - wifi: clear wireless secrets tries counter when deactivating + - core: lack of an IPv4 setting indicates DHCP (novell #664640) + - core: handle D-Bus disconnect better on exit + - policy: don't update hostname on exit + - modem: handle IP Method changes after modem has been created + * debian/control: bump Standards-Version to 3.9.1. + * debian/control: fix/cleanup Description fields, move Homepage to its field. + * debian/network-manager.postrm: cleanup old cruft, partially sync to Debian. + * debian/network-manager.preinst: cleanup, sync some parts with Debian. + * debian/network-manager.postinst: cleanup, sync parts with Debian. + * debian/network-manager.preinst, + debian/network-manager.postrm, + debian/network-manager.postinst: + Move NM's main config file to /etc/NetworkManager/NetworkManager.conf. + * debian/nm-system-settings.conf: renamed to NetworkManager.conf. + * debian/network-manager.install: + - mostly sync with Debian. + - install NetworkManager.conf rather than nm-system-settings.conf. + * debian/compat: using debhelper 7, compat should have been at 7 long ago. + + -- Mathieu Trudel-Lapierre Fri, 11 Feb 2011 11:32:40 -0500 + +network-manager (0.8.3+git.20101219t181118.e919218-0ubuntu2) natty; urgency=low + + [ Mathieu Trudel-Lapierre ] + * debian/source_network-manager.py: + - Replace HAL usage by udev and other means. (LP: #654900) + - Make Gconf/settings/scan results inclusion conditional (LP: #389702) + * debian/patches/gtkdoc-build-requires-gobject.patch: explicitly link against + gobject-2.0 to build documentation files. + + [ Thomas Bechtold ] + * Install gtk-doc API with libnm-util-dev and libnm-glib-dev (LP: #706965) + - update debian/libnm-glib-dev.install + - update debian/libnm-util-dev.install + * Regenerate libnm-glib, libnm-util documentation at build time + - update debian/rules + + -- Mathieu Trudel-Lapierre Mon, 07 Feb 2011 11:34:46 -0500 + +network-manager (0.8.3+git.20101219t181118.e919218-0ubuntu1) natty; urgency=low + + * upstream snapshot 2010-12-19 18:11:18 (GMT) + + e91921814569bf9033fa0779837a77b22eb98e4a + - libnm-util: fix a memory leak in nm_setting_to_string() + - various ipv6 fixes + - libnm-util: fix nm_utils_security_valid() checks for Ad-Hoc APs + - dns: direct IPv4 reverse DNS queries to split DNS servers + - policy: stop touching /etc/hosts + - dhclient: split out dhclient config merging and add testcases + - dhclient: explicitly request WPAD option (bgo #368423) + * Drop the patch to not write localhost.localdomain in /etc/hosts, it's no + longer needed now that NM doesn't change the hosts file. + - delete debian/patches/never-localhostlocaldomain.patch + - update debian/patches/series + * debian/libnm-glib2.symbols: Add new symbols for libnm-glib2: + + nm_dhcp6_config_get_one_option + + nm_dhcp6_config_get_options + + nm_dhcp6_config_get_type + + nm_dhcp6_config_new + * Add vpn-up/vpn-down options for the NM dispatcher script. This should really + fix bug 661951. (LP: #661951) + - update debian/network-manager-dispatcher.script + + -- Mathieu Trudel-Lapierre Mon, 20 Dec 2010 13:55:42 -0500 + +network-manager (0.8.3+git.20101209t061929.638fb18-0ubuntu1) natty; urgency=low + + * upstream snapshot 2010-12-09 06:19:29 (GMT) + + 638fb1878019ac75617b653d13f4970af6e9c970 + - core: correct TIMESTAMP type; fixes potential crash when time() is 32bit + (LP: #686320) + - libnm-glib: actually define the "ip-interface" property + - ifupdown: Correctly mark unmanaged devices (debian #569215) + - ifupdown: Allow to mark bridge ports as unmanaged (debian #530335) + * Finish fixing daily builds: explicitly checkout/switch to the branch we're + interested in before pulling new revisions so that it get properly updated. + - update debian/rules + * Revert s390 devices patch, it was applied upstream. + - remove debian/patches/fix-natty-build.patch + - update debian/patches/series + * Add support for the 'hostname' dispatcher action that would previously + trigger useless "exited with error status 1" messages (but not actually + break anything). For now it will just exit doing nothing. (LP: #661951) + - update debian/network-manager-dispatcher.script + + -- Mathieu Trudel-Lapierre Fri, 10 Dec 2010 12:26:21 -0500 + +network-manager (0.8.3~git.20101118t223039.d60a988-0ubuntu1) natty; urgency=low + + * upstream snapshot 2010-11-18 22:30:39 (GMT) + + d60a988518cb0851488bc21732271a971877cdcd + + [ Evan Broder ] + * Check for notify-reboot-required, instead of depending on it being + available. (LP: #669925) + + [ Mathieu Trudel-Lapierre ] + * explicitly always get HEAD rather than the branch's name in get-orig-source + - update debian/rules + * drop do-not-include-netif.patch; the header conflict was fixed in a kernel + update + - remove debian/patches/do-not-include-netif.patch + - update debian/patches/series + * Short-circuit the /etc/hosts update mechanisms to avoid adding useless + localhost(6?).localdomain(6?) on loopback addresses. (LP: #677496) + - add debian/patches/never-localhostlocaldomain.patch + - update debian/patches/series + + -- Mathieu Trudel-Lapierre Mon, 22 Nov 2010 09:35:21 -0500 + +network-manager (0.8.2-0ubuntu1) natty; urgency=low + + * new upstream release 0.8.2 + - update timestamp in active system connections every 5 mins + - ignore authorization for sleep/wake requests (but restrict to root) + - add timestamp to default auto wired connections (LP: #447067) + - don't crash if for some reason HW addresses aren't available (bgo #630534) + - ensure Enabled state is preserved regardless of rfkill (LP: #387345) + - add dhcp4-change and dhcp6-change events (bgo #563654) + - validate Enable/Disable WiFi and WWAN requests + - handle VPN service installation/removal dynamically (LP: #458595) + - let plugins forbid VPN connections from getting the default route + (LP: #598357) + - work around dbus-glib property access bug (CVE-2010-1172) + - ensure dhcp_manager exists before trying to unref it (bgo #626610) + * drop dhcp3 support patch, it was applied upstream. + - remove debian/patches/99-support-dhcp3.patch + - update debian/patches/series + * drop cherry-picked patches to /etc/hosts handling, their changes are + included in the source tarball: + - remove debian/patches/lp659872_dont_overwite_hosts_aliases_ee9ce60.patch + - remove debian/patches/lp632896_cleanup_etc_hosts.patch + - update debian/patches/series + * Properly document workflow for working on NM packaging. + - add debian/README.source + * Slight change to GET_SOURCE script. Looks like we were looking for the + "orig" keyword in the wrong variable. + - update debian/rules + * Fix typo in README.source + - update debian/README.source + * network-manager Breaks: dhcp3-client (<< 4.1.1-P1-11) to provide seemless + upgrades to isc-dhcp 4 and avoid unnecessary compatibility issues + * switch Build-Depends from dhcp3-client to isc-dhcp-client >= 4.1.1 to make + sure we don't build with an old version of DHCP. + * libnm-glib2 also Breaks: dhcp3-client (<< 4.1.1-P1-11) + - debian/control + * libnm-util1 Breaks: dhcp3-client (<< 4.1.1-P1-11) as well + - debian/control + * Patch various files to support building with kernel headers 2.6.36 and + newer (otherwise it conflicts with libc headers for interface structures) + - debian/patches/do-not-include-netif.patch + - debian/patches/series + + -- Mathieu Trudel-Lapierre Tue, 09 Nov 2010 13:01:48 -0500 + +network-manager (0.8.1+git.20100810t184654.ab580f4-0ubuntu4) natty; urgency=low + + * Pre-initialize the parent GUdevDevice in _update_s390_subchannels, it caused + n-m to fail to compile on natty. + - add debian/patches/fix-natty-build.patch + - update debian/patches/series + + -- Mathieu Trudel-Lapierre Wed, 20 Oct 2010 10:33:49 -0400 + +network-manager (0.8.1+git.20100810t184654.ab580f4-0ubuntu3) natty; urgency=low + + [ Anders Kaseorg ] + * Remove stale entries for the system hostname from /etc/hosts when + bringing down interfaces. (LP: #632896) + - Add debian/patches/lp632896_cleanup_etc_hosts.patch + + [ Mathieu Trudel-Lapierre ] + * Don't overwrite aliases in /etc/hosts (LP: #659872) + - add debian/patches/lp659872_dont_overwite_hosts_aliases_ee9ce60.patch + - update debian/patches/series + + -- Mathieu Trudel-Lapierre Tue, 19 Oct 2010 16:04:00 -0400 + +network-manager (0.8.1+git.20100810t184654.ab580f4-0ubuntu2) maverick; urgency=low + + * Also install the new nmcli utility so some command-line control of NM is available. (LP: #623385) + - update debian/network-manager.install + + -- Mathieu Trudel-Lapierre Tue, 24 Aug 2010 09:30:59 -0400 + +network-manager (0.8.1+git.20100810t184654.ab580f4-0ubuntu1) maverick; urgency=low + + * upstream snapshot 2010-08-10 18:46:54 (GMT) + + ab580f486213f97d41b3141e9d7ef9394a29b14a + - following upstream branch NM_0_8: release 0.8.1 with fixes + * refresh sigaction patch: sigactions moved from NetworkManager.c to main.c + - update debian/patches/70_lp145653_no_sigaction_for_crashes.patch + * refresh wpasupplicant timeout patch: we still should give association + some more time + - update debian/patches/lp292054_tune_supplicant_timeout_60s.patch + * update logging call in "unmanaged" connections patch to properly use + nm_log_info, not nm_info + - update debian/patches/lp191889_always_offline_with_unmanaged_devices.patch + * adding new symbols to debian/libnm-glib2.symbols: + - nm_settings_interface_error_get_type + - nm_active_connection_get_default6 + * adding new symbols to debian/libnm-util1.symbols: + - nm_ip6_address_get_gateway + - nm_ip6_address_set_gateway + - nm_setting_gsm_get_allowed_bands + - nm_setting_gsm_get_home_only + - nm_setting_ip4_config_get_may_fail + - nm_setting_ip6_config_get_may_fail + - nm_utils_ip4_get_default_prefix + - nm_setting_wired_get_cloned_mac_address + - nm_setting_wireless_get_cloned_mac_address + - nm_utils_wifi_channel_to_freq + - nm_utils_wifi_find_next_channel + - nm_utils_wifi_freq_to_channel + - nm_utils_wifi_is_channel_valid + - nm_setting_wired_add_s390_option + - nm_setting_wired_get_num_s390_options + - nm_setting_wired_get_s390_nettype + - nm_setting_wired_get_s390_option + - nm_setting_wired_get_s390_option_by_key + - nm_setting_wired_get_s390_subchannels + - nm_setting_wired_remove_s390_option + * bump DEB_AUTO_UPDATE_ACLOCAL and DEB_AUTO_UPDATE_AUTOMAKE versions from 1.9 + to 1.11, to deal with the builddir variable for libdeprecated-nm-glib.la + - update debian/rules + * adding more new symbols to debian/libnm-glib2.symbols: + - nm_client_networking_get_enabled + - nm_client_networking_set_enabled + - nm_device_get_firmware_missing + - nm_client_get_permission_result + - nm_device_ethernet_get_permanent_hw_address + - nm_device_wifi_get_permanent_hw_address + * dropping ppp Depends to a Recommends (LP: #348521) + - update debian/control + * drop patch 008-BACKEND-debian-fallback-to-generic-loopback.loom.patch, + it looks like the generic backend is already bringing lo up reasonably well + - update debian/patches/series + * fix build-time detection of dhclient version; handle using dhclient v3 by + not passing the new parameters isc-dhcp v4 expects. IPv6 won't work any + better but at least IPv4 will. + - add debian/patches/99-support-dhcp3.patch + - update debian/patches/series + * add dhcp3-client to Build-Depends to properly handle dhclient version + detection. + - update debian/control + + -- Mathieu Trudel-Lapierre Wed, 11 Aug 2010 10:03:55 -0400 + +network-manager (0.8-0ubuntu3) lucid; urgency=low + + [ Alexander Sack ] + * drop patch superseded upstream + - delete debian/patches/0001-core-make-sure-device-interfaces-are-up-before-ip4-c.patch + - update debian/patches/series + + [ Mathieu Trudel ] + * Recommend network-manager-pptp. It's at least useful for some DSL users. + See LP: 107738. + - update debian/control + + -- Mathieu Trudel Thu, 25 Mar 2010 08:53:54 -0400 + +network-manager (0.8-0ubuntu2) lucid; urgency=low + + * Add network-manager-kde as option for network-manager recommends + + -- Jonathan Riddell Mon, 22 Feb 2010 15:49:49 +0000 + +network-manager (0.8-0ubuntu1) lucid; urgency=low + + * upstream 0.8 release + - backends: add backend for Pardus + - libnm-util: fix NMDeviceBt hardware address property + - core: ensure failed /etc/hosts update writes out well-formatted file (LP: #471498) + - netlink: work around kernel cache refill problems + - keyfile: add IPv6 support (bgo #593814) + - libnm-util: add IPv6 comparison functions + - crypto: de-init NSS after calling PR_GetError() + - policy: fall back to original hostname before trying reverse DNS + - policy: be more selective when adding hostname to /etc/hosts (debian #567411) + - ifupdown: interpret allow-hotplug as autoconnect (debian #568784) + - gsm: handle PIN requests during modem enable too (bgo #609197) + - modem: ignore Enabled property changes while activating + - ifupdown: don't tell NM about connections until we check 'managed' (LP: #450458) + + -- Mathieu Trudel Fri, 19 Feb 2010 10:01:07 -0500 + +network-manager (0.8~rc2-0ubuntu1) lucid; urgency=low + + * upstream snapshot 2009-11-12 01:22:59 (GMT) + + 420ea0220c29a45337e239e4c53250a6989160a3 + - ppp: allow update of ppp secrets in all ACTIVATING stages (LP: #432205) + - core: validate pidfile and quit early if NM is already running (rh #517362) + - core: preserve wifi and networking enabled/disabled states (bgo #582447) + - libnm-util: don't allow blank or NULL VPN items or secrets (rh #532084) + + * upstream 0.8-rc1 release + - libnm-util: client cert shouldn't be required to set priv key (bgo #585570) + - wifi: poll rfkill status for ipw2x00 devices + - ppp: increase PPPoE pppd timeout to 30 seconds (debug) + - wifi: don't allow scan requests when associating + - wifi: ensure wifi devices are enabled on wakeup if not rfkilled + - libnm-util: handle PEM files without ending newline (rh #507315) + - system-settings: cache secrets to protect against nm_connection_clear_secrets + - dnsmasq: VPN DNS fixes (LP #389006) + - system-settings: fix crash when deleting wired connections + - modem: subsitute known-good nameservers if PPP doesn't return any (LP: #434477) + - core: clear invalid tag on failed connections when sleeping (LP: #456362) + - wwan: unable to bring up mobile-broadband system connection (LP: #483773) + - 8021x: fixed problems with invalid connection / client-certs (LP: #245184) + + * upstream 0.8-rc2 release + - po: update italian translation (bgo #595673) + - core: fix error when parsing state file for WirelessEnabled fails + - libnm-util: fix potential crash when encrypting fails + - modem: ensure deactivation on disable only happens on disable + - modem: ensure device is deactivated if the modem is disabled + underneath NM + - modem: enable modem before connecting if required + - libnm-glib: add WWAN enable/disable support + - manager: add WWAN enable/disable support + - modem: proxy the ModemManager Enabled property + - manager: generalize rfkill operations + - core: add statefile support for WWAN devices + - udev: add support for other types of rfkill switches + - core: generalize interface for enabling/disabling devices + - modem: fix enable/disable/disconnect flow + - system-settings: Fix using hostname from DHCP + - libnm-util: client certificate should not be required to set + private key (bgo #585570) + + + [ Alexander Sack ] + * allow daily builds to be filed against ubuntu bug system; + to allow this we add report['CrashDB'] = 'ubuntu' to the apport + hook + - update debian/source_network-manager.py + * attach list of system-connection configuration files in apport hook + - update debian/source_network-manager.py + + [ Mathieu Trudel ] + * updated pkcs11 smartcard patch + - updated debian/patches/lp120363_smartcard_pkcs11.patch + * updated signals patch for apport + - updated debian/patches/70_lp145653_no_sigaction_for_crashes.patch + * add new nm_setting_olpc_mesh_new symbol to libnm-util1.symbols + - update debian/libnm-util1.symbols + * add new nm_client_wwan* symbols to libnm-glib2.symbols + - update libnm-glib2.symbols + + [ Tony Espy ] + * add logic to map '~rc' versions to '-rc' tag format used upstream. This + allows the upstream tags to be used, while managing to keep the version + numbers less than the final release version. + - update debian/rules + + -- Tony Espy Wed, 20 Jan 2010 09:51:19 -0500 + +network-manager (0.8~a~git.20091013t193206.679d548-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-10-13 19:32:06 (GMT) + + 679d548e09a0b58815ca62989627d00e7b8c7d96 + - ppp: add minimal debugging output to the ppp plugin + - system-settings: fix crash saving default wired connections to backing storage (LP: #435029) + - sharing: fix sharing after 715ddd2045cf786e6c80e6d3d8617fe70ad24552 (LP: #444756) + - vpn: clear secrets when the connection fails + * drop iptables-dev dependency and explicitly set + --with-iptables=/sbin/iptables for configure + - update debian/control + - update debian/rules + * fix LP: #366525 - network-manager should recommend iptables + - update debian/control + + -- Alexander Sack Thu, 15 Oct 2009 00:16:15 +0200 + +network-manager (0.8~a~git.20091005t192303.1d28ad1-0ubuntu2) karmic; urgency=low + + * add build-dep on iptables-dev + - update debian/control + + -- Mathieu Trudel Tue, 06 Oct 2009 00:32:28 +0200 + +network-manager (0.8~a~git.20091005t192303.1d28ad1-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-10-05 19:23:03 (GMT) + + 1d28ad1aa54bacf6b6b64582ee7c41d9728d7304 + * fixed upstream + - LP: #413622 - Network manager does not unmanage devices configured as + "mapping" in /etc/network/interfaces + - LP: #413967 - Network manager does not connect wlan0 on startup + - LP: #417719 - Disconnected static wired network initially treated as + connected + - LP: #422597 - 802.11x fails for wired connections (wireless works) + - LP: #438771 - Creating a wireless or DSL connection fails with + "Error editing connection: property '%s' / '%s' invalid: %d" + - LP: #443423 - Connection properties are not stored + - LP: #439221 - cannot create wireless Wpa & Wpa2 connection with GUI + - LP: #441668 - network-manager does not save modifications on GSM + connections + - LP: #438454 - NetworkManager fails to set IP and route information entered + + [ Mathieu Trudel ] + * updated pkcs11 smartcard patch + - updated debian/patches/lp120363_smartcard_pkcs11.patch + * add new 802.1x symbols to libnm-util1.symbols + - update debian/libnm-util1.symbols + + [ Alexander Sack ] + * drop cherry-pick now applied upstream + - delete debian/patches/lp436884.patch + - update debian/patches/series + * extend apport hook to also append /etc/NetworkManager/nm-system-settings.conf + - update debian/source_network-manager.py + + -- Alexander Sack Mon, 05 Oct 2009 23:46:01 +0200 + +network-manager (0.8~a~git.20090923t064445.b20cef2-0ubuntu2) karmic; urgency=low + + * fix LP: #436884 - wireless secrets dont work in karmic; we + cherry-pick a one-line git commit that makes the GetSecrets + call use the right dbus proxy. + - add debian/patches/lp436884.patch + - update debian/patches/series + + -- Alexander Sack Tue, 29 Sep 2009 17:11:56 +0200 + +network-manager (0.8~a~git.20090923t064445.b20cef2-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-09-23 06:44:45 (GMT) + + b20cef2e1beae61cb2335edb8cb0aa3932facd54 + * drop patches superseded upstream + - delete debian/patches/lp303142_more_time_for_manual_registration.patch + - update debian/patches/series + * adjust .symbols files for changed vpn ABI/API + - update debian/libnm-glib2.symbols + * fix wrong file location: network-manager.prerm => debian/network-manager.prerm + + -- Alexander Sack Thu, 24 Sep 2009 11:33:58 +0200 + +network-manager (0.8~a~git.20090911t130220.4c77fa0-0ubuntu6) karmic; urgency=low + + LP: #430878 + * debian/rules: We never previously started or restarted network manager + on install or upgrade, and instead flagged a reboot. So we need a + --noscripts for dh_installinit to stop that happening with Upstart + (didn't need this before because the init script was never installed + with dh_installinit) + * debian/network-manager.prerm: Restore, just stop N-M using "stop" + + -- Scott James Remnant Wed, 16 Sep 2009 20:50:31 +0100 + +network-manager (0.8~a~git.20090911t130220.4c77fa0-0ubuntu5) karmic; urgency=low + + * Don't have network manager wait for network filesystems, since + the network filesystems are probably waiting for network manager. + + -- Scott James Remnant Wed, 16 Sep 2009 13:49:48 +0100 + +network-manager (0.8~a~git.20090911t130220.4c77fa0-0ubuntu4) karmic; urgency=low + + [ Alexander Sack ] + * fix upstart regression that made NM restart on hal upgrade + - update debian/network-manager.upstart + + -- Scott James Remnant Wed, 16 Sep 2009 00:08:21 +0100 + +network-manager (0.8~a~git.20090911t130220.4c77fa0-0ubuntu3) karmic; urgency=low + + FFE LP: #427356. + + * Replace init script with Upstart job. + * debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 13:40:43 +0100 + +network-manager (0.8~a~git.20090911t130220.4c77fa0-0ubuntu2) karmic; urgency=low + + * fix LP: #429901 - provide legacy .pc files for libnm_glib and libnm_glib_vpn + to ease transition + - add debian/libnm-glib-dev.links + + -- Alexander Sack Tue, 15 Sep 2009 10:44:42 +0200 + +network-manager (0.8~a~git.20090911t130220.4c77fa0-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-09-11 13:02:20 (GMT) + + 4c77fa08623f41dd710c545ec859dd7e942a3f2c + + fix LP: #411668 - NetworkManager crashes in g_type_check_instance_cast () + when connecting to 3G + + fix LP: #366772 - Network manager does not show EVDO, device detected by hal + + fix LP: #424092 - ifupdown connection device locking regressions caused by + system-settings rework + + fix LP: #424603 - Not closing modems when disconnected + + [ Tony Espy ] + * fix build error due to upstream re-factoring + - update debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch + * fix install problem due to new PolicyKit changes + - update debian/network-manager.install + * fix install problem due to libnm-glib naming changes + - update debian/libnm-glib-dev.install + - update debian/libnm-glib0.install + * handle upstream soname version bump for libnm-glib + - update debian/control + - rename debian/libnm-glib0.install => debian/libnm-glib2.install + - rename debian/libnm-glib0.symbols => debian/libnm-glib2.symbols + - update debian/libnm-glib2.symbols + * add new olpc_mesg symbols to libnm-util1.symbols + - update debian/libnm-utils1.symbols + * fix lintian errors: update Standards-Version to 3.8.3, add missing + ${misc:Depends}, and replace deprecated ${Source-Version} variables + with ${binary:Version} + - update debian/control + + [ Alexander Sack ] + * drop -0ubuntu1 suffix from ip6 symbols added in previous upload + - update debian/libnm-glib0.symbols + * remove hal from build-depends and depends (LP: #416988) + - update debian/control + * adjust patches to new upstream codebase + - update debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch + - update debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch + * build depend on libpolkit-gobject-1-dev instead of libpolkit-dbus-dev + - update debian/control + * make GET_SOURCE not go mad for git versions that use a different abbrev-id syntax + - update debian/rules + * drop patches applied upstream + - delete debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch + - delete debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch + - update debian/patches/series + + [ Mathieu Trudel ] + * adjust patches to new upstream codebase + - update debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch + * add rule to retrieve current snapshot information + - update debian/rules + * fix missing character in GET_SOURCE code + - update debian/rules + * use current snapshot hash from changelog instead of latest in get-snapshot-info + - update debian/rules + * update GET_SOURCE code: exit on any error + - update debian/rules + + -- Alexander Sack Mon, 14 Sep 2009 11:29:38 +0200 + +network-manager (0.8~a~git.20090820t182117.cb60390-0ubuntu2) karmic; urgency=low + + New upstream snapshot: + + LP: #412570 - [novatel] modemmanger does not connect to 3G network, icon + keeps spinning. + + LP: #413333 - [huawei] MM wont connect, keeps nm.applet spinning + + [ Tony Espy ] + * remove deprecated and un-used DBUS init scripts + - remove network-manager.dbus-event + - remove network-manager-dispatcher.dbus-event + * add comment to system settings config file about how to to + override it with another file + - update nm-system-settings.conf + + [ Jonathan Riddell ] + * Recommend on renamed plasma-widget-networkmanagement + * Update Vcs-bzr line in debian/control + + [ Alexander Sack ] + * use command_output from apport.hookutils - thx Matt Zimmerman + - update source_network-manager.py + * add LOCAL_BRANCH feature to play nicely with fta's build bot + - update rules + * add nm_settings_olpc_ symbols to libnm-util1 + - update debian/libnm-util1.symbols + * fix LP: #416598 - mbm dhclient request fails because interface is not up + - add debian/patches/0001-core-make-sure-device-interfaces-are-up-before-ip4-c.patch + - update debian/patches/series + * add ip6 api symbols for libnm-glib0 + - update debian/libnm-glib0.symbols + + [ Matt Zimmerman ] + * Update source_network-manager.py to use attach_network and attach_wifi from + hookutils, to further benefit from common code and add some new info + * Automatically tag apport bugs with driver-ndiswrapper, driver-b44 or + driver-madwifi per https://wiki.ubuntu.com/DebuggingNetworkManager + + -- Alexander Sack Thu, 20 Aug 2009 21:46:03 +0200 + +network-manager (0.8~a~git.20090804t185522.4bab334-0ubuntu1) karmic; urgency=low + + [ Tony Espy ] + * upstream snapshot 2009-08-04 18:55:22 (GMT) + + 4bab33405be01fd263373e530d712f3eb8d01d0d + * add ipv6 header to libnm-util-dev install + - update libnm-util-dev.install + * add ipv6 symbols to libnm-util1 + - update libnm-util1.symbols + * made more revisions to the tarball generation code + after finding problems with the GET_SOURCE function + - update rules + * add more bluetooth symbols to libnm-util1 symbols + - update libnm-util1.symbols + * use -c4 MAKESHLIBS_ARG to detect symbol changes instead of + hard-coding versions for individual libraries. + - update rules + * re-work tarball generation code; added get-curr-source to + grab a specific version; get-orig-source now grabs the tip + of new variable GIT_BRANCH; adjusted changelog version to + new scheme. + - update rules + * add modemmanager to Recommends: + - update control + + [ Alexander Sack ] + * prepare get-orig-source for daily ppa-scripts + - update rules + * drop patches not required on trunk + - delete patches/60_NULL_info_linux_driver.patch + - delete patches/lp199140_dont_manage_virtual_devices.patch + - delete patches/lp356517_manage_virtual_devices_on_armel.patch + - update patches/series + * port smartcard patch and reenable it + - update patches/lp120363_smartcard_pkcs11.patch + - update patches/series + * port patches to trunk + - update patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch + * add libgudev-1.0-dev as new build dependency + - update control + * update .install debhelper files to match new upstream hierarchy + - update libnm-util-dev.install + - update network-manager.install + * add bluetooth settings symbols to libnm-util1 symbols + - update libnm-util1.symbols + + -- Tony Espy Thu, 06 Aug 2009 10:31:17 +0100 + +network-manager (0.7.1-0ubuntu1) karmic; urgency=low + + * upstream release 0.7.1 + + -- Alexander Sack Tue, 02 Jun 2009 12:58:30 +0200 + +network-manager (0.7.1~rc4.1.cf199a964-0ubuntu2) jaunty; urgency=low + + * fix LP: #356517 - NetworkManager does not detect eth0 on armel; on armel + network devices have no visible bus and hence appear similar to virtual + devices that got blacklisted by the fix for LP: #199140; for jaunty + we workaround the issue by explicitly disabling the virtual device + blacklisting on __ARMEL__ + - add patches/lp356517_manage_virtual_devices_on_armel.patch + - update patches/series + + -- Alexander Sack Tue, 14 Apr 2009 13:53:20 +0200 + +network-manager (0.7.1~rc4.1.cf199a964-0ubuntu1) jaunty; urgency=low + + * upstream release 0.7.1 final candidate 1 (Wed Apr 8 06:38:37 2009 -0400) + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + - modem-probe: retry opening the serial port if --delay is used (LP: #351803) + (Up to --delay milliseconds.) + - core: ignore DHCP-sent MTUs less than 577 (LP: #352779) + - core: update FSF address (bgo #577949) + - modem-probe: don't restrict probing on tty device name (LP: #351803) + + -- Alexander Sack Wed, 08 Apr 2009 12:53:41 +0200 + +network-manager (0.7.1~rc4-0ubuntu1) jaunty; urgency=low + + * upstream release 0.7.1 rc4 + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + - dont send AT commands to serial consoles that are not using a modem driver + - nozomi probing (LP: #351803) + - allow users with polkit authorization to view/edit secrets for system connections + - fix crash that might be LP: #319918 + * allow connection sharing out of the box; we add dnsmasq-base to Recommends: + - update control + + -- Alexander Sack Mon, 06 Apr 2009 12:43:31 +0200 + +network-manager (0.7.1~rc3.2.gitb8fc83a7-0ubuntu1) jaunty; urgency=low + + * upstream 0.7.1 rc3 + gitb8fc83a7 (Thu Mar 26 17:05:41 2009 -0400) + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + + fix broken udev-prober for 3G modems (LP: #346835) + * fix LP: #348521 - network-manager sould depend on ppp + - update control + * update diverged patches + - update patches/60_NULL_info_linux_driver.patch + + -- Alexander Sack Fri, 27 Mar 2009 14:37:33 +0100 + +network-manager (0.7.1~rc3.1.git4cf2da146-0ubuntu1) jaunty; urgency=low + + * upstream 0.7.1 rc3 + git4cf2da146 + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + * adjust patches to changed code base + - update patches/60_NULL_info_linux_driver.patch + + -- Alexander Sack Thu, 19 Mar 2009 15:05:35 +0100 + +network-manager (0.7.1~rc3-0ubuntu2) jaunty; urgency=low + + * Recommend plasmoid-network-manager not network-manager-kde + - Closes LP: #340210 + + -- Jonathan Riddell Wed, 11 Mar 2009 14:17:50 +0000 + +network-manager (0.7.1~rc3-0ubuntu1) jaunty; urgency=low + + * upstream 0.7.1 rc3 + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + * point Vcs-Bzr: to new 0.7.1 packaging branch + - update control + * fix .symbols files for libnm-glib0 and libnm-util0 to only contain symbols + for the right shared libs + - update libnm-glib0.symbols + - update libnm-util1.symbols + + [ Steve Langasek ] + * src/nm-hal-manager.c: ignore virtual 'wired' devices whose + originating device is /org/freedesktop/Hal/devices/computer, since + these are generally managed by some other daemon and network-manager + just gets in the way. LP: #199140. + - add patches/lp199140_dont_manage_virtual_devices.patch + - update series + + -- Alexander Sack Thu, 05 Mar 2009 00:54:41 +0100 + +network-manager (0.7.1~rc1+20090220-0ubuntu2) jaunty; urgency=low + + * drop suggests on udev-extras as the modem code was moved into + network-manager + - update control + * ship udev modem probe rules and nm-modem-probe binary in + network-manager package + - update network-manager.install + + -- Alexander Sack Mon, 23 Feb 2009 15:52:55 +0100 + +network-manager (0.7.1~rc1+20090220-0ubuntu1) jaunty; urgency=low + + * upstream 0.7.1 rc1 (post) snapshot + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + + Feb 20, 2009 (a2b55d43) + * Fix LP: #332064 - carrier detect broken for forcedeth and other drivers + + -- Alexander Sack Fri, 20 Feb 2009 16:30:39 +0100 + +network-manager (0.7.1~rc1-0ubuntu2) jaunty; urgency=low + + * upstream 0.7.1 rc1 release taken from git + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + + Feb 18, 2009 (6176cc68) + * rebase some patches on new upstream code base + - update patches/60_NULL_info_linux_driver.patch + * start NetworkManager daemon later (50) and remove old init links + accordingly (requested by Keybuk aka scott@ubuntu.com) + - update debian/network-manager.postinst + * build depend on libudev-dev to enable support for modem probing + through udev-extras; in turn add udev-extras to suggests + - update control + + -- Alexander Sack Thu, 19 Feb 2009 23:35:23 +0100 + +network-manager (0.7.1~20090213+gitf142e15-0ubuntu1) jaunty; urgency=low + + * new upstream snapshot (0.7.1 pre) + + http://git.freedesktop.org/NetworkManager/NetworkManager/ + + NETWORKMANAGER_0_7 (branch) + + Feb 13, 2009 (f142e15) + * patch housekeeping for new upstream code + + remove upstreamed patches + - delete debian/patches/04-ltversioning.patch + - delete debian/patches/ftbfs_nm_netlink_monitor.patch + - delete debian/patches/lp290468_only_consider_name_suffix_VPN_service_files.patch + - update debian/patches/series + + adjust patches to new upstream code base + - update debian/patches/lp292054_tune_supplicant_timeout_60s.patch + * add symbol files for libs: libnm-util1 and libnm-glib0 + - add libnm-glib0.symbols + - add libnm-util1.symbols + * set default behaviour for bzr-builddeb to merge = True + - add .bzr-builddeb/default.conf + * bump shlibs version for libnm-glib0 and libnm-util1 to + -V "libnm-glib0 (>= 0.7.1~20090213)" + - update rules + + -- Alexander Sack Tue, 17 Feb 2009 11:00:12 +0100 + +network-manager (0.7-0ubuntu2) jaunty; urgency=low + + * ppp 2.4.5git transition: bump ppp-dev lower version bound to 2.4.5~ + - update debian/control + + * fix LP: #120363 - NetworkManager should support smartcard based + certificate; we apply the backend patch contributed by David Smith + - add debian/patches/lp120363_smartcard_pkcs11.patch + - update debian/patches/series + + [ Alessandro Ghersi ] + * fix LP: #270584 add the dependency network-manager-dev in + libnm-glib-dev; also fixes LP: #321473 liferea doesnt handle + network-manager online/offline state + - update debian/control + * update Standards-Version to 3.8.0 + - update debian/control + + [ Steven S Danna ] + * fix LP: #283416 - add /etc/init.d/NetworkManager status; init + script was fixed upstream; however, we take the lsb-base lower + version bound from the bug (>= 3.2-14) + - udpate debian/control + + -- Alexander Sack Sat, 14 Feb 2009 22:16:12 +0100 + +network-manager (0.7-0ubuntu1) jaunty; urgency=low + + * (merge) new upstream release NetworkManager 0.7 final + - rev 3802 lp:~vcs-imports/network-manager/main/ + + fix LP: #288963 Network Manager fails to connect to a system stored + network with "set_network_cb(): Couldn't set network config: Did not receive + correct message.." in intrepid + + fix LP: #288703 Routes lost on DHCP lease renewal (breaks VPN) + + * drop probe v250 modem patch; this should be done in udev-extras; until + that happens we rely on accurate hal-info + - delete debian/patches/add_probe_for_v250_modems.patch + - update debian/patches/series + * drop upstreamed patches + - delete debian/patches/50_gcc43.patch + - delete debian/patches/lp282207_set_apn_at_syntax.patch + - delete debian/patches/lp268667_more_ppp_default_options.patch + - delete debian/patches/lp278631-initscript-polishing.patch + - update debian/patches/series + * drop unused patch + - delete debian/patches/41o_completely_deactivate_stage1.patch + * make manual regristration timeout patch out of automatic one (which + was applied upstream) + - rename debian/patches/lp303142_more_time_for_automatic_registration.patch + => debian/patches/lp303142_more_time_for_manual_registration.patch + * add patch to fix ftbfs + - add debian/patches/ftbfs_nm_netlink_monitor.patch + - update debian/patches/series + * [libnm-util-dev] dont try to install nm-setting-ip6-config.h - which is + supposed to be hidden in 0.7 final + - update debian/libnm-util-dev.install + * prepatch upstream soname version bump for libnm-util + - add debian/patches/04-ltversioning.patch + - update debian/patches/series + ship the libs in libnm-util1 + - update debian/control + - rename debian/libnm-util0.install => debian/libnm-util1.install + and bump so shlibs control file info for libnm-util1 + - update debian/rules + * add easy bzr builddeb support with proper upstream-revision (--show-ids) + - add .bzr-builddeb/default.conf + * install plugin in ppp 2.4.4 and 2.4.5 directory + - update debian/network-manager.install + + -- Alexander Sack Mon, 12 Jan 2009 13:29:24 +0100 + +network-manager (0.7~~svn20081018t105859-0ubuntu2) jaunty; urgency=low + + * fix LP: #292054 - Some drivers take too long to associate (Was: + network-manager 0.7 always asks for WPA passphrase); we workaround + this driver/wpasupplicant bug by giving association more time + (e.g. 60sec instead of 25sec) + - add debian/patches/lp292054_tune_supplicant_timeout_60s.patch + - update debian/patches/series + * fix LP: #256905 - dbus policy file (nm-avahi-autoipd.conf) not properly + deployed in package; install nm-avahi-autoipd.conf + - update debian/network-manager.install + * fix LP: #282207 - [Sierra] NM 0.7 does not set APN for AT&T 3G connection; + apply fix from Jerone Young + - add debian/patches/lp282207_set_apn_at_syntax.patch + - update debian/patches/series + * fix LP: #268667 - not all required ppp options get set on command line + which makes ppp use bad values from /etc/ppp/options; we backport upstream + fix + - add debian/patches/lp268667_more_ppp_default_options.patch + - update debian/patches/series + * fix LP: #291564 - ifupdown network manager does not blacklist/unmanage + mapped devices in managed=false mode; thanks to Stephan Trebels for the + patch + - add debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch + - update debian/patches/series + * fix LP: #291902 - ifupdown plugin should not export any parsed connection + configuration when running in managed=false mode; we fix this by exporting + empty connection list in unmanaged mode + - add debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch + - update debian/patches/series + * belt-and-braces fix LP: #290468 VPN fails, "/usr/bin/nm-ppp-starter + missing"; we remove obsolete conffiles in -pptp .preinst; in case user + modified them they will be renamed to .dpkg-bak; this patch takes care that + NM doesn't consider files in /etc/NetworkManager/VPN that don't have a + .name filename suffix. + - add debian/patches/lp290468_only_consider_name_suffix_VPN_service_files.patch + - update debian/patches/series + * fix LP: #303142 - 3G [Option] some modems take a while time to register on + network (CREG); we use g_timeout_add instead of _idle_add to give the + modem some rest during registration phase. + - add debian/patches/lp303142_more_time_for_automatic_registration.patch + - update debian/patches/series + + -- Alexander Sack Fri, 28 Nov 2008 13:47:07 +0100 + +network-manager (0.7~~svn20081018t105859-0ubuntu1) intrepid; urgency=low + + * new upstream snapshot Sat 2008-10-18 10:58:59 +0000 (rev 3648) + from lp:~vcs-imports/network-manager/main. Includes: + + (bzr3642) proper wireless capability detection + - update src/nm-device-wifi.c + + update translations nb + + * More cherry-picks: + + (bzr3650) Updated Belarusian Latin translation. + - update vpn-daemons/pptp/po/be@latin.po + + * Changes in upstream snapshot that don't affect directly produced binary + packages: + + (bzr3645) NA/openvpn: support .cer and .crt certificates for openvpn (related + to LP: #270762) + - update vpn-daemons/openvpn/properties/auth-helpers.c + + (bzr3646) NA/openvpn: The "Certificates (TLS)" tab should also be + present for NM_OPENVPN_CONTYPE_PASSWORD (LP: #280429) + - update vpn-daemons/openvpn/properties/auth-helpers.c + + updated vpn translations es, sv + + -- Alexander Sack Mon, 20 Oct 2008 17:35:58 +0200 + +network-manager (0.7~~svn20081015t224738-0ubuntu1) intrepid; urgency=low + + * new upstream snapshot Wed 2008-10-15 22:47:38 +0000 (bzrrev 3641) + - a few more follow up fixes for routing routing/subnet/vpn handling. + + -- Alexander Sack Thu, 16 Oct 2008 11:08:39 +0200 + +network-manager (0.7~~svn20081015t024626-0ubuntu1) intrepid; urgency=low + + new upstream snapshot Wed 2008-10-15 02:46:26 +0000 (bzrrev 3637); topic: + - more vpn and routing fixes + + [ Alexander Sack ] + * drop upstreamed IFUPDOWN patches + - delete debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch + - delete debian/patches/004-IFUPDOWN-devtracking.loom.patch + - delete debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch + - delete debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch + - delete debian/patches/007-IFUPDOWN-managed-mode.loom.patch + * adjust patches that didnt apply cleanly anymore + - update debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch + * fix eventual restart races by --retry'ing at least 5 seconds for NM to stop + in init script + + [ Mario Limonciello ] + * debian/network-manager.postinst: + - Set startup priority to be lower than Ubiquity to allow only-ubiquity + installs to have network access. (LP: #277302) + + -- Alexander Sack Thu, 16 Oct 2008 00:08:41 +0200 + +network-manager (0.7~~svn20081008t224042-0ubuntu3) intrepid; urgency=low + + * fix LP: #281187: NetworkManager crashed with SIGSEGV in nl_addr_get_len(); + we dont set libhal properties anymore, but instead use the result directly + to categorize GSM/CDMA modems + - update debian/patches/add_probe_for_v250_modems.patch + * fix LP: #282554: NM 0.7 fails to build on all architectures, but amd64 and + i386; we don't use nm_error, but nm_warning when modem probe fails on IO + level; this works around a bug about a missing signal.h include in glib. + - update debian/patches/add_probe_for_v250_modems.patch + + -- Alexander Sack Mon, 13 Oct 2008 18:23:41 +0200 + +network-manager (0.7~~svn20081008t224042-0ubuntu2) intrepid; urgency=low + + * more ifupdown compatibility: we maintain /var/run/network/ifstate + in network manager dispatcher script. This fixes a bug in the + nfs init script that uses /var/run/network/ifstate to determine + whether all required devices are properly up. + - update debian/network-manager-dispatcher.script + * fix LP: #191889: [MASTER] [WORKAROUND] "Offline Mode" feature fails to + detect proper online state for networks that are managed outside of + network manager; we fix this by using NM_STATE_CONNECTED when unmanaged + devices exist. + + -- Alexander Sack Sat, 11 Oct 2008 14:25:55 +0200 + +network-manager (0.7~~svn20081008t224042-0ubuntu1) intrepid; urgency=low + + new upstream snapshot: Wed 2008-10-08 22:40:42 +0000 (bzrrev 3615) from + lp:~vcs-imports/network-manager/main branch + + * fix LP: #277063 - routing randomness + * fix save system settings feature for keyfile plugin + * Fix LP: #278631 - NM output not going cleanly on console; we use + /lib/lsb/init-functions to do proper logging + - add debian/patches/lp278631-initscript-polishing.patch + - update debian/patches/series + * drop upstreamed patches: + 000-FIXCRASH-in-add_default_dhcp_connection.loom.patch, + 001-IFUPDOWN-wep-tx-keyidx.loom.patch, 002-IFUPDOWN-hostname.loom.patch + - update debian/patches/series + - delete debian/patches/000-FIXCRASH-in-add_default_dhcp_connection.loom.patch + - delete debian/patches/001-IFUPDOWN-wep-tx-keyidx.loom.patch + - delete debian/patches/002-IFUPDOWN-hostname.loom.patch + * adjust patches to new upstream codebase + - update debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch + - update debian/patches/004-IFUPDOWN-devtracking.loom.patch + - update debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch + - update debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch + - update debian/patches/007-IFUPDOWN-managed-mode.loom.patch + - update debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch + + -- Alexander Sack Thu, 09 Oct 2008 16:13:09 +0200 + +network-manager (0.7~~svn20081004t225044-0ubuntu1) intrepid; urgency=low + + new upstream snapshot: Sat 2008-10-04 22:50:44 (bzrrev 3602) from + lp:~vcs-imports/network-manager/main branch + + * merging final revision of main.eni branch which brings + us back to parity with upstream branch. features temporarily lost from + "upstream" code base due to this + + graceful defaults for ifupdown ip4settings + + wep-tx-keyidx support + + pre-run intltoolize + * we run intltoolize -f -c in pre-build:: target + - update debian/rules + * drop lp276253_fix_system_hostname.patch; upstream behaviour became more + graceful and we will add ifupdown plugin support to read/write + /etc/hostname + - delete debian/patches/lp276253_fix_system_hostname.patch + - update debian/patches/series + * enable ifupdown system-config-interface implementation by default + (LP: #256054) + - update debian/nm-system-settings.conf + * rewrite README.Debian; we document "managed" vs. "unmanaged" mode as well + as "dial up configurations" + - update debian/README.Debian + * reflect the implicit default mode (unmanaged) in default + nm-system-settings.conf shipped by ubuntu package in intrepid + - update debian/nm-system-settings.conf + * (disabled) add code that enforces -Os instead of -O2 + - update debian/rules + + Cherry-Picking upstream submitted patches: + * debian/patches/000-FIXCRASH-in-add_default_dhcp_connection.loom.patch: + - fix crash of nm-system-settings when replugging devices that get a + default connection created (wired) + * debian/patches/001-IFUPDOWN-wep-tx-keyidx.loom.patch: + - add support for wep-tx-keyidx wpa setting to ifupdown plugin + * debian/patches/002-IFUPDOWN-hostname.loom.patch: + - implement read/write support for /etc/hostname in ifupdown system config + * debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch: + - remove some unused callbacks (cleanup) + * debian/patches/004-IFUPDOWN-devtracking.loom.patch: + - add device tracking infrastructure - prepare managed/unmanaged mode + * debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch: + - implement global unmanaged mode (LP: #256054) + * debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch: + - implement system-settings boolean key ifupdown:managed - default: false + (LP: #256054) + * debian/patches/007-IFUPDOWN-managed-mode.loom.patch: + - implement managed-mode: update mac address of nm-wired/wirless-settings + (LP: #256054) + * debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch: + - use ifconfig (instead of ifup) to bring up loopback. If ifconfig is not + available we fallback to the generic (libnl based) implementation + shipped by NetworkManager + + -- Alexander Sack Mon, 06 Oct 2008 13:40:08 +0200 + +network-manager (0.7~~svn20080928t225540+eni0-0ubuntu2) intrepid; urgency=low + + [ Alexander Sack ] + * remove patches forwarded/applied upstream + - delete debian/patches/80_lp259503_access_to_freed_device_struct.patch + - delete debian/patches/honour_resolvconf_exitcode.patch + - delete debian/patches/lp269010_keyfile_secrets_crash.patch + - update debian/patches/series + * LP: #276253 - NM 0.7 sets hostname to localhost.localdomain instead of + what is in /etc/hostname - we fallback to hostname configured in + /etc/hostname even when no distro specific system plugin is enabled; we + do this for all cases until a proper solution was found. + - add debian/patches/fix_system_hostname.patch + - update debian/patches/series + + [ Matt Zimmerman ] + * (apport hook) Use [].append rather than the += operator, to avoid things + like: "InterestingModules: b 4 4" (should be b44) + - update debian/source_network-manager.py + + -- Alexander Sack Thu, 02 Oct 2008 20:37:20 +0200 + +network-manager (0.7~~svn20080908t183521+eni0-0ubuntu4) intrepid; urgency=low + + * src/probe-modem.c: type_gsm, type_cdma and type_v250 variables are not + properly reset when the retry: block is run twice in probe_modem. This can lead to + unpredicted behaviour; the fix initializes those variables at the beginning of the + retry: block; (LP: #271446) + - update debian/patches/add_probe_for_v250_modems.patch + + -- Alexander Sack Thu, 25 Sep 2008 03:27:46 +0200 + +network-manager (0.7~~svn20080908t183521+eni0-0ubuntu3) intrepid; urgency=low + + [ Antti "Wellark" Kaijanmäki ] + * Fix LP: #268095 - MASTER Network Manager should probe for GSM and CDMA command + sets; we probe all modems tagged as v.250 in hal that otherwise dont specify a + GSM or CDMA command set. + - added debian/patches/add_probe_for_v250_modems.patch + - modified debian/patches/series + + [ Alexander Sack ] + * point Vcs-Bzr to right source tree + - update debian/control + * Fix LP: #269755 - "network manager always crashes on resume"; these crashes + are a regression introduced by fix for LP: #259503 which was first + released in 0.7~~svn20080908t183521+eni0-0ubuntu1. To fix we redo the patch + in a way that will eliminate any idle callbacks as soon as they + become irrelevant. + - update debian/patches/80_lp259503_access_to_freed_device_struct.patch + + [ Steve Langasek ] + * system-settings/plugins/keyfile/plugin.c: it might be better if we were + casting the data from the hash to a gobject, instead of the key which is + a filename... fixes a crash whenever trying to handle system-level secrets. + LP: #269010. + - add debian/patches/lp269010_keyfile_secrets_crash.patch + - update debian/patches/series + + -- Alexander Sack Wed, 17 Sep 2008 02:54:56 +0200 + +network-manager (0.7~~svn20080908t183521+eni0-0ubuntu2) intrepid; urgency=low + + * fix FTBFS; we add uuid-dev to Build-Depends + - update debian/control + + -- Alexander Sack Wed, 10 Sep 2008 09:01:07 +0200 + +network-manager (0.7~~svn20080908t183521+eni0-0ubuntu1) intrepid; urgency=low + + [ Alexander Sack ] + * new upstream snapshot (Mon 2008-09-08 18:35:21 rev3504) + * merge improved ifupdown system config implementation from main.eni branch; + Mon 2008-09-08 20:47:20 +0200; rev 2828 + * Fix LP: #255839 - "0.7 N-M "system setting" does not work"; we create the + /etc/NetworkManager/system-connections/ directory during package install now + - update debian/network-manager.dirs + * adjust patch due to changed ifupdown plugin source dir + - update debian/patches/50_gcc43.patch + * fix LP: #256480 - "network-manager 0.7 breaks resolvconf integration"; we + pass --with-resolvconf=/sbin/resolvconf to configure. + - update debian/rules + * (proposed) fix LP: #259503 - "crashes when unplugging device (or unloading + module)" - crash caused by idle handler accessing already freed device. + We fix that for wireless and ethernet, which both were affected by + properly refcounting the device gobjects. + - add debian/patches/80_lp259503_access_to_freed_device_struct.patch + - update debian/patches/series + * drop ifupdown from Depends: - there is no sense to depend on replacements + - update debian/control + * drop patch applied upstream + - delete debian/patches/05-debian_backend.patch + - update debian/patches/series + * Fix LP: #261688 - NetworkManager build dependency for "libdbus-glib-1-dev + (>= 0.60)" incorrect; we adjust the version to >= 0.74. + - update debian/control + * bump shlibs requirements for libnm-util0 and libnm-glib0 packages to >= + 0.7~~svn20080908 + - update debian/rules + * Fix - Networkmanager doesn't update resolv.conf when resolvconf is + installed, but /etc/resolv.conf isnt a link; we fix that by honouring + the resolvconf exit code and fall back to "normal" named behaviour in case + it fails. This requires a resolvconf update which currently doesnt return + a non-zero exit code when it fails in such a way. + - add debian/patches/honour_resolvconf_exitcode.patch + - update debian/patche/series + + [ Matt Zimmerman ] + * Add apport package hook (LP: #258552) + - add debian/network-manager.links + - add debian/source_network-manager.py + - update debian/network-manager.install + + -- Alexander Sack Tue, 09 Sep 2008 16:24:08 +0200 + +network-manager (0.7~~svn20080818t061112+eni0-0ubuntu1) intrepid; urgency=low + + * fix LP: #255844 - add update-notifier-common to the Depends + - update debian/control + * fix LP: #255958 - nm-tool broken on nm 0.7; we properly run make install + for test/ source directory with proper DESTDIR in + binary-install/network-manager:: cdbs target; in turn we dont explicitly + install the nm-tool binary in network-manager.install + - update debian/rules + - update network-manager.install + * adjust patches for new upstream codebase + - update debian/patches/05-debian_backend.patch + - update debian/patches/50_gcc43.patch + - remove debian/patches/19_interfaces_can_have_more_than_one_instance.patch + - update debian/patches/series + * adjust files installed in libnm-util-dev package: we add + nm-setting-ip6-config.h and we remove nm-setting-vpn-properties.h from + and to the .install list + - update debian/libnm-util-dev.install + * add gtk-doc-tools to build-depends + - update debian/control + * Fix LP: #145653 - "signal handler prevents apport crash reporting" + - add debian/patches/70_lp145653_no_sigaction_for_crashes.patch + - update debian/patches/series + + -- Alexander Sack Mon, 18 Aug 2008 21:27:59 +0200 + +network-manager (0.7~~svn20080720t224551+eni1-0ubuntu1) intrepid; urgency=low + + * new bzr eni/ifupdown preview based on trunk rev 3808 (Sun 2008-07-20 22:45:51 + +0000) aka eni rev 2800 + * adjust 05-debian_backend.patch to new upstream code base + - update debian/patches/05-debian_backend.patch + * drop patches replaced by upstream features + - debian/patches/20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch + - update debian/patches/series + * drop patches applied upstream + - debian/patches/dhclient_dbus_policy_ubuntu.patch + - update debian/patches/series + * drop 41k_20_sec_wireless_link_timeout.patch after a similar fix has + landed in upstream sources + - delete debian/patches/41k_20_sec_wireless_link_timeout.patch + - update debian/patches/series + * dont install NetworkManagerDispatcher files + - update debian/network-manager.install + - update debian/network-manager.manpages + * install debian/tmp/usr/include/NetworkManager/nm-setting-8021x.h and + debian/tmp/usr/include/NetworkManager/nm-setting-pppoe.h to libnm dev + package + - update debian/libnm-util-dev.install + * drop nm-param-spec-specialized.h from libnm-util-dev + - update debian/libnm-util-dev.install + * ship libnm_glib_vpn.pc in libnm-glib-dev package + - update debian/libnm-glib-dev.install + * ship org.freedesktop.network-manager-settings.system.policy in + network-manager package; this allows the connection editor to obtain + modify privileges through authentication. + - update debian/network-manager.install + * ship all usr/share/* pieces in network-manager package + - update debian/network-manager.install + * enable keyfile plugin for global system settings daemon + - add debian/nm-system-settings.conf + - update debian/network-manager.install + * install nm-system-settings binary and plugins + - update debian/network-manager.install + * use --libexecdir=/usr/lib/NetworkManager to prevent clutter of + file system hierarchy; dont install usr/lib/network-manager accordingly. + - update debian/rules + - update debian/network-manager.install + * ship usr/lib/pppd/2.4.4/nm-pppd-plugin.so in network-manager package + - update debian/network-manager.install + * revert previous major SO version bump for libnm-util; add explicit + MAKESHLIBS version for libnm-util0 (>=0.7~~) + - rename debian/libnm-util1.install => debian/libnm-util0.install + - update debian/control + * add libpolkit-dbus-dev to Build-Depends + - update debian/control + * add libnss3-dev to Build-Depends + - update debian/control + * add debian/patches/50_gcc43.patch to support intrepid + - add debian/patches/50_gcc43.patch + - update debian/patches/series + * add Conflicts/Replaces on network-manager-pptp (<< 0.7~~) to prevent + upgrading conflict + - update debian/control + * guard against drivers that dont have linux.info.driver hal property in + the originating_device (hal); we provide a default driver name to prevent + NULL pointer issues. + - add debian/patches/60_NULL_info_linux_driver.patch + - update debian/patches/series + * export DHCP_CLIENT_PATH=/sbin/dhclient in order to not add dhclient as + build-dependency + - update debian/rules + * install update-rc.d startup links for NetworkManager in runlevels 2 3 4 5 + and dont stop in any runlevel + - update debian/network-manager.postinst + * remove NetworkManager update-rc.d links when upgrading from any package << + this version before setting up the runlevels from above + - update debian/network-manager.postinst + * dont restart NetworkManager in postinst, but use restart-notifier to + ask users for reboot + - update debian/network-manager.postinst + * dont run 25NetworkManager and 26NetworkManagerDispatcher scripts in any + pre/post script without testing that it exists and is executable + - update debian/network-manager.preinst + - update debian/network-manager.prerm + * introduce rm_conffile function and abort_rm_conffile function; use it + to remove dbus event scripts + - update debian/network-manager.preinst + - update debian/network-manager.postrm + * remove backup for unmodified and successfully moved or removed conffiles + in postinst + - update debian/network-manager.postinst + * remove NetworkManager update-rc.d links in postrm when downgrading + - update debian/network-manager.postrm + * dont install Dispatcher + - update debian/rules + + -- Alexander Sack Thu, 07 Aug 2008 10:20:55 +0200 + +network-manager (0.7~~svn20080121t191418+eni1-0ubuntu0~pre7) hardy; urgency=low + + * 0.7 svn preview 20080121t191418 with initial eni support + * fix network-manager.{postinst,postrm,preinst,prerm} scripts to + properly migrate the /etc/dbus-1/event.d/25NetworkManager script + to /etc/init.d/NetworkManager + - add debian/network-manager.postrm + - add debian/network-manager.preinst + - update debian/network-manager.postinst + - update debian/network-manager.prerm + * drop depends on dhcdbd + * bump -version-info of libnm-util and ship libnm-util1 package + - update debian/control + - rename debian/libnm-util0.install => debian/libnm-util1.install + * force upgrade of libnm-glib0 by adding explicit MAKESHLIBS version + - update debian/rules + * stop old network manager using /etc/dbus-1/event.d/25NetworkManager + script and remove it after this was done + - update debian/network-manager.postinst + * add automake1.9 to Build-Depends + - update debian/control + * add ppp-dev to Build-Depends + - update debian/control + * include empty aclocal.m4 file to make cdbs trigger aclocal auto run + - add aclocal.m4 + * bump Build-Depends version of libnl-dev to (>= 1.0~pre8) and runtime + Depends of wpasupplicant to (>= 0.6.1~) + * unfold Build-Depends: and Depends: lines to improve legability of patches + - update debian/control + * ship nm-setting-cdma.h to libnm-util-dev + - update debian/libnm-util-dev + * don't pass obsolete options --with-wpa_supplicant and --with-dhcdbd to + configure anymore + - update debian/rules + * don't install /etc/dbus-1/event.d/25NetworkManager and don't restart/stop + NetworkManager from /etc/dbus-1/event.d anymore + - update debian/rules + - update debian/network-manager.postinst + - update debian/network-manager.prerm + * use invoke-rc.d to restart and stop NetworkManager script installed in + /etc/init.d and use update-rc.d to setup/remove NetworkManager to the + |defaults 30| runlevels + - update debian/network-manager.postinst + - update debian/network-manager.prerm + * enable all autotools updates through cdbs + - update debian/rules + * adapt patches to account for changed source base: + - update 41k_20_sec_wireless_link_timeout.patch + * allow dhcp user to use dbus service org.freedesktop.nm_dhcp_client + - add debian/patches/dhclient_dbus_policy_ubuntu.patch + - update debian/patcheds/series + * install /etc/dbus-1/system.d/nm-dhcp-client.conf + - update debian/network-manager.install + * update patchset to account for changed source base in debian/patches/ + and update debian/patches/series accordingly: + - delete 01-supplicant_timeout.patch: not applicable + - delete 04-if_fix.patch: applied upstream + - delete 06-dispatch_more_events.patch: doesn't apply anymore (might need + porting) + - delete 11-man_page_sh_name.patch: applied upstream + - delete 13-rml-wpa-workarounds.patch: driver workarounds -> dropped for now (might need resurrection if drivers don't work out as good - with regards to wext - as expected) + - delete 14-j-hostap-supplicant-driver.patch: more driver workarounds for hostap -> might need resurrection at some point + - delete 16_undefined_macros.patch: not applicable anymore + - delete 17_avahi_autoipd.patch: disable for now (might need porting if + avahi doesn't work) + - delete 21_manual_means_always_online.diff: not applicable anymore + - delete 23_nm-monitor-eni.diff: doesn't really apply anymore. has to be + done differently now + - delete 24pp_svn2578-gnome354565-fix-ethernet-link-detection-races.patch: + applied upstream + - delete 41c_ubuntu-fixup--get_mode_always_fails_typo_fix.patch: applied + upstream. + - delete 41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch: not + applicable + - delete 41m_unref_dbus_connection_on_shutdown.patch: not applicable and + appears to be properly fixed now + - delete 41r_wpa_control_custom_timeout.patch: not applicable (wpa + communication is now done through dbus) + - delete 41r_wpa_control_explicit_TIMEOUT_reply_fixup.patch: not applicable + (wpa communication is now done through dbus) + - delete 41s_wpa_ctrl_socket_non_block.patch: not applicable as there is not + wpa socket communication in nm 0.7 anymore + - delete 41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch: not + applicable (same reason as abve) + - delete 41u_custom_timeout_for_some_wpa_ctrl_operations.patch: all this is + now different in 0.7 + - delete 41wa_lp145683_wpa_ctrl_check_select_result_for_error.patch: no + wpa_ctrl anymore + - delete 41x_lp145653_reraise_fatal_signals.patch: doesn't apply anymore + and never worked anyway + - delete 41y_queue_if_dbus_name_is_taken_on_startup.patch: no obvious port; + lets hope that dbus detects that name owner is down more easily + - delete 41z_lp138217_use_timeout_to_schedule_activation.patch: not + applicable anymore + - delete 42a_lp50214_gnome464215_fix_hidden.patch: is different (maybe + needs porting though) + * drop all 0.6.x svn cherry picks which naturally don't apply for trunk (0.7) + anymore: + - delete debian/patches/24pp_svn2754-lp101857-endianess.patch + - delete debian/patches/24pp_svn2618_set-hardware-RF-to-enabled-if-no-killswitches.patch + - delete debian/patches/24pp_svn2605-gnome354565-dont-up-notwired-interfaces.patch + - delete debian/patches/24pp_svn2604_Add-HAL-based-rfkill-support.patch + - delete debian/patches/24pp_svn2591_Ensure-the-device-is-up-stage3.patch + - delete debian/patches/24pp_svn2579-sleep-1-second-to-stabilize-if.patch + + -- Alexander Sack Tue, 22 Jan 2008 17:26:34 +0000 + +network-manager (0.6.5-0ubuntu17) hardy; urgency=low + + * upload 0.6.5-0ubuntu17 to hardy + + -- Alexander Sack Mon, 05 Nov 2007 19:14:43 +0100 + +network-manager (0.6.5-0ubuntu16.7.10.0) gutsy-proposed; urgency=low + + Release changes from test package previously known as 0.6.5-0ubuntu16~ppa3: + * drop gracefull supplicant shutdown feature and its followup patches, + because they cause crashes and a real fix would need more intrusive code + rewrites: (LP: #145683, LP: #83623, LP: #152098, LP: #151405) + - debian/patches/41n_graceful_supplicant_shutdown.patch, + debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch, + debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch, + debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch: drop + patches that belong to the "graveful supplicant feature". + - debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: update + interleaving patch + - debian/patches/series: update quilt series accordingly. + * debian/patches/24pp_svn2604_Add-HAL-based-rfkill-support.patch: use + gint32 instead of guint32 for getting the killswitch power argument + (LP: #138794). + + -- Alexander Sack Mon, 05 Nov 2007 18:01:13 +0100 + +network-manager (0.6.5-0ubuntu16) gutsy; urgency=low + + * debian/README.Debian: adapt README to match the new behaviour of + network-manager, which doesn't manage _any_ device configured in + /etc/network/interfaces anymore. + * debian/patches/42a_lp50214_gnome464215_fix_hidden.patch,series: new patch + that fixes hidden network for most chipsets (LP: #50214). + + -- Alexander Sack Mon, 15 Oct 2007 18:55:20 +0200 + +network-manager (0.6.5-0ubuntu15) gutsy; urgency=low + + * debian/patches/41z_lp138217_use_timeout_to_schedule_activation.patch,series: + don't use idle_source to schedule activation, but rest a bit by using a + timeout_source with 250ms delay (LP: #138217). + * debian/network-manager.postinst: sleep 2 seconds after ifblacklist_migrate.sh + (LP: #146757). + * debian/patches/41w_lp145683_cancel_scan_in_supplicant_cleanup.patch,series: first part + for lp145683 - cancel pending scans on terminate (LP: #145683). + * debian/patches/41wa_lp145683_wpa_ctrl_check_select_result_for_error.patch,series: + second part to fix lp145683; test select result for errors (in case of + TERMINATE) (LP: #145683). + * debian/patches/41y_queue_if_dbus_name_is_taken_on_startup.patch,series: make + restart of network manager more failsafe and even allow to take over name + ownership. When ownership is taken over (dbus signal |NameLost| received), we + shutdown cleanly by sending |X| through |nm_shutdown_pipe| (LP: #85113). + * debian/patches/41x_lp145653_reraise_fatal_signals.patch: re-raise fatal + signals (LP: #145653). + + -- Alexander Sack Tue, 02 Oct 2007 13:32:50 +0200 + +network-manager (0.6.5-0ubuntu14) gutsy; urgency=low + + * debian/ifblacklist_migrate.sh: fix "/etc/network/interfaces migration + overlooks wlan0" (LP: #141580). + + -- Alexander Sack Mon, 24 Sep 2007 10:21:46 +0200 + +network-manager (0.6.5-0ubuntu13) gutsy; urgency=low + + * debian/patches/20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch: + fix race/null-deref crash that happens if /e/n/i is not completely flushed out + by editor/network-admin (LP: #141106). + * debian/patches/41v_lp141233-fix-supplicant-cleanup-crashes.patch: Add patch + for LP: #141233 - fix crash by not sending ctrl commands to supplicant if no ctrl + socket is open. + * debian/patches/series: add new patch to quilt series + * debian/patches/41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch: + use two distinct variables to track and check connect attempt count to + supplicant and global supplicant socket. Fix bug that prevented network + manager from attempting to connect to supplicant ctrl for cases where + global control already took a long time to succeed. (LP: #141233). + * debian/patches/41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch: + close global ctrl socket connection when nm_utils_supplicant_request_with_check + failed. + * debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: update patch + because of overlapping change with 41t_* patch. + + -- Alexander Sack Fri, 21 Sep 2007 11:26:01 +0200 + +network-manager (0.6.5-0ubuntu12) gutsy; urgency=low + + * debian/patches/05-debian_backend.patch: don't manage auto/allow-* dhcp + interfaces anymore (LP: #139403). + - debian/ifblacklist_migrate.sh: new helper script that blacklists + auto/allow-* dhcp interfaces without any options. + - debian/network-manager.install: install helper script to $pkglibdir + - debian/network-manager.postinst: run ifblacklist_migrate.sh during + configure when upgrading from versions "lt-nl" 0.6.5-0ubuntu12. + * debian/changelog: add merge-dropped changelog entries for 0.6.3-2ubuntuX + revision series (LP: #124018) + * debian/patches/25_lp90267-dont-tear-down-upped-interfaces.patch,series: + drop this patch, so nm is allowed to tear down upped interfaces during + startup again. + + -- Alexander Sack Wed, 19 Sep 2007 18:38:17 +0200 + +network-manager (0.6.5-0ubuntu11) gutsy; urgency=low + + * debian/patches/25_lp90267-dont-tear-down-upped-interfaces.patch: remove + redundant nm_info output previously send to syslog/daemon.log + (LP: #137744). + * debian/patches/41r_wpa_control_custom_timeout.patch: add a state timeout + to wpa control Private struct and add functions to set/unset this custom + timeout; in turn implement this feature and make wpa_ctrl obey this + custom timeout. + * debian/patches/41r_wpa_control_explicit_TIMEOUT_reply_fixup.patch: wpa_ctrl + returns bogus reply string which may lead to access of not-initialized + memory in case an operation times out. We fix this by explicitly setting + reply to TIMEOUT[CLI] on wpa_ctrl side before returning. + * debian/patches/41s_wpa_ctrl_socket_non_block.patch: setup wpa_ctrl_socket as + a real NON_BLOCK socket to prevent one potential reason for stale states + in network-manager (deadlocks). + * debian/patches/41t_nm_device_wireless_index_ctrl_sockets_by_run_count.patch: + to prevent new supplicant sockets to not conflict with sockets that might + still exist from previous run we now append a run_count index to _all_ + socket control paths. This run_count is incremented in supplicant_cleanup + and is mod 10 to prevent any overflow when having more than 32-bit runs. + * debian/patches/41q_retry_supplicant_cleanup_startup_if_ctrl_interface_connect_failes.patch: + another try to terminate wpasupplicant more graceful: new shutdown + sequence sends disable_network, ap_scan 0, interface_remove, terminate. + * debian/patches/41u_custom_timeout_for_some_wpa_ctrl_operations.patch: we now + use a custom timeout for ctrl operations: INTERFACE_ADD, DISABLE_NETWORK, + TERMINATE; we take care that this timeout is unset after operations are + through. + * debian/patches/series: add all these great new patches to quilt _series_. + * debian/patches/41d_ipw3945_turn_off_essid_in_stage1.patch, + 41l_enable_ipw3945_reset_essid.patch,series: drop from patchset - because + we have a real fix in ipw3945 driver now. + * debian/patches/41n_graceful_supplicant_shutdown.patch: update patch in turn of + dropping the patches above. + + -- Alexander Sack Mon, 10 Sep 2007 13:06:24 +0200 + +network-manager (0.6.5-0ubuntu10) gutsy; urgency=low + + * debian/patches/24pp_svn2754-lp101857-endianess.patch,series: prepatch patch + by Wojtek Kaniewski to fix endianess issues in NetworkManager + (LP: #101857). + * debian/network-manager.postinst: apply patch contributed by Villalovos, John L + that prevents NetworkManager restart in postinst + if invoke-rc.d --disclose-deny dbus force-reload fails. This is required to not + start any service during chroot installs of ume. + + -- Alexander Sack Thu, 06 Sep 2007 15:16:46 +0200 + +network-manager (0.6.5-0ubuntu9) gutsy; urgency=low + + * debian/patches/series: disable 41o_completely_deactivate_stage1.patch + for tribe-4 + + -- Alexander Sack Tue, 7 Aug 2007 12:36:37 +0200 + +network-manager (0.6.5-0ubuntu8) gutsy; urgency=low + + * debian/patches/41n_graceful_supplicant_shutdown.patch: move + supplicant_cleanup into stage1_prepare; remove test timeouts in + _stage2_config and add 1 second sleep to the end of xx_stage1_prepare + * debian/patches/series: add new patch 41n_graceful_supplicant_shutdown.patch + to series + * debian/patches/41l_enable_ipw3945_reset_essid.patch: enable + ipw3945_reset_essid, by setting up function in class constructor + * update debian/patches/41l_enable_ipw3945_reset_essid.patch: + completely deactivate device in stage1 now + * debian/patches/series: add new patch 41l_enable_ipw3945_reset_essid.patch + * debian/patches/41m_unref_dbus_connection_on_shutdown.patch, + unref shared dbus_connection on shutdown (LP: #85113) + * debian/patches/series: add new patch 41m_unref_dbus_connection_on_shutdown.patch + * debian/patches/41k_20_sec_wireless_link_timeout.patch: increase + timeout for link setup ... taken from upstream ml + * debian/patches/series: add new patch 41k_20_sec_wireless_link_timeout.patch + * debian/patches/41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch: Fix + ftbfs because of recently deprecated gnome druid - this patch enables gnome + deprecated in Makefiles + * debian/patches/series: add new patch + 41e_fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch + * debian/patches/41d_ipw3945_turn_off_essid_in_stage1.patch: + implement stage1_prepare implementation in nm-device-802-11-wireless.c + * debian/patches/series: add new patch 41d_ipw3945_turn_off_essid_in_stage1.patch + * debian/rules, debian/control, debian/patches/series: Switch patchsystem to quilt + * debian/patches/41c_ubuntu-fixup--get_mode_always_fails_typo_fix.patch: fix + programming bug in wireless code + * debian/patches/24pp_svn2591_Ensure-the-device-is-up-stage3.patch: ensure + device is up in stage3 - cherry-picked from svn + * debian/patches/24pp_svn2618_set-hardware-RF-to-enabled-if-no-killswitches.patch: + enable hardware rf by default - cherry-picked from svn + * debian/patches/24pp_svn2604_Add-HAL-based-rfkill-support.patch: hal based rfkill + - cherry-picked from svn + * debian/patches/24pp_svn2579-sleep-1-second-to-stabilize-if.patch: sleep to + stabilize link status - cherry-picked from svn + * debian/patches/41o_completely_deactivate_stage1.patch: use nm_device_deactivate + instead of just real_deactivate to deactivate device more cleanly + + -- Alexander Sack Tue, 7 Aug 2007 09:51:02 +0200 + +network-manager (0.6.5-0ubuntu7) gutsy; urgency=low + + [Alexander Sack ] + * prefetch bugfix from svn - not-connected wired interface is if-upped: + 1. 24a_svn2578-gnome354565-fix-ethernet-link-detection-races.patch: + - prefetch patch from 0.6.0 release branch (rev 2578) + 2. 24b_svn2605-gnome354565-dont-up-notwired-interfaces.patch: + - prefetch patch from 0.6.0 release branch (rev 2605) + * debian/patches/25_lp90267-dont-tear-down-upped-interfaces.patch: fix master bug that + makes already configured interfaces (in /etc/network/interfaces) being torn down. This + causes issue for network cards that don't have a link beat and might caus troubles + for applications that have already bound to the interface and don't react on netlink + events (LP: #90267) + + [Anthony Mercatante ] + * fixed network-manager.install and debian/rules: + - Installs nm-vpn-perperties in /usr/lib to make it a hidden binary + - Tell dh_shlibdeps to ignore nm-vpn-properties to avoid lots of gnome + dependancies, causing issues to release kubuntu Kubuntu. + + -- Alexander Sack Thu, 12 Jul 2007 11:15:56 +0200 + +network-manager (0.6.5-0ubuntu6) gutsy; urgency=low + + * debian/control: + - add a network-manager-dev Depends on libnm-util-dev + + -- Sebastien Bacher Fri, 06 Jul 2007 10:59:49 +0200 + +network-manager (0.6.5-0ubuntu5) gutsy; urgency=low + + * install nm-vpn-properties (plus manpage) to package + network-manager. It got moved from network-manager-gnome here. + (LP: #123772) + + -- Reinhard Tartler Thu, 05 Jul 2007 09:56:34 +0200 + +network-manager (0.6.5-0ubuntu4) gutsy; urgency=low + + * debian/control: add iproute build-depends again to fix + autobuilder ftbfs. + + -- Alexander Sack Tue, 26 Jun 2007 16:39:17 +0200 + +network-manager (0.6.5-0ubuntu3) gutsy; urgency=low + + Revert all changes from 0.6.5-0ubuntu1 and 0.6.5-0ubuntu2 to + redo new upstream source merge ... + + Drop network-manager-gnome as gnome because the gui code is + now shipped in separate source: + * debian/network-manager-gnome.install, + debian/network-manager-gnome.manpages, + debian/nm-applet.sgml: obsolete files dropped + + * debian/rules: don't create/install nm-applet manpage anymore + + * debian/control: drop network-manager-gnome package + + + Adapt ubuntu patchset in turn of new upstream release 0.6.5: + * debian/patches/05-debian_backend.patch: our @add_data changes + has been applied upstream - drop first hunk of interface_parser.c + diff. + + * debian/patches/09_fix_bigendian_words.patch: drop as + AC_C_BIGENDIAN check is now applied upstream - drop patch. + + * debian/patches/10-po_fr.patch: we only had modifications for + applet .po entries. applet moved to its own source - drop patch. + + * debian/patches/11-man_page_sh_name.patch: +.SH NAME as been + added upstream for /man/NetworkManagerDispatcher.1.in and + man/NetworkManager.1.in; thus, only keep diff for man/nm-tool.1.in. + + * debian/patches/12_dbus1.0.patch: dbus_connection_disconnect was + replaced by dbus_connection_close + dbus_connection_unref; our + patch previously replaced dbus_connection_disconnect with + dbus_connection_unref (only) - drop patch due to upstream fix. + + * debian/patches/13-rml-wpa-workarounds.patch: simple reapply patch + manually as upstream changed some unrelated code in patch proximity. + + * debian/patches/18_static_network-admin.patch: patch for gnome + applet only; since source has moved it has to go - drop patch + + * debian/patches/21_manual_means_always_online.diff: drop patch + for gnome applet code; recalc line numbers of other patches for + updated underlying upstream version; apply hunk + src/NetworkManagerMain.h manually because upstream changed code + in proximity. + + * debian/patches/22_manual_config_available_when_connected.patch: + applet changes only - drop patch + + * debian/patches/23_nm-monitor-eni.diff: manually apply + src/NetworkManagerSystem.h patch whose underlying code base + was changed within proximity of changes; in turn recalc patch + line number for src/backends/NetworkManagerDebian.c as well + as src/NetworkManager.c + + + Change Maintainer Field for ubuntu: + * debian/control: change maintainer field to coredev for upload + + -- Alexander Sack Mon, 25 Jun 2007 18:25:54 +0200 + +network-manager (0.6.5-0ubuntu2) gutsy; urgency=low + + * Added missing build-dep iproute. + Fixes FTBFS on the buildd + * Fixed path installation of nm-vpn-properties + + -- Anthony Mercatante Mon, 18 Jun 2007 12:56:22 +0200 + +network-manager (0.6.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Dropped obsolete 05-debian_backend.patch + * Dropped 09_fix_bigendian_words.patch, merged upstream + * Dropped 10-po_fr.patch, translation fixed upstream + * Dropped 11-man_page_sh_name.patch, merged upstream + * Dropped 12_dbus1.0.patch, merged upstream + * Dropped 13-rml-wpa-workarounds.patch, merged upstream + * Dropped obsolete 14-j-hostap-supplicant-driver.patch + * Dropped obsolete 16_undefined_macros.patch + * Dropped 18_static_network-admin.patch, + 21_manual_means_always_online.diff and + 22_manual_config_available_when_connected.patch, as the applet is + now a separate tarball + * Dropped obsolete + 19_interfaces_can_have_more_than_one_instance.patch, + 20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch + + * Moved 19_interfaces_can_have_more_than_one_instance.patch, + 20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch and + 21_manual_means_always_online.diff in "patches-not-applied". + n-m 0.6.5 has major code changes and the applet is now separate tarball, + those patches need rewritting. + + -- Anthony Mercatante Fri, 15 Jun 2007 11:29:53 +0200 + +network-manager (0.6.4-6ubuntu7) feisty; urgency=low + + * 21_manual_means_always_online.diff: + The previous version of this patch (ubuntu5) made a change to nm-applet + that would assume the state was disconnected if the device list was empty. + This didn't work since the device list is always empty on start because + the status is obtained first. + + This was guarding against having the connected state with no devices, + which broke later assertions. Change the patch to correct those + assertions instead; a connected state with no active device will now + display the wired icon with a "Manual network configuration" tooltip. + + LP: #82335, #105234. + + * 05-debian_backend.patch: + Revert change in ubuntu3 that commented out the blacklisting of + devices listed in /etc/network/interfaces with more exotic configuration + than just inet dhcp. This was done by the above patch in ubuntu5, it + seems silly to do it there, better to do it in the original patch. + + * 22_manual_config_available_when_connected.patch: + Display the "Manual configuration" menu option when we have no devices, + but are connected; since that means some number of blacklisted devices + exist. Don't display the "No network devices" message in that case. + + -- Scott James Remnant Thu, 12 Apr 2007 19:32:01 +0100 + +network-manager (0.6.4-6ubuntu6) feisty; urgency=low + + * debian/rules: + - update translations template + + -- Sebastien Bacher Wed, 11 Apr 2007 22:36:27 +0200 + +network-manager (0.6.4-6ubuntu5) feisty; urgency=low + + * Partially revert 0.6.4-6ubuntu3, but if we find interfaces which are + disabled, we assume we are always online to avoid trouble when people + have advanced and semi-advanced setups. + + -- Tollef Fog Heen Mon, 9 Apr 2007 21:39:20 +0200 + +network-manager (0.6.4-6ubuntu4) feisty; urgency=low + + * /etc/network/interfaces can have more than one instance of the same + interface. For example: + + iface eth0 inet dhcp + and later + iface eth0 inet6 static + + The function ifparser_getif is capable only to return the first instance + of eth0 that is a legal entry for NM to take over, but NM still does not + know how to handle what's next. + + Patch 19_interfaces_can_have_more_than_one_instance.patch creates a sub + list of linked if_block via nextsame, binding together all if_block's + related to the same interface and preserving if_data for each block. + + Patch 20_do_not_take_over_dhcpv4iface_when_v6_is_configured.patch + blacklist interfaces that have dhcp for inet configuration but have an + inet6 entry following later on. NM does not know yet how to + store/restore/configure IPv6 (blacklisted too) so for now we tell NM + to keep the hands off these interfaces. + + (Closes LP: #93636) + + -- Fabio M. Di Nitto Fri, 30 Mar 2007 11:17:42 +0200 + +network-manager (0.6.4-6ubuntu3) feisty; urgency=low + + * Manage some static devices we can understand. This should avoid the + problem people are having with NM marking the machine as offline when + it's just on static instead. LP #82335. + + -- Tollef Fog Heen Tue, 13 Mar 2007 16:18:06 +0100 + +network-manager (0.6.4-6ubuntu2) feisty; urgency=low + + * Add "static configuration" menu item for NetworkRoaming spec. + + -- Tollef Fog Heen Thu, 18 Jan 2007 11:22:19 +0100 + +network-manager (0.6.4-6ubuntu1) feisty; urgency=low + + * Merged with the Debian packages. Remaining changes: + - Changed 12_dbus1.0.patch to unref rather than close the connection + - Added 13-rml-wpa-workarounds.patch + - Added 14-j-hostap-supplicant-driver.patch + - Added 16_undefined_macros.patch + - Call dh_iconcache for network-manager-gnome + - Add recommends on network-manager-gnome | network-manager-kde + - Remove "security" bit in README.Debian since we're using at_console + instead of the netdev group + - Remove the addition of the netdev group as well as the dependency on + adduser. + * Thanks to Riccardo Setti for help with merging the package. Much + appreciated. + + -- Tollef Fog Heen Fri, 15 Dec 2006 14:41:49 +0100 + +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) + * 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 21:30:47 +0100 + +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) + * 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) + * 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 20:18:18 +0200 + +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) + + -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 + +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 + 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 + 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 + + * 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. + * Improved the package description and the manpage of network-manager-gnome. + (Closes: #362962) + + -- Michael Biebl Tue, 20 Jun 2006 23:22:11 +0200 + +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. + * Added homepage URL to package description. + + -- Michael Biebl Thu, 8 Jun 2006 16:21:43 +0200 + +network-manager (0.6.2-3) unstable; urgency=low + + * 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 Tue, 16 May 2006 00:16:43 +0200 + +Old Changelog: +network-manager (0.6.3-2ubuntu7) feisty; urgency=low + + * Add debian/patches/00upstream-ftbfs.patch: + - Fix dbus version check in src/NetworkManagerDbus.c to work with dbus + 1.0. + - src/nm-netlink-monitor.c: Standard fix for new if_addr.h world order. + - These issues are already fixed in the currently pending Debian merge, so + this patch can go away soon. + * Add debian/patches/13_avahi-autoipd.patch: + - src/nm-device.c: Do not use the internal get_autoip() function, but + instead check if avahi-autoipd was engaged for the interface and do not + meddle with the settings in that case. This is in accordance with + upstream who wants to completely throw away the internal IPv4LL code. + - src/dhcp-manager/nm-dhcp-manager.c: Raise DHCP timeout from 45 seconds + to 99 seconds, thus effectively disabling it. We want to use + dhclient.conf's timeout configuration; if that happens to be longer, we + interrupt dhclient while it's still working and get confused if the IP + suddenly changes underneath us. + - src/dhcp-manager/nm-dhcp-manager.c: Treat DHCDBD_FAIL like + DHCDBD_TIMEOUT, i. e. continue with stage 4 of device activation + (IPv4LL address assignment) instead of giving up and trying all over + again. Since dhcdbd calls dhclient in single-shot mode (-1), it will + never return with TIMEOUT, only with FAILURE, and we want to go into + zeroconf mode instead of being stuck in an endless retry loop. + - See https://wiki.ubuntu.com/ZeroConfNetworking for details. + + -- Martin Pitt Wed, 6 Dec 2006 16:42:54 +0100 + +network-manager (0.6.3-2ubuntu6) edgy; urgency=low + + * ndiswrapper uses the stock wext driver now, so remove that bit of the + 10-rml-wpa-workarounds.patch. Adjust + 11-j-hostap-supplicant-driver.patch appropriately. Malone: #46136 + + -- Tollef Fog Heen Tue, 17 Oct 2006 13:17:59 +0200 + +network-manager (0.6.3-2ubuntu5) edgy; urgency=low + + * Rebuild against dbus 0.90 + * debian/patches/12_dbus0.9.patch: + + s/dbus_connection_disconnect/dbus_connection_close/g + + -- Sebastian Dröge Thu, 24 Aug 2006 18:09:06 +0200 + +network-manager (0.6.3-2ubuntu4) edgy; urgency=low + + * Correct network manager to not touch resolv.conf, accidentally dropped + during the merge. + + -- Scott James Remnant Tue, 22 Aug 2006 09:16:37 +0200 + +network-manager (0.6.3-2ubuntu3) edgy; urgency=low + + * debian/rules: + - Add dh_iconcache to network-manager-gnome. + + -- Christian Bjälevik Sun, 6 Aug 2006 12:32:52 +0200 + +network-manager (0.6.3-2ubuntu2) edgy; urgency=low + + * Fix packaging so that the workaround patch isn't already applied, thus + breaking the builds. + + -- Scott James Remnant Sun, 30 Jul 2006 23:24:43 +0100 + +network-manager (0.6.3-2ubuntu1) edgy; urgency=low + + * Merge with debian unstable, using Debian packaging as a base. + Remaining changes: + - our HAL daemon runs as the "haldaemon" user, not "hal", + - use at_console="true" instead of netdev, + - retain rml's workarounds patch, + - retain j's hostap patch. + + -- Scott James Remnant Wed, 12 Jul 2006 22:13:20 +0100 + +network-manager (0.6.2-2) unstable; urgency=low + + * 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 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 + +network-manager (0.6.2-1) unstable; urgency=low + + * 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 Sun, 2 Apr 2006 19:48:28 +0200 + +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 (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 + * 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 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. + + -- 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.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 + * removed network-manager.doc as it was empty. + * uploaded to unstable. + + -- Riccardo Setti Thu, 9 Feb 2006 10:18:13 +0100 + +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. + * 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 + + -- 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 + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/network-manager.postinst +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/network-manager.postinst @@ -0,0 +1,74 @@ +#!/bin/sh + +set -eu + +# 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 + +# 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 you come from a really old network manager we have + # to comment the auto dhcp lines as a best effort approach + + if dpkg --compare-versions "$2" "lt-nl" "0.6.5-0ubuntu12"; then + sh /usr/lib/network-manager/ifblacklist_migrate.sh + sleep 2 + fi + # move nm-system-settings.conf to NetworkManager.conf starting + # from anything below natty, rather than 0.8.1-2 like Debian + if dpkg --compare-versions "$2" lt "0.8.3+git.20110210t152733.00327fb"; then + mv_conffile "/etc/NetworkManager/nm-system-settings.conf" "/etc/NetworkManager/NetworkManager.conf" + fi + + # request a reboot (NM tears down interfaces on restart + # which is not the way we want to go) + [ -x /usr/share/update-notifier/notify-reboot-required ] && \ + /usr/share/update-notifier/notify-reboot-required + + [ -x /etc/dbus-1/event.d/25NetworkManager.dpkg-moving ] && \ + rm -f /etc/dbus-1/event.d/25NetworkManager.dpkg-moving + [ -x /etc/dbus-1/event.d/25NetworkManager.dpkg-removing ] && \ + rm -f /etc/dbus-1/event.d/25NetworkManager.dpkg-removing + + [ -x /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-moving ] && \ + rm -f /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-moving + [ -x /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-removing ] && \ + rm -f /etc/dbus-1/event.d/26NetworkManagerDispatcher.dpkg-removing + + [ -x /etc/init.d/NetworkManager.dpkg-moving ] && \ + rm -f /etc/init.d/NetworkManager.dpkg-moving + [ -x /etc/init.d/NetworkManager.dpkg-removing ] && \ + rm -f /etc/init.d/NetworkManager.dpkg-removing + + update-rc.d -f NetworkManager remove >/dev/null + ;; +esac + +#DEBHELPER# + +exit 0 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-util1.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-util1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-util.so.* --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/libnm-glib-vpn1.install +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/libnm-glib-vpn1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-glib-vpn.so.* --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/README.source +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/README.source @@ -0,0 +1,89 @@ + +------------------------------------------------------ + + README.source - for ubuntu network-manager + Author: Mathieu Trudel-Lapierre + +------------------------------------------------------ + +Content: + + I. Packaging overview + II. Upstream (orig.tar.gz) + III. Efficient Upstream orig.tar.gz production + IV. Patching + +------ + +I. Packaging overview + + + Obtaining latest packaging: + bzr branch lp:~network-manager/network-manager/ubuntu.head + + + this gives you a debian/ only bzr branch + + + to suggested way to build is using bzr-builddeb; for that + 1. put the orig.tar.gz matching your debian/changelog in --orig-dir + of bzr-builddeb (default: ..) + 2. run: bzr bd --merge --dont-purge --builder='debuild -b' + 3. this gives you a build tree and the results in --build-dir + and --result-dir + + +II. Upstream (orig.tar.gz) + +The package provides means to easily grab the _current_ and the latest +upstream snapshot of NetworkManager. + +./debian/rules gets the pristine upstream snapshot for you then packs +things up in a tarball orig.tar.gz. + +The nested tarball is packed using _gz_. + +Examples on how to get orig.tar.gz for snapshots: + + + get latest upstream snapshot: + ./debian/rules get-orig-source + + + get current upstream snapshot (by changelog): + ./debian/rules get-current-source + + +III. Efficient Upstream orig.tar.gz production + +The packaging provides a feature to speed up the orig.tar.gz production by +keeping a local mirror of the NetworkManager checkouts; this reduces the +network overhead considerably and allows you to regularly create tarballs +rather quickly. To do that, append LOCAL_BRANCH=/local/nm/checkout +to your debian/rules invocation, e.g. + + + produce latest upstream snapshot: + ./debian/rules get-orig-source LOCAL_BRANCH=~/NetworkManager/ + + + produce current upstream snapshot (by changelog): + ./debian/rules get-current-source LOCAL_BRANCH=~/NetworkManager/ + + +V. Patching + +We use quilt for the sake of efficiency to code and update patches. + +if you want to create a patch or write a patch, you can quickly get +ready by first getting the orig.tar.gz, then using bzr-builddeb like +so: + + bzr bd-do + +Make sure your QUILT_PATCHES is set appropriately: + + QUILT_PATCHES=debian/patches + +and start working on quilt patches as usual, e.g. + + quilt push -a + quilt applied + quilt pop + quilt refresh + ... + + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/series +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/series @@ -0,0 +1,6 @@ +02-dbus_access_network_manager.patch +70_lp145653_no_sigaction_for_crashes.patch +lp191889_always_offline_with_unmanaged_devices.patch +lp292054_tune_supplicant_timeout_60s.patch +lp120363_smartcard_pkcs11.patch +99_printf_formatting_fixes.patch --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/lp292054_tune_supplicant_timeout_60s.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/lp292054_tune_supplicant_timeout_60s.patch @@ -0,0 +1,16 @@ +From: Alexander Sack +Subject: Workaround driver/wpasupplicant slowness bug by giving association + more time +Bug-Ubuntu: http://launchpad.net/bugs/292054 + +--- network-manager-0.8.1~beta1~git.20100510t073507.f3057a6.orig/src/nm-device-wifi.c 2010-05-10 19:39:11.000000000 +0000 ++++ network-manager-0.8.1~beta1~git.20100510t073507.f3057a6/src/nm-device-wifi.c 2010-05-10 19:56:21.000000000 +0000 +@@ -2792,7 +2792,7 @@ + priv = NM_DEVICE_WIFI_GET_PRIVATE (self); + + /* Set up a timeout on the connection attempt to fail it after 25 seconds */ +- id = g_timeout_add_seconds (25, supplicant_connection_timeout_cb, self); ++ id = g_timeout_add_seconds (60, supplicant_connection_timeout_cb, self); + if (id == 0) { + nm_log_err (LOGD_DEVICE | LOGD_WIFI, + "Activation (%s/wireless): couldn't start supplicant " --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/lp191889_always_offline_with_unmanaged_devices.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/lp191889_always_offline_with_unmanaged_devices.patch @@ -0,0 +1,29 @@ +From: Alexander Sack +Subject: Don't manage devices set in /e/n/i, but at least keep them online. +Bug-Ubuntu: http://launchpad.net/bugs/191889 + +--- a/src/nm-manager.c 2008-09-18 15:16:44 +0000 ++++ b/src/nm-manager.c 2008-10-10 15:44:42 +0000 +@@ -354,16 +354,21 @@ nm_manager_update_state (NMManager *mana + GSList *iter; + + for (iter = priv->devices; iter; iter = iter->next) { + NMDevice *dev = NM_DEVICE (iter->data); + + if (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED) { + new_state = NM_STATE_CONNECTED; + break; ++ } else if (nm_device_get_state (dev) == NM_DEVICE_STATE_UNMANAGED) { ++ new_state = NM_STATE_CONNECTED; ++ nm_log_info (LOGD_CORE, "Unmanaged Device found; state CONNECTED forced. " ++ "(see http://bugs.launchpad.net/bugs/191889)"); ++ break; + } else if (nm_device_is_activating (dev)) { + new_state = NM_STATE_CONNECTING; + } + } + } + + if (priv->state != new_state) { + priv->state = new_state; + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/nousepeerdns.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/nousepeerdns.patch @@ -0,0 +1,23 @@ +diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c +index 73fd1ed..6907bbe 100644 +--- a/src/ppp-manager/nm-ppp-manager.c ++++ b/src/ppp-manager/nm-ppp-manager.c +@@ -807,16 +807,14 @@ create_pppd_cmd_line (NMPPPManager *self, + /* Always ask for DNS, we don't have to use them if the connection + * overrides the returned servers. + */ +- nm_cmd_line_add_string (cmd, "usepeerdns"); +- + if (nm_setting_ppp_get_mru (setting)) { + nm_cmd_line_add_string (cmd, "mru"); +- nm_cmd_line_add_int (cmd, nm_setting_ppp_get_mru (setting)); ++ nm_cmd_line_add_int (cmd, 1452); + } + + if (nm_setting_ppp_get_mtu (setting)) { + nm_cmd_line_add_string (cmd, "mtu"); +- nm_cmd_line_add_int (cmd, nm_setting_ppp_get_mtu (setting)); ++ nm_cmd_line_add_int (cmd, 1452); + } + + nm_cmd_line_add_string (cmd, "lcp-echo-failure"); --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch @@ -0,0 +1,64 @@ +=== modified file 'ChangeLog' +--- + ChangeLog | 10 ++++++++++ + src/backends/NetworkManagerDebian.c | 6 +++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +Index: network-manager-0.7~~svn20081015t024626/ChangeLog +=================================================================== +--- network-manager-0.7~~svn20081015t024626.orig/ChangeLog ++++ network-manager-0.7~~svn20081015t024626/ChangeLog +@@ -120,16 +120,26 @@ + + 2008-10-10 Tambet Ingo + + * src/nm-logging.c (nm_logging_setup): Don't use LOG_CONS when running as + a daemon to prevent NM logging spew on console on startup and shutdown (due + to dependency loop between NM and syslog). + + 2008-10-10 Alexander Sack ++ ++ Fallback to generic enable_loopback if /sbin/ifup isnt installed or ++ fails. ++ * src/backends/NetworkManagerDebian.c ++ - (nm_system_enable_loopback): test for /sbin/ifconfig binary ++ and fallback to nm_generic_enable_loopback if it ++ doesnt exist or when /sbin/ifconfig lo up fails for ++ whatever reason. ++ ++2008-10-10 Alexander Sack + + Implement managed mode. We bind devices configured in /etc/network/interfaces + to their connections by updating wired/wireless setting with the + mac address of the device. + + * system-settings/plugins/ifupdown/plugin.c + - (get_net_address_for_udi): implement function to retrieve MAC + address of udi from hal in GByteArray format +Index: network-manager-0.7~~svn20081015t024626/src/backends/NetworkManagerDebian.c +=================================================================== +--- network-manager-0.7~~svn20081015t024626.orig/src/backends/NetworkManagerDebian.c ++++ network-manager-0.7~~svn20081015t024626/src/backends/NetworkManagerDebian.c +@@ -39,17 +39,21 @@ + /* + * nm_system_enable_loopback + * + * Bring up the loopback interface + * + */ + void nm_system_enable_loopback (void) + { +- nm_spawn_process ("/sbin/ifup lo"); ++ // if wrapper fails we gonna try our own ++ if(!g_file_test ("/sbin/ifconfig", G_FILE_TEST_IS_EXECUTABLE) || ++ nm_spawn_process ("/sbin/ifconfig lo up") != 0) { ++ nm_generic_enable_loopback (); ++ } + } + + /* + * nm_system_update_dns + * + * Invalidate the nscd host cache, if it exists, since + * we changed resolv.conf. + * --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/lp120363_smartcard_pkcs11.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/lp120363_smartcard_pkcs11.patch @@ -0,0 +1,713 @@ +--- + libnm-util/libnm-util.ver | 10 + libnm-util/nm-setting-8021x.c | 303 ++++++++++++++++- + libnm-util/nm-setting-8021x.h | 21 + + src/supplicant-manager/nm-supplicant-config.c | 99 +++++ + src/supplicant-manager/nm-supplicant-config.h | 15 + src/supplicant-manager/nm-supplicant-interface.c | 37 ++ + src/supplicant-manager/nm-supplicant-settings-verify.c | 7 + 7 files changed, 485 insertions(+), 7 deletions(-) + +--- a/libnm-util/libnm-util.ver ++++ b/libnm-util/libnm-util.ver +@@ -76,6 +76,16 @@ + nm_setting_802_1x_get_phase2_private_key_type; + nm_setting_802_1x_set_phase2_private_key; + nm_setting_802_1x_get_pin; ++ nm_setting_802_1x_get_pkcs11_engine_path; ++ nm_setting_802_1x_get_pkcs11_module_path; ++ nm_setting_802_1x_get_pkcs11_module_init_args; ++ nm_setting_802_1x_get_pkcs11_slot; ++ nm_setting_802_1x_get_pkcs11_ca_cert; ++ nm_setting_802_1x_get_pkcs11_client_cert; ++ nm_setting_802_1x_get_pkcs11_private_key; ++ nm_setting_802_1x_get_pkcs11_phase2_ca_cert; ++ nm_setting_802_1x_get_pkcs11_phase2_client_cert; ++ nm_setting_802_1x_get_pkcs11_phase2_private_key; + nm_setting_802_1x_get_private_key; + nm_setting_802_1x_get_private_key_blob; + nm_setting_802_1x_get_private_key_format; +--- a/libnm-util/nm-setting-8021x.c ++++ b/libnm-util/nm-setting-8021x.c +@@ -132,6 +132,16 @@ + GByteArray *phase2_private_key; + char *phase2_private_key_password; + gboolean system_ca_certs; ++ char *pkcs11_engine_path; ++ char *pkcs11_module_path; ++ char *pkcs11_module_init_args; ++ guint pkcs11_slot; ++ char *pkcs11_ca_cert; ++ char *pkcs11_client_cert; ++ char *pkcs11_private_key; ++ char *pkcs11_phase2_ca_cert; ++ char *pkcs11_phase2_client_cert; ++ char *pkcs11_phase2_private_key; + } NMSetting8021xPrivate; + + enum { +@@ -158,6 +168,16 @@ + PROP_PIN, + PROP_PSK, + PROP_SYSTEM_CA_CERTS, ++ PROP_PKCS11_ENGINE_PATH, ++ PROP_PKCS11_MODULE_PATH, ++ PROP_PKCS11_MODULE_INIT_ARGS, ++ PROP_PKCS11_SLOT, ++ PROP_PKCS11_CA_CERT, ++ PROP_PKCS11_CLIENT_CERT, ++ PROP_PKCS11_PRIVATE_KEY, ++ PROP_PKCS11_PHASE2_CA_CERT, ++ PROP_PKCS11_PHASE2_CLIENT_CERT, ++ PROP_PKCS11_PHASE2_PRIVATE_KEY, + + LAST_PROP + }; +@@ -2150,6 +2170,86 @@ + return ck_format_to_type (nm_setting_802_1x_get_phase2_private_key_format (setting)); + } + ++const char * ++nm_setting_802_1x_get_pkcs11_engine_path (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_engine_path; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_module_path (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_module_path; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_module_init_args (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_module_init_args; ++} ++ ++guint ++nm_setting_802_1x_get_pkcs11_slot (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), 0); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_slot; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_ca_cert (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_ca_cert; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_client_cert (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_client_cert; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_private_key (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_private_key; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_phase2_ca_cert (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_phase2_ca_cert; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_phase2_client_cert (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_phase2_client_cert; ++} ++ ++const char * ++nm_setting_802_1x_get_pkcs11_phase2_private_key (NMSetting8021x *setting) ++{ ++ g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL); ++ ++ return NM_SETTING_802_1X_GET_PRIVATE (setting)->pkcs11_phase2_private_key; ++} ++ + static void + need_secrets_password (NMSetting8021x *self, + GPtrArray *secrets, +@@ -2219,7 +2319,8 @@ + const char *path = NULL; + + if (phase2) { +- if (!priv->phase2_private_key || !priv->phase2_private_key->len) { ++ if (!priv->pkcs11_phase2_private_key && ++ (!priv->phase2_private_key || !priv->phase2_private_key->len)) { + g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); + return; + } +@@ -2235,10 +2336,12 @@ + return; + } + +- if (need_private_key_password (blob, path, priv->phase2_private_key_password)) ++ if (!priv->pkcs11_phase2_private_key && ++ need_private_key_password (blob, path, priv->phase2_private_key_password)) + g_ptr_array_add (secrets, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD); + } else { +- if (!priv->private_key || !priv->private_key->len) { ++ if (!priv->pkcs11_private_key && ++ (!priv->private_key || !priv->private_key->len)) { + g_ptr_array_add (secrets, NM_SETTING_802_1X_PRIVATE_KEY); + return; + } +@@ -2254,7 +2357,8 @@ + return; + } + +- if (need_private_key_password (blob, path, priv->private_key_password)) ++ if (!priv->pkcs11_private_key && ++ need_private_key_password (blob, path, priv->private_key_password)) + g_ptr_array_add (secrets, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD); + } + } +@@ -2265,6 +2369,11 @@ + NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self); + + if (phase2) { ++ /* TODO: add better checks for pkcs11 case */ ++ if (priv->pkcs11_phase2_client_cert && ++ priv->pkcs11_phase2_private_key) ++ return TRUE; ++ + if (!priv->phase2_client_cert) { + g_set_error (error, + NM_SETTING_802_1X_ERROR, +@@ -2300,6 +2409,10 @@ + } + } + } else { ++ /* TODO: add better checks for pkcs11 case */ ++ if (priv->pkcs11_client_cert && ++ priv->pkcs11_private_key) ++ return TRUE; + if (!priv->client_cert) { + g_set_error (error, + NM_SETTING_802_1X_ERROR, +@@ -2692,6 +2805,16 @@ + g_free (priv->phase2_autheap); + g_free (priv->phase2_ca_path); + g_free (priv->password); ++ g_free (priv->pin); ++ g_free (priv->pkcs11_engine_path); ++ g_free (priv->pkcs11_module_path); ++ g_free (priv->pkcs11_module_init_args); ++ g_free (priv->pkcs11_ca_cert); ++ g_free (priv->pkcs11_client_cert); ++ g_free (priv->pkcs11_private_key); ++ g_free (priv->pkcs11_phase2_ca_cert); ++ g_free (priv->pkcs11_phase2_client_cert); ++ g_free (priv->pkcs11_phase2_private_key); + + nm_utils_slist_free (priv->eap, g_free); + +@@ -2832,6 +2955,10 @@ + g_free (priv->password); + priv->password = g_value_dup_string (value); + break; ++ case PROP_PIN: ++ g_free (priv->pin); ++ priv->pin = g_value_dup_string (value); ++ break; + case PROP_PRIVATE_KEY: + if (priv->private_key) { + g_byte_array_free (priv->private_key, TRUE); +@@ -2867,6 +2994,45 @@ + case PROP_SYSTEM_CA_CERTS: + priv->system_ca_certs = g_value_get_boolean (value); + break; ++ case PROP_PKCS11_ENGINE_PATH: ++ g_free (priv->pkcs11_engine_path); ++ priv->pkcs11_engine_path = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_MODULE_PATH: ++ g_free (priv->pkcs11_module_path); ++ priv->pkcs11_module_path = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_MODULE_INIT_ARGS: ++ g_free (priv->pkcs11_module_init_args); ++ priv->pkcs11_module_init_args = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_SLOT: ++ priv->pkcs11_slot = g_value_get_uint (value); ++ break; ++ case PROP_PKCS11_CA_CERT: ++ g_free (priv->pkcs11_ca_cert); ++ priv->pkcs11_ca_cert = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_CLIENT_CERT: ++ g_free (priv->pkcs11_client_cert); ++ priv->pkcs11_client_cert = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_PRIVATE_KEY: ++ g_free (priv->pkcs11_private_key); ++ priv->pkcs11_private_key = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_PHASE2_CA_CERT: ++ g_free (priv->pkcs11_phase2_ca_cert); ++ priv->pkcs11_phase2_ca_cert = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_PHASE2_CLIENT_CERT: ++ g_free (priv->pkcs11_phase2_client_cert); ++ priv->pkcs11_phase2_client_cert = g_value_dup_string (value); ++ break; ++ case PROP_PKCS11_PHASE2_PRIVATE_KEY: ++ g_free (priv->pkcs11_phase2_private_key); ++ priv->pkcs11_phase2_private_key = g_value_dup_string (value); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -2926,6 +3092,9 @@ + case PROP_PASSWORD: + g_value_set_string (value, priv->password); + break; ++ case PROP_PIN: ++ g_value_set_string (value, priv->pin); ++ break; + case PROP_PRIVATE_KEY: + g_value_set_boxed (value, priv->private_key); + break; +@@ -2941,6 +3110,36 @@ + case PROP_SYSTEM_CA_CERTS: + g_value_set_boolean (value, priv->system_ca_certs); + break; ++ case PROP_PKCS11_ENGINE_PATH: ++ g_value_set_string (value, priv->pkcs11_engine_path); ++ break; ++ case PROP_PKCS11_MODULE_PATH: ++ g_value_set_string (value, priv->pkcs11_module_path); ++ break; ++ case PROP_PKCS11_MODULE_INIT_ARGS: ++ g_value_set_string (value, priv->pkcs11_module_init_args); ++ break; ++ case PROP_PKCS11_SLOT: ++ g_value_set_uint (value, priv->pkcs11_slot); ++ break; ++ case PROP_PKCS11_CA_CERT: ++ g_value_set_string (value, priv->pkcs11_ca_cert); ++ break; ++ case PROP_PKCS11_CLIENT_CERT: ++ g_value_set_string (value, priv->pkcs11_client_cert); ++ break; ++ case PROP_PKCS11_PRIVATE_KEY: ++ g_value_set_string (value, priv->pkcs11_private_key); ++ break; ++ case PROP_PKCS11_PHASE2_CA_CERT: ++ g_value_set_string (value, priv->pkcs11_phase2_ca_cert); ++ break; ++ case PROP_PKCS11_PHASE2_CLIENT_CERT: ++ g_value_set_string (value, priv->pkcs11_phase2_client_cert); ++ break; ++ case PROP_PKCS11_PHASE2_PRIVATE_KEY: ++ g_value_set_string (value, priv->pkcs11_phase2_private_key); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -3200,6 +3399,19 @@ + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + + /** ++ * NMSetting8021x:pin: ++ * ++ * PIN used for 802.1x auth. ++ **/ ++ g_object_class_install_property ++ (object_class, PROP_PIN, ++ g_param_spec_string (NM_SETTING_802_1X_PIN, ++ "PIN", ++ "PIN", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); ++ ++ /** + * NMSetting8021x:password: + * + * Password used for EAP authentication methods. +@@ -3309,6 +3521,87 @@ + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE)); + ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_ENGINE_PATH, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_ENGINE_PATH, ++ "OpenSSL pkcs11 engine path", ++ "OpenSSL pkcs11 engine path", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_MODULE_PATH, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_MODULE_PATH, ++ "PKCS11 smartcard library module path", ++ "PKCS11 smartcard library module path", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_MODULE_INIT_ARGS, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_MODULE_INIT_ARGS, ++ "PKCS11 smartcard library initialization arguments", ++ "PKCS11 smartcard library initialization arguments", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_SLOT, ++ g_param_spec_uint (NM_SETTING_802_1X_PKCS11_SLOT, ++ "PKCS11 slot", ++ "PKCS11 slot", ++ 0, 1000, 0, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_CA_CERT, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_CA_CERT, ++ "PKCS11 object ID of CA certificate", ++ "PKCS11 object ID of CA certificate", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_CLIENT_CERT, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_CLIENT_CERT, ++ "PKCS11 object ID of client certificate", ++ "PKCS11 object ID of client certificate", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_PRIVATE_KEY, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_PRIVATE_KEY, ++ "PKCS11 object ID of private key", ++ "PKCS11 object ID of private key", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_PHASE2_CA_CERT, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_PHASE2_CA_CERT, ++ "PKCS11 object ID of phase2 CA certificate", ++ "PKCS11 object ID of phase2 CA certificate", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_PHASE2_CLIENT_CERT, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_PHASE2_CLIENT_CERT, ++ "PKCS11 object ID of phase2 client certificate", ++ "PKCS11 object ID of phase2 client certificate", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ g_object_class_install_property ++ (object_class, PROP_PKCS11_PHASE2_PRIVATE_KEY, ++ g_param_spec_string (NM_SETTING_802_1X_PKCS11_PHASE2_PRIVATE_KEY, ++ "PKCS11 object ID of phase2 private key", ++ "PKCS11 object ID of phase2 private key", ++ NULL, ++ G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); ++ ++ + /* Initialize crypto lbrary. */ + if (!nm_utils_init (&error)) { + g_warning ("Couldn't initilize nm-utils/crypto system: %d %s", +--- a/libnm-util/nm-setting-8021x.h ++++ b/libnm-util/nm-setting-8021x.h +@@ -88,6 +88,16 @@ + #define NM_SETTING_802_1X_PIN "pin" + #define NM_SETTING_802_1X_PSK "psk" + #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs" ++#define NM_SETTING_802_1X_PKCS11_ENGINE_PATH "pkcs11-engine-path" ++#define NM_SETTING_802_1X_PKCS11_MODULE_PATH "pkcs11-module-path" ++#define NM_SETTING_802_1X_PKCS11_MODULE_INIT_ARGS "pkcs11-module-init-args" ++#define NM_SETTING_802_1X_PKCS11_SLOT "pkcs11-slot" ++#define NM_SETTING_802_1X_PKCS11_CA_CERT "pkcs11-ca-cert" ++#define NM_SETTING_802_1X_PKCS11_CLIENT_CERT "pkcs11-client-cert" ++#define NM_SETTING_802_1X_PKCS11_PRIVATE_KEY "pkcs11-private-key" ++#define NM_SETTING_802_1X_PKCS11_PHASE2_CA_CERT "pkcs11-phase2-ca-cert" ++#define NM_SETTING_802_1X_PKCS11_PHASE2_CLIENT_CERT "pkcs11-phase2-client-cert" ++#define NM_SETTING_802_1X_PKCS11_PHASE2_PRIVATE_KEY "pkcs11-phase2-private-key" + + /* PRIVATE KEY NOTE: when setting PKCS#12 private keys directly via properties + * using the "blob" scheme, the data must be passed in PKCS#12 format. In this +@@ -275,6 +285,17 @@ + + NMSetting8021xCKType nm_setting_802_1x_get_phase2_private_key_type (NMSetting8021x *setting); + ++const char * nm_setting_802_1x_get_pkcs11_engine_path (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_module_path (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_module_init_args (NMSetting8021x *setting); ++guint nm_setting_802_1x_get_pkcs11_slot (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_ca_cert (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_client_cert (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_private_key (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_phase2_ca_cert (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_phase2_client_cert (NMSetting8021x *setting); ++const char * nm_setting_802_1x_get_pkcs11_phase2_private_key (NMSetting8021x *setting); ++ + G_END_DECLS + + #endif /* NM_SETTING_8021X_H */ +--- a/src/supplicant-manager/nm-supplicant-config.c ++++ b/src/supplicant-manager/nm-supplicant-config.c +@@ -57,6 +57,9 @@ + GHashTable *blobs; + guint32 ap_scan; + gboolean dispose_has_run; ++ char *pkcs11_engine_path; ++ char *pkcs11_module_path; ++ char *pkcs11_module_init_args; + } NMSupplicantConfigPrivate; + + NMSupplicantConfig * +@@ -93,6 +96,7 @@ + + priv->ap_scan = 1; + priv->dispose_has_run = FALSE; ++ priv->pkcs11_engine_path = g_strdup ("/usr/lib/engines/engine_pkcs11.so"); + } + + static gboolean +@@ -242,9 +246,14 @@ + static void + nm_supplicant_config_finalize (GObject *object) + { ++ NMSupplicantConfigPrivate *priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (object); ++ + /* Complete object destruction */ +- g_hash_table_destroy (NM_SUPPLICANT_CONFIG_GET_PRIVATE (object)->config); +- g_hash_table_destroy (NM_SUPPLICANT_CONFIG_GET_PRIVATE (object)->blobs); ++ g_hash_table_destroy (priv->config); ++ g_hash_table_destroy (priv->blobs); ++ g_free (priv->pkcs11_engine_path); ++ g_free (priv->pkcs11_module_path); ++ g_free (priv->pkcs11_module_init_args); + + /* Chain up to the parent class */ + G_OBJECT_CLASS (nm_supplicant_config_parent_class)->finalize (object); +@@ -279,6 +288,69 @@ + NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->ap_scan = ap_scan; + } + ++const char * ++nm_supplicant_config_get_pkcs11_engine_path (NMSupplicantConfig * self) ++{ ++ g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), NULL); ++ ++ return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->pkcs11_engine_path; ++} ++ ++void ++nm_supplicant_config_set_pkcs11_engine_path (NMSupplicantConfig * self, ++ const char *pkcs11_engine_path) ++{ ++ NMSupplicantConfigPrivate *priv; ++ ++ g_return_if_fail (NM_IS_SUPPLICANT_CONFIG (self)); ++ ++ priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self); ++ g_free (priv->pkcs11_engine_path); ++ priv->pkcs11_engine_path = g_strdup (pkcs11_engine_path); ++} ++ ++const char * ++nm_supplicant_config_get_pkcs11_module_path (NMSupplicantConfig * self) ++{ ++ g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), NULL); ++ ++ return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->pkcs11_module_path; ++} ++ ++void ++nm_supplicant_config_set_pkcs11_module_path (NMSupplicantConfig * self, ++ const char *pkcs11_module_path) ++{ ++ NMSupplicantConfigPrivate *priv; ++ ++ g_return_if_fail (NM_IS_SUPPLICANT_CONFIG (self)); ++ ++ priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self); ++ g_free (priv->pkcs11_module_path); ++ priv->pkcs11_module_path = g_strdup (pkcs11_module_path); ++} ++ ++const char * ++nm_supplicant_config_get_pkcs11_module_init_args (NMSupplicantConfig * self) ++{ ++ g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), NULL); ++ ++ return NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->pkcs11_module_init_args; ++} ++ ++void ++nm_supplicant_config_set_pkcs11_module_init_args (NMSupplicantConfig * self, ++ const char *pkcs11_module_init_args) ++{ ++ NMSupplicantConfigPrivate *priv; ++ ++ g_return_if_fail (NM_IS_SUPPLICANT_CONFIG (self)); ++ ++ priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self); ++ g_free (priv->pkcs11_module_init_args); ++ priv->pkcs11_module_init_args = g_strdup (pkcs11_module_init_args); ++} ++ + static void + get_hash_cb (gpointer key, gpointer value, gpointer user_data) + { +@@ -581,6 +653,8 @@ + gboolean success; + const char *key_mgmt, *auth_alg; + const char *psk; ++ const char *pkcs11_engine_path; ++ const char *pkcs11_module_path; + + g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE); + g_return_val_if_fail (setting != NULL, FALSE); +@@ -691,6 +765,27 @@ + } + } + ++ pkcs11_engine_path = nm_setting_802_1x_get_pkcs11_engine_path (setting_8021x); ++ pkcs11_module_path = nm_setting_802_1x_get_pkcs11_module_path (setting_8021x); ++ ++ if (pkcs11_engine_path && pkcs11_module_path) { ++ nm_supplicant_config_set_pkcs11_engine_path (self, pkcs11_engine_path); ++ nm_supplicant_config_set_pkcs11_module_path (self, pkcs11_module_path); ++ nm_supplicant_config_set_pkcs11_module_init_args (self, ++ nm_setting_802_1x_get_pkcs11_module_init_args (setting_8021x)); ++ ++ add_string_val (self, "1", "engine", FALSE, FALSE); ++ add_string_val (self, "pkcs11", "engine_id", FALSE, FALSE); ++ ++ /* TODO: handle more than one slot */ ++ add_string_val (self, nm_setting_802_1x_get_pkcs11_ca_cert (setting_8021x), "ca_cert_id", FALSE, FALSE); ++ add_string_val (self, nm_setting_802_1x_get_pkcs11_client_cert (setting_8021x), "cert_id", FALSE, FALSE); ++ add_string_val (self, nm_setting_802_1x_get_pkcs11_private_key (setting_8021x), "key_id", FALSE, FALSE); ++ add_string_val (self, nm_setting_802_1x_get_pkcs11_phase2_ca_cert (setting_8021x), "ca_cert2_id", FALSE, FALSE); ++ add_string_val (self, nm_setting_802_1x_get_pkcs11_phase2_client_cert (setting_8021x), "cert2_id", FALSE, FALSE); ++ add_string_val (self, nm_setting_802_1x_get_pkcs11_phase2_private_key (setting_8021x), "key2_id", FALSE, FALSE); ++ } ++ + return TRUE; + } + +--- a/src/supplicant-manager/nm-supplicant-config.h ++++ b/src/supplicant-manager/nm-supplicant-config.h +@@ -57,6 +57,21 @@ + void nm_supplicant_config_set_ap_scan (NMSupplicantConfig *self, + guint32 ap_scan); + ++const char *nm_supplicant_config_get_pkcs11_engine_path (NMSupplicantConfig * self); ++ ++void nm_supplicant_config_set_pkcs11_engine_path (NMSupplicantConfig * self, ++ const char *pkcs11_engine_path); ++ ++const char *nm_supplicant_config_get_pkcs11_module_path (NMSupplicantConfig * self); ++ ++void nm_supplicant_config_set_pkcs11_module_path (NMSupplicantConfig * self, ++ const char *pkcs11_module_path); ++ ++const char *nm_supplicant_config_get_pkcs11_module_init_args (NMSupplicantConfig * self); ++ ++void nm_supplicant_config_set_pkcs11_module_init_args (NMSupplicantConfig * self, ++ const char *pkcs11_module_init_args); ++ + GHashTable *nm_supplicant_config_get_hash (NMSupplicantConfig *self); + + GHashTable *nm_supplicant_config_get_blobs (NMSupplicantConfig *self); +--- a/src/supplicant-manager/nm-supplicant-interface.c ++++ b/src/supplicant-manager/nm-supplicant-interface.c +@@ -1259,6 +1259,8 @@ + NMSupplicantInfo *info; + DBusGProxyCall *call; + guint32 ap_scan; ++ const char *pkcs11_engine_path; ++ const char *pkcs11_module_path; + + g_return_val_if_fail (NM_IS_SUPPLICANT_INTERFACE (self), FALSE); + +@@ -1285,6 +1287,41 @@ + G_TYPE_INVALID); + nm_supplicant_info_set_call (info, call); + ++ if (!call) ++ return FALSE; ++ ++ pkcs11_engine_path = nm_supplicant_config_get_pkcs11_engine_path (priv->cfg); ++ pkcs11_module_path = nm_supplicant_config_get_pkcs11_module_path (priv->cfg); ++ ++ if (pkcs11_engine_path && pkcs11_module_path) { ++ GHashTable *pkcs11_config_hash; ++ GValue *val; ++ ++ pkcs11_config_hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) blob_free); ++ ++ val = g_slice_new0 (GValue); ++ g_value_init (val, G_TYPE_STRING); ++ g_value_set_string (val, pkcs11_engine_path); ++ g_hash_table_insert (pkcs11_config_hash, "pkcs11_engine_path", val); ++ ++ val = g_slice_new0 (GValue); ++ g_value_init (val, G_TYPE_STRING); ++ g_value_set_string (val, pkcs11_module_path); ++ g_hash_table_insert (pkcs11_config_hash, "pkcs11_module_path", val); ++ ++ /* TODO: waiting on pkcs11_module_init_args support in wpasupplicant ++ tmp = nm_supplicant_config_get_pkcs11_module_init_args (priv->cfg); ++ g_hash_table_insert (pkcs11_config_hash, "pkcs11_module_init_args", ++ str_to_gvalue(tmp)); ++ */ ++ ++ dbus_g_proxy_call_no_reply (priv->iface_proxy, "setSmartcardModules", ++ DBUS_TYPE_G_MAP_OF_VARIANT, ++ pkcs11_config_hash, ++ G_TYPE_INVALID); ++ g_hash_table_destroy (pkcs11_config_hash); ++ } ++ + return call != NULL; + } + +--- a/src/supplicant-manager/nm-supplicant-settings-verify.c ++++ b/src/supplicant-manager/nm-supplicant-settings-verify.c +@@ -121,7 +121,12 @@ + { "pac_file", TYPE_BYTES, 0, 0, FALSE, NULL }, + { "engine", TYPE_INT, 0, 1, FALSE, NULL }, + { "engine_id", TYPE_BYTES, 0, 0, FALSE, NULL }, +- { "key_id", TYPE_BYTES, 0, 0, FALSE, NULL }, ++ { "ca_cert_id", TYPE_BYTES, 0, 0, FALSE, NULL }, ++ { "cert_id", TYPE_BYTES, 0, 0, FALSE, NULL }, ++ { "key_id", TYPE_BYTES, 0, 0, FALSE, NULL }, ++ { "ca_cert2_id", TYPE_BYTES, 0, 0, FALSE, NULL }, ++ { "cert2_id", TYPE_BYTES, 0, 0, FALSE, NULL }, ++ { "key2_id", TYPE_BYTES, 0, 0, FALSE, NULL }, + { "fragment_size", TYPE_INT, 1, 2000, FALSE, NULL }, + }; + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/23_nm-monitor-eni.diff +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/23_nm-monitor-eni.diff @@ -0,0 +1,230 @@ +=== modified file 'src/NetworkManager.c' +Binary files bzr.debian.0.9.5/.bzr/checkout/dirstate and bzr.debian.0.9.5.new/.bzr/checkout/dirstate differ +diff -Nur bzr.debian.0.9.5/src/backends/NetworkManagerDebian.c bzr.debian.0.9.5.new/src/backends/NetworkManagerDebian.c +--- bzr.debian.0.9.5/src/backends/NetworkManagerDebian.c 2007-06-25 17:40:34.000000000 +0200 ++++ bzr.debian.0.9.5.new/src/backends/NetworkManagerDebian.c 2007-06-25 17:40:34.000000000 +0200 +@@ -31,7 +31,11 @@ + #include + #include + #include ++#include ++#include + #include "NetworkManagerSystem.h" ++#include "NetworkManagerDbus.h" ++#include "NetworkManagerPolicy.h" + #include "NetworkManagerUtils.h" + #include "nm-device.h" + #include "nm-device-802-3-ethernet.h" +@@ -43,14 +47,178 @@ + #define ARPING "/usr/sbin/arping" + #define RESOLVCONF "resolvconf" + ++/* taken from NetworkManager.c */ ++static char *nm_get_device_interface_from_hal (LibHalContext *ctx, const char *udi) ++{ ++ char *iface = NULL; ++ ++ if (libhal_device_property_exists (ctx, udi, "net.interface", NULL)) ++ { ++ /* Only use Ethernet and Wireless devices at the moment */ ++ if (libhal_device_property_exists (ctx, udi, "info.category", NULL)) ++ { ++ char *category = libhal_device_get_property_string (ctx, udi, "info.category", NULL); ++ if (category && (!strcmp (category, "net.80203") || !strcmp (category, "net.80211"))) ++ { ++ char *temp = libhal_device_get_property_string (ctx, udi, "net.interface", NULL); ++ iface = g_strdup (temp); ++ libhal_free_string (temp); ++ } ++ libhal_free_string (category); ++ } ++ } ++ ++ return (iface); ++} ++ ++/* callback called when /etc/network/interfaces is modified */ ++static gboolean eni_changed (GIOChannel *eni_channel, GIOCondition cond, gpointer user_data) ++{ ++ gboolean reparse = FALSE; ++ NMData *data = (NMData *) user_data; ++ NMDevice *active; ++ char **net_devices; ++ DBusError error; ++ int num_net_devices; ++ int i; ++ GSList *walk; ++ struct inotify_event evt; ++ ++ /* read the notifications from the watch descriptor */ ++ while (g_io_channel_read_chars (eni_channel, (gchar *) &evt, ++ sizeof (struct inotify_event), NULL, NULL) == G_IO_STATUS_NORMAL) { ++ if (evt.len > 0) { ++ gchar filename[evt.len]; ++ g_io_channel_read_chars (eni_channel, filename, evt.len, NULL, NULL); ++ ++ if (!strcmp (filename, "interfaces")) ++ reparse = TRUE; ++ } ++ } ++ ++ if (reparse == FALSE) ++ /* ignore this notification */ ++ return TRUE; ++ ++ nm_info ("/etc/network/interface changed: rebuilding the device list."); ++ ++ /* get the existing devices from Hal */ ++ dbus_error_init (&error); ++ net_devices = libhal_find_device_by_capability (data->hal_ctx, "net", &num_net_devices, &error); ++ if (dbus_error_is_set (&error)) { ++ nm_warning ("Could not get existing devices from Hal: %s", error.message); ++ dbus_error_free (&error); ++ ++ return FALSE; ++ } ++ ++ /* get the currently active device, we do not touch it if it has not been disabled */ ++ active = nm_get_active_device (data); ++ if (active && nm_system_device_get_disabled (active) == TRUE) ++ active = NULL; ++ ++ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); ++ ++ /* remove the devices */ ++ for (walk = data->dev_list; walk != NULL; walk = g_slist_next (walk)) { ++ NMDevice *dev = NM_DEVICE (walk->data); ++ ++ if (active && dev == active) { ++ /* do not remove the active device */ ++ nm_info ("Keeping active %s device '%s'.", ++ nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" : "wired Ethernet (802.3)", ++ nm_device_get_iface (dev)); ++ ++ continue; ++ } ++ ++ nm_info ("Removing %s device '%s'.", ++ nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" : "wired Ethernet (802.3)", ++ nm_device_get_iface (dev)); ++ nm_device_set_removed (dev, TRUE); ++ nm_device_stop (dev); ++ ++ nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_REMOVED); ++ g_object_unref (dev); ++ } ++ ++ g_slist_free (data->dev_list); ++ data->dev_list = NULL; ++ if (active) ++ data->dev_list = g_slist_append (data->dev_list, active); ++ ++ nm_info ("Recreating the device list."); ++ /* repopulate the device list */ ++ for (i = 0; i < num_net_devices; i++) ++ { ++ char *iface; ++ ++ if ((iface = nm_get_device_interface_from_hal (data->hal_ctx, net_devices[i]))) ++ { ++ NMDevice *dev; ++ ++ if (active && !strcmp (iface, nm_device_get_iface (active))) ++ continue; ++ ++ if ((dev = nm_device_new (iface, net_devices[i], FALSE, DEVICE_TYPE_UNKNOWN, data))) ++ { ++ nm_info ("Now managing %s device '%s'.", ++ nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" : "wired Ethernet (802.3)", ++ nm_device_get_iface (dev)); ++ ++ data->dev_list = g_slist_append (data->dev_list, dev); ++ nm_device_deactivate (dev); ++ ++ nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_ADDED); ++ } ++ ++ g_free (iface); ++ } ++ } ++ nm_info ("Device list recreated successfully."); ++ ++ libhal_free_string_array (net_devices); ++ nm_policy_schedule_device_change_check (data); ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); ++ ++ return TRUE; ++} ++ + /* + * nm_system_init + * + * Initializes the distribution-specific system backend + * + */ +-void nm_system_init (void) ++void nm_system_init (NMData *data) + { ++ GIOChannel *eni_channel; ++ GSource *io_source; ++ ++ int ifd = inotify_init (); ++ if (ifd == -1) { ++ nm_warning ("Could not initialize inotify"); ++ ++ return; ++ } ++ ++ int wd = inotify_add_watch (ifd, "/etc/network/", IN_CLOSE_WRITE); ++ if (wd == -1) { ++ nm_warning ("Could not monitor /etc/network/interface"); ++ close (ifd); ++ ++ return; ++ } ++ ++ /* add an io_watch to the main_context */ ++ eni_channel = g_io_channel_unix_new (ifd); ++ g_io_channel_set_flags (eni_channel, G_IO_FLAG_NONBLOCK, NULL); ++ g_io_channel_set_encoding (eni_channel, NULL, NULL); ++ io_source = g_io_create_watch (eni_channel, G_IO_IN | G_IO_ERR); ++ g_source_set_callback (io_source, (GSourceFunc) eni_changed, data, NULL); ++ g_source_attach (io_source, data->main_context); ++ g_io_channel_unref (eni_channel); ++ g_source_unref (io_source); + } + + /* +diff -Nur bzr.debian.0.9.5/src/NetworkManager.c bzr.debian.0.9.5.new/src/NetworkManager.c +--- bzr.debian.0.9.5/src/NetworkManager.c 2007-06-25 17:18:17.000000000 +0200 ++++ bzr.debian.0.9.5.new/src/NetworkManager.c 2007-06-25 17:40:34.000000000 +0200 +@@ -757,8 +757,6 @@ + nm_logging_setup (become_daemon); + nm_info ("starting..."); + +- nm_system_init(); +- + /* Initialize our instance data */ + nm_data = nm_data_new (enable_test_devices); + if (!nm_data) +@@ -800,6 +798,8 @@ + /* If Hal is around, grab a device list from it */ + if ((owner = get_name_owner (nm_data->dbus_connection, "org.freedesktop.Hal"))) + nm_hal_init (nm_data); ++ ++ nm_system_init (nm_data); + + /* We run dhclient when we need to, and we don't want any stray ones + * lying around upon launch. +diff -Nur bzr.debian.0.9.5/src/NetworkManagerSystem.h bzr.debian.0.9.5.new/src/NetworkManagerSystem.h +--- bzr.debian.0.9.5/src/NetworkManagerSystem.h 2007-06-25 17:18:17.000000000 +0200 ++++ bzr.debian.0.9.5.new/src/NetworkManagerSystem.h 2007-06-25 17:40:34.000000000 +0200 +@@ -33,7 +33,7 @@ + * implemented in the backend files in backends/ directory + */ + +-void nm_system_init (void); ++void nm_system_init (struct NMData *data); + gboolean nm_system_device_has_active_routes (NMDevice *dev); + + int nm_system_get_rtnl_index_from_iface (const char *iface); --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/02-dbus_access_network_manager.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/02-dbus_access_network_manager.patch @@ -0,0 +1,14 @@ +diff -Nur bzr.debian.0.9.4.patchupdate/src/NetworkManager.conf bzr.debian.0.9.4.patchupdate.new/src/NetworkManager.conf +--- bzr.debian.0.9.4.patchupdate/src/NetworkManager.conf 2007-06-25 17:14:46.000000000 +0200 ++++ bzr.debian.0.9.4.patchupdate.new/src/NetworkManager.conf 2007-06-25 17:15:51.000000000 +0200 +@@ -8,6 +8,10 @@ + + + ++ ++ ++ ++ + + + --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/21_manual_means_always_online.diff +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/21_manual_means_always_online.diff @@ -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; + } --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/99_printf_formatting_fixes.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/99_printf_formatting_fixes.patch @@ -0,0 +1,106 @@ +From: Michael Biebl +Date: Sun, 20 Mar 2011 12:05:50 +0100 +Subject: [PATCH] logger: printf formatting fixes +Forwarded: http://mail.gnome.org/archives/networkmanager-list/2011-March/msg00176.html + +For printf() time_t see +http://lists.freebsd.org/pipermail/freebsd-ports/2006-January/028656.html +--- + src/dhcp-manager/nm-dhcp-manager.c | 6 +++--- + src/ip6-manager/nm-ip6-manager.c | 16 ++++++++-------- + 2 files changed, 11 insertions(+), 11 deletions(-) + + +With addition of changes to po/POTFILES.skip by +Mathieu Trudel-Lapierre +because that patch is not yet committed (and patching makes translation +tests fail). + +diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c +index 8e2392d..23dc3d0 100644 +--- a/src/dhcp-manager/nm-dhcp-manager.c ++++ b/src/dhcp-manager/nm-dhcp-manager.c +@@ -235,19 +235,19 @@ nm_dhcp_manager_handle_event (DBusGProxy *proxy, + + client = get_client_for_pid (manager, (GPid) temp); + if (client == NULL) { +- nm_log_warn (LOGD_DHCP, "(pid %zd) unhandled DHCP event for interface %s", temp, iface); ++ nm_log_warn (LOGD_DHCP, "(pid %lu) unhandled DHCP event for interface %s", temp, iface); + goto out; + } + + if (strcmp (iface, nm_dhcp_client_get_iface (client))) { +- nm_log_warn (LOGD_DHCP, "(pid %zd) received DHCP event from unexpected interface '%s' (expected '%s')", ++ nm_log_warn (LOGD_DHCP, "(pid %lu) received DHCP event from unexpected interface '%s' (expected '%s')", + temp, iface, nm_dhcp_client_get_iface (client)); + goto out; + } + + reason = get_option (options, "reason"); + if (reason == NULL) { +- nm_log_warn (LOGD_DHCP, "(pid %zd) DHCP event didn't have a reason", temp); ++ nm_log_warn (LOGD_DHCP, "(pid %lu) DHCP event didn't have a reason", temp); + goto out; + } + +diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c +index c158496..53a21de 100644 +--- a/src/ip6-manager/nm-ip6-manager.c ++++ b/src/ip6-manager/nm-ip6-manager.c +@@ -701,9 +701,9 @@ process_nduseropt_rdnss (NMIP6Device *device, struct nd_opt_hdr *opt) + cur_server->expires = server.expires; + + if (server.expires > 0) { +- nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided nameserver %s (expires in %zd seconds)", ++ nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided nameserver %s (expires in %jd seconds)", + device->iface, buf, +- server.expires - now); ++ (intmax_t)server.expires - now); + break; + } + +@@ -720,8 +720,8 @@ process_nduseropt_rdnss (NMIP6Device *device, struct nd_opt_hdr *opt) + if (i < device->rdnss_servers->len) + continue; + +- nm_log_dbg (LOGD_IP6, "(%s): found RA-provided nameserver %s (expires in %zd seconds)", +- device->iface, buf, server.expires - now); ++ nm_log_dbg (LOGD_IP6, "(%s): found RA-provided nameserver %s (expires in %jd seconds)", ++ device->iface, buf, (intmax_t)server.expires - now); + + server.addr = *addr; + g_array_append_val (new_servers, server); +@@ -843,9 +843,9 @@ process_nduseropt_dnssl (NMIP6Device *device, struct nd_opt_hdr *opt) + cur_domain->expires = domain.expires; + + if (domain.expires > 0) { +- nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided domain %s (expires in %zd seconds)", ++ nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided domain %s (expires in %jd seconds)", + device->iface, domain_str, +- domain.expires - now); ++ (intmax_t)domain.expires - now); + break; + } + +@@ -862,8 +862,8 @@ process_nduseropt_dnssl (NMIP6Device *device, struct nd_opt_hdr *opt) + if (i < device->dnssl_domains->len) + continue; + +- nm_log_dbg (LOGD_IP6, "(%s): found RA-provided domain %s (expires in %zd seconds)", +- device->iface, domain_str, domain.expires - now); ++ nm_log_dbg (LOGD_IP6, "(%s): found RA-provided domain %s (expires in %jd seconds)", ++ device->iface, domain_str, (intmax_t)domain.expires - now); + + g_assert (strlen (domain_str) < sizeof (domain.domain)); + strcpy (domain.domain, domain_str); +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -4,3 +4,5 @@ + vpn-daemons/pptp + vpn-daemons/vpnc + .pc/70_lp145653_no_sigaction_for_crashes.patch/src/main.c ++.pc/99_printf_formatting_fixes.patch/src/dhcp-manager/nm-dhcp-manager.c ++.pc/99_printf_formatting_fixes.patch/src/ip6-manager/nm-ip6-manager.c +-- +1.7.4.1 --- network-manager-0.8.4~git.20110319t175609.d14809b.orig/debian/patches/70_lp145653_no_sigaction_for_crashes.patch +++ network-manager-0.8.4~git.20110319t175609.d14809b/debian/patches/70_lp145653_no_sigaction_for_crashes.patch @@ -0,0 +1,31 @@ +From: Alexander Sack +Subject: Do not call sigaction on crashes, we want apport to provide reports. +Last-Update: 2011-03-03 + + Mathieu Trudel-Lapierre : + - Updated to add quilt .pc file to POTFILES.skip due to enabling tests in build. + +--- network-manager-0.8.1~beta1~git.20100510t073507.f3057a6.orig/src/main.c 2010-05-10 19:54:00.000000000 +0000 ++++ network-manager-0.8.1~beta1~git.20100510t073507.f3057a6/src/main.c 2010-05-10 19:54:17.000000000 +0000 +@@ -217,12 +217,8 @@ + action.sa_flags = 0; + sigaction (SIGTERM, &action, NULL); + sigaction (SIGINT, &action, NULL); +- sigaction (SIGILL, &action, NULL); +- sigaction (SIGBUS, &action, NULL); + sigaction (SIGFPE, &action, NULL); + sigaction (SIGHUP, &action, NULL); +- sigaction (SIGSEGV, &action, NULL); +- sigaction (SIGABRT, &action, NULL); + sigaction (SIGUSR1, &action, NULL); + } + +Index: network-manager-0.8.4~git.20110228t143901.5cdded6/po/POTFILES.skip +=================================================================== +--- network-manager-0.8.4~git.20110228t143901.5cdded6.orig/po/POTFILES.skip 2011-03-01 15:25:16.163037124 -0500 ++++ network-manager-0.8.4~git.20110228t143901.5cdded6/po/POTFILES.skip 2011-03-01 15:25:23.623037122 -0500 +@@ -3,3 +3,4 @@ + vpn-daemons/openvpn + vpn-daemons/pptp + vpn-daemons/vpnc ++.pc/70_lp145653_no_sigaction_for_crashes.patch/src/main.c