From 6c5e16595db9bf334eccc81e9ca974be2b673e4f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:12:53 +0000 Subject: * improved manpages. - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages * uploaded to unstable. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@562 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 9 ++++ debian/nm-applet.manpages | 2 + debian/nm-applet.sgml | 97 +++++++++++++++++++++++++++++++++++++++++++ debian/nm-vpn-properties.sgml | 95 ++++++++++++++++++++++++++++++++++++++++++ debian/rules | 4 +- 5 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 debian/nm-applet.manpages create mode 100644 debian/nm-applet.sgml create mode 100644 debian/nm-vpn-properties.sgml diff --git a/debian/changelog b/debian/changelog index d3d488a4..ae89ee9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +network-manager (0.5.1-2) unstable; urgency=low + + * improved manpages. + - added nm-vpn-properties, nm-applet manpages + - added debian/nm-applet.manpages + * uploaded to unstable. + + -- Riccardo Setti Wed, 8 Feb 2006 22:08:42 +0100 + network-manager (0.5.1-1) experimental; urgency=low * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because diff --git a/debian/nm-applet.manpages b/debian/nm-applet.manpages new file mode 100644 index 00000000..15a34e96 --- /dev/null +++ b/debian/nm-applet.manpages @@ -0,0 +1,2 @@ +debian/nm-vpn-properties.1 +debian/nm-applet.1 diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml new file mode 100644 index 00000000..0194d70b --- /dev/null +++ b/debian/nm-applet.sgml @@ -0,0 +1,97 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + 8 February, 2006"> + + + GNU"> + GPL"> +]> + + + +
+ giskard@autistici.org; +
+ + Riccardo + Setti + + + 2006 + Riccardo Setti + + &date; + + + nm-applet + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; is the gnome front-end for NetworkManager + If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian + in /usr/share/common/&package; + + + SEE ALSO + + NetworkManager (1). nm-vpn-properties (1) + + More Information about NetworkManager can be found at + http://www.gnome.org/projects/NetworkManager/ . + + + AUTHOR + + This manual page was written by Riccardo Setti giskard@autistici.org for + the Debian system. + + + + + + diff --git a/debian/nm-vpn-properties.sgml b/debian/nm-vpn-properties.sgml new file mode 100644 index 00000000..7b42239e --- /dev/null +++ b/debian/nm-vpn-properties.sgml @@ -0,0 +1,95 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + 8 February, 2006"> + + + GNU"> + GPL"> +]> + + + +
+ giskard@autistici.org; +
+ + Riccardo + Setti + + + 2006 + Riccardo Setti + + &date; + + + nm-vpn-properties + 1 + + + &package; + + Network management framework + + + + &package; + + + + DESCRIPTION + + &package; is the gnome front-end for the NetworkManager VPN handler + + + SEE ALSO + + NetworkManager (1), nm-applet (1) + + More Information about NetworkManager can be found at + http://www.gnome.org/projects/NetworkManager/ . + + + AUTHOR + + This manual page was written by Riccardo Setti giskard@autistici.org for + the Debian system. + + + + + + diff --git a/debian/rules b/debian/rules index 8c8bfe3e..e140634f 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,9 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 10b296365fa34676434a91c7061740cb03ebb497 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:20:00 +0000 Subject: - modifyed NetworManager*.sgml for reflect the correct website. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@563 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 7 ++++--- debian/NetworkManagerDispatcher.sgml | 6 +++--- debian/changelog | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml index cc1fcd92..61ea2121 100644 --- a/debian/NetworkManager.sgml +++ b/debian/NetworkManager.sgml @@ -105,13 +105,14 @@ manpage.1: manpage.sgml nm-applet (1), NetworkManagerDispatcher (1). More Information about NetworkManager can be found at - http://people.redhat.com/dcbw/NetworkManager/ . + http://www.gnome.org/projects/NetworkManager/ . AUTHOR - This manual page was written by Jan Gerber j@bootlab.org for - the Ubuntu system. + This manual page was written by Jan Gerber j@bootlab.org and by + Riccardo Setti giskard@autistici.org for + the Debian/Ubuntu system. diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml index c6a42105..d42b2903 100644 --- a/debian/NetworkManagerDispatcher.sgml +++ b/debian/NetworkManagerDispatcher.sgml @@ -67,13 +67,13 @@ manpage.1: manpage.sgml NetworkManager (1), nm-applet (1). More Information about NetworkManager can be found at - http://people.redhat.com/dcbw/NetworkManager/ . + http://www.gnome.org/projects/NetworkManager/ . AUTHOR - This manual page was written by Jan Gerber j@bootlab.org for - the Ubuntu system. + This manual page was written by Jan Gerber j@bootlab.org and by Riccardo Setti + giskard@autistici.org for the Debian/Ubuntu system. diff --git a/debian/changelog b/debian/changelog index ae89ee9f..dbc1bf33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,10 @@ network-manager (0.5.1-2) unstable; urgency=low * improved manpages. - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages + - modifyed NetworManager*.sgml for reflect the correct website. * uploaded to unstable. - -- Riccardo Setti Wed, 8 Feb 2006 22:08:42 +0100 + -- Riccardo Setti Wed, 8 Feb 2006 22:16:34 +0100 network-manager (0.5.1-1) experimental; urgency=low -- cgit 1.3.0-6-gf8a5 From bb6d8522f4b4f65c095a9fef86fffde4dc9438ba Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:34:39 +0000 Subject: /me should create manpages in debian/ and not in the toplevel dir git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@566 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbc1bf33..eabebc0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,9 @@ network-manager (0.5.1-2) unstable; urgency=low - added nm-vpn-properties, nm-applet manpages - added debian/nm-applet.manpages - modifyed NetworManager*.sgml for reflect the correct website. - * uploaded to unstable. + * uploaded to unstable. - -- Riccardo Setti Wed, 8 Feb 2006 22:16:34 +0100 + -- Riccardo Setti Wed, 8 Feb 2006 22:32:05 +0100 network-manager (0.5.1-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index e140634f..8c9ca76f 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > nm-applet.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From a3f22a606cc42593ba8e27f6da938c9e85056026 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 8 Feb 2006 21:35:42 +0000 Subject: - added debian/network-manager-gnome.manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@567 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- debian/network-manager-gnome.manpages | 2 ++ debian/nm-applet.manpages | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 debian/network-manager-gnome.manpages delete mode 100644 debian/nm-applet.manpages diff --git a/debian/changelog b/debian/changelog index eabebc0b..b04ef708 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ network-manager (0.5.1-2) unstable; urgency=low * improved manpages. - added nm-vpn-properties, nm-applet manpages - - added debian/nm-applet.manpages + - added debian/network-manager-gnome.manpages - modifyed NetworManager*.sgml for reflect the correct website. * uploaded to unstable. diff --git a/debian/network-manager-gnome.manpages b/debian/network-manager-gnome.manpages new file mode 100644 index 00000000..15a34e96 --- /dev/null +++ b/debian/network-manager-gnome.manpages @@ -0,0 +1,2 @@ +debian/nm-vpn-properties.1 +debian/nm-applet.1 diff --git a/debian/nm-applet.manpages b/debian/nm-applet.manpages deleted file mode 100644 index 15a34e96..00000000 --- a/debian/nm-applet.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/nm-vpn-properties.1 -debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 421d5484e4c5fd487b727b8a1241b72633fefd2f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 8 Feb 2006 23:09:57 +0000 Subject: Fixed some paths and typos when creating manpages from sgml. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@568 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/nm-applet.sgml | 2 +- debian/rules | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml index 0194d70b..b027f8a0 100644 --- a/debian/nm-applet.sgml +++ b/debian/nm-applet.sgml @@ -59,7 +59,7 @@ manpage.1: manpage.sgml &package; is the gnome front-end for NetworkManager If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian - in /usr/share/common/&package; + in /usr/share/doc/network-manager SEE ALSO diff --git a/debian/rules b/debian/rules index 8c9ca76f..ba334f02 100755 --- a/debian/rules +++ b/debian/rules @@ -19,9 +19,9 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 1ca553446c1acb38aae5f114cb9b0e505b07a98c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 09:24:40 +0000 Subject: * uploaded to unstable. * removed network-manager.doc as it was empty. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@571 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- debian/network-manager.docs | 1 - debian/rules | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 debian/network-manager.docs diff --git a/debian/changelog b/debian/changelog index b04ef708..7fbf3992 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,10 @@ network-manager (0.5.1-2) unstable; urgency=low - added nm-vpn-properties, nm-applet manpages - added debian/network-manager-gnome.manpages - modifyed NetworManager*.sgml for reflect the correct website. - * uploaded to unstable. + * uploaded to unstable. + * removed network-manager.doc as it was empty. - -- Riccardo Setti Wed, 8 Feb 2006 22:32:05 +0100 + -- Riccardo Setti Thu, 9 Feb 2006 10:18:13 +0100 network-manager (0.5.1-1) experimental; urgency=low diff --git a/debian/network-manager.docs b/debian/network-manager.docs deleted file mode 100644 index 8b137891..00000000 --- a/debian/network-manager.docs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/debian/rules b/debian/rules index ba334f02..fd5c101c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,10 +18,10 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From b5e16541a22dd3b41ea52bbd3aefb0cb21318ccb Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 15:08:23 +0000 Subject: now manpages are built correctly git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@572 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index fd5c101c..eec349aa 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,8 @@ build/network-manager:: /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 - /usr/bin/docbook-to-man debian/nm-vpn-properties > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet > debian/nm-applet.1 + /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 + /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: install -m 755 debian/network-manager.dbus-event \ -- cgit 1.3.0-6-gf8a5 From 074add86a595038fe99e9cd5294435db3621588a Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 20:14:52 +0000 Subject: * added nm-vpn-properties.desktop, nm-logo.xpm * added dbus_access_network_manager and dbus_access_nm_applet patches: - switched to group netdev - updated the dep on dhcdbd * removed network-manager.doc as it was empty. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@574 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 2 +- debian/changelog | 6 +- debian/control | 2 +- debian/network-manager-gnome.dirs | 1 + debian/nm-logo.xpm | 182 ++++++++++++++++++++++++++++++++++++++ debian/nm-vpn-properties.desktop | 9 ++ debian/rules | 10 +-- 7 files changed, 202 insertions(+), 10 deletions(-) create mode 100644 debian/nm-logo.xpm create mode 100644 debian/nm-vpn-properties.desktop diff --git a/debian/README.Debian b/debian/README.Debian index 20c9ed3d..a34d88d8 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,7 +4,7 @@ the user can interact with. Since NetworkManager is not part of main yet, you have to add nm-applet to your session once. (instructions for gnome only) -First add yourself to the plugdev group +First add yourself to the netdev group Go to System -> Preferences -> Sessions In the Startup Programs tab, click Add type "nm-applet", click OK. diff --git a/debian/changelog b/debian/changelog index 7fbf3992..f1e3703c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ network-manager (0.5.1-2) unstable; urgency=low - added nm-vpn-properties, nm-applet manpages - added debian/network-manager-gnome.manpages - modifyed NetworManager*.sgml for reflect the correct website. - * uploaded to unstable. + * added nm-vpn-properties.desktop, nm-logo.xpm + * added dbus_access_network_manager and dbus_access_nm_applet patches: + - switched to group netdev + - updated the dep on dhcdbd * removed network-manager.doc as it was empty. + * uploaded to unstable. -- Riccardo Setti Thu, 9 Feb 2006 10:18:13 +0100 diff --git a/debian/control b/debian/control index 09660b61..ec8fa06d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-2), lsb-base (>= 2.0-6) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index e628b1eb..92c4831a 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1 +1,2 @@ etc/dbus-1/system.d/ +usr/share/pixmaps diff --git a/debian/nm-logo.xpm b/debian/nm-logo.xpm new file mode 100644 index 00000000..20e4f020 --- /dev/null +++ b/debian/nm-logo.xpm @@ -0,0 +1,182 @@ +/* XPM */ +static char *nm-logo[] = { +/* columns rows colors chars-per-pixel */ +"31 32 144 2", +" c #697677FB7FB8", +". c #15175FC087FE", +"X c #14835FFE88A6", +"o c #09C560CC8FD9", +"O c #0694613C9241", +"+ c #028067169DEF", +"@ c #04906949A025", +"# c #093E62AC9307", +"$ c #153262348BBC", +"% c #1B9F660C8E34", +"& c #1186680C96CE", +"* c #16976A2597A0", +"= c #03E1696AA0B1", +"- c #00C16F4DABB9", +"; c #0C756DE3A2EE", +": c #034B71FBAD4D", +"> c #09437623B01E", +", c #028C76FFB4C0", +"< c #0137795DB8AD", +"1 c #005C79D4B9E5", +"2 c #08FF7AB6B729", +"3 c #09877E53BBAE", +"4 c #15B67262A3D0", +"5 c #136577DAACCF", +"6 c #14907892AD2C", +"7 c #22A0630985BE", +"8 c #2CBB67CA879A", +"9 c #2F1C6B888C07", +"0 c #2DF175349ABB", +"q c #348968258401", +"w c #32B96E2E8E29", +"e c #39E47AAF9CD3", +"r c #4FF675EE8A6F", +"t c #502779EB9088", +"y c #502F7A3990FA", +"u c #65C47ECF8C0C", +"i c #6E487F9D88CD", +"p c #72D3800F873E", +"a c #108080CFBBC7", +"s c #2598838DB523", +"d c #57C781DC9893", +"f c #57CE81FA98CC", +"g c #5BBA80B49439", +"h c #5B9284F59B6B", +"j c #4ADC8C5EAFB8", +"k c #44E68F61B7E9", +"l c #4238922EBC42", +"z c #536A8C9EAB7A", +"x c #59E9895DA2FF", +"c c #59368F8CACD6", +"v c #52DB9191B37B", +"b c #511396CDBCBF", +"n c #661981A0903C", +"m c #640F8A749F3A", +"M c #6AE288009783", +"N c #6BD9898C9958", +"B c #78608D169801", +"V c #7BD08FE89A8C", +"C c #7E2992ED9DF4", +"Z c #6A0E8FFCA424", +"A c #67569352AB01", +"S c #6BF492F2A7F4", +"D c #74DF9316A33E", +"F c #7C51974DA5BE", +"G c #7ED79AD6A9AC", +"H c #7FFB9FF9B13E", +"J c #4F1F9BCEC542", +"K c #54D59F6BC7AA", +"L c #6264A477C75A", +"P c #62B3ABE1D27B", +"I c #7853AF66CC76", +"U c #816895259FA8", +"Y c #8D93976F9CF7", +"T c #8A3D98B9A077", +"R c #85BC9BE7A7D7", +"E c #82F79DAEAC35", +"W c #8BF69E05A7D8", +"Q c #8C069F78A9E1", +"! c #91A09C60A23B", +"~ c #8EF9A31AADAF", +"^ c #84F6A213B1CF", +"/ c #8E61A84AB617", +"( c #88D6AB50BD96", +") c #9562A30CAA87", +"_ c #9EA2A871ADF8", +"` c #9FF9A966AEA7", +"' c #94ECA827B245", +"] c #974AAA2FB40E", +"[ c #96EEAE5DBADF", +"{ c #9D23AAC4B227", +"} c #9DE0B130BB6E", +"| c #A150A586A81F", +" . c #A229A817ABAD", +".. c #A492AA51ADD7", +"X. c #A33CAD55B2E1", +"o. c #A6BFB3D4BAD3", +"O. c #AB67B1DAB56B", +"+. c #AC4EB6ACBC49", +"@. c #B391BB15BF57", +"#. c #BA39BE37C071", +"$. c #834DBC15DA10", +"%. c #AF0CBCC4C429", +"&. c #B549BDB4C24E", +"*. c #B988C064C419", +"=. c #B7F4C2D6C8A5", +"-. c #BFC1C595C8C4", +";. c #BED9C7C6CC94", +":. c #C06CD4B7DF9A", +">. c #BCFBD5EDE356", +",. c #BC9FDB03EB09", +"<. c #C2B1C52AC6BD", +"1. c #C1F9C6ABC934", +"2. c #C7A7CB4DCD71", +"3. c #CCF4CDE3CEAD", +"4. c #C568CE82D373", +"5. c #C4F1D554DE16", +"6. c #CD69D25CD522", +"7. c #CB6DD60CDBCC", +"8. c #D582D693D77A", +"9. c #D89ED89AD921", +"0. c #D77AD948DA67", +"q. c #DC43DD4ADE07", +"w. c #C282D667E0FB", +"e. c #D5B3DFEDE56A", +"r. c #CF2FE41FEF10", +"t. c #D190E603F0AF", +"y. c #DF33E38BE600", +"u. c #DA32E4DAEA53", +"i. c #DDB0E9E8F066", +"p. c #D43CE848F2FB", +"a. c #D85EEA77F3FB", +"s. c #DCEBEBECF3BB", +"d. c #E5BAE5C4E5FA", +"f. c #E5C7EAD9EDB0", +"g. c #ECBAED9DEE40", +"h. c #E511EECAF447", +"j. c #ED4EF03AF211", +"k. c #ED61F2C1F5EE", +"l. c #ED5BF579F9CD", +"z. c #F3BDF4FCF604", +"x. c #F5C2F810F986", +"c. c #F7EEF9D8FAF4", +"v. c #F9B0F7FCF723", +"b. c #FE77FE8FFE9D", +/* pixels */ +"b.b.b.b.b.b.b.b.z.9.3.8.d.x.8.8.8.8.0.q.g.b.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.e.X. .....| @. .Y . . . . .2.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.g.X.+.&.@.@.@. .X. .+.@.@.@.@.! q.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.6.{ +.o.X.o.o.o.T .] o.o.+.+.T *.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.&.~ ' B U ' ] V @.! n n ~ ' C X.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.[ F G n @.%.D F M +.v.d.=.V G M .b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.H f h r 1.f.m h t ` b.b.7.d h t ) b.b.b.b.b.b.b.b.", +"b.b.b.b.b.c.A 9 w q 1.x.x w 8 Q b.b.5.w w 8 W b.b.b.b.b.b.b.b.", +"b.b.b.b.b.c.c $ $ % -.c.z $ X F b.b.5.% $ $ R b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.v O # % -.b.j O O D v.b.>.& # o R v.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b = = * -.c.k + + S v.b.>.; @ + E b.b.b.b.b.b.b.b.", +"b.b.b.b.b.c.K , : 4 ;.b.J - - z z.b.,., : ; ^ b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.P 3 1 5 ;.b.$.1 < s y.b.,.3 < > / b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.I 1 1 6 ;.b.s.l , , L k.,.3 1 > } b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.w.a 1 6 ;.b.b.y.[ S S 4.,.3 < 4 =.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.I 2 6 ;.b.b.b.b.v.z.c.,.3 > g d.b.b.b.b.b.b.b.b.", +"b.b.b.v.v.x.x.f.( e @.x.z.j.j.j.j.z.>.0 n 3.v.v.v.c.v.b.b.b.b.", +"x.v.j.g.g.g.d.d.6.o.<.q.9.9.9.8.9.9.8.X.*.9.d.g.g.j.j.x.c.c.b.", +"c.c.v.x.z.j.g.u.>.5.q.d.d.d.d.q.q.d.y.5.>.7.d.k.z.z.v.c.c.b.b.", +"b.b.b.b.b.b.x.r.t.t.g.b.v.j.h.u.u.k.x.r.r.r.g.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.l.p.t.t.z.b.c.s.p.p.h.b.c.a.p.p.j.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.l.a.a.s.z.b.l.a.a.s.c.b.c.s.a.a.h.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.k.a.s.s.x.b.k.s.s.h.b.b.b.s.s.s.k.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.k.h.h.h.x.b.k.s.h.k.b.b.c.h.h.h.k.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.z.h.h.h.c.b.z.h.h.k.b.b.c.k.h.h.z.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.z.l.k.k.c.b.z.k.k.z.b.b.b.k.k.k.z.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.c.z.z.z.c.b.x.l.z.x.b.b.c.z.z.l.c.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.c.c.c.c.v.b.c.c.c.c.b.b.b.c.c.x.c.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.c.c.c.b.c.c.c.c.c.b.b.b.c.c.c.c.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.b.b.c.c.b.b.b.b.c.b.c.b.c.b.b.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.", +"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b." +}; diff --git a/debian/nm-vpn-properties.desktop b/debian/nm-vpn-properties.desktop new file mode 100644 index 00000000..18647fc9 --- /dev/null +++ b/debian/nm-vpn-properties.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=NetworkManager VPN Manager +Name[it]=Gestore di VPN +Exec=nm-vpn-properties +Icon=nm-logo.xpm +Terminal=false +Type=Application +Categories=Application;System;Settings; diff --git a/debian/rules b/debian/rules index eec349aa..e860e29a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,11 +28,7 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d - install -m 644 debian/network-manager.dbus-conf \ - debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf - -binary-install/network-manager-gnome:: - install -m 644 debian/nm-applet.conf \ - debian/network-manager/etc/dbus-1/system.d/nm-applet.conf +binary-install/network-manger-gnome:: + install -m 644 debian/nm-logo.xpm \ + debian/network-manager-gnome/usr/share/pixmaps -- cgit 1.3.0-6-gf8a5 From 0ef63b77db31f41895c4335e4c54d6684d7aa1ac Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Feb 2006 20:16:17 +0000 Subject: - removed debian/network-manager.dbus-conf debian/nm-applet.conf git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@575 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/network-manager.dbus-conf | 24 ------------------------ debian/nm-applet.conf | 24 ------------------------ debian/patches/dbus_access_network_manager.patch | 11 +++++++++++ debian/patches/dbus_access_nm_applet.patch | 11 +++++++++++ 5 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 debian/network-manager.dbus-conf delete mode 100644 debian/nm-applet.conf create mode 100644 debian/patches/dbus_access_network_manager.patch create mode 100644 debian/patches/dbus_access_nm_applet.patch diff --git a/debian/changelog b/debian/changelog index f1e3703c..f3a58002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ network-manager (0.5.1-2) unstable; urgency=low * added dbus_access_network_manager and dbus_access_nm_applet patches: - switched to group netdev - updated the dep on dhcdbd + - removed debian/network-manager.dbus-conf debian/nm-applet.conf * removed network-manager.doc as it was empty. * uploaded to unstable. diff --git a/debian/network-manager.dbus-conf b/debian/network-manager.dbus-conf deleted file mode 100644 index bdf362ff..00000000 --- a/debian/network-manager.dbus-conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/nm-applet.conf b/debian/nm-applet.conf deleted file mode 100644 index 69bc7aee..00000000 --- a/debian/nm-applet.conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch new file mode 100644 index 00000000..06886be3 --- /dev/null +++ b/debian/patches/dbus_access_network_manager.patch @@ -0,0 +1,11 @@ +--- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 ++++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch new file mode 100644 index 00000000..94053ea2 --- /dev/null +++ b/debian/patches/dbus_access_nm_applet.patch @@ -0,0 +1,11 @@ +--- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 ++++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + -- cgit 1.3.0-6-gf8a5 From fc515aae591e54242e81e019690b2745785e88c6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 17 Feb 2006 21:06:05 +0000 Subject: dep on the latest dhcdbd and now we install .conf files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@605 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/network-manager.install b/debian/network-manager.install index b0c7b38b..d2cbee63 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,2 +1,3 @@ debian/tmp/usr/bin/NetworkManager usr/sbin/ debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ +debian/tmp/etc/dbus-1/system.d/* -- cgit 1.3.0-6-gf8a5 From 72f8e32d346062dc259ba238817d362e5635d052 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 18 Feb 2006 13:22:46 +0000 Subject: added by default -lm flag git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@609 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index e860e29a..93930f8d 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-z,defs -Wl,-O1" + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --without-named \ -- cgit 1.3.0-6-gf8a5 From d7759dd3f052a151b3a2e3d85a430e331068e031 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 18 Feb 2006 13:25:24 +0000 Subject: really added -lm flag git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@610 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 93930f8d..09657a86 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-z,defs -Wl,-O1" +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ -- cgit 1.3.0-6-gf8a5 From 659f9d07446c3e80cd438bfe8653cf1789063267 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 26 Feb 2006 20:56:30 +0000 Subject: improved the copyright file of nm git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@662 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/copyright | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/debian/copyright b/debian/copyright index 099ed1c0..2cc573e8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,101 @@ This package was debianized by Thom May on Sun, 3 Oct 2004 11:54:56 +0100. -It was downloaded from ftp.gnome.org +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager -Upstream Author: Dan Williams +src/autoip.c, src/autoip.h are copyright of Arthur van Hoff (avh@strangeberry.com) +and are released under the terms of the GNU Lesser General Public -Copyright: +License: -This package is licensed under the GPL. For a description of the GPL, -see /usr/share/common-licenses/GPL on your Debian system. + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +src/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb. +This code is in the public domain; do with it what you wish. + +gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of +Anders Carlsson and are released under the terms of +the GNU Lesser General Public. (see above). + +src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, and +Novell, Inc. and it's released under the terms of the GNU General Public License. +(see below). + +src/nm-netlink-monitor.h is copyright of Ray Strode and it's released under the terms of the +GNU General Public License. (see below) + +src/backends/interface_parser.c, is copyright of Tom Parker +and it's released under the terms of the GNU General Public License. (see below). + +src/backends/NetworkManagerDebian.c is copyright of Matthew Garrett +and it's released under the terms of the GNU General Public License. (see below) + +src/backends/NetworkManagerGentoo.c is copyright of Dan Williams , +Dan Willemsen , Robert Paskowitz and it's released under the terms +of the GNU General Public License. (see below). + +src/backends/NetworkManagerSlackware.c, is copyright of +Narayan Newton and it's released under the terms of +the GNU General Public License. (see below). + +src/backends/NetworkManagerSuSE.c, is copyright of Dan Williams , +Kay Sievers , Robert Love and it's released +under the terms of the GNU General Public License. (see below). + +src/backends/shvar.c, shvar.h, are copyright of Red Hat Inc and are released under the terms +of the GNU General Public License. (see below). + +src/named-manager/nm-named-manager.c, nm-named-manager.h, are copyright of +Colin Walters and are released under the terms +of the GNU General Public License. (see below). + +utils/nm-utils.c, nm-utils.h are copyright of Ray Strode and +are released under the terms of the GNU General Public License. (see below). + +initscript/Debian/NetworkManager is copyright of , +Mark Roach , Thom May + +gnome/applet/menu-info.c, menu-info.h are copyright of +Jonathan Blandford and are released under the term of +the GNU General Public License. (see below). + +gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of +David Zeuthen, and are licensed to you +under your choice of the Academic Free License version 2.0, or the +GNU General Public License version 2. (see below) + +The rest of the source (what it's not mentioned here) +is copyright of Dan Williams and it's released under +the terms of the GNU General Public License. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. -- cgit 1.3.0-6-gf8a5 From 1720003c86221c60ad00ee3657100c365baf9adf Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 26 Feb 2006 21:03:32 +0000 Subject: * improved debian/copyright . I hope this time it will be good enough to pass the ftp-master check. Thanks to Joerg Jaspert who has pointed me to the problem. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@663 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index f3a58002..bc352781 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.5.1-3) unstable; urgency=low + + * improved debian/copyright . I hope this time it will be + good enough to pass the ftp-master check. Thanks to Joerg Jaspert who + has pointed me to the problem. + + -- Riccardo Setti Sun, 26 Feb 2006 21:57:29 +0100 + network-manager (0.5.1-2) unstable; urgency=low * improved manpages. -- cgit 1.3.0-6-gf8a5 From 9ffe88ccb8fea3213f90fb530b2e955645c78e6f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 27 Feb 2006 21:54:08 +0000 Subject: nm deps on dhcdbd -1 and not -2 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@671 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ec8fa06d..d88aed84 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-2), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-1), lsb-base (>= 2.0-6) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5 From 335f7e7902d01bea249e95b8fe6e7b4105491da4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 27 Feb 2006 21:59:39 +0000 Subject: nm deps on dhcdbd 1.12-1 and not on 1.10-1 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@673 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d88aed84..191f713b 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-1), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5 From a138a696dc7a66feabed8f796ecc4b333cd0262e Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 27 Feb 2006 22:41:17 +0000 Subject: nm deps on debhelper >= 5 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@677 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 191f713b..c45529cc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From cf23b879dff37054f6b1404eb1d902da765bc765 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:07:31 +0000 Subject: first debian release of NM 0.6 (taken from the experimental branch) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@710 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/compat | 2 +- debian/control | 32 +++++++++++++++++++++++++++- debian/dirs | 2 -- debian/network-manager-dev.install | 1 + debian/network-manager-dispatcher.dbus-event | 7 +++--- debian/network-manager-gnome.dirs | 1 - debian/network-manager-gnome.install | 3 ++- debian/network-manager.dbus-event | 22 ++++--------------- debian/network-manager.dirs | 3 +-- debian/network-manager.install | 6 +++--- debian/rules | 1 + 11 files changed, 47 insertions(+), 33 deletions(-) delete mode 100644 debian/dirs diff --git a/debian/compat b/debian/compat index b8626c4c..7ed6ff82 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index c45529cc..85f29f25 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -69,3 +69,33 @@ Description: network management framework daemon (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. + +Package: libnm-util0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: network management framework (shared library) + NetworkManager attempts to keep an active network connection available at all + times. It is intended only for the desktop use-case, and is not intended for + usage on servers. The point of NetworkManager is to make networking + configuration and setup as painless and automatic as possible. If using DHCP, + NetworkManager is _intended_ to replace default routes, obtain IP addresses + from a DHCP server, and change nameservers whenever it sees fit. + . + This package contains a convenience library to ease the access to + NetworkManager. + +Package: libnm-util-dev +Section: libdevel +Architecture: any +Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Description: network management framework (development files) + NetworkManager attempts to keep an active network connection available at all + times. It is intended only for the desktop use-case, and is not intended for + usage on servers. The point of NetworkManager is to make networking + configuration and setup as painless and automatic as possible. If using DHCP, + NetworkManager is _intended_ to replace default routes, obtain IP addresses + from a DHCP server, and change nameservers whenever it sees fit. + . + This package contains header and development files. + diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bbb..00000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install index 9287a6f6..97a00409 100644 --- a/debian/network-manager-dev.install +++ b/debian/network-manager-dev.install @@ -1,3 +1,4 @@ debian/tmp/usr/lib/pkgconfig/NetworkManager.pc debian/tmp/usr/include/NetworkManager/NetworkManager.h +debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h debian/tmp/usr/include/NetworkManager/nm-vpn-ui-interface.h diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index e8c216f2..70747683 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -42,10 +42,9 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index 92c4831a..e628b1eb 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1,2 +1 @@ etc/dbus-1/system.d/ -usr/share/pixmaps diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index c7b30983..dfa048ea 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -2,5 +2,6 @@ debian/tmp/usr/bin/nm-vpn-properties debian/tmp/usr/bin/nm-applet debian/tmp/usr/share/locale/* debian/tmp/usr/share/nm-applet/* -debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties +debian/tmp/etc/dbus-1/system.d/nm-applet.conf diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index f18ea28e..d26d18f4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager PIDFILE=$PIDDIR/$NAME.pid -NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named SCRIPTNAME=/etc/dbus-1/event.d/25$NAME USER=root @@ -54,12 +53,9 @@ d_start() { chmod 755 /var/lib/NetworkManager start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS - RETVAL=$? - log_end_msg $RETVAL - [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE - - + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + + log_end_msg $? } # @@ -69,18 +65,8 @@ d_stop() { log_begin_msg "Stopping $DESC" start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON + log_end_msg $? - - # if NetworkManager does not want to die, apply some more force - if [ -e $PIDFILE ]; then - kill -9 $(cat $PIDFILE) || true - rm -f $PIDFILE - fi - if [ -e $NAMED_PIDFILE ]; then - kill -9 $(cat $NAMED_PIDFILE) || true - rm -f $NAMED_PIDFILE - fi - } diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 86847abc..19c18e1e 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,5 +1,4 @@ etc/dbus-1/event.d etc/dbus-1/system.d -usr/bin -usr/share/locale +etc/NetworkManager/dispatcher.d var/lib/NetworkManager diff --git a/debian/network-manager.install b/debian/network-manager.install index d2cbee63..0f9b1179 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,3 +1,3 @@ -debian/tmp/usr/bin/NetworkManager usr/sbin/ -debian/tmp/usr/bin/NetworkManagerDispatcher usr/sbin/ -debian/tmp/etc/dbus-1/system.d/* +debian/tmp/usr/sbin/NetworkManager +debian/tmp/usr/sbin/NetworkManagerDispatcher +debian/tmp/etc/dbus-1/system.d/NetworkManager.conf diff --git a/debian/rules b/debian/rules index 09657a86..6c5a5ce9 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --without-named \ + --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 From d6d9212e009400e0160d2c0ceb3a620e53804a26 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:18:05 +0000 Subject: updated changelog and some build deps git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@711 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 12 ++++++++++++ debian/control | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bc352781..89fb3357 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +network-manager (0.6.0-1) unstable; urgency=low + + * New upstream release. + - most of the work is taken from the experimental branch of NM. + Thanks goes to Michael Biebl. + * switched to debhelper5. + * added libnl-util0, libnl-util-dev packages. + - added debian/libnl-util0.install , debian/libnl-util-dev.install + * removed debian/dirs as it was useless. + + -- Riccardo Setti Sat, 4 Mar 2006 20:48:58 +0100 + network-manager (0.5.1-3) unstable; urgency=low * improved debian/copyright . I hope this time it will be diff --git a/debian/control b/debian/control index 85f29f25..939b5dd2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev, docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-devi (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 71890c14a8bacfaf817264e5f7845354014a7351 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:20:20 +0000 Subject: removed useless patches git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@712 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/libnm-util-dev.install | 12 +++++++++ debian/libnm-util0.install | 1 + debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch | 11 -------- debian/patches/01_NMDevice.c.patch | 23 ----------------- debian/patches/02_nm-netlink-monitor.patch | 11 -------- debian/patches/if_fix.patch | 33 ++++++++++++++++++++++++ debian/patches/timeout.patch | 11 ++++++++ 7 files changed, 57 insertions(+), 45 deletions(-) create mode 100644 debian/libnm-util-dev.install create mode 100644 debian/libnm-util0.install delete mode 100644 debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch delete mode 100644 debian/patches/01_NMDevice.c.patch delete mode 100644 debian/patches/02_nm-netlink-monitor.patch create mode 100644 debian/patches/if_fix.patch create mode 100644 debian/patches/timeout.patch diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install new file mode 100644 index 00000000..c6b4a027 --- /dev/null +++ b/debian/libnm-util-dev.install @@ -0,0 +1,12 @@ +debian/tmp/usr/lib/pkgconfig/libnm-util.pc +debian/tmp/usr/lib/libnm-util.a +debian/tmp/usr/lib/libnm-util.la +debian/tmp/usr/lib/libnm-util.so +debian/tmp/usr/include/NetworkManager/cipher.h +debian/tmp/usr/include/NetworkManager/cipher-wep-hex.h +debian/tmp/usr/include/NetworkManager/cipher-wep-passphrase.h +debian/tmp/usr/include/NetworkManager/cipher-wep-ascii.h +debian/tmp/usr/include/NetworkManager/cipher-wpa-psk-hex.h +debian/tmp/usr/include/NetworkManager/cipher-wpa-psk-passphrase.h +debian/tmp/usr/include/NetworkManager/dbus-helpers.h +debian/tmp/usr/include/NetworkManager/dbus-method-dispatcher.h diff --git a/debian/libnm-util0.install b/debian/libnm-util0.install new file mode 100644 index 00000000..051d4901 --- /dev/null +++ b/debian/libnm-util0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnm-util.so.* diff --git a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch deleted file mode 100644 index 9b6b3aad..00000000 --- a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/applet-dbus.c.old 2005-12-21 14:19:38.000000000 +0100 -+++ gnome/applet/applet-dbus.c 2005-12-21 14:20:12.000000000 +0100 -@@ -388,7 +388,7 @@ - } - - dbus_error_init (&error); -- acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error); -+ acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &error); - if (dbus_error_is_set (&error)) - { - nm_warning ("nmwa_dbus_init() could not acquire its service. dbus_bus_acquire_service() says: '%s'", error.message); diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch deleted file mode 100644 index a776d3ec..00000000 --- a/debian/patches/01_NMDevice.c.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- NetworkManagerDevice.c 2005-10-19 16:19:53.000000000 +0200 -+++ src/NetworkManagerDevice.c 2006-01-11 12:14:53.000000000 +0100 -@@ -4283,7 +4283,7 @@ - - strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); - edata.cmd = ETHTOOL_GLINK; -- ifr.ifr_data = (char *) &edata; -+ ifr.ifr_data = (void __user *) &edata; - #ifdef IOCTL_DEBUG - nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev)); - #endif -@@ -4305,8 +4305,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ --#include -- -+#define _LINUX_IF_H -+ #include -+#undef _LINUX_IF_ - static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location) - { - struct mii_ioctl_data *mii; diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch deleted file mode 100644 index 4389059d..00000000 --- a/debian/patches/02_nm-netlink-monitor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nm-netlink-monitor.c 2005-08-12 21:06:09.000000000 +0200 -+++ src/nm-netlink-monitor.c 2006-01-11 12:18:52.000000000 +0100 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch new file mode 100644 index 00000000..379e9b38 --- /dev/null +++ b/debian/patches/if_fix.patch @@ -0,0 +1,33 @@ +Index: src/nm-device-802-3-ethernet.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.3 +diff -u -r1.3 nm-device-802-3-ethernet.c +--- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 ++++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 +@@ -328,7 +328,9 @@ + /**************************************/ + /* MII capability detection */ + /**************************************/ ++#define _LINUX_IF_H + #include ++#undef _LINUX_IF_H + + static int + mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) +Index: src/nm-netlink-monitor.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v +retrieving revision 1.17 +diff -u -r1.17 nm-netlink-monitor.c +--- src/nm-netlink-monitor.c 12 Aug 2005 19:06:09 -0000 1.17 ++++ src/nm-netlink-monitor.c 4 Jan 2006 17:13:33 -0000 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/timeout.patch @@ -0,0 +1,11 @@ +--- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 ++++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 +@@ -2205,7 +2205,7 @@ + } + + +-#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ ++#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ + + static unsigned int + get_supplicant_timeout (NMDevice80211Wireless *self) -- cgit 1.3.0-6-gf8a5 From d7f3580e90b2835376d3bb3ba5dd941a1c0a6f1a Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 20:22:53 +0000 Subject: removed a typo in debian/control git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@713 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 939b5dd2..246e1ec3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-devi (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 2f1a307248f079badf3f68b2c0770a94ccafdfc2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 21:38:14 +0000 Subject: installed nm-vpn-properties.desktop git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@721 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 1 + debian/network-manager-gnome.dirs | 1 + debian/rules | 2 ++ 3 files changed, 4 insertions(+) diff --git a/debian/control b/debian/control index 246e1ec3..e38fc7a5 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant +Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index e628b1eb..ccc07a87 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1 +1,2 @@ etc/dbus-1/system.d/ +usr/share/applications/ diff --git a/debian/rules b/debian/rules index 6c5a5ce9..17ec095f 100755 --- a/debian/rules +++ b/debian/rules @@ -35,3 +35,5 @@ binary-install/network-manager:: binary-install/network-manger-gnome:: install -m 644 debian/nm-logo.xpm \ debian/network-manager-gnome/usr/share/pixmaps + install -m 644 debian/nm-vpn-properties.desktop + debian/network-manager-gnome/usr/share/applications -- cgit 1.3.0-6-gf8a5 From 79ca1e2e63391e2a9657167f5d66517b06e8de3f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 21:48:28 +0000 Subject: improved .postinst file git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@722 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 849dec1c..5b2fb40f 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -3,16 +3,11 @@ set -e case "$1" in configure) - if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then - mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled - fi - if [ -x /usr/bin/dbus-send ]; then - /usr/bin/dbus-send --system --type=method_call \ - --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From a7f7a3ada1f631ac0947c75a37196a97d1855c2c Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 22:01:58 +0000 Subject: really install desktop+xpm files git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@723 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 17ec095f..4425220c 100755 --- a/debian/rules +++ b/debian/rules @@ -32,8 +32,9 @@ binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher -binary-install/network-manger-gnome:: +binary-install/network-manager-gnome:: install -m 644 debian/nm-logo.xpm \ - debian/network-manager-gnome/usr/share/pixmaps - install -m 644 debian/nm-vpn-properties.desktop - debian/network-manager-gnome/usr/share/applications + debian/network-manager-gnome/usr/share/pixmaps/nm-logo.xpm + install -m 644 debian/nm-vpn-properties.desktop \ + debian/network-manager-gnome/usr/share/applications/nm-vpn-properties.desktop + -- cgit 1.3.0-6-gf8a5 From 54ad5606353a0afa2c98e1d0c0f30580e365fa8d Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 22:02:53 +0000 Subject: n-m-g.dirs should create usr/share/pixmaps/ git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@724 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-gnome.dirs | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs index ccc07a87..ab3de1b3 100644 --- a/debian/network-manager-gnome.dirs +++ b/debian/network-manager-gnome.dirs @@ -1,2 +1,3 @@ etc/dbus-1/system.d/ +usr/share/pixmaps/ usr/share/applications/ -- cgit 1.3.0-6-gf8a5 From 3f267ef00a8daaab6b966484a592032d5671d25d Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 5 Mar 2006 12:35:00 +0000 Subject: wpasupplicant should be versioned git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@725 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e38fc7a5..b56bbc5a 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) +Recommends: wpasupplicant (>= 0.4.8) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From c310525c658f899c47520f8aa5d2c9cb49cd53b7 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 5 Mar 2006 15:06:46 +0000 Subject: switched to the latest wpa_supplicat git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@727 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b56bbc5a..b89b2973 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) -Recommends: wpasupplicant (>= 0.4.8) +Recommends: wpasupplicant (>= 0.5.1) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From e0225a101acf158a95bc2ac9a41ed73a896ee23f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 6 Mar 2006 11:27:34 +0000 Subject: added NMDebian.patch which add the support for resolvconf git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@736 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- debian/patches/NetworkManagerDebian.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 debian/patches/NetworkManagerDebian.patch diff --git a/debian/changelog b/debian/changelog index 89fb3357..155d6f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,13 @@ network-manager (0.6.0-1) unstable; urgency=low * New upstream release. - most of the work is taken from the experimental branch of NM. Thanks goes to Michael Biebl. + - Added NetworkManagerDebian.patch which...(closes: ) * switched to debhelper5. * added libnl-util0, libnl-util-dev packages. - added debian/libnl-util0.install , debian/libnl-util-dev.install * removed debian/dirs as it was useless. - - -- Riccardo Setti Sat, 4 Mar 2006 20:48:58 +0100 + + -- Riccardo Setti Mon, 6 Mar 2006 12:23:23 +0100 network-manager (0.5.1-3) unstable; urgency=low diff --git a/debian/patches/NetworkManagerDebian.patch b/debian/patches/NetworkManagerDebian.patch new file mode 100644 index 00000000..8e55c8fa --- /dev/null +++ b/debian/patches/NetworkManagerDebian.patch @@ -0,0 +1,20 @@ +--- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 ++++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 +@@ -37,6 +37,7 @@ + #include "nm-utils.h" + + #define ARPING "/usr/sbin/arping" ++#define RESOLVCONF "resolvconf" + + /* + * nm_system_init +@@ -679,5 +680,8 @@ + */ + gboolean nm_system_should_modify_resolv_conf (void) + { +- return TRUE; ++ if (g_find_program_in_path(RESOLVCONF) != NULL) ++ return FALSE; ++ else ++ return TRUE; + } -- cgit 1.3.0-6-gf8a5 From b751f5821a594667e333c0d984e985625e671676 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 6 Mar 2006 12:43:20 +0000 Subject: NM and NMDispatcher must be restarted in .postinst git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@737 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 5b2fb40f..c24034b5 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -6,7 +6,10 @@ case "$1" in if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true fi - + + /etc/dbus-1/event.d/25NetworkManager restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + ;; esac -- cgit 1.3.0-6-gf8a5 From 912f26326946676b99051279bfdcc5e9a48bcad8 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Mar 2006 16:53:01 +0000 Subject: - Added NetworkManagerDebian.patch which introduce supports for resolvconf * added a Dep on wpasupplicant as it's necessary for all encrypted connections. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@742 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/control | 3 +-- debian/network-manager.postinst | 10 +++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 155d6f1d..b8daf888 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,13 +3,15 @@ network-manager (0.6.0-1) unstable; urgency=low * New upstream release. - most of the work is taken from the experimental branch of NM. Thanks goes to Michael Biebl. - - Added NetworkManagerDebian.patch which...(closes: ) + - Added NetworkManagerDebian.patch which introduce supports for resolvconf * switched to debhelper5. * added libnl-util0, libnl-util-dev packages. - added debian/libnl-util0.install , debian/libnl-util-dev.install * removed debian/dirs as it was useless. + * added a Dep on wpasupplicant as it's necessary for all encrypted + connections. - -- Riccardo Setti Mon, 6 Mar 2006 12:23:23 +0100 + -- Riccardo Setti Thu, 9 Mar 2006 15:38:01 +0100 network-manager (0.5.1-3) unstable; urgency=low diff --git a/debian/control b/debian/control index b89b2973..e8603e99 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6) -Recommends: wpasupplicant (>= 0.5.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.5.1) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c24034b5..ac127e03 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -7,9 +7,13 @@ case "$1" in invoke-rc.d dbus force-reload || true fi - /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager restart + fi + + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + fi ;; esac -- cgit 1.3.0-6-gf8a5 From 96f4bb63e1aea9d7428205b05a0cd007ce01ca79 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Mar 2006 16:50:45 +0000 Subject: * New upstream release. * Added myself to uploaders. * Reformatted changelog, always indent - bullet points. * Added dependency on dbus (>= 0.60) * Fixed a small typo in network-manager.postinst * Downgraded dependency of wpasupplicant to 0.4.8. Given that the wpasupplicant includes my patch, this should be enough. If not, we will raise this dependency to 0.5.1 again. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@745 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 40 ++++++++++++++++++++++++---------------- debian/control | 13 +++++++------ debian/network-manager.postinst | 4 ++-- debian/rules | 3 --- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8daf888..eef4d367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,37 +1,45 @@ +network-manager (0.6.1-1) unstable; urgency=low + + * New upstream release. + * Added myself to uploaders. + * Added a dependency on dbus. + + -- Michael Biebl Tue, 14 Mar 2006 15:48:41 +0100 + network-manager (0.6.0-1) unstable; urgency=low * New upstream release. - - most of the work is taken from the experimental branch of NM. - Thanks goes to Michael Biebl. - - Added NetworkManagerDebian.patch which introduce supports for resolvconf + - most of the work is taken from the experimental branch of NM. + Thanks goes to Michael Biebl. + - Added NetworkManagerDebian.patch which introduce supports for resolvconf * switched to debhelper5. * added libnl-util0, libnl-util-dev packages. - - added debian/libnl-util0.install , debian/libnl-util-dev.install + - added debian/libnl-util0.install , debian/libnl-util-dev.install * removed debian/dirs as it was useless. - * added a Dep on wpasupplicant as it's necessary for all encrypted - connections. + * added a dependency on wpasupplicant as it's necessary for all encrypted + connections. -- Riccardo Setti Thu, 9 Mar 2006 15:38:01 +0100 network-manager (0.5.1-3) unstable; urgency=low * improved debian/copyright . I hope this time it will be - good enough to pass the ftp-master check. Thanks to Joerg Jaspert who - has pointed me to the problem. + good enough to pass the ftp-master check. Thanks to Joerg Jaspert who + has pointed me to the problem. -- Riccardo Setti Sun, 26 Feb 2006 21:57:29 +0100 network-manager (0.5.1-2) unstable; urgency=low * improved manpages. - - added nm-vpn-properties, nm-applet manpages - - added debian/network-manager-gnome.manpages - - modifyed NetworManager*.sgml for reflect the correct website. + - added nm-vpn-properties, nm-applet manpages + - added debian/network-manager-gnome.manpages + - modifyed NetworManager*.sgml for reflect the correct website. * added nm-vpn-properties.desktop, nm-logo.xpm * added dbus_access_network_manager and dbus_access_nm_applet patches: - - switched to group netdev - - updated the dep on dhcdbd - - removed debian/network-manager.dbus-conf debian/nm-applet.conf + - switched to group netdev + - updated the dep on dhcdbd + - removed debian/network-manager.dbus-conf debian/nm-applet.conf * removed network-manager.doc as it was empty. * uploaded to unstable. @@ -40,12 +48,12 @@ network-manager (0.5.1-2) unstable; urgency=low network-manager (0.5.1-1) experimental; urgency=low * renamed 25NetworkManagerDispatcher in 26NetworkManagerDispatcher because - first we need to start NetworkManager and then NetworkManagerDispatcher + first we need to start NetworkManager and then NetworkManagerDispatcher * added networkmanger and networkmanaferdispatcher manpages. * Inital upload to Debian (Closes: #270538) * work based on the ubuntu package * Added 01.patch and 02.patch for fix the problem with recent linux - kernel-headers + kernel-headers -- Riccardo Setti Mon, 5 Jan 2006 17:09:29 +0100 diff --git a/debian/control b/debian/control index e8603e99..97f084d1 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,13 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti +Uploaders: Michael Biebl Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.5.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all @@ -23,7 +24,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager -Description: network management framework daemon +Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for usage on servers. The point of NetworkManager is to make networking @@ -37,7 +38,7 @@ Package: network-manager-dev Architecture: any Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config -Description: network management framework daemon development +Description: network management framework daemon (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. @@ -45,7 +46,7 @@ Package: libnm-glib0 Section: libs Architecture: any Depends: ${shlibs:Depends} -Description: network management framework daemon (GLib shared library) +Description: network management framework (GLib shared library) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for usage on servers. The point of NetworkManager is to make networking @@ -59,8 +60,8 @@ Description: network management framework daemon (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libglib2.0-dev, libnm-glib0 (= ${Source-Version}), libdbus-glib-1-dev (>= 0.60) -Description: network management framework daemon (GLib interface) +Depends: libnm-glib0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Description: network management framework (GLib interface) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for usage on servers. The point of NetworkManager is to make networking diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index ac127e03..9460b596 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -11,10 +11,10 @@ case "$1" in /etc/dbus-1/event.d/25NetworkManager restart fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher restart fi - ;; + ;; esac #DEBHELPER# diff --git a/debian/rules b/debian/rules index 4425220c..c0ba849a 100755 --- a/debian/rules +++ b/debian/rules @@ -8,19 +8,16 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --without-named \ --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian clean:: - rm -f po/*.gmo rm -f debian/*.1 build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 -- cgit 1.3.0-6-gf8a5 From 23ad753bcd5c3f1d7206be0d55816b6a7f76cf60 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:29:12 +0000 Subject: New upstream release. Updated if_fix.patch and removed unnecessary lines. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@764 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/patches/if_fix.patch | 16 ---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index eef4d367..430b45f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.2-1) unstable; urgency=low + + * New upstream release. + * Updated if_fix.patch, parts of it have been fixed upstream. + + -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 + network-manager (0.6.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch index 379e9b38..b5667c53 100644 --- a/debian/patches/if_fix.patch +++ b/debian/patches/if_fix.patch @@ -15,19 +15,3 @@ diff -u -r1.3 nm-device-802-3-ethernet.c static int mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) -Index: src/nm-netlink-monitor.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v -retrieving revision 1.17 -diff -u -r1.17 nm-netlink-monitor.c ---- src/nm-netlink-monitor.c 12 Aug 2005 19:06:09 -0000 1.17 -+++ src/nm-netlink-monitor.c 4 Jan 2006 17:13:33 -0000 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -- cgit 1.3.0-6-gf8a5 From 0ce16ea08527212be9efe0969d7a210b8a4187ac Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:47:52 +0000 Subject: - Lowered dependeny on dhcbd to 1.10. We don't absolutely need 1.12. - Removed vpn-properties desktop and icon file. Without VPN plugins these menu entries are rather useless and misleading. As soon as we have VPN plugins in unstable, we can readd these file, but we should look for a better icon then. The current scales badly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@765 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 1 + debian/control | 2 +- debian/nm-logo.xpm | 182 --------------------------------------- debian/nm-vpn-properties.desktop | 9 -- 4 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 debian/nm-logo.xpm delete mode 100644 debian/nm-vpn-properties.desktop diff --git a/debian/changelog b/debian/changelog index 430b45f5..1a974d5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ network-manager (0.6.2-1) unstable; urgency=low * New upstream release. * Updated if_fix.patch, parts of it have been fixed upstream. + * Lowered dependency on dhcbd to (>= 1.10). We don't necessarily need 1.12. -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 diff --git a/debian/control b/debian/control index 97f084d1..1309b4de 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-1), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all diff --git a/debian/nm-logo.xpm b/debian/nm-logo.xpm deleted file mode 100644 index 20e4f020..00000000 --- a/debian/nm-logo.xpm +++ /dev/null @@ -1,182 +0,0 @@ -/* XPM */ -static char *nm-logo[] = { -/* columns rows colors chars-per-pixel */ -"31 32 144 2", -" c #697677FB7FB8", -". c #15175FC087FE", -"X c #14835FFE88A6", -"o c #09C560CC8FD9", -"O c #0694613C9241", -"+ c #028067169DEF", -"@ c #04906949A025", -"# c #093E62AC9307", -"$ c #153262348BBC", -"% c #1B9F660C8E34", -"& c #1186680C96CE", -"* c #16976A2597A0", -"= c #03E1696AA0B1", -"- c #00C16F4DABB9", -"; c #0C756DE3A2EE", -": c #034B71FBAD4D", -"> c #09437623B01E", -", c #028C76FFB4C0", -"< c #0137795DB8AD", -"1 c #005C79D4B9E5", -"2 c #08FF7AB6B729", -"3 c #09877E53BBAE", -"4 c #15B67262A3D0", -"5 c #136577DAACCF", -"6 c #14907892AD2C", -"7 c #22A0630985BE", -"8 c #2CBB67CA879A", -"9 c #2F1C6B888C07", -"0 c #2DF175349ABB", -"q c #348968258401", -"w c #32B96E2E8E29", -"e c #39E47AAF9CD3", -"r c #4FF675EE8A6F", -"t c #502779EB9088", -"y c #502F7A3990FA", -"u c #65C47ECF8C0C", -"i c #6E487F9D88CD", -"p c #72D3800F873E", -"a c #108080CFBBC7", -"s c #2598838DB523", -"d c #57C781DC9893", -"f c #57CE81FA98CC", -"g c #5BBA80B49439", -"h c #5B9284F59B6B", -"j c #4ADC8C5EAFB8", -"k c #44E68F61B7E9", -"l c #4238922EBC42", -"z c #536A8C9EAB7A", -"x c #59E9895DA2FF", -"c c #59368F8CACD6", -"v c #52DB9191B37B", -"b c #511396CDBCBF", -"n c #661981A0903C", -"m c #640F8A749F3A", -"M c #6AE288009783", -"N c #6BD9898C9958", -"B c #78608D169801", -"V c #7BD08FE89A8C", -"C c #7E2992ED9DF4", -"Z c #6A0E8FFCA424", -"A c #67569352AB01", -"S c #6BF492F2A7F4", -"D c #74DF9316A33E", -"F c #7C51974DA5BE", -"G c #7ED79AD6A9AC", -"H c #7FFB9FF9B13E", -"J c #4F1F9BCEC542", -"K c #54D59F6BC7AA", -"L c #6264A477C75A", -"P c #62B3ABE1D27B", -"I c #7853AF66CC76", -"U c #816895259FA8", -"Y c #8D93976F9CF7", -"T c #8A3D98B9A077", -"R c #85BC9BE7A7D7", -"E c #82F79DAEAC35", -"W c #8BF69E05A7D8", -"Q c #8C069F78A9E1", -"! c #91A09C60A23B", -"~ c #8EF9A31AADAF", -"^ c #84F6A213B1CF", -"/ c #8E61A84AB617", -"( c #88D6AB50BD96", -") c #9562A30CAA87", -"_ c #9EA2A871ADF8", -"` c #9FF9A966AEA7", -"' c #94ECA827B245", -"] c #974AAA2FB40E", -"[ c #96EEAE5DBADF", -"{ c #9D23AAC4B227", -"} c #9DE0B130BB6E", -"| c #A150A586A81F", -" . c #A229A817ABAD", -".. c #A492AA51ADD7", -"X. c #A33CAD55B2E1", -"o. c #A6BFB3D4BAD3", -"O. c #AB67B1DAB56B", -"+. c #AC4EB6ACBC49", -"@. c #B391BB15BF57", -"#. c #BA39BE37C071", -"$. c #834DBC15DA10", -"%. c #AF0CBCC4C429", -"&. c #B549BDB4C24E", -"*. c #B988C064C419", -"=. c #B7F4C2D6C8A5", -"-. c #BFC1C595C8C4", -";. c #BED9C7C6CC94", -":. c #C06CD4B7DF9A", -">. c #BCFBD5EDE356", -",. c #BC9FDB03EB09", -"<. c #C2B1C52AC6BD", -"1. c #C1F9C6ABC934", -"2. c #C7A7CB4DCD71", -"3. c #CCF4CDE3CEAD", -"4. c #C568CE82D373", -"5. c #C4F1D554DE16", -"6. c #CD69D25CD522", -"7. c #CB6DD60CDBCC", -"8. c #D582D693D77A", -"9. c #D89ED89AD921", -"0. c #D77AD948DA67", -"q. c #DC43DD4ADE07", -"w. c #C282D667E0FB", -"e. c #D5B3DFEDE56A", -"r. c #CF2FE41FEF10", -"t. c #D190E603F0AF", -"y. c #DF33E38BE600", -"u. c #DA32E4DAEA53", -"i. c #DDB0E9E8F066", -"p. c #D43CE848F2FB", -"a. c #D85EEA77F3FB", -"s. c #DCEBEBECF3BB", -"d. c #E5BAE5C4E5FA", -"f. c #E5C7EAD9EDB0", -"g. c #ECBAED9DEE40", -"h. c #E511EECAF447", -"j. c #ED4EF03AF211", -"k. c #ED61F2C1F5EE", -"l. c #ED5BF579F9CD", -"z. c #F3BDF4FCF604", -"x. c #F5C2F810F986", -"c. c #F7EEF9D8FAF4", -"v. c #F9B0F7FCF723", -"b. c #FE77FE8FFE9D", -/* pixels */ -"b.b.b.b.b.b.b.b.z.9.3.8.d.x.8.8.8.8.0.q.g.b.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.e.X. .....| @. .Y . . . . .2.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.g.X.+.&.@.@.@. .X. .+.@.@.@.@.! q.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.6.{ +.o.X.o.o.o.T .] o.o.+.+.T *.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.&.~ ' B U ' ] V @.! n n ~ ' C X.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.[ F G n @.%.D F M +.v.d.=.V G M .b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.H f h r 1.f.m h t ` b.b.7.d h t ) b.b.b.b.b.b.b.b.", -"b.b.b.b.b.c.A 9 w q 1.x.x w 8 Q b.b.5.w w 8 W b.b.b.b.b.b.b.b.", -"b.b.b.b.b.c.c $ $ % -.c.z $ X F b.b.5.% $ $ R b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.v O # % -.b.j O O D v.b.>.& # o R v.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b = = * -.c.k + + S v.b.>.; @ + E b.b.b.b.b.b.b.b.", -"b.b.b.b.b.c.K , : 4 ;.b.J - - z z.b.,., : ; ^ b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.P 3 1 5 ;.b.$.1 < s y.b.,.3 < > / b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.I 1 1 6 ;.b.s.l , , L k.,.3 1 > } b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.w.a 1 6 ;.b.b.y.[ S S 4.,.3 < 4 =.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.I 2 6 ;.b.b.b.b.v.z.c.,.3 > g d.b.b.b.b.b.b.b.b.", -"b.b.b.v.v.x.x.f.( e @.x.z.j.j.j.j.z.>.0 n 3.v.v.v.c.v.b.b.b.b.", -"x.v.j.g.g.g.d.d.6.o.<.q.9.9.9.8.9.9.8.X.*.9.d.g.g.j.j.x.c.c.b.", -"c.c.v.x.z.j.g.u.>.5.q.d.d.d.d.q.q.d.y.5.>.7.d.k.z.z.v.c.c.b.b.", -"b.b.b.b.b.b.x.r.t.t.g.b.v.j.h.u.u.k.x.r.r.r.g.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.l.p.t.t.z.b.c.s.p.p.h.b.c.a.p.p.j.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.l.a.a.s.z.b.l.a.a.s.c.b.c.s.a.a.h.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.k.a.s.s.x.b.k.s.s.h.b.b.b.s.s.s.k.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.k.h.h.h.x.b.k.s.h.k.b.b.c.h.h.h.k.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.z.h.h.h.c.b.z.h.h.k.b.b.c.k.h.h.z.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.z.l.k.k.c.b.z.k.k.z.b.b.b.k.k.k.z.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.c.z.z.z.c.b.x.l.z.x.b.b.c.z.z.l.c.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.c.c.c.c.v.b.c.c.c.c.b.b.b.c.c.x.c.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.c.c.c.b.c.c.c.c.c.b.b.b.c.c.c.c.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.b.b.c.c.b.b.b.b.c.b.c.b.c.b.b.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.", -"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b." -}; diff --git a/debian/nm-vpn-properties.desktop b/debian/nm-vpn-properties.desktop deleted file mode 100644 index 18647fc9..00000000 --- a/debian/nm-vpn-properties.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=NetworkManager VPN Manager -Name[it]=Gestore di VPN -Exec=nm-vpn-properties -Icon=nm-logo.xpm -Terminal=false -Type=Application -Categories=Application;System;Settings; -- cgit 1.3.0-6-gf8a5 From c1e970a529ac74c9c31a295e134e2f8d554da783 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Mar 2006 20:58:37 +0000 Subject: Forgot to remove the installation of the icon and desktop file from debian/rules... git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@766 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/rules b/debian/rules index c0ba849a..ee921281 100755 --- a/debian/rules +++ b/debian/rules @@ -29,9 +29,3 @@ binary-install/network-manager:: install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher -binary-install/network-manager-gnome:: - install -m 644 debian/nm-logo.xpm \ - debian/network-manager-gnome/usr/share/pixmaps/nm-logo.xpm - install -m 644 debian/nm-vpn-properties.desktop \ - debian/network-manager-gnome/usr/share/applications/nm-vpn-properties.desktop - -- cgit 1.3.0-6-gf8a5 From 1d1d99bcad79fe607bcf628990cae1ca2947f264 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 28 Mar 2006 13:25:16 +0000 Subject: Update NM 0.6.2 to use the new dhcdbd revision which starts on its own. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@768 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a974d5a..5ff810fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ network-manager (0.6.2-1) unstable; urgency=low * New upstream release. * Updated if_fix.patch, parts of it have been fixed upstream. - * Lowered dependency on dhcbd to (>= 1.10). We don't necessarily need 1.12. + * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself + anymore. -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 diff --git a/debian/control b/debian/control index 1309b4de..8a743162 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From 5e7af6f6f819143869be8728cfeed8a55e535d51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Mar 2006 23:21:51 +0000 Subject: Removed "Suggests: openvpn, pptpd" from network-manager. They don't make that much sense. As soon as we have working VPN plugins, we should add them to Suggests. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@769 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 8a743162..9de165ea 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) -Suggests: openvpn, pptpd Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -38,7 +37,7 @@ Package: network-manager-dev Architecture: any Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config -Description: network management framework daemon (development files) +Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. -- cgit 1.3.0-6-gf8a5 From 573354e6c4a37cb9de06a29eb2ad4d01889c87d6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Apr 2006 12:46:47 +0000 Subject: The wpa_supplicant binary was moved from /usr/sbin to /sbin. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@771 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5ff810fc..61cdf819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ network-manager (0.6.2-1) unstable; urgency=low * Updated if_fix.patch, parts of it have been fixed upstream. * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself anymore. + * The wpa_supplicant binary was moved from /usr/sbin to /sbin. Updated + debian/rules accordingly. -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 diff --git a/debian/rules b/debian/rules index ee921281..d8813abe 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ - --with-wpa_supplicant=/usr/sbin/wpa_supplicant \ + --with-wpa_supplicant=/sbin/wpa_supplicant \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian -- cgit 1.3.0-6-gf8a5 From 15792ef7e8756e253133524a47e255c65cd6e768 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Apr 2006 13:31:41 +0000 Subject: Apply an ordering for the packages and choose better names where applicable. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@775 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01-supplicant_timeout.patch | 11 +++++++++++ debian/patches/02-dbus_access_network_manager.patch | 11 +++++++++++ debian/patches/03-dbus_access_nm_applet.patch | 11 +++++++++++ debian/patches/04-if_fix.patch | 17 +++++++++++++++++ debian/patches/05-resolvconf.patch | 20 ++++++++++++++++++++ debian/patches/NetworkManagerDebian.patch | 20 -------------------- debian/patches/dbus_access_network_manager.patch | 11 ----------- debian/patches/dbus_access_nm_applet.patch | 11 ----------- debian/patches/if_fix.patch | 17 ----------------- debian/patches/timeout.patch | 11 ----------- 10 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 debian/patches/01-supplicant_timeout.patch create mode 100644 debian/patches/02-dbus_access_network_manager.patch create mode 100644 debian/patches/03-dbus_access_nm_applet.patch create mode 100644 debian/patches/04-if_fix.patch create mode 100644 debian/patches/05-resolvconf.patch delete mode 100644 debian/patches/NetworkManagerDebian.patch delete mode 100644 debian/patches/dbus_access_network_manager.patch delete mode 100644 debian/patches/dbus_access_nm_applet.patch delete mode 100644 debian/patches/if_fix.patch delete mode 100644 debian/patches/timeout.patch diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/01-supplicant_timeout.patch @@ -0,0 +1,11 @@ +--- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 ++++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 +@@ -2205,7 +2205,7 @@ + } + + +-#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ ++#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ + + static unsigned int + get_supplicant_timeout (NMDevice80211Wireless *self) diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch new file mode 100644 index 00000000..06886be3 --- /dev/null +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -0,0 +1,11 @@ +--- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 ++++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch new file mode 100644 index 00000000..94053ea2 --- /dev/null +++ b/debian/patches/03-dbus_access_nm_applet.patch @@ -0,0 +1,11 @@ +--- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 ++++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch new file mode 100644 index 00000000..b5667c53 --- /dev/null +++ b/debian/patches/04-if_fix.patch @@ -0,0 +1,17 @@ +Index: src/nm-device-802-3-ethernet.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.3 +diff -u -r1.3 nm-device-802-3-ethernet.c +--- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 ++++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 +@@ -328,7 +328,9 @@ + /**************************************/ + /* MII capability detection */ + /**************************************/ ++#define _LINUX_IF_H + #include ++#undef _LINUX_IF_H + + static int + mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/05-resolvconf.patch b/debian/patches/05-resolvconf.patch new file mode 100644 index 00000000..8e55c8fa --- /dev/null +++ b/debian/patches/05-resolvconf.patch @@ -0,0 +1,20 @@ +--- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 ++++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 +@@ -37,6 +37,7 @@ + #include "nm-utils.h" + + #define ARPING "/usr/sbin/arping" ++#define RESOLVCONF "resolvconf" + + /* + * nm_system_init +@@ -679,5 +680,8 @@ + */ + gboolean nm_system_should_modify_resolv_conf (void) + { +- return TRUE; ++ if (g_find_program_in_path(RESOLVCONF) != NULL) ++ return FALSE; ++ else ++ return TRUE; + } diff --git a/debian/patches/NetworkManagerDebian.patch b/debian/patches/NetworkManagerDebian.patch deleted file mode 100644 index 8e55c8fa..00000000 --- a/debian/patches/NetworkManagerDebian.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 -+++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 -@@ -37,6 +37,7 @@ - #include "nm-utils.h" - - #define ARPING "/usr/sbin/arping" -+#define RESOLVCONF "resolvconf" - - /* - * nm_system_init -@@ -679,5 +680,8 @@ - */ - gboolean nm_system_should_modify_resolv_conf (void) - { -- return TRUE; -+ if (g_find_program_in_path(RESOLVCONF) != NULL) -+ return FALSE; -+ else -+ return TRUE; - } diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch deleted file mode 100644 index 06886be3..00000000 --- a/debian/patches/dbus_access_network_manager.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 -+++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 -@@ -8,7 +8,7 @@ - - - -- -+ - - - diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch deleted file mode 100644 index 94053ea2..00000000 --- a/debian/patches/dbus_access_nm_applet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 -+++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 -@@ -8,7 +8,7 @@ - - - -- -+ - - - diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch deleted file mode 100644 index b5667c53..00000000 --- a/debian/patches/if_fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/nm-device-802-3-ethernet.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.3 -diff -u -r1.3 nm-device-802-3-ethernet.c ---- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 -+++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 -@@ -328,7 +328,9 @@ - /**************************************/ - /* MII capability detection */ - /**************************************/ -+#define _LINUX_IF_H - #include -+#undef _LINUX_IF_H - - static int - mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch deleted file mode 100644 index 0723c83a..00000000 --- a/debian/patches/timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 -+++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 -@@ -2205,7 +2205,7 @@ - } - - --#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ -+#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ - - static unsigned int - get_supplicant_timeout (NMDevice80211Wireless *self) -- cgit 1.3.0-6-gf8a5 From ab79d32b92a7c7c479af685ce345956344a4b5e4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 2 Apr 2006 18:02:09 +0000 Subject: - Close some bugs in the changelog. - Added autostart file for nm-applet. Updated README.Debian correspondingly. - Added dependency on hal to network-manager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@778 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 17 +++++++---------- debian/changelog | 10 +++++++--- debian/control | 4 ++-- debian/network-manager-gnome.install | 1 + 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index a34d88d8..0fad5552 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,11 +1,8 @@ -NetworkManger has two parts one is run on the system level to -manager connections and gather information. The other is an applet -the user can interact with. Since NetworkManager is not part of -main yet, you have to add nm-applet to your session once. +NetworkManger consists of two parts: one is on the system level daemon that +manages the connections and gathers information about new networks. The other +is an applet that users can use to interact with the NetworkManager daemon. -(instructions for gnome only) -First add yourself to the netdev group -Go to System -> Preferences -> Sessions -In the Startup Programs tab, click Add -type "nm-applet", click OK. -log out of your gnome session, and log back in again. +To allow users to connect to the NetworkManager daemon they have to be in the +group "netdev". If you want to add a user to group "netdev" use the command +"adduser username netdev" or one of the graphical user management frontends. +After that you have to reload dbus with the command "/etc/init.d/dbus reload". diff --git a/debian/changelog b/debian/changelog index 61cdf819..454b61aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ network-manager (0.6.2-1) unstable; urgency=low - * New upstream release. + * New upstream release. * Updated if_fix.patch, parts of it have been fixed upstream. + * Renamed patches to use a more consistent naming scheme. * Depend on dhcbd (>= 1.12-2) because NM 0.6.2 does not start dhcdbd itself anymore. * The wpa_supplicant binary was moved from /usr/sbin to /sbin. Updated debian/rules accordingly. + * Added dependency on hal (Closes: #356622) + * Added autostart file to network-manager-gnome. This way nm-applet is + started automatically on login. - -- Michael Biebl Mon, 27 Mar 2006 21:56:37 +0200 + -- Michael Biebl Sun, 2 Apr 2006 19:48:28 +0200 network-manager (0.6.1-1) unstable; urgency=low @@ -19,7 +23,7 @@ network-manager (0.6.1-1) unstable; urgency=low network-manager (0.6.0-1) unstable; urgency=low - * New upstream release. + * New upstream release (Closes: #355246) - most of the work is taken from the experimental branch of NM. Thanks goes to Michael Biebl. - Added NetworkManagerDebian.patch which introduce supports for resolvconf diff --git a/debian/control b/debian/control index 9de165ea..fa9886d4 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.6.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -22,7 +22,7 @@ Description: network management framework daemon Package: network-manager-gnome Architecture: any Section: gnome -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index dfa048ea..88214a99 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -5,3 +5,4 @@ debian/tmp/usr/share/nm-applet/* debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties debian/tmp/etc/dbus-1/system.d/nm-applet.conf +debian/tmp/usr/share/gnome/autostart/nm-applet.desktop -- cgit 1.3.0-6-gf8a5 From f7e18eab4786f1e1be4b25c7231074d66d3e430a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 5 Apr 2006 17:29:39 +0000 Subject: Integration work. Scripts in /etc/network/if-*.d/ are now called properly by NetworkManagerDispatcher. Thanks to the Ubuntu guys for this works. It's mostly copied from their package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@790 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 10 +++ debian/network-manager-dispatcher.script | 44 ++++++++++++ debian/patches/06-dispatch_more_events.patch | 104 +++++++++++++++++++++++++++ debian/rules | 4 +- 4 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 debian/network-manager-dispatcher.script create mode 100644 debian/patches/06-dispatch_more_events.patch diff --git a/debian/changelog b/debian/changelog index 454b61aa..a69ea7bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +network-manager (0.6.2-2) unstable; urgency=low + + * More integration work. + Added network-manager-dispatcher.script and 06-dispatch_more_events.patch. + This way the scripts in /etc/networks/if-*.d/ are called properly by + NetworkManagerDispatcher. + Thanks to the Ubuntu devs for this work! + + -- Michael Biebl Wed, 5 Apr 2006 18:52:57 +0200 + network-manager (0.6.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script new file mode 100644 index 00000000..abc6e4d5 --- /dev/null +++ b/debian/network-manager-dispatcher.script @@ -0,0 +1,44 @@ +#!/bin/sh -e +# Script to dispatch NetworkManager events +# +# Runs ifupdown scripts when NetworkManager fiddles with interfaces. + +if [ -z "$1" ]; then + echo "$0: called with no interface" 1>&2 + exit 1; +fi + +# Fake ifupdown environment +export IFACE="$1" +export LOGICAL="$1" +export ADDRFAM="NetworkManager" +export METHOD="NetworkManager" +export VERBOSITY="0" + +# Run the right scripts +case "$2" in + up) + export MODE="start" + export PHASE="up" + exec run-parts /etc/network/if-up.d + ;; + down) + export MODE="stop" + export PHASE="down" + exec run-parts /etc/network/if-down.d + ;; + pre-up) + export MODE="start" + export PHASE="pre-up" + exec run-parts /etc/network/if-pre-up.d + ;; + post-down) + export MODE="stop" + export PHASE="post-down" + exec run-parts /etc/network/if-post-down.d + ;; + *) + echo "$0: called with unknown action \`$2'" 1>&2 + exit 1 + ;; +esac diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch new file mode 100644 index 00000000..e8b30810 --- /dev/null +++ b/debian/patches/06-dispatch_more_events.patch @@ -0,0 +1,104 @@ +diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c +--- network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-13 16:51:57.000000000 +0000 ++++ network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c 2006-04-03 18:14:06.000000000 +0100 +@@ -44,6 +44,8 @@ enum NMDAction + NMD_DEVICE_DONT_KNOW, + NMD_DEVICE_NOW_INACTIVE, + NMD_DEVICE_NOW_ACTIVE, ++ NMD_DEVICE_GOING_INACTIVE, ++ NMD_DEVICE_GOING_ACTIVE, + }; + typedef enum NMDAction NMDAction; + +@@ -95,6 +97,10 @@ static void nmd_execute_scripts (NMDActi + if (action == NMD_DEVICE_NOW_ACTIVE) + char_act = "up"; + else if (action == NMD_DEVICE_NOW_INACTIVE) ++ char_act = "post-down"; ++ else if (action == NMD_DEVICE_GOING_ACTIVE) ++ char_act = "pre-up"; ++ else if (action == NMD_DEVICE_GOING_INACTIVE) + char_act = "down"; + else + return; +@@ -217,9 +223,13 @@ static DBusHandlerResult nmd_dbus_filter + } + + if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) +- action = NMD_DEVICE_NOW_INACTIVE; ++ action = NMD_DEVICE_GOING_INACTIVE; + else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) + action = NMD_DEVICE_NOW_ACTIVE; ++ else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceActivating")) ++ action = NMD_DEVICE_GOING_ACTIVE; ++ else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceDeactivated")) ++ action = NMD_DEVICE_NOW_INACTIVE; + + if (action != NMD_DEVICE_DONT_KNOW) + { +@@ -234,8 +244,10 @@ static DBusHandlerResult nmd_dbus_filter + if (dev_object_path && dev_iface_name) + { + nm_info ("Device %s (%s) is now %s.", dev_object_path, dev_iface_name, +- (action == NMD_DEVICE_NOW_INACTIVE ? "down" : +- (action == NMD_DEVICE_NOW_ACTIVE ? "up" : "error"))); ++ (action == NMD_DEVICE_NOW_INACTIVE ? "going down" : ++ (action == NMD_DEVICE_NOW_ACTIVE ? "up" : ++ (action == NMD_DEVICE_GOING_INACTIVE ? "going down" : ++ (action == NMD_DEVICE_GOING_ACTIVE ? "going up" : "error"))))); + + nmd_execute_scripts (action, dev_iface_name); + } +diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in +--- network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 ++++ network-manager-0.6.2/man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 +@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo + directory in response to interfaces coming up and down. The scripts are run + alphabetically. The first parameter is the network interface name. The second + parameter is ++.I pre\-up ++before bringing the interface up, + .I up +-if the interface is now up and ++after bringing the interface up, + .I down +-if the interface is now down. ++before taking the interface down and ++.I post\-down ++after taking the interface down. + .SH OPTIONS + The following options are supported: + .TP +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c +--- network-manager-0.6.2~/src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 ++++ network-manager-0.6.2/src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 +@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si + { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, + { DEVICE_ACTIVATING, "DeviceActivating" }, + { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, ++ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, + { DEVICE_ADDED, "DeviceAdded" }, + { DEVICE_REMOVED, "DeviceRemoved" }, + { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h +--- network-manager-0.6.2~/src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 ++++ network-manager-0.6.2/src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 +@@ -40,6 +40,7 @@ typedef enum + DEVICE_ACTIVATING, + DEVICE_ACTIVATION_FAILED, + DEVICE_ACTIVATION_CANCELED, ++ DEVICE_DEACTIVATED, + DEVICE_ADDED, + DEVICE_REMOVED, + DEVICE_CARRIER_ON, +diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c +--- network-manager-0.6.2~/src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 ++++ network-manager-0.6.2/src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 +@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) + NM_DEVICE_GET_CLASS (self)->deactivate (self); + + nm_schedule_state_change_signal_broadcast (self->priv->app_data); ++ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); + } + + diff --git a/debian/rules b/debian/rules index d8813abe..121f42b8 100755 --- a/debian/rules +++ b/debian/rules @@ -28,4 +28,6 @@ binary-install/network-manager:: debian/network-manager/etc/dbus-1/event.d/25NetworkManager install -m 755 debian/network-manager-dispatcher.dbus-event \ debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher - + install -m 755 debian/network-manager-dispatcher.script \ + debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown + -- cgit 1.3.0-6-gf8a5 From 44a31b5773ec83522ba8047b0cd19ef975808e42 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 5 May 2006 16:59:12 +0000 Subject: - Standards-Version 3.7.2 - Make libnm_glib wait between connection attempts to dbus (07-libnm_glib_reconnect_dbus.patch) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@811 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++- debian/control | 2 +- debian/patches/07-libnm_glib_reconnect_dbus.patch | 65 +++++++++++++++++++++++ 3 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 debian/patches/07-libnm_glib_reconnect_dbus.patch diff --git a/debian/changelog b/debian/changelog index a69ea7bc..17be6e9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ network-manager (0.6.2-2) unstable; urgency=low - * More integration work. + * More integration work. Added network-manager-dispatcher.script and 06-dispatch_more_events.patch. This way the scripts in /etc/networks/if-*.d/ are called properly by NetworkManagerDispatcher. Thanks to the Ubuntu devs for this work! + * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between + unsuccessful connection attempts to dbus. (Closes: #366010) + * Bumped Standards-Version to 3.7.2, no further changes required. - -- Michael Biebl Wed, 5 Apr 2006 18:52:57 +0200 + -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 network-manager (0.6.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index fa9886d4..4c9457bf 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 Package: network-manager Architecture: any diff --git a/debian/patches/07-libnm_glib_reconnect_dbus.patch b/debian/patches/07-libnm_glib_reconnect_dbus.patch new file mode 100644 index 00000000..371813b2 --- /dev/null +++ b/debian/patches/07-libnm_glib_reconnect_dbus.patch @@ -0,0 +1,65 @@ +Index: gnome/libnm_glib/libnm_glib.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/gnome/libnm_glib/libnm_glib.c,v +retrieving revision 1.11 +diff -u -p -r1.11 libnm_glib.c +--- gnome/libnm_glib/libnm_glib.c 21 Feb 2006 06:25:50 -0000 1.11 ++++ gnome/libnm_glib/libnm_glib.c 5 May 2006 15:35:55 -0000 +@@ -39,6 +39,7 @@ struct libnm_glib_ctx + GMainLoop * g_main_loop; + DBusConnection * dbus_con; + guint dbus_watcher; ++ guint dbus_watch_interval; + gboolean thread_done; + gboolean thread_inited; + +@@ -347,14 +348,29 @@ libnm_glib_dbus_watcher (gpointer user_d + + g_return_val_if_fail (ctx != NULL, FALSE); + ++ ctx->dbus_watcher = 0; ++ + if (!ctx->dbus_con) + ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx); + + if (ctx->dbus_con) +- return (FALSE); /* Don't reschedule ourselves if we have a connection to dbus */ ++ { ++ /* Get NM's state right away after we reconnect */ ++ libnm_glib_get_nm_state (ctx); ++ ctx->dbus_watch_interval = 1000; ++ } ++ else ++ { ++ /* Wait 3 seconds longer each time we fail to reconnect to dbus, ++ * with a maximum wait of one minute. ++ */ ++ ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); + +- /* Reschule ourselves if we _still_ don't have a connection to dbus */ +- return (TRUE); ++ /* Reschule ourselves if we _still_ don't have a connection to dbus */ ++ libnm_glib_schedule_dbus_watcher (ctx); ++ } ++ ++ return FALSE; + } + + +@@ -372,7 +388,7 @@ libnm_glib_schedule_dbus_watcher (libnm_ + + if (ctx->dbus_watcher == 0) + { +- GSource *source = g_idle_source_new (); ++ GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); + g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL); + ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); + g_source_unref (source); +@@ -453,6 +469,7 @@ libnm_glib_ctx_new (void) + goto error; + if (!(ctx->callbacks_lock = g_mutex_new ())) + goto error; ++ ctx->dbus_watch_interval = 1000; + + return ctx; + -- cgit 1.3.0-6-gf8a5 From 5e049c924e41f2099c65be0cf9e6e441bdd84dc2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 5 May 2006 21:40:48 +0000 Subject: Lots of integration work. NM behaves like a good citizen now and is ready for "testing". git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@815 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 38 ++++++++++++++++- debian/changelog | 22 ++++++---- debian/patches/08-disabled_devices.patch | 52 +++++++++++++++++++++++ debian/patches/09-nm_bad_mutex_free.patch | 69 +++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 8 deletions(-) create mode 100644 debian/patches/08-disabled_devices.patch create mode 100644 debian/patches/09-nm_bad_mutex_free.patch diff --git a/debian/README.Debian b/debian/README.Debian index 0fad5552..537f1c83 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,8 +1,44 @@ -NetworkManger consists of two parts: one is on the system level daemon that +NetworkManager consists of two parts: one is on the system level daemon that manages the connections and gathers information about new networks. The other is an applet that users can use to interact with the NetworkManager daemon. +Security +~~~~~~~~ To allow users to connect to the NetworkManager daemon they have to be in the group "netdev". If you want to add a user to group "netdev" use the command "adduser username netdev" or one of the graphical user management frontends. After that you have to reload dbus with the command "/etc/init.d/dbus reload". + +Configuration +~~~~~~~~~~~~~ +Only devices that are not listed in /etc/network/interfaces or which have been +configured "auto" and "dhcp" (with no other options) are managed by NM. + +Examples: + +1.) +auto wlan0 +iface wlan0 inet dhcp +-> This device is managed by NM. + +2.) +auto wlan0 +iface wlan0 inet dhcp + wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf +-> This devices is *not* managed by NM because it has additional options. + +3.) +iface wlan0 inet dhcp +-> This device is *not* managed by NM because it is not set to "auto". + +4.) +iface eth0 inet static +address 192.168.1.10 +netmask 255.255.255.0 +gateway 192.168.1.1 +-> This device is *not* managed by NM because it is configured as "static" and + has additional options. + +5.) +Device is not listed in /etc/network/interfaces. +-> Device is managed by NM. diff --git a/debian/changelog b/debian/changelog index 17be6e9b..6874f9fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,20 @@ network-manager (0.6.2-2) unstable; urgency=low - * More integration work. - Added network-manager-dispatcher.script and 06-dispatch_more_events.patch. - This way the scripts in /etc/networks/if-*.d/ are called properly by - NetworkManagerDispatcher. - Thanks to the Ubuntu devs for this work! - * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between - unsuccessful connection attempts to dbus. (Closes: #366010) + * More integration work. (Closes: #355244) + - Added network-manager-dispatcher.script and + 06-dispatch_more_events.patch. + This way the scripts in /etc/networks/if-*.d/ are called properly by + NetworkManagerDispatcher. + Thanks to the Ubuntu devs for this work! + - Added 08-disabled_devices.patch. Network interfaces listed in + /etc/network/interfaces which are not configured "auto" and "dhcp" are + not handled by NM. This makes it possible to configure interfaces + statically and have NM not messing with them. + Updated README.Debian to reflect these changes. + - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if devices are + listed in /etc/network/interfaces. + * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep + between unsuccessful connection attempts to dbus. (Closes: #366010) * Bumped Standards-Version to 3.7.2, no further changes required. -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch new file mode 100644 index 00000000..9ffe22ce --- /dev/null +++ b/debian/patches/08-disabled_devices.patch @@ -0,0 +1,52 @@ +--- src/backends/NetworkManagerDebian.c.orig 2006-05-05 19:59:18.000000000 +0200 ++++ src/backends/NetworkManagerDebian.c 2006-05-05 20:04:34.000000000 +0200 +@@ -521,7 +521,48 @@ + */ + gboolean nm_system_device_get_disabled (NMDevice *dev) + { +- return FALSE; ++ const char *iface; ++ if_block *curr_device, *curr_b; ++ if_data *curr_d; ++ gboolean blacklist = TRUE; ++ ++ g_return_val_if_fail (dev != NULL, TRUE); ++ ++ iface = nm_device_get_iface (dev); ++ ++ ifparser_init (); ++ ++ /* If the interface isn't listed in /etc/network/interfaces then ++ * it's considered okay to control it. ++ */ ++ curr_device = ifparser_getif (iface); ++ if (curr_device == NULL) { ++ blacklist = FALSE; ++ goto out; ++ } ++ ++ /* If the interface is listed and isn't marked "auto" then it's ++ * definitely not okay to control it. ++ */ ++ for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { ++ if (!strcmp (curr_b->type, "auto") ++ && !strcmp (curr_b->name, iface)) ++ blacklist = FALSE; ++ } ++ ++ /* If the interface has no options other than just "inet dhcp" ++ * it's probably ok to fiddle with it. ++ */ ++ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { ++ if (strcmp (curr_d->key, "inet") ++ || strcmp (curr_d->data, "dhcp")) ++ blacklist = TRUE; ++ } ++ ++out: ++ ifparser_destroy (); ++ ++ return blacklist; + } + + diff --git a/debian/patches/09-nm_bad_mutex_free.patch b/debian/patches/09-nm_bad_mutex_free.patch new file mode 100644 index 00000000..9da4cce0 --- /dev/null +++ b/debian/patches/09-nm_bad_mutex_free.patch @@ -0,0 +1,69 @@ +--- network-manager-0.6.2.orig/src/nm-device-802-11-wireless.c 2006-05-05 02:13:37.000000000 -0500 ++++ network-manager-0.6.2/src/nm-device-802-11-wireless.c 2006-05-05 02:20:23.000000000 -0500 +@@ -60,7 +60,7 @@ + + struct _NMDevice80211WirelessPrivate + { +- gboolean dispose_has_run; ++ gboolean is_initialized; + + struct ether_addr hw_addr; + +@@ -242,7 +242,7 @@ + nm_device_802_11_wireless_init (NMDevice80211Wireless * self) + { + self->priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self); +- self->priv->dispose_has_run = FALSE; ++ self->priv->is_initialized = FALSE; + + memset (&(self->priv->hw_addr), 0, sizeof (struct ether_addr)); + self->priv->supplicant.pid = -1; +@@ -256,6 +256,7 @@ + guint32 caps; + NMSock * sk; + ++ self->priv->is_initialized = TRUE; + self->priv->scan_mutex = g_mutex_new (); + nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex"); + +@@ -2988,24 +2989,22 @@ + NMDevice80211WirelessClass * klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object); + NMDeviceClass * parent_class; + +- if (self->priv->dispose_has_run) +- /* If dispose did already run, return. */ +- return; +- +- /* Make sure dispose does not run twice. */ +- self->priv->dispose_has_run = TRUE; +- +- /* +- * In dispose, you are supposed to free all types referenced from this +- * object which might themselves hold a reference to self. Generally, +- * the most simple solution is to unref all members on which you own a +- * reference. +- */ +- +- nm_device_802_11_wireless_ap_list_clear (self); +- if (self->priv->ap_list) +- nm_ap_list_unref (self->priv->ap_list); +- g_mutex_free (self->priv->scan_mutex); ++ /* Only do this part of the cleanup if the object is initialized */ ++ if (self->priv->is_initialized) { ++ self->priv->is_initialized = FALSE; ++ ++ /* ++ * In dispose, you are supposed to free all types referenced from this ++ * object which might themselves hold a reference to self. Generally, ++ * the most simple solution is to unref all members on which you own a ++ * reference. ++ */ ++ ++ nm_device_802_11_wireless_ap_list_clear (self); ++ if (self->priv->ap_list) ++ nm_ap_list_unref (self->priv->ap_list); ++ g_mutex_free (self->priv->scan_mutex); ++ } + + /* Chain up to the parent class */ + parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); -- cgit 1.3.0-6-gf8a5 From da7733f04f25edbf724a14568f14a351099a32f3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 8 May 2006 20:56:35 +0000 Subject: Remove *.la files from -dev packages. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@817 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/libnm-glib-dev.install | 1 - debian/libnm-util-dev.install | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6874f9fb..ee66008a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ network-manager (0.6.2-2) unstable; urgency=low * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between unsuccessful connection attempts to dbus. (Closes: #366010) * Bumped Standards-Version to 3.7.2, no further changes required. + * Removed *.la files from the dev packages as we also ship pkg-config files + which are a better alternative. -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install index 754ac2e6..624f7a5a 100644 --- a/debian/libnm-glib-dev.install +++ b/debian/libnm-glib-dev.install @@ -1,5 +1,4 @@ debian/tmp/usr/lib/pkgconfig/libnm_glib.pc debian/tmp/usr/lib/libnm_glib*.a -debian/tmp/usr/lib/libnm_glib*.la debian/tmp/usr/lib/libnm_glib*.so debian/tmp/usr/include/NetworkManager/libnm_glib.h diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install index c6b4a027..66abe57e 100644 --- a/debian/libnm-util-dev.install +++ b/debian/libnm-util-dev.install @@ -1,6 +1,5 @@ debian/tmp/usr/lib/pkgconfig/libnm-util.pc debian/tmp/usr/lib/libnm-util.a -debian/tmp/usr/lib/libnm-util.la debian/tmp/usr/lib/libnm-util.so debian/tmp/usr/include/NetworkManager/cipher.h debian/tmp/usr/include/NetworkManager/cipher-wep-hex.h -- cgit 1.3.0-6-gf8a5 From f9ec882bec72c776c55aee51f2e299f6af2e52ce Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 9 May 2006 19:27:53 +0000 Subject: We don't need LDFLAGS="-lm". It builds fine without it, even with -Wl,--as-needed git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@818 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 121f42b8..28d9dab5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,6 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lm" - DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-wpa_supplicant=/sbin/wpa_supplicant \ -- cgit 1.3.0-6-gf8a5 From 63b3f3f48fb827a50b82d46c358dbedea4060770 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 May 2006 00:33:27 +0000 Subject: Use strstr, because auto can have multiple interfaces, e.g. auto lo eth0 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@819 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/08-disabled_devices.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index 9ffe22ce..d5392c9f 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -30,7 +30,7 @@ + */ + for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { + if (!strcmp (curr_b->type, "auto") -+ && !strcmp (curr_b->name, iface)) ++ && strstr (curr_b->name, iface)) + blacklist = FALSE; + } + -- cgit 1.3.0-6-gf8a5 From a5a5d5671a0c793b4d45373947178fa77fec9a16 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 May 2006 00:36:14 +0000 Subject: Fix the /etc/network/interfaces parser: - Only add data to an existing block (prevents segfault) - Support mapping and allow-* stanzas. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@820 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 7 +- debian/changelog | 6 +- debian/patches/10-interface_parser_fixes.patch | 90 ++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 debian/patches/10-interface_parser_fixes.patch diff --git a/debian/README.Debian b/debian/README.Debian index 537f1c83..4694c299 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -11,8 +11,11 @@ After that you have to reload dbus with the command "/etc/init.d/dbus reload". Configuration ~~~~~~~~~~~~~ -Only devices that are not listed in /etc/network/interfaces or which have been -configured "auto" and "dhcp" (with no other options) are managed by NM. +Only devices that are *not* listed in /etc/network/interfaces or which have +been configured "auto" and "dhcp" (with no other options) are managed by NM. + +This way you can setup a custom (static) configuration for a device and NM +will not try to override this setting. Examples: diff --git a/debian/changelog b/debian/changelog index ee66008a..9f2cdaf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,13 +11,15 @@ network-manager (0.6.2-2) unstable; urgency=low not handled by NM. This makes it possible to configure interfaces statically and have NM not messing with them. Updated README.Debian to reflect these changes. - - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if devices are - listed in /etc/network/interfaces. + - Added 09-nm_bad_mutex_free.patch. Otherwise NM crashes if a device is + disabled. * Added 07-libnm_glib_reconnect_dbus.patch which makes libnm_glib sleep between unsuccessful connection attempts to dbus. (Closes: #366010) * Bumped Standards-Version to 3.7.2, no further changes required. * Removed *.la files from the dev packages as we also ship pkg-config files which are a better alternative. + * Added 10-interface_parser_fixes.patch which fixes several problems with + the /etc/network/interfaces parser. (Closes: #355564) -- Michael Biebl Fri, 5 May 2006 18:01:47 +0200 diff --git a/debian/patches/10-interface_parser_fixes.patch b/debian/patches/10-interface_parser_fixes.patch new file mode 100644 index 00000000..e751e359 --- /dev/null +++ b/debian/patches/10-interface_parser_fixes.patch @@ -0,0 +1,90 @@ +Index: src/backends/interface_parser.c +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/backends/interface_parser.c,v +retrieving revision 1.6 +diff -u -3 -p -r1.6 interface_parser.c +--- src/backends/interface_parser.c 24 Oct 2005 15:04:28 -0000 1.6 ++++ src/backends/interface_parser.c 9 May 2006 23:06:35 -0000 +@@ -50,6 +50,10 @@ void add_block(const char *type, const c + + void add_data(const char *key,const char *data) + { ++ // Check if there is a block where we can attach our data ++ if (first == NULL) ++ return; ++ + if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); + ret->key = g_strdup(key); + ret->data = g_strdup(data); +@@ -73,6 +77,10 @@ void ifparser_init(void) + { + FILE *inp = fopen(INTERFACES,"r"); + int ret = 0; ++ char *line; ++ char *space; ++ char rline[255]; ++ + if (inp == NULL) + { + nm_warning ("Error: Can't open %s\n",INTERFACES); +@@ -81,10 +89,16 @@ void ifparser_init(void) + first = last = NULL; + while(1) + { +- char *line,rline[255],*space; ++ line = space = NULL; + ret = fscanf(inp,"%255[^\n]\n",rline); + if (ret == EOF) + break; ++ // If the line did not match, skip it ++ if (ret == 0) { ++ fgets(rline, 255, inp); ++ continue; ++ } ++ + line = rline; + while(line[0] == ' ') + line++; +@@ -94,18 +108,19 @@ void ifparser_init(void) + SPACE_OR_TAB(line,space) + if (space == NULL) + { +- nm_warning ("Error: Can't parse interface line '%s'\n",line); ++ nm_warning ("Error: Can't parse interface line '%s'\n",line); + continue; + } + space[0] = '\0'; + +- ++ // There are four different stanzas: ++ // iface, mapping, auto and allow-*. Create a block for each of them. + if (strcmp(line,"iface")==0) + { + char *space2 = strchr(space+1,' '); + if (space2 == NULL) + { +- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); ++ nm_warning ("Error: Can't parse iface line '%s'\n",space+1); + continue; + } + space2[0]='\0'; +@@ -116,7 +131,7 @@ void ifparser_init(void) + space = strchr(space2+1,' '); + if (space == NULL) + { +- nm_warning ("Error: Can't parse data '%s'\n",space2+1); ++ nm_warning ("Error: Can't parse data '%s'\n",space2+1); + continue; + } + space[0] = '\0'; +@@ -124,6 +139,10 @@ void ifparser_init(void) + } + } + else if (strcmp(line,"auto")==0) ++ add_block(line,space+1); ++ else if (strcmp(line,"mapping")==0) ++ add_block(line,space+1); ++ else if (strncmp(line,"allow-",6)==0) + add_block(line,space+1); + else + add_data(line,space+1); -- cgit 1.3.0-6-gf8a5 From caaa00c14e74b82528bde834cbfd1216dc339696 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 May 2006 21:15:52 +0000 Subject: Wrote a NEWS file explaining the changes (handling of devices listed in /e/n/i) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@836 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..0c0f4d7a --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,17 @@ +network-manager (0.6.2-2) unstable; urgency=low + + * NetworkManager now reads the network interface configuration specified in + /etc/network/interfaces. Devices that are listed there and match certain + criteria are *not* managed by NetworkManager anymore. + For more on information on what these criteria are please read + /usr/share/doc/network-manager/README.Debian, section "Configuration". + This means that if NetworkManager stops to manage one of your network + devices with this release but you want NetworkManager to take care of this + device, simply remove the device configuration from + /etc/network/interfaces. + This also means that you can now setup a custom configuration without + NetworkManager overriding this setting. E.g. you might setup your wired + network interface eth0 statically in /etc/network/interfaces and for your + wireless network device wlan0 you can let NetworkManager handle it. + + -- Michael Biebl Wed, 10 May 2006 22:51:18 +0200 -- cgit 1.3.0-6-gf8a5 From 35c2556dbd2c86a6adbf1657cb7c54de20aea56b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 May 2006 22:12:13 +0000 Subject: Add the NEWS.Debian file only to the network-manager package git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@840 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NEWS | 17 ----------------- debian/changelog | 7 +++++++ debian/docs | 3 --- debian/network-manager.NEWS | 17 +++++++++++++++++ debian/rules | 2 ++ 5 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 debian/NEWS delete mode 100644 debian/docs create mode 100644 debian/network-manager.NEWS diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index 0c0f4d7a..00000000 --- a/debian/NEWS +++ /dev/null @@ -1,17 +0,0 @@ -network-manager (0.6.2-2) unstable; urgency=low - - * NetworkManager now reads the network interface configuration specified in - /etc/network/interfaces. Devices that are listed there and match certain - criteria are *not* managed by NetworkManager anymore. - For more on information on what these criteria are please read - /usr/share/doc/network-manager/README.Debian, section "Configuration". - This means that if NetworkManager stops to manage one of your network - devices with this release but you want NetworkManager to take care of this - device, simply remove the device configuration from - /etc/network/interfaces. - This also means that you can now setup a custom configuration without - NetworkManager overriding this setting. E.g. you might setup your wired - network interface eth0 statically in /etc/network/interfaces and for your - wireless network device wlan0 you can let NetworkManager handle it. - - -- Michael Biebl Wed, 10 May 2006 22:51:18 +0200 diff --git a/debian/changelog b/debian/changelog index 9f2cdaf0..f6501cb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.2-3) unstable; urgency=low + + * Ship the NEWS.Debian file only for the network-manager package. + (Closes: #367063) + + -- Michael Biebl Sat, 13 May 2006 12:35:03 +0200 + network-manager (0.6.2-2) unstable; urgency=low * More integration work. (Closes: #355244) diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 5502ed8f..00000000 --- a/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -NEWS -README -TODO diff --git a/debian/network-manager.NEWS b/debian/network-manager.NEWS new file mode 100644 index 00000000..0c0f4d7a --- /dev/null +++ b/debian/network-manager.NEWS @@ -0,0 +1,17 @@ +network-manager (0.6.2-2) unstable; urgency=low + + * NetworkManager now reads the network interface configuration specified in + /etc/network/interfaces. Devices that are listed there and match certain + criteria are *not* managed by NetworkManager anymore. + For more on information on what these criteria are please read + /usr/share/doc/network-manager/README.Debian, section "Configuration". + This means that if NetworkManager stops to manage one of your network + devices with this release but you want NetworkManager to take care of this + device, simply remove the device configuration from + /etc/network/interfaces. + This also means that you can now setup a custom configuration without + NetworkManager overriding this setting. E.g. you might setup your wired + network interface eth0 statically in /etc/network/interfaces and for your + wireless network device wlan0 you can let NetworkManager handle it. + + -- Michael Biebl Wed, 10 May 2006 22:51:18 +0200 diff --git a/debian/rules b/debian/rules index 28d9dab5..ebbeb317 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_INSTALL_DOCS_ALL := README AUTHORS TODO + DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dbus-sys=/etc/dbus-1/system.d \ --with-wpa_supplicant=/sbin/wpa_supplicant \ -- cgit 1.3.0-6-gf8a5 From c1a83915903d35e1e6296359c2b194de213a78d5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 May 2006 22:32:59 +0000 Subject: Support cards which can't do carrier detect. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@841 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/11-carrier_detection.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian/patches/11-carrier_detection.patch diff --git a/debian/changelog b/debian/changelog index f6501cb9..b42cddfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.2-3) unstable; urgency=low - * Ship the NEWS.Debian file only for the network-manager package. + * Ship the NEWS.Debian file only for the network-manager package. (Closes: #367063) + * Added 11-carrier_detection.patch to support network cards which can't do + carrier detection. (Closes: #366373) - -- Michael Biebl Sat, 13 May 2006 12:35:03 +0200 + -- Michael Biebl Tue, 16 May 2006 00:16:43 +0200 network-manager (0.6.2-2) unstable; urgency=low diff --git a/debian/patches/11-carrier_detection.patch b/debian/patches/11-carrier_detection.patch new file mode 100644 index 00000000..ff7d1ecf --- /dev/null +++ b/debian/patches/11-carrier_detection.patch @@ -0,0 +1,17 @@ +=================================================================== +RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v +retrieving revision 1.13.2.1 +retrieving revision 1.13.2.2 +diff -u -r1.13.2.1 -r1.13.2.2 +--- src/nm-device-802-3-ethernet.c 2006/03/09 21:39:15 1.13.2.1 ++++ src/nm-device-802-3-ethernet.c 2006/05/13 19:06:05 1.13.2.2 +@@ -207,8 +207,7 @@ + if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self)) + caps |= NM_DEVICE_CAP_CARRIER_DETECT; + +- if (caps) +- caps |= NM_DEVICE_CAP_NM_SUPPORTED; ++ caps |= NM_DEVICE_CAP_NM_SUPPORTED; + + return caps; + } -- cgit 1.3.0-6-gf8a5 From 622f751812d193facaa79f10421f5950a558c389 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 13:43:48 +0000 Subject: - New upstream (bugfix) release 0.6.3 - Removed patches which were merged upstream: 07-libnm_glib_reconnect_dbus.patch 09-nm_bad_mutex_free.patch 10-interface_parser_fixes.patch. 11-carrier_detection.patch - Added watch file. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@846 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 +++ debian/control | 2 +- debian/patches/07-libnm_glib_reconnect_dbus.patch | 65 ---------------- debian/patches/09-nm_bad_mutex_free.patch | 69 ----------------- debian/patches/10-interface_parser_fixes.patch | 90 ----------------------- debian/patches/11-carrier_detection.patch | 17 ----- debian/watch | 3 + 7 files changed, 15 insertions(+), 242 deletions(-) delete mode 100644 debian/patches/07-libnm_glib_reconnect_dbus.patch delete mode 100644 debian/patches/09-nm_bad_mutex_free.patch delete mode 100644 debian/patches/10-interface_parser_fixes.patch delete mode 100644 debian/patches/11-carrier_detection.patch create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index b42cddfe..12717637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +network-manager (0.6.3-1) unstable; urgency=low + + * New upstream release. + - Removed 07-libnm_glib_reconnect_dbus.patch, merged upstream. + - Removed 09-nm_bad_mutex_free.patch, fixed upstream. + - Removed 10-interface_parser_fixes.patch, merged upstream. + - Removed 11-carrier_detection.patch, merged upstream. + * Added a watch file. + + -- Michael Biebl Thu, 8 Jun 2006 13:53:33 +0200 + network-manager (0.6.2-3) unstable; urgency=low * Ship the NEWS.Debian file only for the network-manager package. diff --git a/debian/control b/debian/control index 4c9457bf..b1fae970 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager diff --git a/debian/patches/07-libnm_glib_reconnect_dbus.patch b/debian/patches/07-libnm_glib_reconnect_dbus.patch deleted file mode 100644 index 371813b2..00000000 --- a/debian/patches/07-libnm_glib_reconnect_dbus.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: gnome/libnm_glib/libnm_glib.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/gnome/libnm_glib/libnm_glib.c,v -retrieving revision 1.11 -diff -u -p -r1.11 libnm_glib.c ---- gnome/libnm_glib/libnm_glib.c 21 Feb 2006 06:25:50 -0000 1.11 -+++ gnome/libnm_glib/libnm_glib.c 5 May 2006 15:35:55 -0000 -@@ -39,6 +39,7 @@ struct libnm_glib_ctx - GMainLoop * g_main_loop; - DBusConnection * dbus_con; - guint dbus_watcher; -+ guint dbus_watch_interval; - gboolean thread_done; - gboolean thread_inited; - -@@ -347,14 +348,29 @@ libnm_glib_dbus_watcher (gpointer user_d - - g_return_val_if_fail (ctx != NULL, FALSE); - -+ ctx->dbus_watcher = 0; -+ - if (!ctx->dbus_con) - ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx); - - if (ctx->dbus_con) -- return (FALSE); /* Don't reschedule ourselves if we have a connection to dbus */ -+ { -+ /* Get NM's state right away after we reconnect */ -+ libnm_glib_get_nm_state (ctx); -+ ctx->dbus_watch_interval = 1000; -+ } -+ else -+ { -+ /* Wait 3 seconds longer each time we fail to reconnect to dbus, -+ * with a maximum wait of one minute. -+ */ -+ ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); - -- /* Reschule ourselves if we _still_ don't have a connection to dbus */ -- return (TRUE); -+ /* Reschule ourselves if we _still_ don't have a connection to dbus */ -+ libnm_glib_schedule_dbus_watcher (ctx); -+ } -+ -+ return FALSE; - } - - -@@ -372,7 +388,7 @@ libnm_glib_schedule_dbus_watcher (libnm_ - - if (ctx->dbus_watcher == 0) - { -- GSource *source = g_idle_source_new (); -+ GSource * source = g_timeout_source_new (ctx->dbus_watch_interval); - g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL); - ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx); - g_source_unref (source); -@@ -453,6 +469,7 @@ libnm_glib_ctx_new (void) - goto error; - if (!(ctx->callbacks_lock = g_mutex_new ())) - goto error; -+ ctx->dbus_watch_interval = 1000; - - return ctx; - diff --git a/debian/patches/09-nm_bad_mutex_free.patch b/debian/patches/09-nm_bad_mutex_free.patch deleted file mode 100644 index 9da4cce0..00000000 --- a/debian/patches/09-nm_bad_mutex_free.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- network-manager-0.6.2.orig/src/nm-device-802-11-wireless.c 2006-05-05 02:13:37.000000000 -0500 -+++ network-manager-0.6.2/src/nm-device-802-11-wireless.c 2006-05-05 02:20:23.000000000 -0500 -@@ -60,7 +60,7 @@ - - struct _NMDevice80211WirelessPrivate - { -- gboolean dispose_has_run; -+ gboolean is_initialized; - - struct ether_addr hw_addr; - -@@ -242,7 +242,7 @@ - nm_device_802_11_wireless_init (NMDevice80211Wireless * self) - { - self->priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self); -- self->priv->dispose_has_run = FALSE; -+ self->priv->is_initialized = FALSE; - - memset (&(self->priv->hw_addr), 0, sizeof (struct ether_addr)); - self->priv->supplicant.pid = -1; -@@ -256,6 +256,7 @@ - guint32 caps; - NMSock * sk; - -+ self->priv->is_initialized = TRUE; - self->priv->scan_mutex = g_mutex_new (); - nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex"); - -@@ -2988,24 +2989,22 @@ - NMDevice80211WirelessClass * klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object); - NMDeviceClass * parent_class; - -- if (self->priv->dispose_has_run) -- /* If dispose did already run, return. */ -- return; -- -- /* Make sure dispose does not run twice. */ -- self->priv->dispose_has_run = TRUE; -- -- /* -- * In dispose, you are supposed to free all types referenced from this -- * object which might themselves hold a reference to self. Generally, -- * the most simple solution is to unref all members on which you own a -- * reference. -- */ -- -- nm_device_802_11_wireless_ap_list_clear (self); -- if (self->priv->ap_list) -- nm_ap_list_unref (self->priv->ap_list); -- g_mutex_free (self->priv->scan_mutex); -+ /* Only do this part of the cleanup if the object is initialized */ -+ if (self->priv->is_initialized) { -+ self->priv->is_initialized = FALSE; -+ -+ /* -+ * In dispose, you are supposed to free all types referenced from this -+ * object which might themselves hold a reference to self. Generally, -+ * the most simple solution is to unref all members on which you own a -+ * reference. -+ */ -+ -+ nm_device_802_11_wireless_ap_list_clear (self); -+ if (self->priv->ap_list) -+ nm_ap_list_unref (self->priv->ap_list); -+ g_mutex_free (self->priv->scan_mutex); -+ } - - /* Chain up to the parent class */ - parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); diff --git a/debian/patches/10-interface_parser_fixes.patch b/debian/patches/10-interface_parser_fixes.patch deleted file mode 100644 index e751e359..00000000 --- a/debian/patches/10-interface_parser_fixes.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: src/backends/interface_parser.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/backends/interface_parser.c,v -retrieving revision 1.6 -diff -u -3 -p -r1.6 interface_parser.c ---- src/backends/interface_parser.c 24 Oct 2005 15:04:28 -0000 1.6 -+++ src/backends/interface_parser.c 9 May 2006 23:06:35 -0000 -@@ -50,6 +50,10 @@ void add_block(const char *type, const c - - void add_data(const char *key,const char *data) - { -+ // Check if there is a block where we can attach our data -+ if (first == NULL) -+ return; -+ - if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); - ret->key = g_strdup(key); - ret->data = g_strdup(data); -@@ -73,6 +77,10 @@ void ifparser_init(void) - { - FILE *inp = fopen(INTERFACES,"r"); - int ret = 0; -+ char *line; -+ char *space; -+ char rline[255]; -+ - if (inp == NULL) - { - nm_warning ("Error: Can't open %s\n",INTERFACES); -@@ -81,10 +89,16 @@ void ifparser_init(void) - first = last = NULL; - while(1) - { -- char *line,rline[255],*space; -+ line = space = NULL; - ret = fscanf(inp,"%255[^\n]\n",rline); - if (ret == EOF) - break; -+ // If the line did not match, skip it -+ if (ret == 0) { -+ fgets(rline, 255, inp); -+ continue; -+ } -+ - line = rline; - while(line[0] == ' ') - line++; -@@ -94,18 +108,19 @@ void ifparser_init(void) - SPACE_OR_TAB(line,space) - if (space == NULL) - { -- nm_warning ("Error: Can't parse interface line '%s'\n",line); -+ nm_warning ("Error: Can't parse interface line '%s'\n",line); - continue; - } - space[0] = '\0'; - -- -+ // There are four different stanzas: -+ // iface, mapping, auto and allow-*. Create a block for each of them. - if (strcmp(line,"iface")==0) - { - char *space2 = strchr(space+1,' '); - if (space2 == NULL) - { -- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); -+ nm_warning ("Error: Can't parse iface line '%s'\n",space+1); - continue; - } - space2[0]='\0'; -@@ -116,7 +131,7 @@ void ifparser_init(void) - space = strchr(space2+1,' '); - if (space == NULL) - { -- nm_warning ("Error: Can't parse data '%s'\n",space2+1); -+ nm_warning ("Error: Can't parse data '%s'\n",space2+1); - continue; - } - space[0] = '\0'; -@@ -124,6 +139,10 @@ void ifparser_init(void) - } - } - else if (strcmp(line,"auto")==0) -+ add_block(line,space+1); -+ else if (strcmp(line,"mapping")==0) -+ add_block(line,space+1); -+ else if (strncmp(line,"allow-",6)==0) - add_block(line,space+1); - else - add_data(line,space+1); diff --git a/debian/patches/11-carrier_detection.patch b/debian/patches/11-carrier_detection.patch deleted file mode 100644 index ff7d1ecf..00000000 --- a/debian/patches/11-carrier_detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.13.2.1 -retrieving revision 1.13.2.2 -diff -u -r1.13.2.1 -r1.13.2.2 ---- src/nm-device-802-3-ethernet.c 2006/03/09 21:39:15 1.13.2.1 -+++ src/nm-device-802-3-ethernet.c 2006/05/13 19:06:05 1.13.2.2 -@@ -207,8 +207,7 @@ - if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self)) - caps |= NM_DEVICE_CAP_CARRIER_DETECT; - -- if (caps) -- caps |= NM_DEVICE_CAP_NM_SUPPORTED; -+ caps |= NM_DEVICE_CAP_NM_SUPPORTED; - - return caps; - } diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..c7e07a46 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz -- cgit 1.3.0-6-gf8a5 From 55b7fe04569b2d0b9ed1576a00f56c1995fa83c4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 14:33:43 +0000 Subject: Added homepage URL to package description. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@847 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12717637..e84a729e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ network-manager (0.6.3-1) unstable; urgency=low - Removed 10-interface_parser_fixes.patch, merged upstream. - Removed 11-carrier_detection.patch, merged upstream. * Added a watch file. + * Added homepage URL to package description. - -- Michael Biebl Thu, 8 Jun 2006 13:53:33 +0200 + -- Michael Biebl Thu, 8 Jun 2006 16:21:43 +0200 network-manager (0.6.2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index b1fae970..4df76836 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,8 @@ Description: network management framework daemon from a DHCP server, and change nameservers whenever it sees fit. . This package provides the userspace daemons. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-gnome Architecture: any @@ -32,6 +34,8 @@ Description: network management framework (GNOME frontend) from a DHCP server, and change nameservers whenever it sees fit. . This package provides the notification applet to the control system. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-dev Architecture: any @@ -40,6 +44,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib0 Section: libs @@ -55,6 +61,8 @@ Description: network management framework (GLib shared library) . This package provides the shared library that applications can use to query connection status via NetworkManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib-dev Section: libdevel @@ -70,6 +78,8 @@ Description: network management framework (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util0 Section: libs @@ -85,6 +95,8 @@ Description: network management framework (shared library) . This package contains a convenience library to ease the access to NetworkManager. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util-dev Section: libdevel @@ -99,4 +111,6 @@ Description: network management framework (development files) from a DHCP server, and change nameservers whenever it sees fit. . This package contains header and development files. + . + Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From c8ce7ee97a4cda637265432f17dc91abc6924bec Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 21:21:31 +0000 Subject: download.gnome.org seems to be preferred by the Gnome people... git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@850 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index c7e07a46..f2d66b4c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz +http://download.gnome.org/sources/NetworkManager/0.6/NetworkManager-(.*)\.tar\.gz -- cgit 1.3.0-6-gf8a5 From 8a3aa7b73917d56ea69452dc9d76aa53aac0267d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 22:21:30 +0000 Subject: The NetworkManager daemon needs some time to shutdown. Pass --retry 60 to s-s-d, 60 secs should be enough. Do the same for NetworkManagerDispatcher. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@851 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 2 +- debian/network-manager.dbus-event | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index 70747683..4b70eea1 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -52,7 +52,7 @@ d_start() { # d_stop() { log_begin_msg "Stopping $DESC" - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? } diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index d26d18f4..8d35dfe4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -63,7 +63,7 @@ d_start() { # d_stop() { log_begin_msg "Stopping $DESC" - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON log_end_msg $? -- cgit 1.3.0-6-gf8a5 From 62f9aab052015becba3184d4c2e7b01dea1dbe8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 8 Jun 2006 22:32:03 +0000 Subject: Removed "sleep 1" in restart between stop and start, because s-s-d --stop --retry 60 is a much better solution. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@853 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 1 - debian/network-manager.dbus-event | 1 - 2 files changed, 2 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index 4b70eea1..18f6beb6 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -67,7 +67,6 @@ case "$1" in ;; restart|force-reload) d_stop - sleep 1 d_start ;; *) diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 8d35dfe4..4009e84d 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -79,7 +79,6 @@ case "$1" in ;; restart|force-reload) d_stop - sleep 1 d_start ;; *) -- cgit 1.3.0-6-gf8a5 From 676c97361205d04db307bf9350fe372e69499904 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 14 Jun 2006 01:04:14 +0000 Subject: hal must be able to send events about hotplugged devices to NM. Added user hal to /etc/dbus-1/system.d/NetworkManager.conf. Should git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@854 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/patches/02-dbus_access_network_manager.patch | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e84a729e..406dc2ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.6.3-2) unstable; urgency=low + + * Updated 02-dbus_access_network_manager.patch to allow the hal daemon + (running as user "hal") to send events about hotplugged devices to the + NetworkManager daemon. (Closes: 355785) + + -- Michael Biebl Wed, 14 Jun 2006 02:53:13 +0200 + network-manager (0.6.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index 06886be3..afa3bc3b 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,10 +1,14 @@ ---- src/NetworkManager.conf.orig 2006-02-07 04:24:38.000000000 +0100 -+++ src/NetworkManager.conf 2006-02-07 04:25:00.000000000 +0100 -@@ -8,7 +8,7 @@ +--- src/NetworkManager.conf.orig 2006-06-14 02:47:10.000000000 +0200 ++++ src/NetworkManager.conf 2006-06-14 02:48:31.000000000 +0200 +@@ -8,7 +8,11 @@ - ++ ++ ++ ++ + -- cgit 1.3.0-6-gf8a5 From 2d050cf0d49b7179871631290e37a91fb879a3a3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 20 Jun 2006 16:01:54 +0000 Subject: Added a Recommends: notification-daemon to network-manager-gnome. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@859 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 406dc2ba..c445491e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ network-manager (0.6.3-2) unstable; urgency=low * Updated 02-dbus_access_network_manager.patch to allow the hal daemon (running as user "hal") to send events about hotplugged devices to the NetworkManager daemon. (Closes: 355785) + * Added a Recommends: notification-daemon to network-manager-gnome. - -- Michael Biebl Wed, 14 Jun 2006 02:53:13 +0200 + -- Michael Biebl Wed, 14 Jun 2006 14:00:15 +0200 network-manager (0.6.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4df76836..9288b533 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) +Recommends: notification-daemon Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5 From e2bb2da74742a9c731492f0c83bf004c7fc8fe46 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 20 Jun 2006 21:43:19 +0000 Subject: Improved the package description and the manpage of network-manager-gnome to make it clear that nm-applet is a systray applet and not a gnome-panel applet. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@862 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 3 ++- debian/changelog | 4 +++- debian/control | 7 ++++++- debian/nm-applet.sgml | 9 ++++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 4694c299..8fa5e314 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,6 +1,7 @@ NetworkManager consists of two parts: one is on the system level daemon that manages the connections and gathers information about new networks. The other -is an applet that users can use to interact with the NetworkManager daemon. +is a systray applet that users can use to interact with the NetworkManager +daemon. Security ~~~~~~~~ diff --git a/debian/changelog b/debian/changelog index c445491e..c0ced1cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ network-manager (0.6.3-2) unstable; urgency=low (running as user "hal") to send events about hotplugged devices to the NetworkManager daemon. (Closes: 355785) * Added a Recommends: notification-daemon to network-manager-gnome. + * Improved the package description and the manpage of network-manager-gnome. + (Closes: #362962) - -- Michael Biebl Wed, 14 Jun 2006 14:00:15 +0200 + -- Michael Biebl Tue, 20 Jun 2006 23:22:11 +0200 network-manager (0.6.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9288b533..2ac3103d 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,12 @@ Description: network management framework (GNOME frontend) NetworkManager is _intended_ to replace default routes, obtain IP addresses from a DHCP server, and change nameservers whenever it sees fit. . - This package provides the notification applet to the control system. + This package contains a systray applet for GNOME's notification area but it + also works for other desktop environments which provide a systray like KDE + or XFCE. + It displays the available networks and allows to easily switch between them. + For encrypted networks it will prompt the user for the key/passphrase and it + can optionally store them in the gnome-keyring. . Homepage: http://www.gnome.org/projects/NetworkManager/ diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml index b027f8a0..f457fd93 100644 --- a/debian/nm-applet.sgml +++ b/debian/nm-applet.sgml @@ -57,9 +57,12 @@ manpage.1: manpage.sgml DESCRIPTION - &package; is the gnome front-end for NetworkManager - If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian - in /usr/share/doc/network-manager + &package; is the GNOME front-end for NetworkManager + It is a systray applet which will display an icon in GNOME's notification area but it + also works for other desktop environments which provide a systray like KDE or XFCE. + &package; shows a list of available networks and allows you to easily switch between them. For encrypted networks it + will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to + type them again. SEE ALSO -- cgit 1.3.0-6-gf8a5 From 0cf95b63fb5cf6aa9856bd1ad527f4896d76d719 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 23 Jul 2006 09:49:09 +0000 Subject: * New upstream release. (closes: #379163) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@886 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c0ced1cf..1265705c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-1) unstable; urgency=low + + * New upstream release. (closes: #379163) + + -- Riccardo Setti Sun, 23 Jul 2006 11:47:10 +0200 + network-manager (0.6.3-2) unstable; urgency=low * Updated 02-dbus_access_network_manager.patch to allow the hal daemon -- cgit 1.3.0-6-gf8a5 From a449bc5835aeca913c8ccc5e378ec3b06fcdde2f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 2 Aug 2006 17:56:24 +0000 Subject: - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@910 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 ++- debian/control | 2 +- debian/patches/08-disabled_devices.patch | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1265705c..cd7f013b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) + - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) - -- Riccardo Setti Sun, 23 Jul 2006 11:47:10 +0200 + -- Riccardo Setti Wed, 2 Aug 2006 19:51:48 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 2ac3103d..9f16c586 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: network-manager Section: net Priority: optional -Maintainer: Riccardo Setti +Maintainer: Riccardo Setti Uploaders: Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index d5392c9f..37e2d727 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -29,17 +29,17 @@ + * definitely not okay to control it. + */ + for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { -+ if (!strcmp (curr_b->type, "auto") ++ if (!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug") + && strstr (curr_b->name, iface)) + blacklist = FALSE; + } + + /* If the interface has no options other than just "inet dhcp" -+ * it's probably ok to fiddle with it. ++ * it's probably ok to fiddle with it. + */ + for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { + if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp")) ++ || strcmp (curr_d->data, "dhcp" )|| strcmp ( currd->key, "iface")) + blacklist = TRUE; + } + -- cgit 1.3.0-6-gf8a5 From 420f5e82421755940f3d1b3f3145e7bf9da20299 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Wed, 2 Aug 2006 18:04:11 +0000 Subject: fixed an error in debian/patch/08.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@911 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/08-disabled_devices.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index 37e2d727..50a4e4c2 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -29,7 +29,7 @@ + * definitely not okay to control it. + */ + for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { -+ if (!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug") ++ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")) + && strstr (curr_b->name, iface)) + blacklist = FALSE; + } @@ -39,7 +39,7 @@ + */ + for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { + if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp" )|| strcmp ( currd->key, "iface")) ++ || strcmp (curr_d->data, "dhcp" )|| strcmp ( curr_d->key, "iface")) + blacklist = TRUE; + } + -- cgit 1.3.0-6-gf8a5 From b5c7402310a94300f20924523d5cd0d8b63816d6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Fri, 4 Aug 2006 22:39:28 +0000 Subject: updated README.Debian git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@912 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian index 8fa5e314..f52a031f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -25,6 +25,11 @@ auto wlan0 iface wlan0 inet dhcp -> This device is managed by NM. +1.a) +allow-hotplug eth1 +iface eth0 ined dhcp +-> This device is manager by NM + 2.) auto wlan0 iface wlan0 inet dhcp -- cgit 1.3.0-6-gf8a5 From 28d56c2421a32c149cc62a7ab14ab18f05bd042e Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 7 Aug 2006 08:36:38 +0000 Subject: - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) * Added 09_fix_bigendian_sha1.patch wich will fix the WPA+plaint text pw auth method on powerpc (and in other bigendian arch) (closes: #381464) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@913 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/09_fix_bigendian_sha1.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 debian/patches/09_fix_bigendian_sha1.patch diff --git a/debian/changelog b/debian/changelog index cd7f013b..cd19f05b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) - - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) + - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) + * Added 09_fix_bigendian_sha1.patch wich will fix the WPA+plaint text pw + auth method on powerpc (and in other bigendian arch) (closes: #381464) - -- Riccardo Setti Wed, 2 Aug 2006 19:51:48 +0200 + -- Riccardo Setti Mon, 7 Aug 2006 10:32:52 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/patches/09_fix_bigendian_sha1.patch b/debian/patches/09_fix_bigendian_sha1.patch new file mode 100644 index 00000000..07d2f2ae --- /dev/null +++ b/debian/patches/09_fix_bigendian_sha1.patch @@ -0,0 +1,14 @@ +--- configure.old 2006-08-07 10:31:07.000000000 +0200 ++++ configure 2006-08-07 10:31:14.000000000 +0200 +@@ -25440,6 +25440,11 @@ + echo "${ECHO_T}no" >&6; } + fi + ++## Enable bigendian stuff for sha1 hash code ++if "$target_cpu" = "powerpc"; then ++ CPU_CFLAGS="-DWORDS_BIGENDIAN $CPU_CFLAGS" ++fi ++ + ac_config_files="$ac_config_files Makefile include/Makefile utils/Makefile src/Makefile src/named-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile dispatcher-daemon/Makefile gnome/Makefile gnome/applet/Makefile gnome/applet/icons/Makefile gnome/libnm_glib/libnm_glib.pc gnome/libnm_glib/Makefile gnome/vpn-properties/Makefile test/Makefile test/test-common/Makefile test/libnm-util/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/RedHat/NetworkManagerDispatcher initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/Slackware/rc.networkmanager-dispatcher initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/SUSE/networkmanager-dispatcher initscript/Arch/Makefile initscript/Arch/networkmanager initscript/Arch/networkmanager-dispatcher man/Makefile man/NetworkManager.1 man/NetworkManagerDispatcher.1 man/nm-tool.1 po/Makefile.in NetworkManager.pc" + + cat >confcache <<\_ACEOF -- cgit 1.3.0-6-gf8a5 From 0eca7a8c9c4bafc2cb977306aa0d6c1b4774b315 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 7 Aug 2006 11:22:31 +0000 Subject: fixed some typo in README.Debian, removed 09.patch (better solution are coming), fixed 08.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@914 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 4 ++-- debian/patches/08-disabled_devices.patch | 2 +- debian/patches/09_fix_bigendian_sha1.patch | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 debian/patches/09_fix_bigendian_sha1.patch diff --git a/debian/README.Debian b/debian/README.Debian index f52a031f..0e20e53e 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -26,8 +26,8 @@ iface wlan0 inet dhcp -> This device is managed by NM. 1.a) -allow-hotplug eth1 -iface eth0 ined dhcp +allow-hotplug eth0 +iface eth0 inet dhcp -> This device is manager by NM 2.) diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch index 50a4e4c2..07b87d9a 100644 --- a/debian/patches/08-disabled_devices.patch +++ b/debian/patches/08-disabled_devices.patch @@ -39,7 +39,7 @@ + */ + for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { + if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp" )|| strcmp ( curr_d->key, "iface")) ++ || strcmp (curr_d->data, "dhcp" )) + blacklist = TRUE; + } + diff --git a/debian/patches/09_fix_bigendian_sha1.patch b/debian/patches/09_fix_bigendian_sha1.patch deleted file mode 100644 index 07d2f2ae..00000000 --- a/debian/patches/09_fix_bigendian_sha1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.old 2006-08-07 10:31:07.000000000 +0200 -+++ configure 2006-08-07 10:31:14.000000000 +0200 -@@ -25440,6 +25440,11 @@ - echo "${ECHO_T}no" >&6; } - fi - -+## Enable bigendian stuff for sha1 hash code -+if "$target_cpu" = "powerpc"; then -+ CPU_CFLAGS="-DWORDS_BIGENDIAN $CPU_CFLAGS" -+fi -+ - ac_config_files="$ac_config_files Makefile include/Makefile utils/Makefile src/Makefile src/named-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/backends/Makefile libnm-util/libnm-util.pc libnm-util/Makefile dispatcher-daemon/Makefile gnome/Makefile gnome/applet/Makefile gnome/applet/icons/Makefile gnome/libnm_glib/libnm_glib.pc gnome/libnm_glib/Makefile gnome/vpn-properties/Makefile test/Makefile test/test-common/Makefile test/libnm-util/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/RedHat/NetworkManagerDispatcher initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/Slackware/rc.networkmanager-dispatcher initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/SUSE/networkmanager-dispatcher initscript/Arch/Makefile initscript/Arch/networkmanager initscript/Arch/networkmanager-dispatcher man/Makefile man/NetworkManager.1 man/NetworkManagerDispatcher.1 man/nm-tool.1 po/Makefile.in NetworkManager.pc" - - cat >confcache <<\_ACEOF -- cgit 1.3.0-6-gf8a5 From a67dce3c363667f5efea4519b9b1178a5597a266 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 7 Aug 2006 15:07:07 +0000 Subject: * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@915 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +- debian/patches/09_fix_bigendian_words.patch | 310 ++++++++++++++++++++++++++++ 2 files changed, 312 insertions(+), 2 deletions(-) create mode 100644 debian/patches/09_fix_bigendian_words.patch diff --git a/debian/changelog b/debian/changelog index cd19f05b..3ea54527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,10 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (closes: #379163) - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) - * Added 09_fix_bigendian_sha1.patch wich will fix the WPA+plaint text pw + * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw auth method on powerpc (and in other bigendian arch) (closes: #381464) - -- Riccardo Setti Mon, 7 Aug 2006 10:32:52 +0200 + -- Riccardo Setti Mon, 7 Aug 2006 17:06:47 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/patches/09_fix_bigendian_words.patch b/debian/patches/09_fix_bigendian_words.patch new file mode 100644 index 00000000..736103b9 --- /dev/null +++ b/debian/patches/09_fix_bigendian_words.patch @@ -0,0 +1,310 @@ +--- configure.orig 2006-08-07 17:02:37.000000000 +0200 ++++ configure 2006-08-07 17:03:56.000000000 +0200 +@@ -23030,6 +23030,293 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + ++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 ++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } ++if test "${ac_cv_c_bigendian+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # See if sys/param.h defines the BYTE_ORDER macro. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN ++ bogus endian macros ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ # It does; now see whether it defined to BIG_ENDIAN or not. ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++#if BYTE_ORDER != BIG_ENDIAN ++ not big endian ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_bigendian=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # It does not; compile a test program. ++if test "$cross_compiling" = yes; then ++ # try to guess the endianness by grepping values into an object file ++ ac_cv_c_bigendian=unknown ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } ++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } ++int ++main () ++{ ++ _ascii (); _ebcdic (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ++ ac_cv_c_bigendian=yes ++fi ++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then ++ if test "$ac_cv_c_bigendian" = unknown; then ++ ac_cv_c_bigendian=no ++ else ++ # finding both strings is unlikely to happen, but who knows? ++ ac_cv_c_bigendian=unknown ++ fi ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++ ++ /* Are we little or big endian? From Harbison&Steele. */ ++ union ++ { ++ long int l; ++ char c[sizeof (long int)]; ++ } u; ++ u.l = 1; ++ return u.c[sizeof (long int) - 1] == 1; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_bigendian=no ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_c_bigendian=yes ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 ++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } ++case $ac_cv_c_bigendian in ++ yes) ++ ++cat >>confdefs.h <<\_ACEOF ++#define WORDS_BIGENDIAN 1 ++_ACEOF ++ ;; ++ no) ++ ;; ++ *) ++ { { echo "$as_me:$LINENO: error: unknown endianness ++presetting ac_cv_c_bigendian=no (or yes) will help" >&5 ++echo "$as_me: error: unknown endianness ++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} ++ { (exit 1); exit 1; }; } ;; ++esac ++ ++ + + # Check whether --with-distro was given. + if test "${with_distro+set}" = set; then +--- configure.in.org 2006-08-07 17:02:45.000000000 +0200 ++++ configure.in 2006-08-07 17:03:37.000000000 +0200 +@@ -50,6 +50,11 @@ + AC_PROG_INTLTOOL([0.27.2]) + AM_GLIB_GNU_GETTEXT + ++dnl ++dnl Make sha1.c happy on big endian systems ++dnl ++AC_C_BIGENDIAN ++ + AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware])) + if test "z$with_distro" = "z"; then + AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") -- cgit 1.3.0-6-gf8a5 From 321063053e273062a758eba1a2754c4209b8f023 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 7 Aug 2006 22:18:00 +0000 Subject: As NetworkManager uses ifup/ifdown in the backend, add an explicit dependency on ifupdown package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@920 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9f16c586..a528d1ce 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0), ifupdown Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5 From 55de205b9e6260d5c0580a92670f680218f9ac3a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 7 Aug 2006 22:27:21 +0000 Subject: - Use the term "D-Bus" in favor of dbus, upstream recommends this spelling. - Proper line breaks in changelog. - Fix for a minor typo in README.Debian. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@922 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 10 +++++----- debian/changelog | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 0e20e53e..59a789e4 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -8,7 +8,7 @@ Security To allow users to connect to the NetworkManager daemon they have to be in the group "netdev". If you want to add a user to group "netdev" use the command "adduser username netdev" or one of the graphical user management frontends. -After that you have to reload dbus with the command "/etc/init.d/dbus reload". +After that you have to reload D-Bus with the command "/etc/init.d/dbus reload". Configuration ~~~~~~~~~~~~~ @@ -28,7 +28,7 @@ iface wlan0 inet dhcp 1.a) allow-hotplug eth0 iface eth0 inet dhcp --> This device is manager by NM +-> This device is managed by NM 2.) auto wlan0 @@ -42,9 +42,9 @@ iface wlan0 inet dhcp 4.) iface eth0 inet static -address 192.168.1.10 -netmask 255.255.255.0 -gateway 192.168.1.1 + address 192.168.1.10 + netmask 255.255.255.0 + gateway 192.168.1.1 -> This device is *not* managed by NM because it is configured as "static" and has additional options. diff --git a/debian/changelog b/debian/changelog index 3ea54527..e653d562 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ network-manager (0.6.4-1) unstable; urgency=low - * New upstream release. (closes: #379163) - - allow "auto-hotplug" iface to be managed by NM. (closes: #381017) + * New upstream release. (Closes: #379163) + * Allow interfaces marked "auto-hotplug" to be managed by NM. + (Closes: #381017) * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw - auth method on powerpc (and in other bigendian arch) (closes: #381464) + auth method on powerpc (and on other bigendian arch). (Closes: #381464) -- Riccardo Setti Mon, 7 Aug 2006 17:06:47 +0200 -- cgit 1.3.0-6-gf8a5 From 369c275e40eb385976eecd781b5d2c1a1b640443 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 8 Aug 2006 02:10:36 +0000 Subject: - Merge the patches resolvonf+disabled_devices into a single patch debian_backend. This one patch should hold all modifications to the Debian backend. - Do not handle mapped devices. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@924 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 ++- debian/patches/05-debian_backend.patch | 123 +++++++++++++++++++++++++++++++ debian/patches/05-resolvconf.patch | 20 ----- debian/patches/08-disabled_devices.patch | 52 ------------- 4 files changed, 132 insertions(+), 74 deletions(-) create mode 100644 debian/patches/05-debian_backend.patch delete mode 100644 debian/patches/05-resolvconf.patch delete mode 100644 debian/patches/08-disabled_devices.patch diff --git a/debian/changelog b/debian/changelog index e653d562..4ca14491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,19 @@ network-manager (0.6.4-1) unstable; urgency=low + [ Riccardo Setti ] * New upstream release. (Closes: #379163) - * Allow interfaces marked "auto-hotplug" to be managed by NM. + * Allow interfaces marked "auto-hotplug" to be managed by NM. (Closes: #381017) * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw auth method on powerpc (and on other bigendian arch). (Closes: #381464) - -- Riccardo Setti Mon, 7 Aug 2006 17:06:47 +0200 + [ Michael Biebl ] + * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into + a single patch called 05-debian_backend.patch. + * Updated 05-debian_backend.patch to not control mapped interfaces. + (Closes: #377498) + + -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch new file mode 100644 index 00000000..84c7238e --- /dev/null +++ b/debian/patches/05-debian_backend.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c +index 740572a..8090696 100644 +--- a/src/backends/NetworkManagerDebian.c ++++ b/src/backends/NetworkManagerDebian.c +@@ -37,6 +37,7 @@ #include "interface_parser.h" + #include "nm-utils.h" + + #define ARPING "/usr/sbin/arping" ++#define RESOLVCONF "resolvconf" + + /* + * nm_system_init +@@ -514,13 +515,60 @@ gboolean nm_system_device_get_use_dhcp ( + /* + * nm_system_device_get_disabled + * +- * Return whether the distro-specific system config tells us to use +- * dhcp for this device. ++ * Return whether the distro-specific system config tells us to disable ++ * this device. + * + */ + gboolean nm_system_device_get_disabled (NMDevice *dev) + { +- return FALSE; ++ const char *iface; ++ if_block *curr_device, *curr_b; ++ if_data *curr_d; ++ gboolean blacklist = TRUE; ++ ++ g_return_val_if_fail (dev != NULL, TRUE); ++ ++ iface = nm_device_get_iface (dev); ++ ++ ifparser_init (); ++ ++ /* If the device is listed in a mapping, do not control it */ ++ if (ifparser_getmapping (iface) != NULL) { ++ blacklist = TRUE; ++ goto out; ++ } ++ ++ /* If the interface isn't listed in /etc/network/interfaces then ++ * it's considered okay to control it. ++ */ ++ curr_device = ifparser_getif (iface); ++ if (curr_device == NULL) { ++ blacklist = FALSE; ++ goto out; ++ } ++ ++ /* If the interface is listed and isn't marked "auto" then it's ++ * definitely not okay to control it. ++ */ ++ for (curr_b = ifparser_getfirst (); curr_b; curr_b = curr_b->next) { ++ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")) ++ && strstr (curr_b->name, iface)) ++ blacklist = FALSE; ++ } ++ ++ /* If the interface has no options other than just "inet dhcp" ++ * it's probably ok to fiddle with it. ++ */ ++ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { ++ if (strcmp (curr_d->key, "inet") ++ || strcmp (curr_d->data, "dhcp" )) ++ blacklist = TRUE; ++ } ++ ++out: ++ ifparser_destroy (); ++ ++ return blacklist; + } + + +@@ -679,7 +727,10 @@ void nm_system_set_hostname (NMIP4Config + */ + gboolean nm_system_should_modify_resolv_conf (void) + { +- return TRUE; ++ if (g_find_program_in_path(RESOLVCONF) != NULL) ++ return FALSE; ++ else ++ return TRUE; + } + + +diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c +index 53d6487..aa81134 100644 +--- a/src/backends/interface_parser.c ++++ b/src/backends/interface_parser.c +@@ -198,6 +198,18 @@ if_block *ifparser_getif(const char* ifa + return NULL; + } + ++if_block *ifparser_getmapping(const char* iface) ++{ ++ if_block *curr = first; ++ while(curr!=NULL) ++ { ++ if (strcmp(curr->type,"mapping")==0 && strcmp(curr->name,iface)==0) ++ return curr; ++ curr = curr->next; ++ } ++ return NULL; ++} ++ + const char *ifparser_getkey(if_block* iface, const char *key) + { + if_data *curr = iface->info; +diff --git a/src/backends/interface_parser.h b/src/backends/interface_parser.h +index 075f454..8914283 100644 +--- a/src/backends/interface_parser.h ++++ b/src/backends/interface_parser.h +@@ -44,6 +44,7 @@ void ifparser_init(void); + void ifparser_destroy(void); + + if_block *ifparser_getif(const char* iface); ++if_block *ifparser_getmapping(const char* iface); + if_block *ifparser_getfirst(void); + const char *ifparser_getkey(if_block* iface, const char *key); + diff --git a/debian/patches/05-resolvconf.patch b/debian/patches/05-resolvconf.patch deleted file mode 100644 index 8e55c8fa..00000000 --- a/debian/patches/05-resolvconf.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/backends/NetworkManagerDebian.c 2006-02-28 22:24:22.000000000 +0100 -+++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c 2006-03-06 12:19:34.000000000 +0100 -@@ -37,6 +37,7 @@ - #include "nm-utils.h" - - #define ARPING "/usr/sbin/arping" -+#define RESOLVCONF "resolvconf" - - /* - * nm_system_init -@@ -679,5 +680,8 @@ - */ - gboolean nm_system_should_modify_resolv_conf (void) - { -- return TRUE; -+ if (g_find_program_in_path(RESOLVCONF) != NULL) -+ return FALSE; -+ else -+ return TRUE; - } diff --git a/debian/patches/08-disabled_devices.patch b/debian/patches/08-disabled_devices.patch deleted file mode 100644 index 07b87d9a..00000000 --- a/debian/patches/08-disabled_devices.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- src/backends/NetworkManagerDebian.c.orig 2006-05-05 19:59:18.000000000 +0200 -+++ src/backends/NetworkManagerDebian.c 2006-05-05 20:04:34.000000000 +0200 -@@ -521,7 +521,48 @@ - */ - gboolean nm_system_device_get_disabled (NMDevice *dev) - { -- return FALSE; -+ const char *iface; -+ if_block *curr_device, *curr_b; -+ if_data *curr_d; -+ gboolean blacklist = TRUE; -+ -+ g_return_val_if_fail (dev != NULL, TRUE); -+ -+ iface = nm_device_get_iface (dev); -+ -+ ifparser_init (); -+ -+ /* If the interface isn't listed in /etc/network/interfaces then -+ * it's considered okay to control it. -+ */ -+ curr_device = ifparser_getif (iface); -+ if (curr_device == NULL) { -+ blacklist = FALSE; -+ goto out; -+ } -+ -+ /* If the interface is listed and isn't marked "auto" then it's -+ * definitely not okay to control it. -+ */ -+ for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { -+ if ((!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")) -+ && strstr (curr_b->name, iface)) -+ blacklist = FALSE; -+ } -+ -+ /* If the interface has no options other than just "inet dhcp" -+ * it's probably ok to fiddle with it. -+ */ -+ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { -+ if (strcmp (curr_d->key, "inet") -+ || strcmp (curr_d->data, "dhcp" )) -+ blacklist = TRUE; -+ } -+ -+out: -+ ifparser_destroy (); -+ -+ return blacklist; - } - - -- cgit 1.3.0-6-gf8a5 From 0d83a8843f0157a1fba8753d4cef1a10e69e4f8b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 8 Aug 2006 02:28:35 +0000 Subject: Fix small typo in changelog. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@925 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ca14491..d58cff56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,8 @@ network-manager (0.6.4-1) unstable; urgency=low * New upstream release. (Closes: #379163) * Allow interfaces marked "auto-hotplug" to be managed by NM. (Closes: #381017) - * Added 09_fix_bigendian_words.patch wich will fix the WPA+plaint text pw - auth method on powerpc (and on other bigendian arch). (Closes: #381464) + * Added 09_fix_bigendian_words.patch which will fix the WPA+plain text pw + auth method on powerpc (and on other bigendian archs). (Closes: #381464) [ Michael Biebl ] * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into -- cgit 1.3.0-6-gf8a5 From 911c1f8ef6f9eb7f52f5bdf7c973f8f528549726 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 12 Aug 2006 15:37:12 +0000 Subject: Improve the dial-up configuration handling: - Display the provider name instead of a cryptic number - Check the return value of ifupdown - Add a new section to README.Debian about how to set up a dial-up connection git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@927 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 20 +++++++- debian/patches/05-debian_backend.patch | 92 +++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 4 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 59a789e4..621518cd 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -10,8 +10,8 @@ group "netdev". If you want to add a user to group "netdev" use the command "adduser username netdev" or one of the graphical user management frontends. After that you have to reload D-Bus with the command "/etc/init.d/dbus reload". -Configuration -~~~~~~~~~~~~~ +Configuration of wireless and ethernet interfaces +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Only devices that are *not* listed in /etc/network/interfaces or which have been configured "auto" and "dhcp" (with no other options) are managed by NM. @@ -51,3 +51,19 @@ iface eth0 inet static 5.) Device is not listed in /etc/network/interfaces. -> Device is managed by NM. + +Dial-up configuration +~~~~~~~~~~~~~~~~~~~~~ +After configuring your PPP interface (either manually or by using a tool like +"pppconfig") to work with a peer called "myisp" you should edit +/etc/network/interfaces and add a stanza like this: + +iface ppp0 inet ppp + provider myisp + +NM will then make it possible to dial this connection. +If you want to set up multiple internet service providers simply create a new +stanza as listed above specifying the provider and a different iface, e.g. ppp1. + +Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" +man page for further information. diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 84c7238e..c8006623 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,5 +1,5 @@ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..8090696 100644 +index 740572a..3a2fdd6 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -37,6 +37,7 @@ #include "interface_parser.h" @@ -74,7 +74,95 @@ index 740572a..8090696 100644 } -@@ -679,7 +727,10 @@ void nm_system_set_hostname (NMIP4Config +@@ -563,12 +611,18 @@ gboolean nm_system_deactivate_dialup (GS + if (strcmp (dialup, config->name) == 0) + { + char *cmd; ++ int status; + + nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data); + cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data); + nm_spawn_process (cmd); + g_free (cmd); +- ret = TRUE; ++ if (status == 0) { ++ ret = TRUE; ++ } else { ++ nm_warning ("Couldn't deactivate dialup device %s (%s) - %d", dialup, (char *) config->data, status); ++ ret = FALSE; ++ } + break; + } + } +@@ -587,12 +641,18 @@ gboolean nm_system_activate_dialup (GSLi + if (strcmp (dialup, config->name) == 0) + { + char *cmd; ++ int status; + + nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data); + cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data); + nm_spawn_process (cmd); + g_free (cmd); +- ret = TRUE; ++ if (status == 0) { ++ ret = TRUE; ++ } else { ++ nm_warning ("Couldn't activate dialup device %s (%s) - %d", dialup, (char *) config->data, status); ++ ret = FALSE; ++ } + break; + } + } +@@ -603,23 +663,26 @@ gboolean nm_system_activate_dialup (GSLi + GSList * nm_system_get_dialup_config (void) + { + const char *buf; +- unsigned int i = 0; ++ const char *provider; + GSList *list = NULL; + if_block *curr; + ifparser_init(); + + /* FIXME: get all ppp(and others?) lines from /e/n/i here */ + curr = ifparser_getfirst(); +- while(curr!=NULL) ++ while (curr != NULL) + { + NMDialUpConfig *config; +- if (strcmp(curr->type,"iface")==0) ++ if (strcmp(curr->type, "iface") == 0) + { +- buf = ifparser_getkey(curr,"inet"); +- if (buf && strcmp (buf, "ppp")==0) ++ buf = ifparser_getkey(curr, "inet"); ++ if (buf && strcmp (buf, "ppp") == 0) + { ++ provider = ifparser_getkey(curr, "provider"); ++ if (!provider) ++ provider = "default provider"; + config = g_malloc (sizeof (NMDialUpConfig)); +- config->name = g_strdup_printf ("Modem (#%d)", i++); ++ config->name = g_strdup_printf ("%s via Modem", provider); + config->data = g_strdup (curr->name); /* interface name */ + + list = g_slist_append (list, config); +@@ -631,14 +694,6 @@ GSList * nm_system_get_dialup_config (vo + } + ifparser_destroy(); + +- /* Hack: Go back and remove the "(#0)" if there is only one device */ +- if (i == 1) +- { +- NMDialUpConfig *config = (NMDialUpConfig *) list->data; +- g_free (config->name); +- config->name = g_strdup ("Modem"); +- } +- + return list; + } + +@@ -679,7 +734,10 @@ void nm_system_set_hostname (NMIP4Config */ gboolean nm_system_should_modify_resolv_conf (void) { -- cgit 1.3.0-6-gf8a5 From ef8b63010b80cb4024f46bd8d702318d665435a4 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 13 Aug 2006 20:44:48 +0000 Subject: updated some patches git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@932 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01-supplicant_timeout.patch | 6 +-- debian/patches/04-if_fix.patch | 11 ++--- debian/patches/06-dispatch_more_events.patch | 66 +++------------------------- 3 files changed, 12 insertions(+), 71 deletions(-) diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch index 0723c83a..45060db4 100644 --- a/debian/patches/01-supplicant_timeout.patch +++ b/debian/patches/01-supplicant_timeout.patch @@ -1,6 +1,6 @@ ---- src/nm-device-802-11-wireless.c.orig 2006-02-13 11:46:50.000000000 +0100 -+++ src/nm-device-802-11-wireless.c 2006-02-13 11:47:08.000000000 +0100 -@@ -2205,7 +2205,7 @@ +--- src/nm-device-802-11-wireless.c 2006-06-20 20:15:45.000000000 +0200 ++++ src/nm-device-802-11-wireless.c.new 2006-08-13 22:32:13.000000000 +0200 +@@ -2329,7 +2329,7 @@ } diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch index b5667c53..ca0b1574 100644 --- a/debian/patches/04-if_fix.patch +++ b/debian/patches/04-if_fix.patch @@ -1,11 +1,6 @@ -Index: src/nm-device-802-3-ethernet.c -=================================================================== -RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v -retrieving revision 1.3 -diff -u -r1.3 nm-device-802-3-ethernet.c ---- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3 -+++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000 -@@ -328,7 +328,9 @@ +--- src/nm-device-802-3-ethernet.c 2006-05-13 21:06:05.000000000 +0200 ++++ src/nm-device-802-3-ethernet.c.new 2006-08-13 22:34:56.000000000 +0200 +@@ -376,7 +376,9 @@ /**************************************/ /* MII capability detection */ /**************************************/ diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index e8b30810..8b85f49a 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -1,7 +1,6 @@ -diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c ---- network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-13 16:51:57.000000000 +0000 -+++ network-manager-0.6.2/dispatcher-daemon/NetworkManagerDispatcher.c 2006-04-03 18:14:06.000000000 +0100 -@@ -44,6 +44,8 @@ enum NMDAction +--- dispatcher-daemon/NetworkManagerDispatcher.c.old 2006-08-13 22:40:18.000000000 +0200 ++++ dispatcher-daemon/NetworkManagerDispatcher.c 2006-08-13 22:40:27.000000000 +0200 +@@ -44,6 +44,8 @@ NMD_DEVICE_DONT_KNOW, NMD_DEVICE_NOW_INACTIVE, NMD_DEVICE_NOW_ACTIVE, @@ -10,7 +9,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n }; typedef enum NMDAction NMDAction; -@@ -95,6 +97,10 @@ static void nmd_execute_scripts (NMDActi +@@ -95,6 +97,10 @@ if (action == NMD_DEVICE_NOW_ACTIVE) char_act = "up"; else if (action == NMD_DEVICE_NOW_INACTIVE) @@ -21,7 +20,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n char_act = "down"; else return; -@@ -217,9 +223,13 @@ static DBusHandlerResult nmd_dbus_filter +@@ -217,9 +223,13 @@ } if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) @@ -36,7 +35,7 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n if (action != NMD_DEVICE_DONT_KNOW) { -@@ -234,8 +244,10 @@ static DBusHandlerResult nmd_dbus_filter +@@ -234,8 +244,10 @@ if (dev_object_path && dev_iface_name) { nm_info ("Device %s (%s) is now %s.", dev_object_path, dev_iface_name, @@ -49,56 +48,3 @@ diff -ruNp network-manager-0.6.2~/dispatcher-daemon/NetworkManagerDispatcher.c n nmd_execute_scripts (action, dev_iface_name); } -diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in ---- network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 -+++ network-manager-0.6.2/man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 -@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo - directory in response to interfaces coming up and down. The scripts are run - alphabetically. The first parameter is the network interface name. The second - parameter is -+.I pre\-up -+before bringing the interface up, - .I up --if the interface is now up and -+after bringing the interface up, - .I down --if the interface is now down. -+before taking the interface down and -+.I post\-down -+after taking the interface down. - .SH OPTIONS - The following options are supported: - .TP -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c ---- network-manager-0.6.2~/src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 -+++ network-manager-0.6.2/src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 -@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si - { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, - { DEVICE_ACTIVATING, "DeviceActivating" }, - { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, -+ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, - { DEVICE_ADDED, "DeviceAdded" }, - { DEVICE_REMOVED, "DeviceRemoved" }, - { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h ---- network-manager-0.6.2~/src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 -+++ network-manager-0.6.2/src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 -@@ -40,6 +40,7 @@ typedef enum - DEVICE_ACTIVATING, - DEVICE_ACTIVATION_FAILED, - DEVICE_ACTIVATION_CANCELED, -+ DEVICE_DEACTIVATED, - DEVICE_ADDED, - DEVICE_REMOVED, - DEVICE_CARRIER_ON, -diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c ---- network-manager-0.6.2~/src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 -+++ network-manager-0.6.2/src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 -@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) - NM_DEVICE_GET_CLASS (self)->deactivate (self); - - nm_schedule_state_change_signal_broadcast (self->priv->app_data); -+ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); - } - - -- cgit 1.3.0-6-gf8a5 From 65dce1fd406fc96801d744b763608bd44cb536d5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 10:51:43 +0000 Subject: fixed debian/patches/06 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@941 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/06-dispatch_more_events.patch | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index 8b85f49a..adbae7ae 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -48,3 +48,55 @@ nmd_execute_scripts (action, dev_iface_name); } +diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in +--- man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 ++++ man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 +@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo + directory in response to interfaces coming up and down. The scripts are run + alphabetically. The first parameter is the network interface name. The second + parameter is ++.I pre\-up ++before bringing the interface up, + .I up +-if the interface is now up and ++after bringing the interface up, + .I down +-if the interface is now down. ++before taking the interface down and ++.I post\-down ++after taking the interface down. + .SH OPTIONS + The following options are supported: + .TP +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c +--- src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 ++++ src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 +@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si + { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, + { DEVICE_ACTIVATING, "DeviceActivating" }, + { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, ++ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, + { DEVICE_ADDED, "DeviceAdded" }, + { DEVICE_REMOVED, "DeviceRemoved" }, + { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, +diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h +--- src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 ++++ src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 +@@ -40,6 +40,7 @@ typedef enum + DEVICE_ACTIVATING, + DEVICE_ACTIVATION_FAILED, + DEVICE_ACTIVATION_CANCELED, ++ DEVICE_DEACTIVATED, + DEVICE_ADDED, + DEVICE_REMOVED, + DEVICE_CARRIER_ON, +diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c +--- src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 ++++ src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 +@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) + NM_DEVICE_GET_CLASS (self)->deactivate (self); + + nm_schedule_state_change_signal_broadcast (self->priv->app_data); ++ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); + } + -- cgit 1.3.0-6-gf8a5 From b05311797c4d27d5b905b12a36a87953b0ce56c6 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 14:00:11 +0000 Subject: - Bumped hal deps to version 0.5.7.1. NM needs user haldaemon for dbus operations. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@946 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 4 ++-- debian/patches/02-dbus_access_network_manager.patch | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d58cff56..b906784a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ network-manager (0.6.4-1) unstable; urgency=low [ Riccardo Setti ] * New upstream release. (Closes: #379163) + - Bumped hal deps to version 0.5.7.1. NM needs user haldaemon for dbus + operations. * Allow interfaces marked "auto-hotplug" to be managed by NM. (Closes: #381017) * Added 09_fix_bigendian_words.patch which will fix the WPA+plain text pw diff --git a/debian/control b/debian/control index a528d1ce..aaa7846e 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.7.1), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.0), ifupdown +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index afa3bc3b..139a3d87 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -5,7 +5,7 @@ - -+ ++ + + + -- cgit 1.3.0-6-gf8a5 From 09b3a71b898b0751530121dd7648d93b15b038aa Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 15 Aug 2006 16:16:46 +0000 Subject: Revert build-dep on new libhal-dev changes. Only a run-time depend on the new version is needed git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@948 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index aaa7846e..1f132a50 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Riccardo Setti Uploaders: Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.7.1), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 Package: network-manager -- cgit 1.3.0-6-gf8a5 From 81542ea9555bbb0e31188705362622d2a99c5aa2 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:17:46 +0000 Subject: (really) fixed debian/patches/06 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@949 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/06-dispatch_more_events.patch | 67 +++++++++++++--------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch index adbae7ae..60d50432 100644 --- a/debian/patches/06-dispatch_more_events.patch +++ b/debian/patches/06-dispatch_more_events.patch @@ -48,10 +48,9 @@ nmd_execute_scripts (action, dev_iface_name); } -diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in ---- man/NetworkManagerDispatcher.1.in 2006-04-03 18:10:32.000000000 +0100 -+++ man/NetworkManagerDispatcher.1.in 2006-04-03 18:14:06.000000000 +0100 -@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo +--- man/NetworkManagerDispatcher.1.in 2006-02-01 19:14:15.000000000 +0100 ++++ man/NetworkManagerDispatcher.1.in.new 2006-08-15 20:13:00.000000000 +0200 +@@ -12,10 +12,14 @@ directory in response to interfaces coming up and down. The scripts are run alphabetically. The first parameter is the network interface name. The second parameter is @@ -68,35 +67,33 @@ diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-mana .SH OPTIONS The following options are supported: .TP -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c ---- src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 -+++ src/NetworkManagerDbus.c 2006-04-03 18:14:06.000000000 +0100 -@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si - { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, - { DEVICE_ACTIVATING, "DeviceActivating" }, - { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, -+ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, - { DEVICE_ADDED, "DeviceAdded" }, - { DEVICE_REMOVED, "DeviceRemoved" }, - { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, -diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h ---- src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 -+++ src/NetworkManagerDbus.h 2006-04-03 18:14:06.000000000 +0100 -@@ -40,6 +40,7 @@ typedef enum - DEVICE_ACTIVATING, - DEVICE_ACTIVATION_FAILED, - DEVICE_ACTIVATION_CANCELED, -+ DEVICE_DEACTIVATED, - DEVICE_ADDED, - DEVICE_REMOVED, - DEVICE_CARRIER_ON, -diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c ---- src/nm-device.c 2006-03-21 17:56:34.000000000 +0000 -+++ src/nm-device.c 2006-04-03 18:14:06.000000000 +0100 -@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self) - NM_DEVICE_GET_CLASS (self)->deactivate (self); - - nm_schedule_state_change_signal_broadcast (self->priv->app_data); -+ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); +--- src/NetworkManagerDbus.c 2006-05-21 19:28:02.000000000 +0200 ++++ src/NetworkManagerDbus.c.new 2006-08-15 20:15:18.000000000 +0200 +@@ -191,6 +191,7 @@ + { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, + { DEVICE_ACTIVATING, "DeviceActivating" }, + { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, ++ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, + { DEVICE_ADDED, "DeviceAdded" }, + { DEVICE_REMOVED, "DeviceRemoved" }, + { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, +--- src/NetworkManagerDbus.h 2006-05-21 19:28:02.000000000 +0200 ++++ src/NetworkManagerDbus.h.new 2006-08-15 20:15:39.000000000 +0200 +@@ -40,6 +40,7 @@ + DEVICE_ACTIVATING, + DEVICE_ACTIVATION_FAILED, + DEVICE_ACTIVATION_CANCELED, ++ DEVICE_DEACTIVATED, + DEVICE_ADDED, + DEVICE_REMOVED, + DEVICE_CARRIER_ON, +--- src/nm-device.c 2006-07-10 22:30:49.000000000 +0200 ++++ src/nm-device.c.new 2006-08-15 20:16:11.000000000 +0200 +@@ -1436,6 +1436,7 @@ + NM_DEVICE_GET_CLASS (self)->deactivate (self); + + nm_schedule_state_change_signal_broadcast (self->priv->app_data); ++ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); } - + + -- cgit 1.3.0-6-gf8a5 From e1060c25e2b8dcf18a77886a13487c05544ff303 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:36:50 +0000 Subject: updated manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@950 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 4 +- debian/NetworkManagerDispatcher.sgml | 97 ------------------------------------ debian/network-manager.install | 1 + debian/network-manager.manpages | 3 +- debian/rules | 1 - 5 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 debian/NetworkManagerDispatcher.sgml diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml index 61ea2121..a7ab53a8 100644 --- a/debian/NetworkManager.sgml +++ b/debian/NetworkManager.sgml @@ -102,7 +102,7 @@ manpage.1: manpage.sgml SEE ALSO - nm-applet (1), NetworkManagerDispatcher (1). + nm-applet (1), NetworkManagerDispatcher (1), nm-tool (1). More Information about NetworkManager can be found at http://www.gnome.org/projects/NetworkManager/ . @@ -111,7 +111,7 @@ manpage.1: manpage.sgml AUTHOR This manual page was written by Jan Gerber j@bootlab.org and by - Riccardo Setti giskard@autistici.org for + Riccardo Setti giskard@debian.org for the Debian/Ubuntu system. diff --git a/debian/NetworkManagerDispatcher.sgml b/debian/NetworkManagerDispatcher.sgml deleted file mode 100644 index d42b2903..00000000 --- a/debian/NetworkManagerDispatcher.sgml +++ /dev/null @@ -1,97 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - 30 August, 2005"> - - - GNU"> - GPL"> -]> - - - -
- j@bootlab.org; -
- - Jan - Gerber - - - 2005 - Jan Gerber - - &date; - - - NetworkManagerDispatcher - 1 - - - &package; - - Network management framework - - - - &package; - - - - DESCRIPTION - - &package; calls scripts in -/etc/NetworkManager/dispatcher.d each time the network is broght up or down by NetworkManager. Arguments to these scripts are network device and up or down. so it will call something like /etc/NetworkManager/dispatcher.d/example eth0 up - - - - SEE ALSO - - NetworkManager (1), nm-applet (1). - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Jan Gerber j@bootlab.org and by Riccardo Setti - giskard@autistici.org for the Debian/Ubuntu system. - - - - - - diff --git a/debian/network-manager.install b/debian/network-manager.install index 0f9b1179..2fc8ba3f 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,3 +1,4 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher +debian/tmp/usr/lib/network-manager debian/tmp/etc/dbus-1/system.d/NetworkManager.conf diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 9ac2586b..907a2a3e 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,2 +1,3 @@ -debian/NetworkManagerDispatcher.1 +man/NetworkManagerDispatcher.1 +man/nm-tools.1 debian/NetworkManager.1 diff --git a/debian/rules b/debian/rules index ebbeb317..91f3f158 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From f87b0bbcf823d63a65fa22e9778daf18b2cbd5c0 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:39:52 +0000 Subject: fixed debian/network-manager.manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@951 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.manpages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 907a2a3e..4acdbf6f 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 -man/nm-tools.1 +man/nm-tool1 debian/NetworkManager.1 -- cgit 1.3.0-6-gf8a5 From bba78e24c6c3ce2a26782e97adbd045e22b7eb01 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:41:49 +0000 Subject: fixed debian/network-manager.manpages git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@952 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.manpages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 4acdbf6f..7177493c 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 -man/nm-tool1 +man/nm-tool.1 debian/NetworkManager.1 -- cgit 1.3.0-6-gf8a5 From a4c7c6bcccfb407fc6f4c9746e295f8262206f38 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 15 Aug 2006 18:44:14 +0000 Subject: fixed debian/rules git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@953 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 91f3f158..cf7bdef2 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManagerDispatcher.sgml > debian/NetworkManagerDispatcher.1 + /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 4ab5ad85236aa35dfbd2459d274e798c9f49d777 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 15 Aug 2006 21:00:45 +0000 Subject: - We already use the upstream man page for NetworkManagerDispatcher; do the same for the NetworkManager man page. - As the upstream man pages of NetworkManager and NetworkManagerDispatcher reference the nm-tool man page and we already install the nm-tool man page it makes sense to also install the corresponding nm-tool binary ;-) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@954 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/NetworkManager.sgml | 136 ---------------------------------------- debian/changelog | 5 +- debian/network-manager.install | 1 + debian/network-manager.manpages | 2 +- debian/rules | 1 - 5 files changed, 5 insertions(+), 140 deletions(-) delete mode 100644 debian/NetworkManager.sgml diff --git a/debian/NetworkManager.sgml b/debian/NetworkManager.sgml deleted file mode 100644 index a7ab53a8..00000000 --- a/debian/NetworkManager.sgml +++ /dev/null @@ -1,136 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - 30 August, 2005"> - - - GNU"> - GPL"> -]> - - - -
- j@bootlab.org; -
- - Jan - Gerber - - - 2005 - Jan Gerber - - &date; - - - NetworkManager - 1 - - - &package; - - Network management framework - - - - &package; - - - - - - - DESCRIPTION - - This manual page documents briefly the - &package; command. - - &package; monitors all network connections and automatically chooses the best connection to use. It is started as a system service by dbus. nm-applet allows you to specify wireless access points which wireless cards in the computer should associate with - - - OPTIONS - - This program follows the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. - - - - - - - - Don't become a daemon, Messages will be logged to stdout - - - - - - - - Allow dummy devices to be created via DBUS methods [DEBUG] - - - - - - - - Show summary of options. - - - - - - SEE ALSO - - nm-applet (1), NetworkManagerDispatcher (1), nm-tool (1). - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Jan Gerber j@bootlab.org and by - Riccardo Setti giskard@debian.org for - the Debian/Ubuntu system. - - - - - - diff --git a/debian/changelog b/debian/changelog index b906784a..77e4bf58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,10 +12,11 @@ network-manager (0.6.4-1) unstable; urgency=low [ Michael Biebl ] * Merged the patches 05-resolvconf.patch and 08-disabled_devices.patch into a single patch called 05-debian_backend.patch. - * Updated 05-debian_backend.patch to not control mapped interfaces. + * Updated 05-debian_backend.patch to not control mapped interfaces. (Closes: #377498) + * Ship the nm-tool utility. - -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 + -- Michael Biebl Tue, 15 Aug 2006 22:52:30 +0200 network-manager (0.6.3-2) unstable; urgency=low diff --git a/debian/network-manager.install b/debian/network-manager.install index 2fc8ba3f..f0327436 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -2,3 +2,4 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher debian/tmp/usr/lib/network-manager debian/tmp/etc/dbus-1/system.d/NetworkManager.conf +test/nm-tool /usr/bin/ diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 7177493c..153d1ce0 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,3 @@ man/NetworkManagerDispatcher.1 man/nm-tool.1 -debian/NetworkManager.1 +man/NetworkManager.1 diff --git a/debian/rules b/debian/rules index cf7bdef2..57cbedb3 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean:: build/network-manager:: - /usr/bin/docbook-to-man debian/NetworkManager.sgml > debian/NetworkManager.1 /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -- cgit 1.3.0-6-gf8a5 From 714ad36a998c33fe3242d56f0597f50b43c9ad8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 15 Aug 2006 21:53:49 +0000 Subject: - Move the last changelog entry to the new revision 0.6.4-2 because it didn't make it into the 0.6.4-1 release. - Reset the changelog date signature of 0.6.4-1 to "Tue, 8 Aug 2006 01:51:13 +0200", which is the one of the official 0.6.4-1 release. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@955 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77e4bf58..97ad34e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-2) unstable; urgency=low + + * Ship the nm-tool binary. + + -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 + network-manager (0.6.4-1) unstable; urgency=low [ Riccardo Setti ] @@ -14,9 +20,8 @@ network-manager (0.6.4-1) unstable; urgency=low a single patch called 05-debian_backend.patch. * Updated 05-debian_backend.patch to not control mapped interfaces. (Closes: #377498) - * Ship the nm-tool utility. - -- Michael Biebl Tue, 15 Aug 2006 22:52:30 +0200 + -- Michael Biebl Tue, 8 Aug 2006 01:51:13 +0200 network-manager (0.6.3-2) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 6ee72e595c622a051bf906ca46a20a8117a2fb33 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sun, 27 Aug 2006 17:55:54 +0000 Subject: close 384891 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@976 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 97ad34e5..b8a7cd0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ network-manager (0.6.4-2) unstable; urgency=low - * Ship the nm-tool binary. + * Ship the nm-tool binary. (closes: #384891) -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 -- cgit 1.3.0-6-gf8a5 From 23a97e78c68fb99151de2bc640dfebf358794d43 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 5 Sep 2006 17:50:22 +0000 Subject: * Changed adeprecated dbus function (closes: 385380) - added 12_dbus0.9.patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@994 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/patches/12_dbus0.9.patch | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 debian/patches/12_dbus0.9.patch diff --git a/debian/changelog b/debian/changelog index b8a7cd0f..e23aacaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.4-3) unstable; urgency=low + + * Changed adeprecated dbus function (closes: 385380) + - added 12_dbus0.9.patch. + + -- Riccardo Setti Tue, 5 Sep 2006 19:48:00 +0200 + network-manager (0.6.4-2) unstable; urgency=low * Ship the nm-tool binary. (closes: #384891) diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus0.9.patch new file mode 100644 index 00000000..a3aa9e03 --- /dev/null +++ b/debian/patches/12_dbus0.9.patch @@ -0,0 +1,20 @@ +--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 ++++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 +@@ -230,7 +230,7 @@ + { + /* Try to reactivate our connection to dbus on the next pass through the event loop */ + ctx->nm_state = LIBNM_NO_DBUS; +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + libnm_glib_schedule_dbus_watcher (ctx); + } + else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) +@@ -444,7 +444,7 @@ + g_main_loop_unref (ctx->g_main_loop); + + if (ctx->dbus_con) +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + + if (ctx->callbacks_lock) + g_mutex_free (ctx->callbacks_lock); -- cgit 1.3.0-6-gf8a5 From 551c415f391d14698d0cf484f279c95c5be5cc9f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 5 Sep 2006 22:41:02 +0000 Subject: Cosmetic changes. Properly indent second line comments (2 white spaces). Looks more consistent. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@996 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e23aacaa..aee99fd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ network-manager (0.6.4-3) unstable; urgency=low - * Changed adeprecated dbus function (closes: 385380) - - added 12_dbus0.9.patch. + * Changed adeprecated dbus function. (Closes: 385380) + - Added 12_dbus0.9.patch. -- Riccardo Setti Tue, 5 Sep 2006 19:48:00 +0200 network-manager (0.6.4-2) unstable; urgency=low - * Ship the nm-tool binary. (closes: #384891) + * Ship the nm-tool binary. (Closes: #384891) -- Michael Biebl Tue, 15 Aug 2006 23:42:09 +0200 -- cgit 1.3.0-6-gf8a5 From 154e5b7e9dd6779e3a9f63fb9afb9e8b1b193dad Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 29 Sep 2006 11:22:39 +0000 Subject: Fix typo in package description. Closes: #390062 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1042 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index aee99fd7..305044f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-4) unstable; urgency=low + + * Correct typo in package description. (Closes: #390062) + + -- Michael Biebl Fri, 29 Sep 2006 13:18:02 +0200 + network-manager (0.6.4-3) unstable; urgency=low * Changed adeprecated dbus function. (Closes: 385380) diff --git a/debian/control b/debian/control index 1f132a50..710e055d 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,7 @@ Section: devel Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config Description: network management framework (development files) this package provides header files that are needed to - compile VPN Plugins for NetworManager. + compile VPN Plugins for NetworkManager. . Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From fdd75c9d0feb0b1b6ca3e45bdb67ba53259c41d1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:31:37 +0000 Subject: * prerm has no configure target, so remove it. * properly indent it. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1096 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.prerm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm index 356a8b8c..8a010110 100644 --- a/debian/network-manager.prerm +++ b/debian/network-manager.prerm @@ -1,16 +1,14 @@ #!/bin/sh + set -e case "$1" in - configure) - if [ -f /etc/dbus-1/event.d/25NetworkManagerDispatcher ]; then - rm /etc/dbus-1/event.d/25NetworkManagerDispatcher - fi - ;; remove) /etc/dbus-1/event.d/25NetworkManager stop /etc/dbus-1/event.d/26NetworkManagerDispatcher stop - ;; + ;; esac #DEBHELPER# + +exit 0 -- cgit 1.3.0-6-gf8a5 From 0cdf500bc3cc1bf5f193c49f1804cdbfc24bd42e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:40:46 +0000 Subject: * Create group netdev in postinst and add a Depends on adduser. * Cleanup indentation. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1097 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/control | 2 +- debian/network-manager.postinst | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 305044f0..cfac8822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ network-manager (0.6.4-4) unstable; urgency=low * Correct typo in package description. (Closes: #390062) + * debian/network-manager.postinst + - Create group netdev if not yet existent. Add a Depends on adduser. - -- Michael Biebl Fri, 29 Sep 2006 13:18:02 +0200 + -- Michael Biebl Tue, 24 Oct 2006 14:32:54 +0200 network-manager (0.6.4-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 710e055d..4e2033b2 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 9460b596..1e73dfa2 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,20 +1,27 @@ #!/bin/sh + set -e case "$1" in - configure) - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi + configure) + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi - if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager restart - fi + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager restart + fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + fi + ;; esac #DEBHELPER# + +exit 0 -- cgit 1.3.0-6-gf8a5 From 9a34fb19f4531455400f52b55b2c1449eaaa5827 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:41:57 +0000 Subject: Update my email address. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1098 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4e2033b2..d1a9c0c1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: network-manager Section: net Priority: optional Maintainer: Riccardo Setti -Uploaders: Michael Biebl +Uploaders: Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 -- cgit 1.3.0-6-gf8a5 From 62d4af9627d2368c88e2a8abca710f2923e824ed Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 13:09:47 +0000 Subject: Add instructions to README.Debian how to restart NM after changing /e/n/i. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1099 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 7 +++++++ debian/changelog | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index 621518cd..8fc8c455 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -18,6 +18,9 @@ been configured "auto" and "dhcp" (with no other options) are managed by NM. This way you can setup a custom (static) configuration for a device and NM will not try to override this setting. +After modifying /etc/network/interfaces you have to restart NM with the +command "/etc/dbus-1/event.d/25NetworkManager restart". + Examples: 1.) @@ -65,5 +68,9 @@ NM will then make it possible to dial this connection. If you want to set up multiple internet service providers simply create a new stanza as listed above specifying the provider and a different iface, e.g. ppp1. +After modifying /etc/network/interfaces you have to restart NM with the +command "/etc/dbus-1/event.d/25NetworkManager restart". + Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" man page for further information. + diff --git a/debian/changelog b/debian/changelog index cfac8822..eac0afbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ network-manager (0.6.4-4) unstable; urgency=low * Correct typo in package description. (Closes: #390062) * debian/network-manager.postinst - Create group netdev if not yet existent. Add a Depends on adduser. + * Add instructions to README.Debian how to restart NetworkManager after + modifying /etc/network/interfaces. (Closes: 384892) - -- Michael Biebl Tue, 24 Oct 2006 14:32:54 +0200 + -- Michael Biebl Tue, 24 Oct 2006 14:58:19 +0200 network-manager (0.6.4-3) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From 8c51ad8783cedd385dcaea3d308e6e08389c9875 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 18:24:47 +0000 Subject: * Fix the parser for /etc/network/interfaces. The code is still shit, but at least now it accepts tabs or spaces (or combinations of both) as token separator. * On dns changes, do not restart nscd, only invalidate the hosts cache. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1100 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 ++- debian/patches/05-debian_backend.patch | 93 ++++++++++++++++++++++++++++++++-- 2 files changed, 95 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index eac0afbb..692c8c44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,12 @@ network-manager (0.6.4-4) unstable; urgency=low * debian/network-manager.postinst - Create group netdev if not yet existent. Add a Depends on adduser. * Add instructions to README.Debian how to restart NetworkManager after - modifying /etc/network/interfaces. (Closes: 384892) + modifying /etc/network/interfaces. (Closes: 384892) + * debian/patches/05-debian_backend.patch + - Fix the parser for /etc/network/interfaces. (Closes: #383765) + - Do not restart nscd on dns changes, only invalidate the hosts cache. - -- Michael Biebl Tue, 24 Oct 2006 14:58:19 +0200 + -- Michael Biebl Tue, 24 Oct 2006 20:18:18 +0200 network-manager (0.6.4-3) unstable; urgency=low diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index c8006623..8a54e68e 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,5 +1,5 @@ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..3a2fdd6 100644 +index 740572a..93c2914 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -37,6 +37,7 @@ #include "interface_parser.h" @@ -10,6 +10,25 @@ index 740572a..3a2fdd6 100644 /* * nm_system_init +@@ -238,14 +239,14 @@ void nm_system_kill_all_dhcp_daemons (vo + /* + * nm_system_update_dns + * +- * Make glibc/nscd aware of any changes to the resolv.conf file by +- * restarting nscd. ++ * Invalidate the nscd host cache, if it exists, since ++ * we changed resolv.conf. + * + */ + void nm_system_update_dns (void) + { +- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); +- ++ nm_info ("Clearing nscd hosts cache."); ++ nm_spawn_process ("/usr/sbin/nscd -i hosts"); + } + + @@ -514,13 +515,60 @@ gboolean nm_system_device_get_use_dhcp ( /* * nm_system_device_get_disabled @@ -175,10 +194,78 @@ index 740572a..3a2fdd6 100644 diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c -index 53d6487..aa81134 100644 +index 53d6487..2fa559f 100644 --- a/src/backends/interface_parser.c +++ b/src/backends/interface_parser.c -@@ -198,6 +198,18 @@ if_block *ifparser_getif(const char* ifa +@@ -71,7 +71,8 @@ void add_data(const char *key,const char + //printf("added data '%s' with key '%s'\n",data,key); + } + +-#define SPACE_OR_TAB(string,ret) {ret = strchr(string,' ');ret=(ret == NULL?strchr(string,'\t'):ret);} ++// define what we consider a whitespace ++#define WS " \t" + + void ifparser_init(void) + { +@@ -105,36 +106,52 @@ void ifparser_init(void) + if (line[0]=='#' || line[0]=='\0') + continue; + +- SPACE_OR_TAB(line,space) ++ space = line; ++ while (!strchr(WS, space[0])) space++; ++ + if (space == NULL) + { +- nm_warning ("Error: Can't parse interface line '%s'\n",line); ++ nm_warning ("Error: Can't parse line '%s'\n",line); + continue; + } ++ ++ // terminate line string and skip further whitespaces + space[0] = '\0'; +- ++ while (isspace(space[1])) space++; ++ + // There are four different stanzas: + // iface, mapping, auto and allow-*. Create a block for each of them. + if (strcmp(line,"iface")==0) + { +- char *space2 = strchr(space+1,' '); ++ char *space2 = space+1; ++ while (!strchr(WS, space2[0])) space2++; ++ + if (space2 == NULL) + { + nm_warning ("Error: Can't parse iface line '%s'\n",space+1); + continue; + } ++ ++ // terminate space string and skip further whitespaces + space2[0]='\0'; ++ while (isspace(space2[1])) space2++; ++ + add_block(line,space+1); + + if (space2[1]!='\0') + { +- space = strchr(space2+1,' '); ++ space = space2+1; ++ while (!strchr(WS, space[0])) space++; ++ + if (space == NULL) + { + nm_warning ("Error: Can't parse data '%s'\n",space2+1); + continue; + } ++ // terminate space2 string and skip further whitespaces + space[0] = '\0'; ++ while (isspace(space[1])) space++; ++ + add_data(space2+1,space+1); + } + } +@@ -198,6 +215,18 @@ if_block *ifparser_getif(const char* ifa return NULL; } -- cgit 1.3.0-6-gf8a5 From 28a4b40856f34de9dc8f4d1ef8825cc943379d81 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 21:23:24 +0000 Subject: Make the /e/n/i a bit more robust and easier to read. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1104 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/05-debian_backend.patch | 140 +++++++++++++++++++++++++-------- 1 file changed, 107 insertions(+), 33 deletions(-) diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 8a54e68e..8882e749 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -194,10 +194,25 @@ index 740572a..93c2914 100644 diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c -index 53d6487..2fa559f 100644 +index 53d6487..b3ad300 100644 --- a/src/backends/interface_parser.c +++ b/src/backends/interface_parser.c -@@ -71,7 +71,8 @@ void add_data(const char *key,const char +@@ -50,11 +50,13 @@ void add_block(const char *type, const c + + void add_data(const char *key,const char *data) + { ++ if_data *ret; ++ + // Check if there is a block where we can attach our data + if (first == NULL) + return; + +- if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); ++ ret = (if_data*) calloc(1,sizeof(struct _if_data)); + ret->key = g_strdup(key); + ret->data = g_strdup(data); + +@@ -71,14 +73,18 @@ void add_data(const char *key,const char //printf("added data '%s' with key '%s'\n",data,key); } @@ -207,65 +222,124 @@ index 53d6487..2fa559f 100644 void ifparser_init(void) { -@@ -105,36 +106,52 @@ void ifparser_init(void) - if (line[0]=='#' || line[0]=='\0') + FILE *inp = fopen(INTERFACES,"r"); + int ret = 0; ++ int pos; ++ int len; + char *line; +- char *space; ++ char *key; ++ char *data; + char rline[255]; + + if (inp == NULL) +@@ -89,7 +95,7 @@ void ifparser_init(void) + first = last = NULL; + while(1) + { +- line = space = NULL; ++ line = NULL; + ret = fscanf(inp,"%255[^\n]\n",rline); + if (ret == EOF) + break; +@@ -102,50 +108,71 @@ void ifparser_init(void) + line = rline; + while(line[0] == ' ') + line++; +- if (line[0]=='#' || line[0]=='\0') ++ if (line[0] == '#' || line[0] == '\0') continue; - SPACE_OR_TAB(line,space) -+ space = line; -+ while (!strchr(WS, space[0])) space++; +- if (space == NULL) ++ len = strlen(line); ++ pos = 0; ++ while (!strchr(WS, line[pos]) && pos < len) pos++; ++ ++ // terminate key string and skip further whitespaces ++ line[pos++] = '\0'; ++ while (strchr(WS, line[pos]) && pos < len) pos++; + - if (space == NULL) ++ if (pos >= len) { - nm_warning ("Error: Can't parse interface line '%s'\n",line); -+ nm_warning ("Error: Can't parse line '%s'\n",line); ++ nm_warning ("Error: Can't parse line '%s'\n", line); continue; } -+ -+ // terminate line string and skip further whitespaces - space[0] = '\0'; +- space[0] = '\0'; - -+ while (isspace(space[1])) space++; ++ key = &line[0]; ++ data = &line[pos]; + // There are four different stanzas: // iface, mapping, auto and allow-*. Create a block for each of them. - if (strcmp(line,"iface")==0) +- if (strcmp(line,"iface")==0) ++ if (strcmp(key, "iface") == 0) { - char *space2 = strchr(space+1,' '); -+ char *space2 = space+1; -+ while (!strchr(WS, space2[0])) space2++; +- if (space2 == NULL) ++ char *key2; ++ ++ while (!strchr(WS, line[pos]) && pos < len ) pos++; + - if (space2 == NULL) ++ // terminate first data string and skip further whitespaces ++ line[pos++] = '\0'; ++ while (strchr(WS, line[pos]) && pos < len) pos++; ++ if (pos >= len) { - nm_warning ("Error: Can't parse iface line '%s'\n",space+1); +- nm_warning ("Error: Can't parse iface line '%s'\n",space+1); ++ nm_warning ("Error: Can't parse iface line '%s'\n", data); continue; } -+ -+ // terminate space string and skip further whitespaces - space2[0]='\0'; -+ while (isspace(space2[1])) space2++; -+ - add_block(line,space+1); +- space2[0]='\0'; +- add_block(line,space+1); ++ key2 = &line[pos]; ++ ++ add_block(key, data); - if (space2[1]!='\0') +- if (space2[1]!='\0') ++ if (pos < len) { - space = strchr(space2+1,' '); -+ space = space2+1; -+ while (!strchr(WS, space[0])) space++; +- if (space == NULL) ++ ++ while (!strchr(WS, line[pos]) && pos < len ) pos++; + - if (space == NULL) ++ // terminate key2 string and skip further whitespaces ++ line[pos++] = '\0'; ++ while (strchr(WS, line[pos]) && pos < len) pos++; ++ if (pos >= len) { - nm_warning ("Error: Can't parse data '%s'\n",space2+1); +- nm_warning ("Error: Can't parse data '%s'\n",space2+1); ++ nm_warning ("Error: Can't parse inet line '%s'\n", key2); continue; } -+ // terminate space2 string and skip further whitespaces - space[0] = '\0'; -+ while (isspace(space[1])) space++; +- space[0] = '\0'; +- add_data(space2+1,space+1); ++ data = &line[pos]; + - add_data(space2+1,space+1); ++ add_data(key2, data); } } -@@ -198,6 +215,18 @@ if_block *ifparser_getif(const char* ifa +- else if (strcmp(line,"auto")==0) +- add_block(line,space+1); +- else if (strcmp(line,"mapping")==0) +- add_block(line,space+1); +- else if (strncmp(line,"allow-",6)==0) +- add_block(line,space+1); ++ else if (strcmp(key, "auto") == 0) ++ add_block(key, data); ++ else if (strcmp(key, "mapping") == 0) ++ add_block(key, data); ++ else if (strncmp(key, "allow-", 6) == 0) ++ add_block(key, data); + else +- add_data(line,space+1); ++ add_data(key, data); + + //printf("line: '%s' ret=%d\n",rline,ret); + } +@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* ifa return NULL; } -- cgit 1.3.0-6-gf8a5 From 7a2fb80ff8ebf40b2182ecc5f24895cd2d92b7ef Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 21:37:23 +0000 Subject: Improve the start scripts a bit. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1105 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-dispatcher.dbus-event | 12 ++++++------ debian/network-manager.dbus-event | 18 ++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index 18f6beb6..c9448e80 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -15,7 +15,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="NetworkManager dispatcher" +DESC="network events dispatcher" NAME="NetworkManagerDispatcher" DAEMON=/usr/sbin/$NAME PIDDIR=/var/run/NetworkManager @@ -35,7 +35,6 @@ test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDi # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR @@ -44,33 +43,34 @@ d_start() { start-stop-daemon --start --quiet --pidfile $PIDFILE \ --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - log_end_msg $? } # # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $DESC" start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON - log_end_msg $? } case "$1" in start) + log_daemon_msg "Starting $DESC" "$NAME" d_start ;; stop) + log_daemon_msg "Stopping $DESC" "$NAME" d_stop ;; restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start + log_end_msg $? ;; *) - log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 exit 1 ;; esac diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 4009e84d..22dcc877 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -16,7 +16,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="NetworkManager daemon" +DESC="network connection manager" NAME="NetworkManager" DAEMON=/usr/sbin/$NAME @@ -42,47 +42,45 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # Function that starts the daemon/service. # d_start() { - log_begin_msg "Starting $DESC" if [ ! -d $PIDDIR ]; then mkdir -p $PIDDIR chown $USER:$USER $PIDDIR fi - modprobe capability >/dev/null 2>&1 || true - - test -d /var/lib/NetworkManager || mkdir -p /var/lib/NetworkManager - chmod 755 /var/lib/NetworkManager start-stop-daemon --start --quiet --pidfile $PIDFILE \ --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - log_end_msg $? } # # Function that stops the daemon/service. # d_stop() { - log_begin_msg "Stopping $DESC" start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON - log_end_msg $? } case "$1" in start) + log_daemon_msg "Starting $DESC" "$NAME" d_start + log_end_msg $? ;; stop) + log_daemon_msg "Stopping $DESC" "$NAME" d_stop + log_end_msg $? ;; restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start + log_end_msg $? ;; *) - log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 exit 1 ;; esac -- cgit 1.3.0-6-gf8a5 From 13efdc9ecc8bd7c9d5576cc1d5c07d13c6c02ab1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Oct 2006 09:04:00 +0000 Subject: Fix a small bug in NetworkManagerDispatcher start script. Forgot to print a log_end_msg $? on start/stop. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1106 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ debian/network-manager-dispatcher.dbus-event | 10 ++++++---- debian/network-manager.dbus-event | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 692c8c44..abdfd212 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.4-5) unstable; urgency=low + + * Small fix for the NetworkManagerDispatcher init script. + + -- Michael Biebl Wed, 25 Oct 2006 11:00:34 +0200 + network-manager (0.6.4-4) unstable; urgency=low * Correct typo in package description. (Closes: #390062) diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event index c9448e80..53dbf24b 100644 --- a/debian/network-manager-dispatcher.dbus-event +++ b/debian/network-manager-dispatcher.dbus-event @@ -56,18 +56,20 @@ d_stop() { case "$1" in start) - log_daemon_msg "Starting $DESC" "$NAME" + log_daemon_msg "Starting $DESC" "$NAME" d_start + log_end_msg $? ;; stop) - log_daemon_msg "Stopping $DESC" "$NAME" + log_daemon_msg "Stopping $DESC" "$NAME" d_stop + log_end_msg $? ;; restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start - log_end_msg $? + log_end_msg $? ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event index 22dcc877..f69d7fd4 100644 --- a/debian/network-manager.dbus-event +++ b/debian/network-manager.dbus-event @@ -69,12 +69,12 @@ case "$1" in log_end_msg $? ;; stop) - log_daemon_msg "Stopping $DESC" "$NAME" + log_daemon_msg "Stopping $DESC" "$NAME" d_stop log_end_msg $? ;; restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" + log_daemon_msg "Restarting $DESC" "$NAME" d_stop d_start log_end_msg $? -- cgit 1.3.0-6-gf8a5 From 87fb83553f69096efd8cae43f93025a6911563a5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 14 Nov 2006 20:50:36 +0000 Subject: added 12_dbus1.0.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1148 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/12_dbus0.9.patch | 20 -------------------- debian/patches/12_dbus1.0.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/12_dbus0.9.patch create mode 100644 debian/patches/12_dbus1.0.patch diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus0.9.patch deleted file mode 100644 index a3aa9e03..00000000 --- a/debian/patches/12_dbus0.9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 -+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 -@@ -230,7 +230,7 @@ - { - /* Try to reactivate our connection to dbus on the next pass through the event loop */ - ctx->nm_state = LIBNM_NO_DBUS; -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - libnm_glib_schedule_dbus_watcher (ctx); - } - else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +444,7 @@ - g_main_loop_unref (ctx->g_main_loop); - - if (ctx->dbus_con) -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - - if (ctx->callbacks_lock) - g_mutex_free (ctx->callbacks_lock); diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch new file mode 100644 index 00000000..85e0b5bc --- /dev/null +++ b/debian/patches/12_dbus1.0.patch @@ -0,0 +1,31 @@ +--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 ++++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 +@@ -230,7 +230,7 @@ + { + /* Try to reactivate our connection to dbus on the next pass through the event loop */ + ctx->nm_state = LIBNM_NO_DBUS; +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + libnm_glib_schedule_dbus_watcher (ctx); + } + else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) +@@ -444,7 +444,7 @@ + g_main_loop_unref (ctx->g_main_loop); + + if (ctx->dbus_con) +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + + if (ctx->callbacks_lock) + g_mutex_free (ctx->callbacks_lock); +--- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100 ++++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100 +@@ -832,7 +832,7 @@ + } + + dbus_error_init (&error); +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++#if (DBUS_VERSION_MAJOR == 1) || (DBUS_VERSION_MINOR >= 60) + flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ + #else + flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; -- cgit 1.3.0-6-gf8a5 From f6000fd2f8d83e5df7edcedf16e21cb376dbb125 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 17:32:36 +0000 Subject: Apply the patch from Cyril Brulebois, which fixes some typos in the french translation. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1177 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/patches/10-po_fr.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 debian/patches/10-po_fr.patch diff --git a/debian/changelog b/debian/changelog index abdfd212..f8d8323d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.6.4-6) unstable; urgency=low + + * debian/patches/10-po_fr.patch + - Added. Small fixes for the French translation. (Closes: #401060) + Thanks to Cyril Brulebois. + + -- Michael Biebl Thu, 30 Nov 2006 18:30:16 +0100 + network-manager (0.6.4-5) unstable; urgency=low * Small fix for the NetworkManagerDispatcher init script. diff --git a/debian/patches/10-po_fr.patch b/debian/patches/10-po_fr.patch new file mode 100644 index 00000000..e2c2b4f6 --- /dev/null +++ b/debian/patches/10-po_fr.patch @@ -0,0 +1,37 @@ +Index: po/fr.po +=================================================================== +RCS file: /cvs/gnome/NetworkManager/po/fr.po,v +retrieving revision 1.2.6.2 +diff -u -3 -p -r1.2.6.2 fr.po +--- po/fr.po 12 Jun 2006 15:47:57 -0000 1.2.6.2 ++++ po/fr.po 30 Nov 2006 17:29:17 -0000 +@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea + + #: ../gnome/applet/applet.c:1562 + msgid "Create _New Wireless Network..." +-msgstr "Créer_un nouveau réseau sans fil..." ++msgstr "Créer _un nouveau réseau sans fil..." + + #: ../gnome/applet/applet.c:1685 + msgid "_VPN Connections" +@@ -290,17 +290,17 @@ msgstr "NetworkManager n'est pas lancé. + #. 'Enable Networking' item + #: ../gnome/applet/applet.c:2170 + msgid "Enable _Networking" +-msgstr "Activer_le réseau" ++msgstr "Activer _le réseau" + + #. 'Enable Wireless' item + #: ../gnome/applet/applet.c:2176 + msgid "Enable _Wireless" +-msgstr "Activer la_connexion sans fil" ++msgstr "Activer la _connexion sans fil" + + #. 'Connection Information' item + #: ../gnome/applet/applet.c:2182 + msgid "Connection _Information" +-msgstr "Informations sur la_connexion" ++msgstr "Informations sur la _connexion" + + #. Help item + #: ../gnome/applet/applet.c:2193 -- cgit 1.3.0-6-gf8a5 From 9e6221b09d05a15bd1568896ec959ce65210a7e8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 19:05:17 +0000 Subject: Run dos2unix over 12_dbus1.0.patch to remove the unnecessary line-feeds. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1178 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/12_dbus1.0.patch | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch index 85e0b5bc..d9380526 100644 --- a/debian/patches/12_dbus1.0.patch +++ b/debian/patches/12_dbus1.0.patch @@ -1,23 +1,23 @@ ---- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 -+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 -@@ -230,7 +230,7 @@ - { - /* Try to reactivate our connection to dbus on the next pass through the event loop */ - ctx->nm_state = LIBNM_NO_DBUS; -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - libnm_glib_schedule_dbus_watcher (ctx); - } - else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +444,7 @@ - g_main_loop_unref (ctx->g_main_loop); - - if (ctx->dbus_con) -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); - - if (ctx->callbacks_lock) - g_mutex_free (ctx->callbacks_lock); +--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 ++++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 +@@ -230,7 +230,7 @@ + { + /* Try to reactivate our connection to dbus on the next pass through the event loop */ + ctx->nm_state = LIBNM_NO_DBUS; +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + libnm_glib_schedule_dbus_watcher (ctx); + } + else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) +@@ -444,7 +444,7 @@ + g_main_loop_unref (ctx->g_main_loop); + + if (ctx->dbus_con) +- dbus_connection_disconnect (ctx->dbus_con); ++ dbus_connection_close (ctx->dbus_con); + + if (ctx->callbacks_lock) + g_mutex_free (ctx->callbacks_lock); --- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100 +++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100 @@ -832,7 +832,7 @@ -- cgit 1.3.0-6-gf8a5 From a268781a63a0289c63b0fc27372d431897411ca3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 19:20:04 +0000 Subject: Write the changelog for 0.6.4-6 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1179 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8d8323d..fbf95d5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -network-manager (0.6.4-6) unstable; urgency=low +network-manager (0.6.4-6) unstable; urgency=medium * debian/patches/10-po_fr.patch - Added. Small fixes for the French translation. (Closes: #401060) Thanks to Cyril Brulebois. + * debian/patches/12_dbus1.0.patch + - Updated 12_dbus0.9.patch for D-Bus 1.0 to pass the correct flags to + dbus_bus_request_name(). (Closes: #401039) + * Urgency medium, as it fixes a FTBFS bug. - -- Michael Biebl Thu, 30 Nov 2006 18:30:16 +0100 + -- Michael Biebl Thu, 30 Nov 2006 20:05:36 +0100 network-manager (0.6.4-5) unstable; urgency=low -- cgit 1.3.0-6-gf8a5 From afce5bd8bb8fef0a36c50fba66fc1acce8cafef0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 19:53:16 +0000 Subject: Add missing ".SH NAME" stanzas to man pages. Fixes linda/lintia warnings. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1180 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++- debian/patches/11-man_page_sh_name.patch | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 debian/patches/11-man_page_sh_name.patch diff --git a/debian/changelog b/debian/changelog index fbf95d5e..5971539e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,11 @@ network-manager (0.6.4-6) unstable; urgency=medium * debian/patches/12_dbus1.0.patch - Updated 12_dbus0.9.patch for D-Bus 1.0 to pass the correct flags to dbus_bus_request_name(). (Closes: #401039) + * debian/patches/11-man_page_sh_name.patch + - Add missing ".SH NAME" stanzas to man pages. * Urgency medium, as it fixes a FTBFS bug. - -- Michael Biebl Thu, 30 Nov 2006 20:05:36 +0100 + -- Michael Biebl Thu, 30 Nov 2006 20:50:44 +0100 network-manager (0.6.4-5) unstable; urgency=low diff --git a/debian/patches/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch new file mode 100644 index 00000000..344a3cb1 --- /dev/null +++ b/debian/patches/11-man_page_sh_name.patch @@ -0,0 +1,45 @@ +Index: man/NetworkManager.1.in +=================================================================== +RCS file: /cvs/gnome/NetworkManager/man/NetworkManager.1.in,v +retrieving revision 1.2 +diff -u -3 -p -r1.2 NetworkManager.1.in +--- man/NetworkManager.1.in 1 Feb 2006 18:14:15 -0000 1.2 ++++ man/NetworkManager.1.in 30 Nov 2006 19:33:39 -0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NETWORKMANAGER "1" ++.SH NAME + NetworkManager \- network management daemon + .SH SYNOPSIS + .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices] +Index: man/NetworkManagerDispatcher.1.in +=================================================================== +RCS file: /cvs/gnome/NetworkManager/man/NetworkManagerDispatcher.1.in,v +retrieving revision 1.2 +diff -u -3 -p -r1.2 NetworkManagerDispatcher.1.in +--- man/NetworkManagerDispatcher.1.in 1 Feb 2006 18:14:15 -0000 1.2 ++++ man/NetworkManagerDispatcher.1.in 30 Nov 2006 19:33:39 -0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NETWORKMANAGERDISPATCHER "1" ++.SH NAME + NetworkManagerDispatcher \- daemon that runs commands in response to off/online + .SH SYNOPSIS + .B NetworkManagerDispatcher [\-\-no-daemon] +Index: man/nm-tool.1.in +=================================================================== +RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v +retrieving revision 1.1 +diff -u -3 -p -r1.1 nm-tool.1.in +--- man/nm-tool.1.in 1 Feb 2006 18:14:15 -0000 1.1 ++++ man/nm-tool.1.in 30 Nov 2006 19:33:39 -0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NM-TOOL "1" ++.SH NAME + nm-tool \- utility to report NetworkManager state + .SH SYNOPSIS + .B nm-tool -- cgit 1.3.0-6-gf8a5 From 7565f96dd3b349b2b0a0435cb2190fdfb681393a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 20:35:33 +0000 Subject: Be compliant to the freedesktop.org autostart spec and install the nm-applet autostart file into /etc/xdg/autostart. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1181 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ++++- debian/network-manager-gnome.install | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5971539e..8e33fde6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,12 @@ network-manager (0.6.4-6) unstable; urgency=medium dbus_bus_request_name(). (Closes: #401039) * debian/patches/11-man_page_sh_name.patch - Add missing ".SH NAME" stanzas to man pages. + * debian/network-manager-gnome.install + - Install the nm-applet autostart file into /etc/xdg/autostart rather than + /usr/share/gnome/autostart to be compliant to the fd.o autostart spec. * Urgency medium, as it fixes a FTBFS bug. - -- Michael Biebl Thu, 30 Nov 2006 20:50:44 +0100 + -- Michael Biebl Thu, 30 Nov 2006 21:30:47 +0100 network-manager (0.6.4-5) unstable; urgency=low diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install index 88214a99..d5e110c7 100644 --- a/debian/network-manager-gnome.install +++ b/debian/network-manager-gnome.install @@ -5,4 +5,4 @@ debian/tmp/usr/share/nm-applet/* debian/tmp/usr/share/icons debian/tmp/usr/share/gnome-vpn-properties debian/tmp/etc/dbus-1/system.d/nm-applet.conf -debian/tmp/usr/share/gnome/autostart/nm-applet.desktop +debian/tmp/usr/share/gnome/autostart/nm-applet.desktop etc/xdg/autostart/ -- cgit 1.3.0-6-gf8a5 From e3fb5656a668b45d3b130a48db747c1716bb6fb5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 20:52:00 +0000 Subject: Remove unnecessary directory creations. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1182 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager-gnome.dirs | 3 --- debian/network-manager.dirs | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 debian/network-manager-gnome.dirs diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs deleted file mode 100644 index ab3de1b3..00000000 --- a/debian/network-manager-gnome.dirs +++ /dev/null @@ -1,3 +0,0 @@ -etc/dbus-1/system.d/ -usr/share/pixmaps/ -usr/share/applications/ diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 19c18e1e..c505972a 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,4 +1,2 @@ -etc/dbus-1/event.d -etc/dbus-1/system.d etc/NetworkManager/dispatcher.d var/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From eaeb8f7b5d9a195517226a494c5fa666309e5913 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 30 Nov 2006 21:02:03 +0000 Subject: Deleted one line I shouldn't have, as it is still used. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1183 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.dirs | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index c505972a..2475d118 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,2 +1,3 @@ +etc/dbus-1/event.d etc/NetworkManager/dispatcher.d var/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From 0a6e3291d19221be9a51f480754f46b9f766fabc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 2 Jan 2007 18:19:38 +0000 Subject: Add recommends on network-manager-{gnome,kde} to network-manager package (taken from Ubuntu) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1197 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/control | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8e33fde6..37dbf5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.4-7) unstable; urgency=low + + * debian/control + - Add recommends on network-manager-gnome | network-manager-kde. + + -- Michael Biebl Tue, 2 Jan 2007 19:16:54 +0100 + network-manager (0.6.4-6) unstable; urgency=medium * debian/patches/10-po_fr.patch diff --git a/debian/control b/debian/control index d1a9c0c1..5e38891a 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Standards-Version: 3.7.2 Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser +Recommends: network-manager-gnome | network-manager-kde Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5 From 97e0f5b21486b4759830beb09f45c53db6c96b5f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 10 Jan 2007 21:05:48 +0000 Subject: Pull the dbus 1.0 changes from SVN, which uses unref rather than close. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1215 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/12_dbus1.0.patch | 35 +++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 37dbf5dc..760c0697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ network-manager (0.6.4-7) unstable; urgency=low * debian/control - - Add recommends on network-manager-gnome | network-manager-kde. + - Add recommends on network-manager-gnome | network-manager-kde. + * debian/patches/12_dbus1.0.patch + - Updated to unref rather than close the connection. - -- Michael Biebl Tue, 2 Jan 2007 19:16:54 +0100 + -- Michael Biebl Wed, 10 Jan 2007 22:03:15 +0100 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch index d9380526..a8ce1422 100644 --- a/debian/patches/12_dbus1.0.patch +++ b/debian/patches/12_dbus1.0.patch @@ -1,31 +1,42 @@ ---- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200 -+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200 -@@ -230,7 +230,7 @@ +diff -urN NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c +--- NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c 2007-01-10 21:58:05.000000000 +0100 ++++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c 2007-01-10 22:00:00.000000000 +0100 +@@ -230,7 +230,8 @@ { /* Try to reactivate our connection to dbus on the next pass through the event loop */ ctx->nm_state = LIBNM_NO_DBUS; - dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); ++ dbus_connection_unref (ctx->dbus_con); ++ ctx->dbus_con = NULL; libnm_glib_schedule_dbus_watcher (ctx); } else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +444,7 @@ +@@ -444,7 +445,10 @@ g_main_loop_unref (ctx->g_main_loop); if (ctx->dbus_con) - dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_close (ctx->dbus_con); ++ { ++ dbus_connection_unref (ctx->dbus_con); ++ ctx->dbus_con = NULL; ++ } if (ctx->callbacks_lock) g_mutex_free (ctx->callbacks_lock); ---- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100 -+++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100 -@@ -832,7 +832,7 @@ +diff -urN NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c NetworkManager-0.6.4/src/NetworkManagerDbus.c +--- NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c 2007-01-10 21:58:05.000000000 +0100 ++++ NetworkManager-0.6.4/src/NetworkManagerDbus.c 2007-01-10 22:01:49.000000000 +0100 +@@ -831,10 +831,10 @@ } dbus_error_init (&error); -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) -+#if (DBUS_VERSION_MAJOR == 1) || (DBUS_VERSION_MINOR >= 60) - flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ +- flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ ++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) ++ flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; #else - flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; +- flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; ++ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; + #endif + ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error); + if (dbus_error_is_set (&error)) -- cgit 1.3.0-6-gf8a5 From b2f669e84c3cf0ab1ec1b9c29c877dcb80aa20b9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 3 Mar 2007 02:55:22 +0000 Subject: Add patch by Andy Whitcroft. "|" the wep capabilities instead of "&". git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1245 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++++- debian/control | 2 +- debian/patches/13-wep_capabilities.patch | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 debian/patches/13-wep_capabilities.patch diff --git a/debian/changelog b/debian/changelog index 760c0697..74e5c649 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ network-manager (0.6.4-7) unstable; urgency=low * debian/control - - Add recommends on network-manager-gnome | network-manager-kde. + - Add Recommends: network-manager-gnome | network-manager-kde to + network-manager. + - Add Recommends: libpam-keyring to network-manager-gnome. This allows to + unlock the gnome-keyring automatically upon login. * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the connection. + * debian/patches/13-wep_capabilities.patch + - Correctly set the available WEP capabilities. (Closes: #411867) + Thanks to Andy Whitcroft for the patch! -- Michael Biebl Wed, 10 Jan 2007 22:03:15 +0100 diff --git a/debian/control b/debian/control index 5e38891a..115d6f43 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) -Recommends: notification-daemon +Recommends: notification-daemon, libpam-keyring Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/patches/13-wep_capabilities.patch b/debian/patches/13-wep_capabilities.patch new file mode 100644 index 00000000..e69dcad6 --- /dev/null +++ b/debian/patches/13-wep_capabilities.patch @@ -0,0 +1,21 @@ +Index: src/NetworkManagerAP.c +=================================================================== +--- src/NetworkManagerAP.c (Revision 2356) ++++ src/NetworkManagerAP.c (Revision 2357) +@@ -572,12 +572,14 @@ + { + if (cipher & IW_AUTH_CIPHER_WEP40) + { +- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40); ++ caps |= NM_802_11_CAP_PROTO_WEP; ++ caps |= NM_802_11_CAP_CIPHER_WEP40; + caps &= ~NM_802_11_CAP_PROTO_NONE; + } + if (cipher & IW_AUTH_CIPHER_WEP104) + { +- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104); ++ caps |= NM_802_11_CAP_PROTO_WEP; ++ caps |= NM_802_11_CAP_CIPHER_WEP104; + caps &= ~NM_802_11_CAP_PROTO_NONE; + } + if (cipher & IW_AUTH_CIPHER_TKIP) -- cgit 1.3.0-6-gf8a5 From 815d2dc4af5bd9bb56c7c651c7b0cc4de983a567 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Mar 2007 21:28:10 +0000 Subject: Add XS-Vcs-* fields. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1254 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++-- debian/control | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74e5c649..8353c00d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,10 @@ network-manager (0.6.4-7) unstable; urgency=low - Add Recommends: network-manager-gnome | network-manager-kde to network-manager. - Add Recommends: libpam-keyring to network-manager-gnome. This allows to - unlock the gnome-keyring automatically upon login. + unlock the gnome-keyring automatically upon login. + - Add XS-Vcs-* fields. * debian/patches/12_dbus1.0.patch - - Updated to unref rather than close the connection. + - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch - Correctly set the available WEP capabilities. (Closes: #411867) Thanks to Andy Whitcroft for the patch! diff --git a/debian/control b/debian/control index 115d6f43..889c5279 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Riccardo Setti Uploaders: Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager +XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager Package: network-manager Architecture: any -- cgit 1.3.0-6-gf8a5 From 6b0da5e00a0a0a3649f757f55915fff6fb6ab932 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 19:35:02 +0000 Subject: network-manager-vpnc/network-manager-openvpn are now in the archive resp. NEW. Add Recommends to network-manager-gnome git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1316 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8353c00d..1c9c04b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ network-manager (0.6.4-7) unstable; urgency=low network-manager. - Add Recommends: libpam-keyring to network-manager-gnome. This allows to unlock the gnome-keyring automatically upon login. + - Add Recommends: network-manager-vpnc, network-manager-openvpn to + network-manager-gnome. (Closes: #406241) - Add XS-Vcs-* fields. * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. diff --git a/debian/control b/debian/control index 889c5279..25396769 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Package: network-manager-gnome Architecture: any Section: gnome Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) -Recommends: notification-daemon, libpam-keyring +Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for -- cgit 1.3.0-6-gf8a5 From 127e1fdd0a6c509536a81c662d388a9ceeecc900 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 22:09:39 +0000 Subject: Add dependency on gnome-icon-theme to network-manager-gnome. Closes: #372466 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1317 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1c9c04b7..49cccb3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ network-manager (0.6.4-7) unstable; urgency=low - Add Recommends: network-manager-vpnc, network-manager-openvpn to network-manager-gnome. (Closes: #406241) - Add XS-Vcs-* fields. + - Add Depends: gnome-icon-theme to network-manager-gnome, which fixes a + problem with nm-applet failing to start because of missing icons. + (Closes: #372466) * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch diff --git a/debian/control b/debian/control index 25396769..4b430eb9 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Description: network management framework daemon Package: network-manager-gnome Architecture: any Section: gnome -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}), gnome-icon-theme Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn Description: network management framework (GNOME frontend) NetworkManager attempts to keep an active network connection available at all -- cgit 1.3.0-6-gf8a5 From 83d084c306ec01ea8160785bb9d5bf1c1b1f84a4 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 23:39:35 +0000 Subject: Rename README.Debian to network-manager.README.Debian make it obvious that it is only installed for the network-manager binary package git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1318 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/README.Debian | 76 ------------------------------------ debian/network-manager.README.Debian | 76 ++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 debian/README.Debian create mode 100644 debian/network-manager.README.Debian diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 8fc8c455..00000000 --- a/debian/README.Debian +++ /dev/null @@ -1,76 +0,0 @@ -NetworkManager consists of two parts: one is on the system level daemon that -manages the connections and gathers information about new networks. The other -is a systray applet that users can use to interact with the NetworkManager -daemon. - -Security -~~~~~~~~ -To allow users to connect to the NetworkManager daemon they have to be in the -group "netdev". If you want to add a user to group "netdev" use the command -"adduser username netdev" or one of the graphical user management frontends. -After that you have to reload D-Bus with the command "/etc/init.d/dbus reload". - -Configuration of wireless and ethernet interfaces -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Only devices that are *not* listed in /etc/network/interfaces or which have -been configured "auto" and "dhcp" (with no other options) are managed by NM. - -This way you can setup a custom (static) configuration for a device and NM -will not try to override this setting. - -After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/dbus-1/event.d/25NetworkManager restart". - -Examples: - -1.) -auto wlan0 -iface wlan0 inet dhcp --> This device is managed by NM. - -1.a) -allow-hotplug eth0 -iface eth0 inet dhcp --> This device is managed by NM - -2.) -auto wlan0 -iface wlan0 inet dhcp - wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf --> This devices is *not* managed by NM because it has additional options. - -3.) -iface wlan0 inet dhcp --> This device is *not* managed by NM because it is not set to "auto". - -4.) -iface eth0 inet static - address 192.168.1.10 - netmask 255.255.255.0 - gateway 192.168.1.1 --> This device is *not* managed by NM because it is configured as "static" and - has additional options. - -5.) -Device is not listed in /etc/network/interfaces. --> Device is managed by NM. - -Dial-up configuration -~~~~~~~~~~~~~~~~~~~~~ -After configuring your PPP interface (either manually or by using a tool like -"pppconfig") to work with a peer called "myisp" you should edit -/etc/network/interfaces and add a stanza like this: - -iface ppp0 inet ppp - provider myisp - -NM will then make it possible to dial this connection. -If you want to set up multiple internet service providers simply create a new -stanza as listed above specifying the provider and a different iface, e.g. ppp1. - -After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/dbus-1/event.d/25NetworkManager restart". - -Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" -man page for further information. - diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian new file mode 100644 index 00000000..8fc8c455 --- /dev/null +++ b/debian/network-manager.README.Debian @@ -0,0 +1,76 @@ +NetworkManager consists of two parts: one is on the system level daemon that +manages the connections and gathers information about new networks. The other +is a systray applet that users can use to interact with the NetworkManager +daemon. + +Security +~~~~~~~~ +To allow users to connect to the NetworkManager daemon they have to be in the +group "netdev". If you want to add a user to group "netdev" use the command +"adduser username netdev" or one of the graphical user management frontends. +After that you have to reload D-Bus with the command "/etc/init.d/dbus reload". + +Configuration of wireless and ethernet interfaces +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Only devices that are *not* listed in /etc/network/interfaces or which have +been configured "auto" and "dhcp" (with no other options) are managed by NM. + +This way you can setup a custom (static) configuration for a device and NM +will not try to override this setting. + +After modifying /etc/network/interfaces you have to restart NM with the +command "/etc/dbus-1/event.d/25NetworkManager restart". + +Examples: + +1.) +auto wlan0 +iface wlan0 inet dhcp +-> This device is managed by NM. + +1.a) +allow-hotplug eth0 +iface eth0 inet dhcp +-> This device is managed by NM + +2.) +auto wlan0 +iface wlan0 inet dhcp + wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf +-> This devices is *not* managed by NM because it has additional options. + +3.) +iface wlan0 inet dhcp +-> This device is *not* managed by NM because it is not set to "auto". + +4.) +iface eth0 inet static + address 192.168.1.10 + netmask 255.255.255.0 + gateway 192.168.1.1 +-> This device is *not* managed by NM because it is configured as "static" and + has additional options. + +5.) +Device is not listed in /etc/network/interfaces. +-> Device is managed by NM. + +Dial-up configuration +~~~~~~~~~~~~~~~~~~~~~ +After configuring your PPP interface (either manually or by using a tool like +"pppconfig") to work with a peer called "myisp" you should edit +/etc/network/interfaces and add a stanza like this: + +iface ppp0 inet ppp + provider myisp + +NM will then make it possible to dial this connection. +If you want to set up multiple internet service providers simply create a new +stanza as listed above specifying the provider and a different iface, e.g. ppp1. + +After modifying /etc/network/interfaces you have to restart NM with the +command "/etc/dbus-1/event.d/25NetworkManager restart". + +Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" +man page for further information. + -- cgit 1.3.0-6-gf8a5 From 25e31482c0894d8884caf0ed3fa05662ef63d946 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 2 Apr 2007 23:42:48 +0000 Subject: Add a README.Debian for network-manager-gnome http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414187 git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1319 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/network-manager-gnome.README.Debian | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 debian/network-manager-gnome.README.Debian diff --git a/debian/changelog b/debian/changelog index 49cccb3b..d7068b7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,15 +9,17 @@ network-manager (0.6.4-7) unstable; urgency=low network-manager-gnome. (Closes: #406241) - Add XS-Vcs-* fields. - Add Depends: gnome-icon-theme to network-manager-gnome, which fixes a - problem with nm-applet failing to start because of missing icons. + problem with nm-applet failing to start because of missing icons. (Closes: #372466) * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch - Correctly set the available WEP capabilities. (Closes: #411867) Thanks to Andy Whitcroft for the patch! + * debian/network-manager-gnome.README.Debian + - Add a README.Debian file for network-manager-gnome. (Closes: #414187) - -- Michael Biebl Wed, 10 Jan 2007 22:03:15 +0100 + -- Michael Biebl Tue, 03 Apr 2007 01:39:48 +0200 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/network-manager-gnome.README.Debian b/debian/network-manager-gnome.README.Debian new file mode 100644 index 00000000..0af61464 --- /dev/null +++ b/debian/network-manager-gnome.README.Debian @@ -0,0 +1,11 @@ +network-manager-gnome provides a Notification Area applet called nm-applet for +conveniently choosing wired and wireless networks in GNOME, KDE and XFCE. + +network-manager-gnome (by virtue of the fact it uses network-manager) +requires users to be in the group 'netdev' for it to work. If users aren't +in the group 'netdev' then it won't automatically appear, and work, in the +Notification Area. + +network-manager-gnome uses network-manager. Please see the +network-mananger documentation in +/usr/share/doc/network-manager/README.Debian for further information. -- cgit 1.3.0-6-gf8a5 From 071455bd735a38e9df53ed9efe717f75003d2579 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 3 Apr 2007 00:19:08 +0000 Subject: Small fix for the German translation git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1320 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/patches/14-po_de.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 debian/patches/14-po_de.patch diff --git a/debian/changelog b/debian/changelog index d7068b7e..33c4c000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,10 @@ network-manager (0.6.4-7) unstable; urgency=low Thanks to Andy Whitcroft for the patch! * debian/network-manager-gnome.README.Debian - Add a README.Debian file for network-manager-gnome. (Closes: #414187) + * debian/patches/14-po_de.patch + - Added. Small fix for the German translation. - -- Michael Biebl Tue, 03 Apr 2007 01:39:48 +0200 + -- Michael Biebl Tue, 03 Apr 2007 02:18:28 +0200 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/patches/14-po_de.patch b/debian/patches/14-po_de.patch new file mode 100644 index 00000000..25ceff26 --- /dev/null +++ b/debian/patches/14-po_de.patch @@ -0,0 +1,13 @@ +Index: po/de.po +=================================================================== +--- po/de.po (Revision 2227) ++++ po/de.po (Arbeitskopie) +@@ -276,7 +276,7 @@ + #. 'Enable Networking' item + #: ../gnome/applet/applet.c:2170 + msgid "Enable _Networking" +-msgstr "Netzwerk_aktivieren" ++msgstr "Netzwerk _aktivieren" + + #. 'Enable Wireless' item + #: ../gnome/applet/applet.c:2176 -- cgit 1.3.0-6-gf8a5 From e91c21edc2b06e8b550d5565b6655a892dbbb8ea Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 3 Apr 2007 00:42:26 +0000 Subject: Update the Debian backend: - Only call nscd -i hosts when nscd is installed http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402436 - Set status variable to return code of ifup/ifdown http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415642 - Remove mDNSResponder restart. Obosoleted by Avahi which doesn't need that. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1321 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 ++++++-- debian/patches/05-debian_backend.patch | 46 ++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33c4c000..285a7ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,15 @@ network-manager (0.6.4-7) unstable; urgency=low - Add a README.Debian file for network-manager-gnome. (Closes: #414187) * debian/patches/14-po_de.patch - Added. Small fix for the German translation. - - -- Michael Biebl Tue, 03 Apr 2007 02:18:28 +0200 + * debian/patches/05-debian_backend.patch + - Updated. Set status variable to return code of ifup/ifdown. + (Closes: #415642) + - Only invalidate the nscd hosts cache when nscd is actually installed. + (Closes: #402436) + - Remove mDNSResponder restart from nm_system_restart_mdns_responder(). + mDNSResponder has been obsoleted by Avahi which does not need a restart. + + -- Michael Biebl Tue, 03 Apr 2007 02:21:57 +0200 network-manager (0.6.4-6) unstable; urgency=medium diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index 8882e749..b8967be7 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -1,8 +1,8 @@ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c -index 740572a..93c2914 100644 +index 740572a..4e3e44a 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c -@@ -37,6 +37,7 @@ #include "interface_parser.h" +@@ -37,6 +37,7 @@ #include "nm-utils.h" #define ARPING "/usr/sbin/arping" @@ -10,7 +10,7 @@ index 740572a..93c2914 100644 /* * nm_system_init -@@ -238,14 +239,14 @@ void nm_system_kill_all_dhcp_daemons (vo +@@ -238,14 +239,16 @@ void nm_system_kill_all_dhcp_daemons (void) /* * nm_system_update_dns * @@ -24,12 +24,24 @@ index 740572a..93c2914 100644 { - nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); - -+ nm_info ("Clearing nscd hosts cache."); -+ nm_spawn_process ("/usr/sbin/nscd -i hosts"); ++ if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { ++ nm_info ("Clearing nscd hosts cache."); ++ nm_spawn_process ("/usr/sbin/nscd -i hosts"); ++ } + } + + +@@ -257,8 +260,7 @@ void nm_system_update_dns (void) + * + */ + void nm_system_restart_mdns_responder (void) +-{ +- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder"); ++{ } -@@ -514,13 +515,60 @@ gboolean nm_system_device_get_use_dhcp ( +@@ -514,13 +516,60 @@ gboolean nm_system_device_get_use_dhcp (NMDevice *dev) /* * nm_system_device_get_disabled * @@ -93,7 +105,7 @@ index 740572a..93c2914 100644 } -@@ -563,12 +611,18 @@ gboolean nm_system_deactivate_dialup (GS +@@ -563,12 +612,18 @@ gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) if (strcmp (dialup, config->name) == 0) { char *cmd; @@ -101,7 +113,8 @@ index 740572a..93c2914 100644 nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data); cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data); - nm_spawn_process (cmd); +- nm_spawn_process (cmd); ++ status = nm_spawn_process (cmd); g_free (cmd); - ret = TRUE; + if (status == 0) { @@ -113,7 +126,7 @@ index 740572a..93c2914 100644 break; } } -@@ -587,12 +641,18 @@ gboolean nm_system_activate_dialup (GSLi +@@ -587,12 +642,18 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) if (strcmp (dialup, config->name) == 0) { char *cmd; @@ -121,7 +134,8 @@ index 740572a..93c2914 100644 nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data); cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data); - nm_spawn_process (cmd); +- nm_spawn_process (cmd); ++ status = nm_spawn_process (cmd); g_free (cmd); - ret = TRUE; + if (status == 0) { @@ -133,7 +147,7 @@ index 740572a..93c2914 100644 break; } } -@@ -603,23 +663,26 @@ gboolean nm_system_activate_dialup (GSLi +@@ -603,23 +664,26 @@ gboolean nm_system_activate_dialup (GSList *list, const char *dialup) GSList * nm_system_get_dialup_config (void) { const char *buf; @@ -166,7 +180,7 @@ index 740572a..93c2914 100644 config->data = g_strdup (curr->name); /* interface name */ list = g_slist_append (list, config); -@@ -631,14 +694,6 @@ GSList * nm_system_get_dialup_config (vo +@@ -631,14 +695,6 @@ GSList * nm_system_get_dialup_config (void) } ifparser_destroy(); @@ -181,7 +195,7 @@ index 740572a..93c2914 100644 return list; } -@@ -679,7 +734,10 @@ void nm_system_set_hostname (NMIP4Config +@@ -679,7 +735,10 @@ void nm_system_set_hostname (NMIP4Config *config) */ gboolean nm_system_should_modify_resolv_conf (void) { @@ -197,7 +211,7 @@ diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c index 53d6487..b3ad300 100644 --- a/src/backends/interface_parser.c +++ b/src/backends/interface_parser.c -@@ -50,11 +50,13 @@ void add_block(const char *type, const c +@@ -50,11 +50,13 @@ void add_block(const char *type, const char* name) void add_data(const char *key,const char *data) { @@ -212,7 +226,7 @@ index 53d6487..b3ad300 100644 ret->key = g_strdup(key); ret->data = g_strdup(data); -@@ -71,14 +73,18 @@ void add_data(const char *key,const char +@@ -71,14 +73,18 @@ void add_data(const char *key,const char *data) //printf("added data '%s' with key '%s'\n",data,key); } @@ -339,7 +353,7 @@ index 53d6487..b3ad300 100644 //printf("line: '%s' ret=%d\n",rline,ret); } -@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* ifa +@@ -198,6 +225,18 @@ if_block *ifparser_getif(const char* iface) return NULL; } -- cgit 1.3.0-6-gf8a5 From 004fc7ded0534f3501f664c3c0f98f822ff7f155 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 3 Apr 2007 00:49:24 +0000 Subject: Change maintainer address to pkg-utopia-maintainers@lists.alioth.debian.org. Set Riccardo and myself as Uploaders. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1322 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 285a7ab7..c2867ad0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ network-manager (0.6.4-7) unstable; urgency=low - Add Depends: gnome-icon-theme to network-manager-gnome, which fixes a problem with nm-applet failing to start because of missing icons. (Closes: #372466) + - Change maintainer address to + pkg-utopia-maintainers@lists.alioth.debian.org. + Add Riccardo and myself to Uploaders. * debian/patches/12_dbus1.0.patch - Updated to unref rather than close the D-Bus connection. * debian/patches/13-wep_capabilities.patch diff --git a/debian/control b/debian/control index 4b430eb9..644e505a 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: network-manager Section: net Priority: optional -Maintainer: Riccardo Setti -Uploaders: Michael Biebl +Maintainer: Utopia Maintenance Team +Uploaders: Riccardo Setti , Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 -- cgit 1.3.0-6-gf8a5 From 4310bb5e2f9d9e56a0c1e544adf87d7c91d74c76 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Apr 2007 21:00:59 +0000 Subject: Switch to regular SysV init scripts - Rename the start script properly so they are picked up by dh_installinit - Start them at S26, stop them at K14 - preinst,postinst,postrm: Make sure, the old conffiles for NetworkManager(Dispatcher) are removed/renamed properly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1434 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 17 +++++ debian/network-manager-dispatcher.dbus-event | 80 -------------------- debian/network-manager.dbus-event | 88 ---------------------- debian/network-manager.init | 87 +++++++++++++++++++++ ...network-manager.network-manager-dispatcher.init | 80 ++++++++++++++++++++ debian/network-manager.postinst | 68 ++++++++++++----- debian/network-manager.postrm | 85 +++++++++++++++++++++ debian/network-manager.preinst | 64 ++++++++++++++++ debian/network-manager.prerm | 14 ---- debian/rules | 7 +- 10 files changed, 386 insertions(+), 204 deletions(-) delete mode 100644 debian/network-manager-dispatcher.dbus-event delete mode 100644 debian/network-manager.dbus-event create mode 100644 debian/network-manager.init create mode 100644 debian/network-manager.network-manager-dispatcher.init create mode 100644 debian/network-manager.postrm create mode 100644 debian/network-manager.preinst delete mode 100644 debian/network-manager.prerm diff --git a/debian/changelog b/debian/changelog index c2867ad0..38b9921a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +network-manager (0.6.4-8) unstable; urgency=low + + * Install the NetworkManager and NetworkManagerDispatcher start scripts as + regular SysV init scripts + - Rename debian/network-manager.dbus-event to debian/network-manager.init + and debian/network-manager-dispatcher.dbus-event to + debian/network-manager.network-manager-dispatcher.init. + - Add proper LSB headers to the init scripts. + - debian/rules + Call dh_installinit for network-manager and network-manager-dispatcher. + - debian/network-manager.{preinst,postinst,postrm} + Remove the old conffiles /etc/dbus-1/event.d/25NetworkManager and + /etc/dbus-1/event.d/26NetworkManagerDispatcher or rename them to + *.dpkg-bak if they were changed locally. + + -- Michael Biebl Tue, 24 Apr 2007 22:30:22 +0200 + network-manager (0.6.4-7) unstable; urgency=low * debian/control diff --git a/debian/network-manager-dispatcher.dbus-event b/debian/network-manager-dispatcher.dbus-event deleted file mode 100644 index 53dbf24b..00000000 --- a/debian/network-manager-dispatcher.dbus-event +++ /dev/null @@ -1,80 +0,0 @@ -#! /bin/sh -# -# NetworkManager NetworkManagerDispatcher daemon -# Daemon for automatically switching network -# connections to the best available connection. -# This file should be placed in /etc/init.d. -# -# Authors: Christian Bjälevik -# Jan Gerber -# Mark Roach -# Thom May -# -# - -set -e - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="network events dispatcher" -NAME="NetworkManagerDispatcher" -DAEMON=/usr/sbin/$NAME -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid -SCRIPTNAME=/etc/dbus-1/event.d/26$NAME -USER=root - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -test -f /etc/default/rcS && . /etc/default/rcS -test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher - -# -# Function that starts the daemon/service. -# -d_start() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $USER:$USER $PIDDIR - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - -} - -# -# Function that stops the daemon/service. -# -d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON -} - - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - d_start - log_end_msg $? - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - d_stop - log_end_msg $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - d_stop - d_start - log_end_msg $? - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event deleted file mode 100644 index f69d7fd4..00000000 --- a/debian/network-manager.dbus-event +++ /dev/null @@ -1,88 +0,0 @@ -#! /bin/sh -# -# NetworkManager NetworkManager daemon -# Daemon for automatically switching network -# connections to the best available connection. -# This file should be placed in /etc/init.d. -# -# Authors: Christian Bjälevik -# Jan Gerber -# Mark Roach -# Thom May -# -# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl -# - -set -e - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="network connection manager" -NAME="NetworkManager" - -DAEMON=/usr/sbin/$NAME - -PIDDIR=/var/run/NetworkManager -PIDFILE=$PIDDIR/$NAME.pid - -SCRIPTNAME=/etc/dbus-1/event.d/25$NAME -USER=root - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -# We need /sbin/ip -[ -x /sbin/ip ] || exit 1 - -. /lib/lsb/init-functions - -test -f /etc/default/rcS && . /etc/default/rcS -test -f /etc/default/NetworkManager && . /etc/default/NetworkManager - -# -# Function that starts the daemon/service. -# -d_start() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $USER:$USER $PIDDIR - fi - - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE - -} - -# -# Function that stops the daemon/service. -# -d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ - --oknodo --user $USER --exec $DAEMON - -} - - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - d_start - log_end_msg $? - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - d_stop - log_end_msg $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - d_stop - d_start - log_end_msg $? - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/network-manager.init b/debian/network-manager.init new file mode 100644 index 00000000..d096e950 --- /dev/null +++ b/debian/network-manager.init @@ -0,0 +1,87 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: NetworkManager +# Required-Start: $local_fs dbus dhcdbd hal +# Required-Stop: $local_fs dbus dhcdbd hal +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: network connection manager +# Description: Daemon for automatically switching network +# connections to the best available connection. +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="network connection manager" +NAME="NetworkManager" + +DAEMON=/usr/sbin/$NAME + +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid + +SCRIPTNAME=/etc/init.d/network-manager +USER=root + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# We need /sbin/ip +[ -x /sbin/ip ] || exit 1 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManager && . /etc/default/NetworkManager + +# +# Function that starts the daemon/service. +# +d_start() { + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON + +} + + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + d_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + d_stop + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + d_stop + d_start + log_end_msg $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init new file mode 100644 index 00000000..2f386b2b --- /dev/null +++ b/debian/network-manager.network-manager-dispatcher.init @@ -0,0 +1,80 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: NetworkManagerDispatcher +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: network events dispatcher +# Description: This daemon automatically runs scripts when +# NetworkManager changes the network state. +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="network events dispatcher" +NAME="NetworkManagerDispatcher" +DAEMON=/usr/sbin/$NAME +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid +SCRIPTNAME=/etc/init.d/network-manager-dispatcher +USER=root + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher + +# +# Function that starts the daemon/service. +# +d_start() { + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON +} + + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + d_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + d_stop + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + d_stop + d_start + log_end_msg $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 1e73dfa2..c2a445c7 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,27 +1,59 @@ -#!/bin/sh +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was installed: +# configure +# +# +# If prerm fails during upgrade or fails on failed upgrade: +# abort-upgrade +# +# If prerm fails during deconfiguration of a package: +# abort-deconfigure in-favour +# removing +# +# If prerm fails during replacement due to conflict: +# abort-remove in-favour -set -e -case "$1" in - configure) - if ! getent group netdev > /dev/null; then - addgroup --quiet --system netdev - fi +# Remove a no-longer used conffile +rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE".dpkg-remove ]; then + echo "Removing obsolete conffile $CONFFILE" + rm -f "$CONFFILE".dpkg-remove + fi +} + - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi +case "$1" in + configure) + # Upgrade from previous versions + if dpkg --compare-versions "$2" lt "0.6.4-8"; then + rm_conffile /etc/dbus-1/event.d/25NetworkManager + rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + fi - if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager restart - fi + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; + + abort-upgrade|abort-deconfigure|abort-remove) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; esac #DEBHELPER# - exit 0 + diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm new file mode 100644 index 00000000..812369bd --- /dev/null +++ b/debian/network-manager.postrm @@ -0,0 +1,85 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was removed: +# remove +# +# After the package was purged: +# purge +# +# After the package was upgraded: +# upgrade +# if that fails: +# failed-upgrade +# +# +# After all of the packages files have been replaced: +# disappear +# +# +# If preinst fails during install: +# abort-install +# +# If preinst fails during upgrade of removed package: +# abort-install +# +# If preinst fails during upgrade: +# abort-upgrade + + +# Undo removal of a no-longer used conffile +undo_rm_conffile() +{ + CONFFILE="$1" + + if [ ! -e "$CONFFILE" ]; then + if [ -e "$CONFFILE".dpkg-bak ]; then + echo "Restoring modified conffile $CONFFILE" + mv -f "$CONFFILE".dpkg-bak "$CONFFILE" + elif [ -e "$CONFFILE".dpkg-remove ]; then + echo "Restoring conffile $CONFFILE" + mv -f "$CONFFILE".dpkg-remove "$CONFFILE" + fi + fi +} + + +# Purge backup conffile +rm_backup_conffile() +{ + CONFFILE="$1" + if [ -e "$CONFFILE".dpkg-bak ]; then + echo "Purging backup of conffile $CONFFILE" + rm -f "$CONFFILE".dpkg-bak + fi +} + + +case "$1" in + remove) + ;; + + purge) + rm_backup_conffile /etc/dbus-1/event.d/25NetworkManager + rm_backup_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + ;; + + upgrade|failed-upgrade|disappear) + ;; + + abort-install|abort-upgrade) + # Abort upgrade from previous versions + if dpkg --compare-versions "$2" lt "0.6.4-8"; then + undo_rm_conffile /etc/dbus-1/event.d/25NetworkManager + undo_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + fi + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst new file mode 100644 index 00000000..60db6ae0 --- /dev/null +++ b/debian/network-manager.preinst @@ -0,0 +1,64 @@ +#!/bin/sh -e +# This script can be called in the following ways: +# +# Before the package is installed: +# install +# +# Before removed package is upgraded: +# install +# +# Before the package is upgraded: +# upgrade +# +# +# If postrm fails during upgrade or fails on failed upgrade: +# abort-upgrade + + +# Prepare to remove a no-longer used conffile +prep_rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak" + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + mv -f "$CONFFILE" "$CONFFILE".dpkg-remove + fi + fi +} + + +case "$1" in + install) + ;; + + upgrade) + # Upgrade from previous versions + if dpkg --compare-versions "$2" lt "0.6.4-8"; then + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager stop + fi + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher stop + fi + prep_rm_conffile /etc/dbus-1/event.d/25NetworkManager + prep_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + fi + ;; + + abort-upgrade) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 diff --git a/debian/network-manager.prerm b/debian/network-manager.prerm deleted file mode 100644 index 8a010110..00000000 --- a/debian/network-manager.prerm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - remove) - /etc/dbus-1/event.d/25NetworkManager stop - /etc/dbus-1/event.d/26NetworkManagerDispatcher stop - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index 57cbedb3..55dd9d1d 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-dhcdbd=/usr/sbin/dhcdbd \ --with-distro=debian +DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . + clean:: rm -f po/*.gmo rm -f debian/*.1 @@ -22,10 +24,7 @@ build/network-manager:: /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: - install -m 755 debian/network-manager.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/25NetworkManager - install -m 755 debian/network-manager-dispatcher.dbus-event \ - debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher + dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS) install -m 755 debian/network-manager-dispatcher.script \ debian/network-manager/etc/NetworkManager/dispatcher.d/01ifupdown -- cgit 1.3.0-6-gf8a5 From a0c0b9a690d4b91f5f0a1e6873fd9d5d29355cb6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Apr 2007 15:24:52 +0000 Subject: Clean up some remaining traces of /etc/dbus-1/event.d git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1438 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.README.Debian | 4 ++-- debian/network-manager.dirs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index 8fc8c455..c59c7f9b 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -19,7 +19,7 @@ This way you can setup a custom (static) configuration for a device and NM will not try to override this setting. After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/dbus-1/event.d/25NetworkManager restart". +command "/etc/init.d/network-manager restart". Examples: @@ -69,7 +69,7 @@ If you want to set up multiple internet service providers simply create a new stanza as listed above specifying the provider and a different iface, e.g. ppp1. After modifying /etc/network/interfaces you have to restart NM with the -command "/etc/dbus-1/event.d/25NetworkManager restart". +command "/etc/init.d/network-manager restart". Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces" man page for further information. diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index 2475d118..c505972a 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,3 +1,2 @@ -etc/dbus-1/event.d etc/NetworkManager/dispatcher.d var/lib/NetworkManager -- cgit 1.3.0-6-gf8a5 From d6f0e556f983e13a380a1f0634cebd296d75b34d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:42:08 +0000 Subject: * New upstream release. (Closes: #420959, #431658) - Runs wpa_supplicant in less verbose mode. (Closes: #375302, #431562) - Adds support for LEAP and phase two authentication. (Closes: #420959, #402747) * Removed patches that were merged upstream - debian/patches/09_fix_bigendian_words.patch - debian/patches/12_dbus1.0.patch - debian/patches/13-wep_capabilities git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1672 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 13 ++ debian/patches/09_fix_bigendian_words.patch | 310 ---------------------------- debian/patches/12_dbus1.0.patch | 42 ---- debian/patches/13-wep_capabilities.patch | 21 -- 4 files changed, 13 insertions(+), 373 deletions(-) delete mode 100644 debian/patches/09_fix_bigendian_words.patch delete mode 100644 debian/patches/12_dbus1.0.patch delete mode 100644 debian/patches/13-wep_capabilities.patch diff --git a/debian/changelog b/debian/changelog index 38b9921a..41d31dec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +network-manager (0.6.5-1) unstable; urgency=low + + * New upstream release. (Closes: #420959, #431658) + - Runs wpa_supplicant in less verbose mode. (Closes: #375302, #431562) + - Adds support for LEAP and phase two authentication. + (Closes: #420959, #402747) + * Removed patches that were merged upstream + - debian/patches/09_fix_bigendian_words.patch + - debian/patches/12_dbus1.0.patch + - debian/patches/13-wep_capabilities + + -- Michael Biebl Sat, 25 Aug 2007 00:21:49 +0200 + network-manager (0.6.4-8) unstable; urgency=low * Install the NetworkManager and NetworkManagerDispatcher start scripts as diff --git a/debian/patches/09_fix_bigendian_words.patch b/debian/patches/09_fix_bigendian_words.patch deleted file mode 100644 index 736103b9..00000000 --- a/debian/patches/09_fix_bigendian_words.patch +++ /dev/null @@ -1,310 +0,0 @@ ---- configure.orig 2006-08-07 17:02:37.000000000 +0200 -+++ configure 2006-08-07 17:03:56.000000000 +0200 -@@ -23030,6 +23030,293 @@ - < $srcdir/po/POTFILES.in > po/POTFILES - - -+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } -+if test "${ac_cv_c_bigendian+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # See if sys/param.h defines the BYTE_ORDER macro. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+ -+int -+main () -+{ -+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN -+ bogus endian macros -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ # It does; now see whether it defined to BIG_ENDIAN or not. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+ -+int -+main () -+{ -+#if BYTE_ORDER != BIG_ENDIAN -+ not big endian -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_bigendian=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_c_bigendian=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # It does not; compile a test program. -+if test "$cross_compiling" = yes; then -+ # try to guess the endianness by grepping values into an object file -+ ac_cv_c_bigendian=unknown -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -+int -+main () -+{ -+ _ascii (); _ebcdic (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -+ ac_cv_c_bigendian=yes -+fi -+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -+ if test "$ac_cv_c_bigendian" = unknown; then -+ ac_cv_c_bigendian=no -+ else -+ # finding both strings is unlikely to happen, but who knows? -+ ac_cv_c_bigendian=unknown -+ fi -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+ -+ /* Are we little or big endian? From Harbison&Steele. */ -+ union -+ { -+ long int l; -+ char c[sizeof (long int)]; -+ } u; -+ u.l = 1; -+ return u.c[sizeof (long int) - 1] == 1; -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_bigendian=no -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_c_bigendian=yes -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -+case $ac_cv_c_bigendian in -+ yes) -+ -+cat >>confdefs.h <<\_ACEOF -+#define WORDS_BIGENDIAN 1 -+_ACEOF -+ ;; -+ no) -+ ;; -+ *) -+ { { echo "$as_me:$LINENO: error: unknown endianness -+presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -+echo "$as_me: error: unknown endianness -+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -+ { (exit 1); exit 1; }; } ;; -+esac -+ -+ - - # Check whether --with-distro was given. - if test "${with_distro+set}" = set; then ---- configure.in.org 2006-08-07 17:02:45.000000000 +0200 -+++ configure.in 2006-08-07 17:03:37.000000000 +0200 -@@ -50,6 +50,11 @@ - AC_PROG_INTLTOOL([0.27.2]) - AM_GLIB_GNU_GETTEXT - -+dnl -+dnl Make sha1.c happy on big endian systems -+dnl -+AC_C_BIGENDIAN -+ - AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware])) - if test "z$with_distro" = "z"; then - AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch deleted file mode 100644 index a8ce1422..00000000 --- a/debian/patches/12_dbus1.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urN NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c ---- NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c 2007-01-10 21:58:05.000000000 +0100 -+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c 2007-01-10 22:00:00.000000000 +0100 -@@ -230,7 +230,8 @@ - { - /* Try to reactivate our connection to dbus on the next pass through the event loop */ - ctx->nm_state = LIBNM_NO_DBUS; -- dbus_connection_disconnect (ctx->dbus_con); -+ dbus_connection_unref (ctx->dbus_con); -+ ctx->dbus_con = NULL; - libnm_glib_schedule_dbus_watcher (ctx); - } - else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) -@@ -444,7 +445,10 @@ - g_main_loop_unref (ctx->g_main_loop); - - if (ctx->dbus_con) -- dbus_connection_disconnect (ctx->dbus_con); -+ { -+ dbus_connection_unref (ctx->dbus_con); -+ ctx->dbus_con = NULL; -+ } - - if (ctx->callbacks_lock) - g_mutex_free (ctx->callbacks_lock); -diff -urN NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c NetworkManager-0.6.4/src/NetworkManagerDbus.c ---- NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c 2007-01-10 21:58:05.000000000 +0100 -+++ NetworkManager-0.6.4/src/NetworkManagerDbus.c 2007-01-10 22:01:49.000000000 +0100 -@@ -831,10 +831,10 @@ - } - - dbus_error_init (&error); --#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) -- flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */ -+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) -+ flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; - #else -- flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; -+ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; - #endif - ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error); - if (dbus_error_is_set (&error)) diff --git a/debian/patches/13-wep_capabilities.patch b/debian/patches/13-wep_capabilities.patch deleted file mode 100644 index e69dcad6..00000000 --- a/debian/patches/13-wep_capabilities.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: src/NetworkManagerAP.c -=================================================================== ---- src/NetworkManagerAP.c (Revision 2356) -+++ src/NetworkManagerAP.c (Revision 2357) -@@ -572,12 +572,14 @@ - { - if (cipher & IW_AUTH_CIPHER_WEP40) - { -- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40); -+ caps |= NM_802_11_CAP_PROTO_WEP; -+ caps |= NM_802_11_CAP_CIPHER_WEP40; - caps &= ~NM_802_11_CAP_PROTO_NONE; - } - if (cipher & IW_AUTH_CIPHER_WEP104) - { -- caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104); -+ caps |= NM_802_11_CAP_PROTO_WEP; -+ caps |= NM_802_11_CAP_CIPHER_WEP104; - caps &= ~NM_802_11_CAP_PROTO_NONE; - } - if (cipher & IW_AUTH_CIPHER_TKIP) -- cgit 1.3.0-6-gf8a5 From 3d4e2b16578e14f89bb5f839904ccd756a06da73 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:46:25 +0000 Subject: * debian/network-manager.preinst - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1673 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/network-manager.preinst | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41d31dec..f6f99b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ network-manager (0.6.5-1) unstable; urgency=low - debian/patches/09_fix_bigendian_words.patch - debian/patches/12_dbus1.0.patch - debian/patches/13-wep_capabilities + * debian/network-manager.preinst + - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. - -- Michael Biebl Sat, 25 Aug 2007 00:21:49 +0200 + -- Michael Biebl Sun, 26 Aug 2007 20:46:05 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 60db6ae0..3f737448 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -18,11 +18,12 @@ # Prepare to remove a no-longer used conffile prep_rm_conffile() { - CONFFILE="$1" + PKGNAME="$1" + CONFFILE="$2" if [ -e "$CONFFILE" ]; then md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" if [ "$md5sum" != "$old_md5sum" ]; then echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak" mv -f "$CONFFILE" "$CONFFILE".dpkg-bak @@ -46,8 +47,8 @@ case "$1" in if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi - prep_rm_conffile /etc/dbus-1/event.d/25NetworkManager - prep_rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + prep_rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager + prep_rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher fi ;; -- cgit 1.3.0-6-gf8a5 From 5b85762af7b4dd320c5b526a69dba9b9f380e285 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 18:55:09 +0000 Subject: * Rebased and updated patches for new release - debian/patches/11-man_page_sh_name.patch - debian/patches/05-debian_backend.patch git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1674 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/patches/05-debian_backend.patch | 15 --------------- debian/patches/11-man_page_sh_name.patch | 30 ------------------------------ 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6f99b51..1199e0c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ network-manager (0.6.5-1) unstable; urgency=low - debian/patches/13-wep_capabilities * debian/network-manager.preinst - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. + * Rebased and updated patches for new release + - debian/patches/11-man_page_sh_name.patch + - debian/patches/05-debian_backend.patch -- Michael Biebl Sun, 26 Aug 2007 20:46:05 +0200 diff --git a/debian/patches/05-debian_backend.patch b/debian/patches/05-debian_backend.patch index b8967be7..931a2063 100644 --- a/debian/patches/05-debian_backend.patch +++ b/debian/patches/05-debian_backend.patch @@ -211,21 +211,6 @@ diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c index 53d6487..b3ad300 100644 --- a/src/backends/interface_parser.c +++ b/src/backends/interface_parser.c -@@ -50,11 +50,13 @@ void add_block(const char *type, const char* name) - - void add_data(const char *key,const char *data) - { -+ if_data *ret; -+ - // Check if there is a block where we can attach our data - if (first == NULL) - return; - -- if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data)); -+ ret = (if_data*) calloc(1,sizeof(struct _if_data)); - ret->key = g_strdup(key); - ret->data = g_strdup(data); - @@ -71,14 +73,18 @@ void add_data(const char *key,const char *data) //printf("added data '%s' with key '%s'\n",data,key); } diff --git a/debian/patches/11-man_page_sh_name.patch b/debian/patches/11-man_page_sh_name.patch index 344a3cb1..b363268c 100644 --- a/debian/patches/11-man_page_sh_name.patch +++ b/debian/patches/11-man_page_sh_name.patch @@ -1,33 +1,3 @@ -Index: man/NetworkManager.1.in -=================================================================== -RCS file: /cvs/gnome/NetworkManager/man/NetworkManager.1.in,v -retrieving revision 1.2 -diff -u -3 -p -r1.2 NetworkManager.1.in ---- man/NetworkManager.1.in 1 Feb 2006 18:14:15 -0000 1.2 -+++ man/NetworkManager.1.in 30 Nov 2006 19:33:39 -0000 -@@ -3,6 +3,7 @@ - .\" Copyright (C) 2005 Robert Love - .\" - .TH NETWORKMANAGER "1" -+.SH NAME - NetworkManager \- network management daemon - .SH SYNOPSIS - .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices] -Index: man/NetworkManagerDispatcher.1.in -=================================================================== -RCS file: /cvs/gnome/NetworkManager/man/NetworkManagerDispatcher.1.in,v -retrieving revision 1.2 -diff -u -3 -p -r1.2 NetworkManagerDispatcher.1.in ---- man/NetworkManagerDispatcher.1.in 1 Feb 2006 18:14:15 -0000 1.2 -+++ man/NetworkManagerDispatcher.1.in 30 Nov 2006 19:33:39 -0000 -@@ -3,6 +3,7 @@ - .\" Copyright (C) 2005 Robert Love - .\" - .TH NETWORKMANAGERDISPATCHER "1" -+.SH NAME - NetworkManagerDispatcher \- daemon that runs commands in response to off/online - .SH SYNOPSIS - .B NetworkManagerDispatcher [\-\-no-daemon] Index: man/nm-tool.1.in =================================================================== RCS file: /cvs/gnome/NetworkManager/man/nm-tool.1.in,v -- cgit 1.3.0-6-gf8a5 From 614e759115bb291136e155f2b37af80780ef0ab3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 22:17:40 +0000 Subject: * Upstream has split nm-applet into a separate package. This means we no longer build the network-manager-gnome binary package from this source package. - Removed files that are now part of the new nm-applet source package + debian/network-manager-gnome.README.Debian + debian/patches/10-po_fr.patch + debian/patches/14-po_de.patch + debian/patches/03-dbus_access_nm_applet.patch + debian/network-manager-gnome.manpages + debian/nm-applet.sgml + debian/network-manager.install + debian/network-manager-gnome.install - debian/control + Remove the binary package network-manager-gnome. + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as nm-vpn-properties is now part of the network-manager binary package. + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove libpanel-applet2-dev. - debian/rules + Do not build the nm-applet.1 manpage anymore. + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1675 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 25 ++++++- debian/control | 32 ++------- debian/network-manager-gnome.README.Debian | 11 --- debian/network-manager-gnome.install | 8 --- debian/network-manager-gnome.manpages | 2 - debian/network-manager.install | 3 + debian/nm-applet.sgml | 100 -------------------------- debian/patches/03-dbus_access_nm_applet.patch | 11 --- debian/patches/10-po_fr.patch | 37 ---------- debian/patches/14-po_de.patch | 13 ---- debian/rules | 3 +- 11 files changed, 35 insertions(+), 210 deletions(-) delete mode 100644 debian/network-manager-gnome.README.Debian delete mode 100644 debian/network-manager-gnome.install delete mode 100644 debian/network-manager-gnome.manpages delete mode 100644 debian/nm-applet.sgml delete mode 100644 debian/patches/03-dbus_access_nm_applet.patch delete mode 100644 debian/patches/10-po_fr.patch delete mode 100644 debian/patches/14-po_de.patch diff --git a/debian/changelog b/debian/changelog index 1199e0c9..121895f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,31 @@ network-manager (0.6.5-1) unstable; urgency=low * Rebased and updated patches for new release - debian/patches/11-man_page_sh_name.patch - debian/patches/05-debian_backend.patch + * Upstream has split nm-applet into a separate package. This means we no + longer build the network-manager-gnome binary package from this source + package. + - Removed files that are now part of the new nm-applet source package + + debian/network-manager-gnome.README.Debian + + debian/patches/10-po_fr.patch + + debian/patches/14-po_de.patch + + debian/patches/03-dbus_access_nm_applet.patch + + debian/network-manager-gnome.manpages + + debian/nm-applet.sgml + + debian/network-manager.install + + debian/network-manager-gnome.install + - debian/control + + Remove the binary package network-manager-gnome. + + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as + nm-vpn-properties is now part of the network-manager binary package. + + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove + libpanel-applet2-dev. + - debian/rules + + Do not build the nm-applet.1 manpage anymore. + + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary + workaround until this binary has also been moved into the nm-applet + source package. - -- Michael Biebl Sun, 26 Aug 2007 20:46:05 +0200 + -- Michael Biebl Sun, 26 Aug 2007 23:55:17 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/control b/debian/control index 644e505a..07df5c2a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager @@ -12,6 +12,8 @@ Package: network-manager Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser Recommends: network-manager-gnome | network-manager-kde +Conflicts: network-manager-gnome (<< 0.6.5-1) +Replaces: network-manager-gnome (<< 0.6.5-1) Description: network management framework daemon NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -24,32 +26,10 @@ Description: network management framework daemon . Homepage: http://www.gnome.org/projects/NetworkManager/ -Package: network-manager-gnome -Architecture: any -Section: gnome -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version}), gnome-icon-theme -Recommends: notification-daemon, libpam-keyring, network-manager-vpnc, network-manager-openvpn -Description: network management framework (GNOME frontend) - NetworkManager attempts to keep an active network connection available at all - times. It is intended only for the desktop use-case, and is not intended for - usage on servers. The point of NetworkManager is to make networking - configuration and setup as painless and automatic as possible. If using DHCP, - NetworkManager is _intended_ to replace default routes, obtain IP addresses - from a DHCP server, and change nameservers whenever it sees fit. - . - This package contains a systray applet for GNOME's notification area but it - also works for other desktop environments which provide a systray like KDE - or XFCE. - It displays the available networks and allows to easily switch between them. - For encrypted networks it will prompt the user for the key/passphrase and it - can optionally store them in the gnome-keyring. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ - Package: network-manager-dev Architecture: any Section: devel -Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config +Depends: pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. @@ -76,7 +56,7 @@ Description: network management framework (GLib shared library) Package: libnm-glib-dev Section: libdevel Architecture: any -Depends: libnm-glib0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-glib0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) Description: network management framework (GLib interface) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for @@ -110,7 +90,7 @@ Description: network management framework (shared library) Package: libnm-util-dev Section: libdevel Architecture: any -Depends: libnm-util0 (= ${Source-Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) +Depends: libnm-util0 (= ${binary:Version}), libglib2.0-dev, libdbus-glib-1-dev (>= 0.60) Description: network management framework (development files) NetworkManager attempts to keep an active network connection available at all times. It is intended only for the desktop use-case, and is not intended for diff --git a/debian/network-manager-gnome.README.Debian b/debian/network-manager-gnome.README.Debian deleted file mode 100644 index 0af61464..00000000 --- a/debian/network-manager-gnome.README.Debian +++ /dev/null @@ -1,11 +0,0 @@ -network-manager-gnome provides a Notification Area applet called nm-applet for -conveniently choosing wired and wireless networks in GNOME, KDE and XFCE. - -network-manager-gnome (by virtue of the fact it uses network-manager) -requires users to be in the group 'netdev' for it to work. If users aren't -in the group 'netdev' then it won't automatically appear, and work, in the -Notification Area. - -network-manager-gnome uses network-manager. Please see the -network-mananger documentation in -/usr/share/doc/network-manager/README.Debian for further information. diff --git a/debian/network-manager-gnome.install b/debian/network-manager-gnome.install deleted file mode 100644 index d5e110c7..00000000 --- a/debian/network-manager-gnome.install +++ /dev/null @@ -1,8 +0,0 @@ -debian/tmp/usr/bin/nm-vpn-properties -debian/tmp/usr/bin/nm-applet -debian/tmp/usr/share/locale/* -debian/tmp/usr/share/nm-applet/* -debian/tmp/usr/share/icons -debian/tmp/usr/share/gnome-vpn-properties -debian/tmp/etc/dbus-1/system.d/nm-applet.conf -debian/tmp/usr/share/gnome/autostart/nm-applet.desktop etc/xdg/autostart/ diff --git a/debian/network-manager-gnome.manpages b/debian/network-manager-gnome.manpages deleted file mode 100644 index 15a34e96..00000000 --- a/debian/network-manager-gnome.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/nm-vpn-properties.1 -debian/nm-applet.1 diff --git a/debian/network-manager.install b/debian/network-manager.install index f0327436..90422942 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -1,5 +1,8 @@ debian/tmp/usr/sbin/NetworkManager debian/tmp/usr/sbin/NetworkManagerDispatcher debian/tmp/usr/lib/network-manager +debian/tmp/usr/share/locale debian/tmp/etc/dbus-1/system.d/NetworkManager.conf test/nm-tool /usr/bin/ +debian/tmp/usr/bin/nm-vpn-properties +debian/tmp/usr/share/gnome-vpn-properties/nm-vpn-properties.glade diff --git a/debian/nm-applet.sgml b/debian/nm-applet.sgml deleted file mode 100644 index f457fd93..00000000 --- a/debian/nm-applet.sgml +++ /dev/null @@ -1,100 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - 8 February, 2006"> - - - GNU"> - GPL"> -]> - - - -
- giskard@autistici.org; -
- - Riccardo - Setti - - - 2006 - Riccardo Setti - - &date; - - - nm-applet - 1 - - - &package; - - Network management framework - - - - &package; - - - - DESCRIPTION - - &package; is the GNOME front-end for NetworkManager - It is a systray applet which will display an icon in GNOME's notification area but it - also works for other desktop environments which provide a systray like KDE or XFCE. - &package; shows a list of available networks and allows you to easily switch between them. For encrypted networks it - will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to - type them again. - - - SEE ALSO - - NetworkManager (1). nm-vpn-properties (1) - - More Information about NetworkManager can be found at - http://www.gnome.org/projects/NetworkManager/ . - - - AUTHOR - - This manual page was written by Riccardo Setti giskard@autistici.org for - the Debian system. - - - - - - diff --git a/debian/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch deleted file mode 100644 index 94053ea2..00000000 --- a/debian/patches/03-dbus_access_nm_applet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 -+++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 -@@ -8,7 +8,7 @@ - - - -- -+ - - - diff --git a/debian/patches/10-po_fr.patch b/debian/patches/10-po_fr.patch deleted file mode 100644 index e2c2b4f6..00000000 --- a/debian/patches/10-po_fr.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: po/fr.po -=================================================================== -RCS file: /cvs/gnome/NetworkManager/po/fr.po,v -retrieving revision 1.2.6.2 -diff -u -3 -p -r1.2.6.2 fr.po ---- po/fr.po 12 Jun 2006 15:47:57 -0000 1.2.6.2 -+++ po/fr.po 30 Nov 2006 17:29:17 -0000 -@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea - - #: ../gnome/applet/applet.c:1562 - msgid "Create _New Wireless Network..." --msgstr "Créer_un nouveau réseau sans fil..." -+msgstr "Créer _un nouveau réseau sans fil..." - - #: ../gnome/applet/applet.c:1685 - msgid "_VPN Connections" -@@ -290,17 +290,17 @@ msgstr "NetworkManager n'est pas lancé. - #. 'Enable Networking' item - #: ../gnome/applet/applet.c:2170 - msgid "Enable _Networking" --msgstr "Activer_le réseau" -+msgstr "Activer _le réseau" - - #. 'Enable Wireless' item - #: ../gnome/applet/applet.c:2176 - msgid "Enable _Wireless" --msgstr "Activer la_connexion sans fil" -+msgstr "Activer la _connexion sans fil" - - #. 'Connection Information' item - #: ../gnome/applet/applet.c:2182 - msgid "Connection _Information" --msgstr "Informations sur la_connexion" -+msgstr "Informations sur la _connexion" - - #. Help item - #: ../gnome/applet/applet.c:2193 diff --git a/debian/patches/14-po_de.patch b/debian/patches/14-po_de.patch deleted file mode 100644 index 25ceff26..00000000 --- a/debian/patches/14-po_de.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: po/de.po -=================================================================== ---- po/de.po (Revision 2227) -+++ po/de.po (Arbeitskopie) -@@ -276,7 +276,7 @@ - #. 'Enable Networking' item - #: ../gnome/applet/applet.c:2170 - msgid "Enable _Networking" --msgstr "Netzwerk_aktivieren" -+msgstr "Netzwerk _aktivieren" - - #. 'Enable Wireless' item - #: ../gnome/applet/applet.c:2176 diff --git a/debian/rules b/debian/rules index 55dd9d1d..a4a1c76d 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 . +DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties + clean:: rm -f po/*.gmo rm -f debian/*.1 @@ -21,7 +23,6 @@ clean:: build/network-manager:: /usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1 - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 binary-install/network-manager:: dh_installinit --name network-manager-dispatcher $(DEB_DH_INSTALLINIT_ARGS) -- cgit 1.3.0-6-gf8a5 From f04dbc618f4a8ef079e0acc1a185b0c7bf5eb2f6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 22:59:14 +0000 Subject: * debian/patches/20-stable_branch_updates_r2652.patch - Pull updates from the stable branch up until revision 2652. - Fixes broken link detection and a couple of smaller issues. - Adds support for the rfkill switch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1676 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 +- .../patches/20-stable_branch_updates_r2652.patch | 914 +++++++++++++++++++++ 2 files changed, 919 insertions(+), 1 deletion(-) create mode 100644 debian/patches/20-stable_branch_updates_r2652.patch diff --git a/debian/changelog b/debian/changelog index 121895f8..656772f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,8 +36,12 @@ network-manager (0.6.5-1) unstable; urgency=low + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. + * debian/patches/20-stable_branch_updates_r2652.patch + - Pull updates from the stable branch up until revision 2652. + - Fixes broken link detection and a couple of smaller issues. + - Adds support for the rfkill switch. - -- Michael Biebl Sun, 26 Aug 2007 23:55:17 +0200 + -- Michael Biebl Mon, 27 Aug 2007 00:39:16 +0200 network-manager (0.6.4-8) unstable; urgency=low diff --git a/debian/patches/20-stable_branch_updates_r2652.patch b/debian/patches/20-stable_branch_updates_r2652.patch new file mode 100644 index 00000000..aea8e86f --- /dev/null +++ b/debian/patches/20-stable_branch_updates_r2652.patch @@ -0,0 +1,914 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (Revision 2558) ++++ ChangeLog (Revision 2652) +@@ -1,3 +1,99 @@ ++2007-07-26 Dan Williams ++ ++ Patch from Bernhard Miklautz ++ ++ * src/NetworkManagerSystem.c ++ - (nm_system_device_set_ip4_route): don't add the route if it's on the ++ same subnet (#437396) ++ ++2007-07-26 Dan Williams ++ ++ * src/nm-device-802-11-wireless.c ++ - (real_start): I hate orinoco; apparently has trouble scanning too soon ++ after being brought up, so do the initial scan a bit later. ++ ++2007-06-27 Dan Williams ++ ++ * src/NetworkManager.c ++ - (nm_hal_init): set hardware RF to enabled if no killswitches are found ++ after the initial discovery ++ ++2007-06-21 Dan Williams ++ ++ More fixes for Fedora #194124, gnome.org #354565 ++ ++ * src/nm-device-802-3-ethernet.c ++ - (real_act_stage1_prepare): new function; fail activation if device ++ doesn't have a link ++ ++ * src/NetworkManagerPolicy.c ++ - (nm_policy_activation_finish): ensure device is actually activated ++ before sending out signals. Fixes a race where device cancellation ++ would be processed right after finish was scheduled, but not run. ++ - (nm_policy_device_change_check, nm_policy_schedule_device_change_check): ++ ensure device change check GSource ID is locked across threads; ++ allow interruption of activation of 802.3 ethernet devices that no ++ longer have an active link, and ensure that 802.3 ethernet devices ++ have an active link before starting activation ++ ++2007-06-21 Dan Williams ++ ++ Add HAL-based rfkill support, based on a patch from Benjamin Kahn. ++ ++ * src/NetworkManagerDbus.[ch] ++ - (nm_dbus_signal_wireless_enabled): new function, emit signals when ++ wireless enabled status changes ++ ++ * src/nm-dbus-nm.c ++ - (nm_dbus_nm_set_wireless_enabled): handle hardware rfkill correctly; ++ send errors when hardware switch overrides user request, and send ++ signals when wireless enabled state changes ++ - (nm_dbus_nm_get_wireless_enabled): send additional 'hardware rf enabled' ++ argument in method reply ++ ++ * src/NetworkManager.c ++ - (handle_killswitch_pcall_done, nm_killswitch_getpower_reply_cb, ++ nm_poll_killswitches, nm_add_killswitch_device, ++ nm_add_initial_killswitch_devices): new functions; detect and handle ++ hardware killswitches exported by HAL. Unfortunately we have to ++ poll the switches because HAL doesn't support signals for killswitches ++ yet. ++ - (nm_hal_device_new_capability): detect killswitches added asynchronously ++ - (nm_hal_init): look for killswitches when connecting to HAL ++ - (nm_hal_deinit): dispose of killswitches when deiniting HAL data ++ ++ * src/NetworkManagerMain.h ++ - Add bits to track killswitches ++ ++2007-06-12 Dan Williams ++ ++ * src/nm-device.c ++ - (real_act_stage3_ip_config_start): sometimes the device gets downed ++ during the wpa_supplicant association. Ensure the device is up ++ before it's used for IP configuration. ++ ++2007-06-07 Dan Williams ++ ++ Patch from Jon Nettleton ++ ++ * src/nm-device-802-11-wireless.c: ++ - (real_act_stage2_config): sleep 1 second to allow link status ++ to stabilize ++ ++2007-06-07 Dan Williams ++ ++ * (nm_device_802_3_ethernet_link_activated, ++ nm_device_802_3_ethernet_link_deactivated): fix ethernet link detection ++ behavior due to races between the netlink code and when the ++ device thread recognizes the change. Checking the link state ++ before scheduling the change even on the device thread is wrong. ++ (gnome.org #354565, rh #194124) ++ ++2007-04-25 Dan Williams ++ ++ * initscript/RedHat/NetworkManager.in: remove trailing backslash ++ (gnome.org #432401) ++ + 2007-04-18 Tambet Ingo + + * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network_cb): Update the security +Index: src/NetworkManagerDbus.c +=================================================================== +--- src/NetworkManagerDbus.c (Revision 2558) ++++ src/NetworkManagerDbus.c (Revision 2652) +@@ -434,6 +434,29 @@ + } + + ++void nm_dbus_signal_wireless_enabled (NMData * data) ++{ ++ DBusMessage * message; ++ ++ g_return_if_fail (data != NULL); ++ g_return_if_fail (data->dbus_connection != NULL); ++ ++ if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, "WirelessEnabled"))) ++ { ++ nm_warning ("%s(): Not enough memory for new dbus message!", __func__); ++ return; ++ } ++ ++ dbus_message_append_args (message, ++ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, ++ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, ++ DBUS_TYPE_INVALID); ++ if (!dbus_connection_send (data->dbus_connection, message, NULL)) ++ nm_warning ("%s(): Could not emit the WirelessEnabled signal!", __func__); ++ ++ dbus_message_unref (message); ++} ++ + /* + * nm_dbus_signal_filter + * +Index: src/NetworkManagerDbus.h +=================================================================== +--- src/NetworkManagerDbus.h (Revision 2558) ++++ src/NetworkManagerDbus.h (Revision 2652) +@@ -68,6 +68,7 @@ + + void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength); + void nm_dbus_signal_device_strength_change (DBusConnection *connection, NMDevice80211Wireless *dev, gint strength); ++void nm_dbus_signal_wireless_enabled (NMData * data); + + NMDevice * nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path); + +Index: src/nm-dbus-nm.c +=================================================================== +--- src/nm-dbus-nm.c (Revision 2558) ++++ src/nm-dbus-nm.c (Revision 2652) +@@ -483,53 +483,84 @@ + return (reply); + } + +-static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) ++static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) + { + gboolean enabled = FALSE; + DBusError err; +- NMData *app_data; ++ NMData * data; ++ DBusMessage * ret = NULL; + +- g_return_val_if_fail (data && data->data && connection && message, NULL); ++ g_return_val_if_fail (cb_data && cb_data->data && connection && message, NULL); + + dbus_error_init (&err); + if (!dbus_message_get_args (message, &err, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID)) +- return NULL; ++ goto out; + +- app_data = data->data; +- app_data->wireless_enabled = enabled; ++ data = cb_data->data; ++ if (enabled == data->wireless_enabled) ++ goto out; + +- if (!enabled) +- { +- GSList *elt; ++ /* Hardware rfkill overrides whatever user wants */ ++ if (!data->hw_rf_enabled) { ++ nm_info ("User request to %s wireless overridden by radio killswitch.", ++ enabled ? "enable" : "disable"); + +- /* Physically down all wireless devices */ +- nm_lock_mutex (app_data->dev_list_mutex, __FUNCTION__); +- for (elt = app_data->dev_list; elt; elt = g_slist_next (elt)) +- { +- NMDevice *dev = (NMDevice *)(elt->data); +- if (nm_device_is_802_11_wireless (dev)) +- { ++ /* Return error if user tries to re-enable wireless, or just ignore ++ * a disable wireless request when wireless is already disabled. ++ */ ++ if (enabled) { ++ ret = nm_dbus_create_error_message (message, ++ NM_DBUS_INTERFACE, ++ "DisabledBySystem", ++ "Wireless disabled by hardware switch."); ++ } ++ goto out; ++ } ++ ++ nm_info ("User request to %s wireless.", enabled ? "enable" : "disable"); ++ ++ data->wireless_enabled = enabled; ++ if (!data->wireless_enabled) { ++ GSList * elt; ++ ++ /* Deactivate all wireless devices and force them down so they ++ * turn off their radios. ++ */ ++ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); ++ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { ++ NMDevice * dev = (NMDevice *) elt->data; ++ if (nm_device_is_802_11_wireless (dev)) { + nm_device_deactivate (dev); + nm_device_bring_down (dev); + } + } +- nm_unlock_mutex (app_data->dev_list_mutex, __FUNCTION__); ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); + } + +- nm_policy_schedule_device_change_check (data->data); ++ nm_policy_schedule_device_change_check (data); ++ nm_dbus_signal_wireless_enabled (data); + +- return NULL; ++out: ++ return ret; + } + +-static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data) ++static DBusMessage *nm_dbus_nm_get_wireless_enabled (DBusConnection *connection, DBusMessage *message, NMDbusCBData *cb_data) + { ++ NMData * data; + DBusMessage *reply = NULL; + +- g_return_val_if_fail (data && data->data && connection && message, NULL); ++ g_return_val_if_fail (cb_data && connection && message, NULL); + +- if ((reply = dbus_message_new_method_return (message))) +- dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &data->data->wireless_enabled, DBUS_TYPE_INVALID); ++ data = cb_data->data; ++ g_return_val_if_fail (data != NULL, NULL); + ++ if ((reply = dbus_message_new_method_return (message))) { ++ dbus_message_append_args (reply, ++ DBUS_TYPE_BOOLEAN, &data->wireless_enabled, ++ DBUS_TYPE_BOOLEAN, &data->hw_rf_enabled, ++ DBUS_TYPE_INVALID); ++ } ++ + return reply; + } + +Index: src/nm-device-802-3-ethernet.c +=================================================================== +--- src/nm-device-802-3-ethernet.c (Revision 2558) ++++ src/nm-device-802-3-ethernet.c (Revision 2652) +@@ -108,18 +108,16 @@ + GObject *obj, + NMDevice8023Ethernet *self) + { ++ GSource * source; ++ + /* Make sure signal is for us */ + if (NM_DEVICE (self) != NM_DEVICE (obj)) + return; + +- if (!nm_device_has_active_link (NM_DEVICE (self))) +- { +- GSource * source = g_idle_source_new (); +- +- g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); +- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); +- g_source_unref (source); +- } ++ source = g_idle_source_new (); ++ g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL); ++ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); ++ g_source_unref (source); + } + + +@@ -135,18 +133,16 @@ + GObject *obj, + NMDevice8023Ethernet *self) + { ++ GSource * source; ++ + /* Make sure signal is for us */ + if (NM_DEVICE (self) != NM_DEVICE (obj)) + return; + +- if (nm_device_has_active_link (NM_DEVICE (self))) +- { +- GSource * source = g_idle_source_new (); +- +- g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); +- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); +- g_source_unref (source); +- } ++ source = g_idle_source_new (); ++ g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL); ++ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self))); ++ g_source_unref (source); + } + + static void +@@ -211,6 +207,26 @@ + return caps; + } + ++ ++static NMActStageReturn ++real_act_stage1_prepare (NMDevice *dev, NMActRequest *req) ++{ ++ NMDevice8023Ethernet * self = NM_DEVICE_802_3_ETHERNET (dev); ++ NMDevice8023EthernetClass * klass; ++ NMDeviceClass * parent_class; ++ ++ /* Ensure ethernet devices have a link before going further with activation, ++ * partially works around Fedora #194124. ++ */ ++ if (!nm_device_has_active_link (dev)) ++ return NM_ACT_STAGE_RETURN_FAILURE; ++ ++ /* Chain up to parent */ ++ klass = NM_DEVICE_802_3_ETHERNET_GET_CLASS (self); ++ parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass)); ++ return parent_class->act_stage1_prepare (dev, req); ++} ++ + static void + nm_device_802_3_ethernet_dispose (GObject *object) + { +@@ -275,6 +291,7 @@ + parent_class->get_generic_capabilities = real_get_generic_capabilities; + parent_class->init = real_init; + parent_class->update_link = real_update_link; ++ parent_class->act_stage1_prepare = real_act_stage1_prepare; + + g_type_class_add_private (object_class, sizeof (NMDevice8023EthernetPrivate)); + } +Index: src/NetworkManagerPolicy.c +=================================================================== +--- src/NetworkManagerPolicy.c (Revision 2558) ++++ src/NetworkManagerPolicy.c (Revision 2652) +@@ -52,6 +52,7 @@ + NMDevice *dev = NULL; + NMData *data = NULL; + NMAccessPoint * ap = NULL; ++ NMActRequest * dev_req; + + g_return_val_if_fail (req != NULL, FALSE); + +@@ -61,6 +62,13 @@ + dev = nm_act_request_get_dev (req); + g_assert (dev); + ++ /* Ensure that inactive devices don't get the activated signal ++ * sent due to race conditions. ++ */ ++ dev_req = nm_device_get_act_request (dev); ++ if (!dev_req || (dev_req != req)) ++ return FALSE; ++ + if (nm_device_is_802_11_wireless (dev)) + ap = nm_act_request_get_ap (req); + +@@ -265,14 +273,16 @@ + } + + #if 0 +- nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (best_wired_dev) : "(null)", +- best_wireless_dev ? nm_device_get_iface (best_wireless_dev) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); ++ nm_info ("AUTO: Best wired device = %s, best wireless device = %s (%s)", best_wired_dev ? nm_device_get_iface (NM_DEVICE (best_wired_dev)) : "(null)", ++ best_wireless_dev ? nm_device_get_iface (NM_DEVICE (best_wireless_dev)) : "(null)", (best_wireless_dev && *ap) ? nm_ap_get_essid (*ap) : "null" ); + #endif + + return highest_priority_dev; + } + + ++static GStaticMutex dcc_mutex = G_STATIC_MUTEX_INIT; ++ + /* + * nm_policy_device_change_check + * +@@ -294,7 +304,9 @@ + + g_return_val_if_fail (data != NULL, FALSE); + ++ g_static_mutex_lock (&dcc_mutex); + data->dev_change_check_idle_id = 0; ++ g_static_mutex_unlock (&dcc_mutex); + + old_dev = nm_get_active_device (data); + +@@ -303,11 +315,19 @@ + + if (old_dev) + { ++ gboolean has_link = TRUE; + guint32 caps = nm_device_get_capabilities (old_dev); + ++ /* Ensure ethernet devices have a link before starting activation, ++ * partially works around Fedora #194124. ++ */ ++ if (nm_device_is_802_3_ethernet (old_dev)) ++ has_link = nm_device_has_active_link (old_dev); ++ + /* Don't interrupt a currently activating device. */ + if ( nm_device_is_activating (old_dev) +- && !nm_device_can_interrupt_activation (old_dev)) ++ && !nm_device_can_interrupt_activation (old_dev) ++ && has_link) + { + nm_info ("Old device '%s' activating, won't change.", nm_device_get_iface (old_dev)); + goto out; +@@ -425,13 +445,36 @@ + if (do_switch && (nm_device_is_802_3_ethernet (new_dev) || (nm_device_is_802_11_wireless (new_dev) && ap))) + { + NMActRequest * act_req = NULL; ++ gboolean has_link = TRUE; + +- if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) ++ /* Ensure ethernet devices have a link before starting activation, ++ * partially works around Fedora #194124. ++ */ ++ if (nm_device_is_802_3_ethernet (new_dev)) ++ has_link = nm_device_has_active_link (new_dev); ++ ++ if (has_link) + { +- nm_info ("Will activate connection '%s%s%s'.", nm_device_get_iface (new_dev), ap ? "/" : "", ap ? nm_ap_get_essid (ap) : ""); +- nm_policy_schedule_device_activation (act_req); +- nm_act_request_unref (act_req); ++ if ((act_req = nm_act_request_new (data, new_dev, ap, FALSE))) ++ { ++ nm_info ("Will activate connection '%s%s%s'.", ++ nm_device_get_iface (new_dev), ++ ap ? "/" : "", ++ ap ? nm_ap_get_essid (ap) : ""); ++ nm_policy_schedule_device_activation (act_req); ++ nm_act_request_unref (act_req); ++ } ++ else ++ { ++ nm_info ("Error creating activation request for %s", ++ nm_device_get_iface (new_dev)); ++ } + } ++ else ++ { ++ nm_info ("Won't activate %s because it no longer has a link.", ++ nm_device_get_iface (new_dev)); ++ } + } + + if (ap) +@@ -452,11 +495,9 @@ + */ + void nm_policy_schedule_device_change_check (NMData *data) + { +- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; +- + g_return_if_fail (data != NULL); + +- g_static_mutex_lock (&mutex); ++ g_static_mutex_lock (&dcc_mutex); + + if (data->dev_change_check_idle_id == 0) + { +@@ -466,8 +507,7 @@ + data->dev_change_check_idle_id = g_source_attach (source, data->main_context); + g_source_unref (source); + } +- +- g_static_mutex_unlock (&mutex); ++ g_static_mutex_unlock (&dcc_mutex); + } + + +Index: src/nm-ap-security-wpa-eap.c +=================================================================== +--- src/nm-ap-security-wpa-eap.c (Revision 2558) ++++ src/nm-ap-security-wpa-eap.c (Revision 2652) +@@ -57,7 +57,6 @@ + NMAPSecurityWPA_EAP * security = NULL; + int eap_method; + int key_type; +- int phase2_type; + int wpa_version; + char * identity = NULL; + char * passwd = NULL; +Index: src/nm-device.c +=================================================================== +--- src/nm-device.c (Revision 2558) ++++ src/nm-device.c (Revision 2652) +@@ -856,6 +856,12 @@ + data = nm_act_request_get_data (req); + g_assert (data); + ++ /* Sometimes the device gets downed by wpa_supplicant; in any case, make ++ * sure it's up before anything tries to use it. ++ */ ++ if (!nm_device_is_up (self)) ++ nm_device_bring_up (self); ++ + /* DHCP devices try DHCP, non-DHCP default to SUCCESS */ + if (nm_device_get_use_dhcp (self)) + { +Index: src/NetworkManager.c +=================================================================== +--- src/NetworkManager.c (Revision 2558) ++++ src/NetworkManager.c (Revision 2652) +@@ -67,6 +67,7 @@ + + static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); + static void nm_data_free (NMData *data); ++static gboolean nm_poll_killswitches(gpointer user_data); + + /* + * nm_get_device_interface_from_hal +@@ -274,7 +275,184 @@ + } + + ++static void handle_killswitch_pcall_done (NMData *data, DBusPendingCall * pcall) ++{ ++ GSource * source; ++ gboolean now_enabled = FALSE; ++ gboolean now_disabled = FALSE; ++ ++ data->ks_pcall_list = g_slist_remove (data->ks_pcall_list, pcall); ++ if (g_slist_length (data->ks_pcall_list) > 0) ++ return; /* not done with all killswitches yet */ ++ ++ if (data->hw_rf_enabled != data->tmp_hw_rf_enabled) { ++ nm_info ("Wireless now %s by radio killswitch", ++ data->tmp_hw_rf_enabled ? "enabled" : "disabled"); ++ if (data->tmp_hw_rf_enabled) ++ now_enabled = TRUE; ++ else ++ now_disabled = TRUE; ++ ++ data->hw_rf_enabled = data->tmp_hw_rf_enabled; ++ } ++ ++ if (data->hw_rf_enabled == data->wireless_enabled) ++ goto out; ++ ++ /* Only re-enabled wireless if killswitch just changed, otherwise ++ * ignore hardware rf enabled state. ++ */ ++ if (now_enabled && !data->wireless_enabled) { ++ data->wireless_enabled = TRUE; ++ nm_policy_schedule_device_change_check (data); ++ nm_dbus_signal_wireless_enabled (data); ++ } else if (!data->hw_rf_enabled && data->wireless_enabled) { ++ GSList * elt; ++ ++ /* Deactivate all wireless devices and force them down so they ++ * turn off their radios. ++ */ ++ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__); ++ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) { ++ NMDevice * dev = (NMDevice *) elt->data; ++ if (nm_device_is_802_11_wireless (dev)) { ++ nm_device_deactivate (dev); ++ nm_device_bring_down (dev); ++ } ++ } ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); ++ ++ data->wireless_enabled = FALSE; ++ nm_policy_schedule_device_change_check (data); ++ nm_dbus_signal_wireless_enabled (data); ++ } ++ ++out: ++ /* Schedule another killswitch poll */ ++ source = g_timeout_source_new (6000); ++ g_source_set_callback (source, nm_poll_killswitches, data, NULL); ++ g_source_attach (source, data->main_context); ++ g_source_unref (source); ++} ++ ++static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * data) ++{ ++ DBusError err; ++ DBusMessage * reply = NULL; ++ guint32 status; ++ ++ g_return_if_fail (pcall != NULL); ++ g_return_if_fail (data != NULL); ++ ++ if (!dbus_pending_call_get_completed (pcall)) ++ goto out; ++ ++ if (!(reply = dbus_pending_call_steal_reply (pcall))) ++ goto out; ++ ++ if (message_is_error (reply)) { ++ dbus_error_init (&err); ++ dbus_set_error_from_message (&err, reply); ++ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); ++ dbus_error_free (&err); ++ goto out; ++ } ++ ++ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { ++ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); ++ dbus_error_free (&err); ++ goto out; ++ } ++ ++ if (status == 0) ++ data->tmp_hw_rf_enabled = FALSE; ++ ++out: ++ if (reply) ++ dbus_message_unref (reply); ++ ++ handle_killswitch_pcall_done (data, pcall); ++ dbus_pending_call_unref (pcall); ++} ++ ++ ++static gboolean nm_poll_killswitches (gpointer user_data) ++{ ++ NMData * data = (NMData *) user_data; ++ DBusConnection * connection = data->dbus_connection; ++ GSList * elt; ++ ++ g_return_val_if_fail (data != NULL, FALSE); ++ ++ data->tmp_hw_rf_enabled = TRUE; ++ ++ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) ++ { ++ DBusPendingCall * pcall; ++ DBusMessage * message; ++ ++ message = dbus_message_new_method_call ("org.freedesktop.Hal", ++ elt->data, ++ "org.freedesktop.Hal.Device.KillSwitch", ++ "GetPower"); ++ if (!dbus_connection_send_with_reply (connection, message, &pcall, 5000)) { ++ nm_warning ("%s(): could not send dbus message", __func__); ++ } else if (!pcall) { ++ nm_warning ("%s(): could not send dbus message; pcall was NULL", __func__); ++ } else { ++ dbus_pending_call_set_notify (pcall, ++ (DBusPendingCallNotifyFunction) nm_killswitch_getpower_reply_cb, ++ data, ++ NULL); ++ data->ks_pcall_list = g_slist_append (data->ks_pcall_list, pcall); ++ } ++ dbus_message_unref (message); ++ } ++ return FALSE; ++} ++ ++ + /* ++ * nm_add_killswitch_device ++ * ++ * Adds a killswitch device to the list ++ * ++ */ ++static void nm_add_killswitch_device (NMData * data, const char * udi) ++{ ++ char * type; ++ GSList * elt; ++ ++ type = libhal_device_get_property_string (data->hal_ctx, udi, "killswitch.type", NULL); ++ if (!type) ++ return; ++ ++ if (strcmp (type, "wlan") != 0) ++ goto out; ++ ++ /* see if it's already in the list */ ++ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt)) { ++ const char * list_udi = (const char *) elt->data; ++ if (strcmp (list_udi, udi) == 0) ++ goto out; ++ } ++ ++ /* Start polling switches if this is the first switch we've found */ ++ if (g_slist_length (data->killswitch_list) == 0) { ++ GSource * source = g_idle_source_new (); ++ g_source_set_callback (source, nm_poll_killswitches, data, NULL); ++ g_source_attach (source, data->main_context); ++ g_source_unref (source); ++ } ++ ++ data->killswitch_list = g_slist_append (data->killswitch_list, g_strdup (udi)); ++ nm_info ("Found radio killswitch %s", udi); ++ ++out: ++ libhal_free_string (type); ++} ++ ++/* + * nm_hal_device_new_capability + * + */ +@@ -283,10 +461,9 @@ + NMData *data = (NMData *)libhal_ctx_get_user_data (ctx); + + g_return_if_fail (data != NULL); ++ g_return_if_fail (capability != NULL); + +- /*nm_debug ("nm_hal_device_new_capability() called with udi = %s, capability = %s", udi, capability );*/ +- +- if (capability && ((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) ++ if (((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0))) + { + char *iface; + +@@ -296,6 +473,10 @@ + g_free (iface); + } + } ++ else if (strcmp (capability, "killswitch") == 0) ++ { ++ nm_add_killswitch_device (data, udi); ++ } + } + + +@@ -340,7 +521,31 @@ + libhal_free_string_array (net_devices); + } + ++void nm_add_initial_killswitch_devices (NMData * data) ++{ ++ char ** udis; ++ int num_udis, i; ++ DBusError error; + ++ g_return_if_fail (data != NULL); ++ ++ dbus_error_init (&error); ++ udis = libhal_find_device_by_capability (data->hal_ctx, "killswitch", &num_udis, &error); ++ if (!udis) ++ return; ++ ++ if (dbus_error_is_set (&error)) { ++ nm_warning("Could not find killswitch devices: %s", error.message); ++ dbus_error_free (&error); ++ return; ++ } ++ ++ for (i = 0; i < num_udis; i++) ++ nm_add_killswitch_device (data, udis[i]); ++ libhal_free_string_array (udis); ++} ++ ++ + /* + * nm_state_change_signal_broadcast + * +@@ -616,28 +821,39 @@ + g_return_if_fail (data != NULL); + + if ((data->hal_ctx = nm_get_hal_ctx (data))) ++ { ++ nm_add_initial_killswitch_devices (data); + nm_add_initial_devices (data); ++ } ++ ++ /* If there weren't any killswitches, mark hardware RF to on */ ++ if (g_slist_length (data->killswitch_list) == 0) ++ data->hw_rf_enabled = TRUE; + } + + + void nm_hal_deinit (NMData *data) + { ++ DBusError error; ++ + g_return_if_fail (data != NULL); + +- if (data->hal_ctx) ++ if (!data->hal_ctx) ++ return; ++ ++ g_slist_foreach (data->killswitch_list, (GFunc) g_free, NULL); ++ g_slist_free (data->killswitch_list); ++ data->killswitch_list = NULL; ++ ++ dbus_error_init (&error); ++ libhal_ctx_shutdown (data->hal_ctx, &error); ++ if (dbus_error_is_set (&error)) + { +- DBusError error; +- +- dbus_error_init (&error); +- libhal_ctx_shutdown (data->hal_ctx, &error); +- if (dbus_error_is_set (&error)) +- { +- nm_warning ("libhal shutdown failed - %s", error.message); +- dbus_error_free (&error); +- } +- libhal_ctx_free (data->hal_ctx); +- data->hal_ctx = NULL; ++ nm_warning ("libhal shutdown failed - %s", error.message); ++ dbus_error_free (&error); + } ++ libhal_ctx_free (data->hal_ctx); ++ data->hal_ctx = NULL; + } + + +Index: src/nm-device-802-11-wireless.c +=================================================================== +--- src/nm-device-802-11-wireless.c (Revision 2558) ++++ src/nm-device-802-11-wireless.c (Revision 2652) +@@ -617,7 +617,10 @@ + /* Start the scanning timeout for devices that can do scanning */ + if (nm_device_get_capabilities (dev) & NM_DEVICE_CAP_WIRELESS_SCAN) + { +- self->priv->pending_scan = g_idle_source_new (); ++ /* Stupid orinoco has problems scanning immediately after being up, ++ * so wait a bit before triggering a scan. ++ */ ++ self->priv->pending_scan = g_timeout_source_new (600); + g_source_set_callback (self->priv->pending_scan, + nm_device_802_11_wireless_scan, + self, +@@ -2981,6 +2984,9 @@ + return NM_ACT_STAGE_RETURN_POSTPONE; + } + ++ /* Some cards are dumb. Wait a second */ ++ sleep (1); ++ + iface = nm_device_get_iface (dev); + if (!supplicant_exec (self)) + { +@@ -3446,10 +3452,9 @@ + char *genie, *gpos, *gend, *custom; + NMAccessPoint *ap = NULL; + size_t clen; +- int maxrate; ++ int maxrate = 0; + struct iw_event iwe_buf, *iwe = &iwe_buf; + struct stream_descr stream; +- struct wireless_scan * wscan = NULL; + int ret; + + g_return_val_if_fail (dev != NULL, FALSE); +Index: src/NetworkManagerMain.h +=================================================================== +--- src/NetworkManagerMain.h (Revision 2558) ++++ src/NetworkManagerMain.h (Revision 2652) +@@ -82,6 +82,7 @@ + GSList * dev_list; + GMutex * dev_list_mutex; + ++ gboolean hw_rf_enabled; + gboolean wireless_enabled; + gboolean modem_active; + gboolean asleep; +@@ -90,6 +91,10 @@ + GSList * dialup_list; + GMutex * dialup_list_mutex; + ++ GSList * killswitch_list; ++ GSList * ks_pcall_list; /* track killswitch D-Bus pending calls */ ++ gboolean tmp_hw_rf_enabled; ++ + struct NMAccessPointList *allowed_ap_list; + struct NMAccessPointList *invalid_ap_list; + } NMData; +Index: src/NetworkManagerSystem.c +=================================================================== +--- src/NetworkManagerSystem.c (Revision 2558) ++++ src/NetworkManagerSystem.c (Revision 2652) +@@ -64,6 +64,7 @@ + struct sockaddr_in *p; + const char * iface; + int err; ++ NMIP4Config * config = NULL; + + iface = nm_device_get_iface (dev); + +@@ -75,6 +76,15 @@ + if (ip4_gateway == 0) + return TRUE; + ++ /* ++ * Do not add the route if the destination is on the same subnet. ++ */ ++ config = nm_device_get_ip4_config(dev); ++ if (config && ++ ((guint32)ip4_dest & nm_ip4_config_get_netmask(config)) == ++ (nm_ip4_config_get_address(config) & nm_ip4_config_get_netmask(config))) ++ return TRUE; ++ + if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL) + return FALSE; + -- cgit 1.3.0-6-gf8a5 From 5e7a39ec82eeeb644bd136e047d75bb51c51adc5 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:04:27 +0000 Subject: - debian/copyright + Remove the copyright notices for files which are now in the nm-applet source package. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1677 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 3 +++ debian/copyright | 12 ++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 656772f6..bbc219f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ network-manager (0.6.5-1) unstable; urgency=low + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary workaround until this binary has also been moved into the nm-applet source package. + - debian/copyright + + Remove the copyright notices for files which are now in the nm-applet + source package. * debian/patches/20-stable_branch_updates_r2652.patch - Pull updates from the stable branch up until revision 2652. - Fixes broken link detection and a couple of smaller issues. diff --git a/debian/copyright b/debian/copyright index 2cc573e8..8813c529 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,13 +22,9 @@ License: License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -src/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb. +libnm-util/gnome-keyring-md5.c, gnome-keyring-md5.h is written by Colin Plumb. This code is in the public domain; do with it what you wish. -gnome/nm-applet/eggtrayicon.c, eggtrayicon.h are copyright of -Anders Carlsson and are released under the terms of -the GNU Lesser General Public. (see above). - src/nm-netlink-monitor.c is copyright of Ray Strode, David Zeuthen, and Novell, Inc. and it's released under the terms of the GNU General Public License. (see below). @@ -67,11 +63,7 @@ are released under the terms of the GNU General Public License. (see below). initscript/Debian/NetworkManager is copyright of , Mark Roach , Thom May -gnome/applet/menu-info.c, menu-info.h are copyright of -Jonathan Blandford and are released under the term of -the GNU General Public License. (see below). - -gnome//nm-vpn-properties.c, nm-vpn-properties.h are copyright of +gnome/nm-vpn-properties.c, nm-vpn-properties.h are copyright of David Zeuthen, and are licensed to you under your choice of the Academic Free License version 2.0, or the GNU General Public License version 2. (see below) -- cgit 1.3.0-6-gf8a5 From 7335936f2b285acf52d56570a290971572584651 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:19:41 +0000 Subject: + Update Build-Depends. Add autotools-dev, libglib2.0-dev and iproute, remove libpanel-applet2-dev. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1678 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbc219f4..c5249902 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,8 @@ network-manager (0.6.5-1) unstable; urgency=low + Remove the binary package network-manager-gnome. + Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as nm-vpn-properties is now part of the network-manager binary package. - + Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove - libpanel-applet2-dev. + + Update Build-Depends. Add autotools-dev, libglib2.0-dev and iproute, + remove libpanel-applet2-dev. - debian/rules + Do not build the nm-applet.1 manpage anymore. + Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary diff --git a/debian/control b/debian/control index 07df5c2a..eb5f632d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager -- cgit 1.3.0-6-gf8a5 From 8519ea27928d06161a68e8775dfddbc669157e8a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:24:37 +0000 Subject: * debian/patches/02-dbus_access_network_manager.patch - Add support for at_console dbus access check. (Closes: #426462) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1679 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 ++ debian/patches/02-dbus_access_network_manager.patch | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5249902..cb6a7c32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ network-manager (0.6.5-1) unstable; urgency=low - Pull updates from the stable branch up until revision 2652. - Fixes broken link detection and a couple of smaller issues. - Adds support for the rfkill switch. + * debian/patches/02-dbus_access_network_manager.patch + - Add support for at_console dbus access check. (Closes: #426462) -- Michael Biebl Mon, 27 Aug 2007 00:39:16 +0200 diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index 139a3d87..ced5effe 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,15 +1,19 @@ ---- src/NetworkManager.conf.orig 2006-06-14 02:47:10.000000000 +0200 -+++ src/NetworkManager.conf 2006-06-14 02:48:31.000000000 +0200 -@@ -8,7 +8,11 @@ +Index: src/NetworkManager.conf +=================================================================== +--- src/NetworkManager.conf (Revision 2735) ++++ src/NetworkManager.conf (Arbeitskopie) +@@ -8,6 +8,14 @@ -- + + + + + ++ ++ ++ + - -- cgit 1.3.0-6-gf8a5 From 263d34e792f1a5bb73813e5654ff034fb704df24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 26 Aug 2007 23:42:50 +0000 Subject: Post tagging commit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1681 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb6a7c32..3addd7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.5-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Michael Biebl Mon, 27 Aug 2007 01:42:37 +0200 + network-manager (0.6.5-1) unstable; urgency=low * New upstream release. (Closes: #420959, #431658) -- cgit 1.3.0-6-gf8a5 From 8e106e46371ab5ce776447c0b8c7b2413d752f40 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 18:27:56 +0000 Subject: * debian/patches/21-endianess_fix_r2754.patch - Fixes a problem with ASCII passphrases on big-endian systems due to a missing config.h include. (Closes: 391364) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1744 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++--- debian/patches/21-endianess_fix_r2754.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 debian/patches/21-endianess_fix_r2754.patch diff --git a/debian/changelog b/debian/changelog index 3addd7bd..11828177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (0.6.5-2) UNRELEASED; urgency=low +network-manager (0.6.5-2) unstable; urgency=low - * NOT RELEASED YET + * debian/patches/21-endianess_fix_r2754.patch + - Fixes a problem with ASCII passphrases on big-endian systems due to a missing + config.h include. (Closes: 391364) - -- Michael Biebl Mon, 27 Aug 2007 01:42:37 +0200 + -- Michael Biebl Sun, 09 Sep 2007 17:54:50 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/patches/21-endianess_fix_r2754.patch b/debian/patches/21-endianess_fix_r2754.patch new file mode 100644 index 00000000..4932e22a --- /dev/null +++ b/debian/patches/21-endianess_fix_r2754.patch @@ -0,0 +1,28 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (Revision 2753) ++++ ChangeLog (Revision 2754) +@@ -1,3 +1,8 @@ ++2007-08-30 Dan Williams ++ ++ * libnm-util/sha1.c ++ - Include config.h to get defines for endiannes (gnome.org #420216) ++ + 2007-07-26 Dan Williams + + Patch from Bernhard Miklautz +Index: libnm-util/sha1.c +=================================================================== +--- libnm-util/sha1.c (Revision 2753) ++++ libnm-util/sha1.c (Revision 2754) +@@ -12,6 +12,10 @@ + * See README and COPYING for more details. + */ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + -- cgit 1.3.0-6-gf8a5 From efaa302a97cc325431001b40277008b79a58a4a9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 18:28:59 +0000 Subject: - Fixes a problem with ASCII passphrases on big-endian systems due to a missing * debian/network-manager.manpages - Install nm-vpn-properties manpage. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1745 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/network-manager.manpages | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 11828177..7f28e388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ network-manager (0.6.5-2) unstable; urgency=low * debian/patches/21-endianess_fix_r2754.patch - - Fixes a problem with ASCII passphrases on big-endian systems due to a missing + - Fixes a problem with ASCII passphrases on big-endian systems due to a missing config.h include. (Closes: 391364) + * debian/network-manager.manpages + - Install nm-vpn-properties manpage. - -- Michael Biebl Sun, 09 Sep 2007 17:54:50 +0200 + -- Michael Biebl Fri, 28 Sep 2007 20:28:16 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/network-manager.manpages b/debian/network-manager.manpages index 153d1ce0..50ee9f13 100644 --- a/debian/network-manager.manpages +++ b/debian/network-manager.manpages @@ -1,3 +1,4 @@ man/NetworkManagerDispatcher.1 man/nm-tool.1 man/NetworkManager.1 +debian/nm-vpn-properties.1 -- cgit 1.3.0-6-gf8a5 From 26f3ae33c2f5ed4c962523597a343ef1e1532736 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:08:01 +0000 Subject: * debian/control - Use the new "Homepage:" field to specify the upstream URL. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1746 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 +++- debian/control | 15 ++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f28e388..7e5aa1f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ network-manager (0.6.5-2) unstable; urgency=low config.h include. (Closes: 391364) * debian/network-manager.manpages - Install nm-vpn-properties manpage. + * debian/control + - Use the new "Homepage:" field to specify the upstream URL. - -- Michael Biebl Fri, 28 Sep 2007 20:28:16 +0200 + -- Michael Biebl Fri, 28 Sep 2007 20:37:08 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/control b/debian/control index eb5f632d..c852a6dc 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,11 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager +Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any @@ -23,8 +24,6 @@ Description: network management framework daemon from a DHCP server, and change nameservers whenever it sees fit. . This package provides the userspace daemons. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager-dev Architecture: any @@ -33,8 +32,6 @@ Depends: pkg-config Description: network management framework (development files) this package provides header files that are needed to compile VPN Plugins for NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib0 Section: libs @@ -50,8 +47,6 @@ Description: network management framework (GLib shared library) . This package provides the shared library that applications can use to query connection status via NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-glib-dev Section: libdevel @@ -67,8 +62,6 @@ Description: network management framework (GLib interface) . This package provides the interface that applications can use to query connection status via NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util0 Section: libs @@ -84,8 +77,6 @@ Description: network management framework (shared library) . This package contains a convenience library to ease the access to NetworkManager. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ Package: libnm-util-dev Section: libdevel @@ -100,6 +91,4 @@ Description: network management framework (development files) from a DHCP server, and change nameservers whenever it sees fit. . This package contains header and development files. - . - Homepage: http://www.gnome.org/projects/NetworkManager/ -- cgit 1.3.0-6-gf8a5 From e1a65e5b1eda31353ebd56b882568cd53507d34a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:17:01 +0000 Subject: * 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as nm-vpn-properties requires gnome druid which has been deprecated in GTK+ 2.12. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1747 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++- ...x_vpn_ftbfs_dont_disable_gnome_deprecated.patch | 44 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch diff --git a/debian/changelog b/debian/changelog index 7e5aa1f1..c3d83182 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,12 @@ network-manager (0.6.5-2) unstable; urgency=low - Install nm-vpn-properties manpage. * debian/control - Use the new "Homepage:" field to specify the upstream URL. + * 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch + - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as + nm-vpn-properties requires gnome druid which has been deprecated in + GTK+ 2.12. - -- Michael Biebl Fri, 28 Sep 2007 20:37:08 +0200 + -- Michael Biebl Fri, 28 Sep 2007 21:12:33 +0200 network-manager (0.6.5-1) unstable; urgency=low diff --git a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch new file mode 100644 index 00000000..ac0459b6 --- /dev/null +++ b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch @@ -0,0 +1,44 @@ +=== modified file 'gnome/vpn-properties/Makefile.am' +--- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.am 2007-06-25 13:51:34 +0000 ++++ network-manager-0.6.5/gnome/vpn-properties/Makefile.am 2007-08-03 11:50:32 +0000 +@@ -21,17 +21,16 @@ nm_vpn_properties_CFLAGS = + $(GCONF_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBGNOMEUI_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DICONDIR=\""$(datadir)/icons"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DVERSION=\"$(VERSION)\" \ + $(NULL) + + nm_vpn_properties_LDADD = \ + $(GLADE_LIBS) \ + $(GTK_LIBS) \ + $(GCONF_LIBS) \ + +=== modified file 'gnome/vpn-properties/Makefile.in' +--- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.in 2007-06-25 13:51:34 +0000 ++++ network-manager-0.6.5/gnome/vpn-properties/Makefile.in 2007-08-03 11:50:32 +0000 +@@ -258,17 +258,16 @@ nm_vpn_properties_CFLAGS = \ + $(GCONF_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(LIBGNOMEUI_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DICONDIR=\""$(datadir)/icons"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DVERSION=\"$(VERSION)\" \ + $(NULL) + + + nm_vpn_properties_LDADD = \ + $(GLADE_LIBS) \ + $(GTK_LIBS) \ + -- cgit 1.3.0-6-gf8a5 From 6a797f4958b22d0c9bf8849a58ec1ddce896ea51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:23:56 +0000 Subject: Fix the changelog entry. gnome-druid is in libgnomeui git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1748 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c3d83182..5e918fb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ network-manager (0.6.5-2) unstable; urgency=low * 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as nm-vpn-properties requires gnome druid which has been deprecated in - GTK+ 2.12. + libgnomeui 2.20. -- Michael Biebl Fri, 28 Sep 2007 21:12:33 +0200 -- cgit 1.3.0-6-gf8a5 From 0bb60eff4e78e18e793862e8e06d5235f19c3552 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:33:44 +0000 Subject: Post tagging commit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1750 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5e918fb9..a4065efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.5-3) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Michael Biebl Fri, 28 Sep 2007 21:33:25 +0200 + network-manager (0.6.5-2) unstable; urgency=low * debian/patches/21-endianess_fix_r2754.patch -- cgit 1.3.0-6-gf8a5 From 72482de1cc44c8b01220e45f7391282abfc52d76 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 22 Oct 2007 15:09:38 +0000 Subject: * debian/patches/23-rfkill_return_type.patch - The return type of the GetPower() method from Device.Killswitch has changed from UINT32 to INT32 in hal-0.5.10. Fix the code accordingly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1824 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 +++++--- debian/patches/23-rfkill_return_type.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 debian/patches/23-rfkill_return_type.patch diff --git a/debian/changelog b/debian/changelog index a4065efd..e616438e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -network-manager (0.6.5-3) UNRELEASED; urgency=low +network-manager (0.6.5-3) unstable; urgency=low - * NOT RELEASED YET + * debian/patches/23-rfkill_return_type.patch + - The return type of the GetPower() method from Device.Killswitch has + changed from UINT32 to INT32 in hal-0.5.10. Fix the code accordingly. - -- Michael Biebl Fri, 28 Sep 2007 21:33:25 +0200 + -- Michael Biebl Mon, 22 Oct 2007 17:05:44 +0200 network-manager (0.6.5-2) unstable; urgency=low diff --git a/debian/patches/23-rfkill_return_type.patch b/debian/patches/23-rfkill_return_type.patch new file mode 100644 index 00000000..1e327d46 --- /dev/null +++ b/debian/patches/23-rfkill_return_type.patch @@ -0,0 +1,22 @@ +Index: src/NetworkManager.c +=================================================================== +--- src/NetworkManager.c (Revision 2974) ++++ src/NetworkManager.c (Arbeitskopie) +@@ -339,7 +339,7 @@ + { + DBusError err; + DBusMessage * reply = NULL; +- guint32 status; ++ gint32 status; + + g_return_if_fail (pcall != NULL); + g_return_if_fail (data != NULL); +@@ -358,7 +358,7 @@ + goto out; + } + +- if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status, DBUS_TYPE_INVALID)) { ++ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { + nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); + dbus_error_free (&err); + goto out; -- cgit 1.3.0-6-gf8a5 From 1468ebe109738f235b1a0e20725e8bae038dfb4a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 2 Nov 2007 23:43:40 +0000 Subject: * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1835 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e616438e..e7e688a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (0.6.5-4) UNRELEASED; urgency=low + + * debian/control + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + + -- Michael Biebl Sat, 03 Nov 2007 00:43:02 +0100 + network-manager (0.6.5-3) unstable; urgency=low * debian/patches/23-rfkill_return_type.patch diff --git a/debian/control b/debian/control index c852a6dc..4cae2c45 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Utopia Maintenance Team , Michael Biebl Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager +Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager +Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager -- cgit 1.3.0-6-gf8a5 From 8d8ad4577ac189e0173fe659fbecc3d2f267777c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Dec 2007 07:04:11 +0000 Subject: - Bump Build-Depends on libnl-dev to (>= 1.0~pre8). * debian/patches/24-libnl1-pre8_fix.patch - Backport support for libnl 1.0-pre8 from upstream SVN. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1963 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++- debian/control | 4 +-- debian/patches/24-libnl1-pre8_fix.patch | 46 +++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 debian/patches/24-libnl1-pre8_fix.patch diff --git a/debian/changelog b/debian/changelog index e7e688a7..b48e2ab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Bump Build-Depends on libnl-dev to (>= 1.0~pre8). + * debian/patches/24-libnl1-pre8_fix.patch + - Backport support for libnl 1.0-pre8 from upstream SVN. - -- Michael Biebl Sat, 03 Nov 2007 00:43:02 +0100 + -- Michael Biebl Thu, 20 Dec 2007 07:58:34 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 4cae2c45..44ba3354 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: net Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Riccardo Setti , Michael Biebl -Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man, iproute -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libglade2-dev, libglib2.0-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0~pre8), libnotify-dev (>= 0.3), docbook-to-man, iproute +Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager Homepage: http://www.gnome.org/projects/NetworkManager/ diff --git a/debian/patches/24-libnl1-pre8_fix.patch b/debian/patches/24-libnl1-pre8_fix.patch new file mode 100644 index 00000000..26a54e7b --- /dev/null +++ b/debian/patches/24-libnl1-pre8_fix.patch @@ -0,0 +1,46 @@ +=== modified file 'src/NetworkManagerSystem.c' +--- src/NetworkManagerSystem.c 2007-12-20 06:06:27 +0000 ++++ src/NetworkManagerSystem.c 2007-12-20 06:57:47 +0000 +@@ -224,16 +224,33 @@ + + static struct nl_handle * new_nl_handle (void) + { +- struct nl_handle * nlh = NULL; +- +- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); +- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); +- if (nl_connect(nlh, NETLINK_ROUTE) < 0) +- { +- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); ++ struct nl_handle * nlh = NULL; ++ struct nl_cb *cb; ++ ++ cb = nl_cb_alloc (NL_CB_VERBOSE); ++ nlh = nl_handle_alloc_cb (cb); ++ ++ if (!nlh) { ++ nm_warning ("couldn't allocate netlink handle."); ++ return NULL; ++ } ++ ++ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ /* HACK: try one more time. Because the netlink monitor for link state ++ * inits before we get here, it grabs the port that matches the PID ++ * of the NM process, which also happens to be the PID that libnl uses ++ * the first time too. The real fix is to convert nm-netlink-monitor.c ++ * over to use libnl. ++ */ + nl_handle_destroy (nlh); + nlh = NULL; +- } ++ ++ nlh = new_nl_handle (); ++ if (!nlh) { ++ nm_error ("couldn't connect to netlink: %s", nl_geterror ()); ++ return NULL; ++ } ++ } + + return nlh; + } + -- cgit 1.3.0-6-gf8a5 From 7de4a53bac759a854e1d45923d04aad686d45b6d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 20 Dec 2007 07:05:06 +0000 Subject: - Backport support for libnl 1.0-pre8 from upstream SVN. * debian/network-manager.dirs - Add /var/run/NetworkManager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1964 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/network-manager.dirs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b48e2ab2..b4fe1b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,11 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low - The Vcs-* fields are now officially supported, so remove the XS- prefix. - Bump Build-Depends on libnl-dev to (>= 1.0~pre8). * debian/patches/24-libnl1-pre8_fix.patch - - Backport support for libnl 1.0-pre8 from upstream SVN. + - Backport support for libnl 1.0-pre8 from upstream SVN. + * debian/network-manager.dirs + - Add /var/run/NetworkManager. - -- Michael Biebl Thu, 20 Dec 2007 07:58:34 +0100 + -- Michael Biebl Thu, 20 Dec 2007 08:04:17 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs index c505972a..231b4756 100644 --- a/debian/network-manager.dirs +++ b/debian/network-manager.dirs @@ -1,2 +1,3 @@ etc/NetworkManager/dispatcher.d var/lib/NetworkManager +var/run/NetworkManager -- cgit 1.3.0-6-gf8a5 From 645642682faedc926ecb79c83a0306202dd2f6a7 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 23 Dec 2007 15:54:07 +0000 Subject: * debian/network-manager-dispatcher.script - Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for scripts in if-down.d to be compliant with ifupdown. (Closes: #452371) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2000 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ++++- debian/network-manager-dispatcher.script | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4fe1b24..f358ca8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low - Backport support for libnl 1.0-pre8 from upstream SVN. * debian/network-manager.dirs - Add /var/run/NetworkManager. + * debian/network-manager-dispatcher.script + - Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for + scripts in if-down.d to be compliant with ifupdown. (Closes: #452371) - -- Michael Biebl Thu, 20 Dec 2007 08:04:17 +0100 + -- Michael Biebl Sun, 23 Dec 2007 16:27:30 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script index abc6e4d5..fd182853 100644 --- a/debian/network-manager-dispatcher.script +++ b/debian/network-manager-dispatcher.script @@ -19,12 +19,12 @@ export VERBOSITY="0" case "$2" in up) export MODE="start" - export PHASE="up" + export PHASE="post-up" exec run-parts /etc/network/if-up.d ;; down) export MODE="stop" - export PHASE="down" + export PHASE="pre-down" exec run-parts /etc/network/if-down.d ;; pre-up) -- cgit 1.3.0-6-gf8a5 From 001add6140068afaa0edc1bc4579ef2e0f73b236 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 25 Dec 2007 15:52:48 +0000 Subject: * debian/patches/12_readme_format.patch - Fix line break in README file. (Closes: #444038) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2001 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++-- debian/patches/12_readme_format.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 debian/patches/12_readme_format.patch diff --git a/debian/changelog b/debian/changelog index f358ca8e..e7e86f04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.5-4) UNRELEASED; urgency=low +network-manager (0.6.5-4) unstable; urgency=low * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. @@ -10,8 +10,10 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low * debian/network-manager-dispatcher.script - Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for scripts in if-down.d to be compliant with ifupdown. (Closes: #452371) + * debian/patches/12_readme_format.patch + - Fix line break in README file. (Closes: #444038) - -- Michael Biebl Sun, 23 Dec 2007 16:27:30 +0100 + -- Michael Biebl Tue, 25 Dec 2007 16:51:00 +0100 network-manager (0.6.5-3) unstable; urgency=low diff --git a/debian/patches/12_readme_format.patch b/debian/patches/12_readme_format.patch new file mode 100644 index 00000000..5fa39d24 --- /dev/null +++ b/debian/patches/12_readme_format.patch @@ -0,0 +1,14 @@ +Index: README +=================================================================== +--- README (Revision 3190) ++++ README (Arbeitskopie) +@@ -20,7 +20,8 @@ + For wireless networking support, NetworkManager keeps a list of wireless + networks, the preferred list. Preferred Networks are wireless networks that + the user has explicitly made NetworkManager associate with at some previous +-time. So if the user walks into a Starbucks and explicitly asks NetworkManager to associate with that Starbucks network, NetworkManager will remember the ++time. So if the user walks into a Starbucks and explicitly asks NetworkManager ++to associate with that Starbucks network, NetworkManager will remember the + Starbucks network information from that point on. Upon returning to that + Starbucks, NetworkManager will attempt to associate _automatically_ with the + Starbucks network since it is now in the Preferred Networks list. The point of -- cgit 1.3.0-6-gf8a5 From 2436bc7c43c54d14e8ec514f86e69c2938a79dc8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 25 Dec 2007 16:22:39 +0000 Subject: Post tagging commit git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2003 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7e86f04..33c922d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.6.5-5) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Michael Biebl Tue, 25 Dec 2007 17:22:22 +0100 + network-manager (0.6.5-4) unstable; urgency=low * debian/control -- cgit 1.3.0-6-gf8a5 From 2d192e860a94462247e73bda6eeece5768fbb0fd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 21:59:21 +0000 Subject: * Rebuild against libnl1. (Closes: #461922) * debian/patches/24-get_mode_fix_r3122.patch - Pull r3122 from upstream stable branch. - Fix getting mode of device. * debian/patches/25-libnl_unique_pid_r3155.patch - Pull r3155 from stable branch. - Ensures that the pid acquired by libnl is unique. * debian/patches/26-libnl_1.0-pre8_r3206.patch - Pull r3206 from upstream stable branch. - Replaces 24-libnl1-pre8_fix.patch, which has been removed. - Fixes a FTBFS on architectures using SIGTRAP in G_BREAKPOINT(). (Closes: #459740) * debian/patches/13-validate_mac_addr.patch - Drop APs with an invalid MAC address. (Closes: #461500) Thanks to Sjoerd Simons for the patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2056 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 20 +- debian/patches/13-validate_mac_addr.patch | 33 ++ debian/patches/24-get_mode_fix_r3122.patch | 13 + debian/patches/24-libnl1-pre8_fix.patch | 46 --- debian/patches/25-libnl_unique_pid_r3155.patch | 417 +++++++++++++++++++++++++ debian/patches/26-libnl_1.0-pre8_r3206.patch | 202 ++++++++++++ 6 files changed, 682 insertions(+), 49 deletions(-) create mode 100644 debian/patches/13-validate_mac_addr.patch create mode 100644 debian/patches/24-get_mode_fix_r3122.patch delete mode 100644 debian/patches/24-libnl1-pre8_fix.patch create mode 100644 debian/patches/25-libnl_unique_pid_r3155.patch create mode 100644 debian/patches/26-libnl_1.0-pre8_r3206.patch diff --git a/debian/changelog b/debian/changelog index 33c922d6..6d4ed972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,22 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low - * NOT RELEASED YET - - -- Michael Biebl Tue, 25 Dec 2007 17:22:22 +0100 + * Rebuild against libnl1. (Closes: #461922) + * debian/patches/24-get_mode_fix_r3122.patch + - Pull r3122 from upstream stable branch. + - Fix getting mode of device. + * debian/patches/25-libnl_unique_pid_r3155.patch + - Pull r3155 from stable branch. + - Ensures that the pid acquired by libnl is unique. + * debian/patches/26-libnl_1.0-pre8_r3206.patch + - Pull r3206 from upstream stable branch. + - Replaces 24-libnl1-pre8_fix.patch, which has been removed. + - Fixes a FTBFS on architectures using SIGTRAP in G_BREAKPOINT(). + (Closes: #459740) + * debian/patches/13-validate_mac_addr.patch + - Drop APs with an invalid MAC address. (Closes: #461500) + Thanks to Sjoerd Simons for the patch. + + -- Michael Biebl Thu, 24 Jan 2008 22:49:09 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/patches/13-validate_mac_addr.patch b/debian/patches/13-validate_mac_addr.patch new file mode 100644 index 00000000..47a81e19 --- /dev/null +++ b/debian/patches/13-validate_mac_addr.patch @@ -0,0 +1,33 @@ +--- network-manager-0.6.5.orig/src/nm-device-802-11-wireless.c ++++ network-manager-0.6.5/src/nm-device-802-11-wireless.c +@@ -3439,6 +3439,20 @@ + } + + static gboolean ++has_valid_ether_addr (NMAccessPoint *ap) ++{ ++ struct ether_addr *addr; ++ int i; ++ ++ addr = nm_ap_get_address (ap); ++ for (i = 0 ; i < ETH_ALEN; i++) ++ if (addr->ether_addr_octet[i] != 0) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static gboolean + process_scan_results (NMDevice80211Wireless *dev, + const guint8 *res_buf, + guint32 res_buf_len) +@@ -3474,7 +3488,8 @@ + + /* Merge previous AP */ + if (ap) { +- add_new_ap_to_device_list (dev, ap); ++ if (has_valid_ether_addr (ap)) ++ add_new_ap_to_device_list (dev, ap); + nm_ap_unref (ap); + ap = NULL; + } diff --git a/debian/patches/24-get_mode_fix_r3122.patch b/debian/patches/24-get_mode_fix_r3122.patch new file mode 100644 index 00000000..f89db8d5 --- /dev/null +++ b/debian/patches/24-get_mode_fix_r3122.patch @@ -0,0 +1,13 @@ +Index: src/nm-device-802-11-wireless.c +=================================================================== +--- src/nm-device-802-11-wireless.c (Revision 3121) ++++ src/nm-device-802-11-wireless.c (Revision 3122) +@@ -1144,7 +1144,7 @@ + #endif + if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (NM_DEVICE (self)), SIOCGIWMODE, &wrq) == 0) + { +- if ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA)) ++ if ((wrq.u.mode == IW_MODE_ADHOC) || (wrq.u.mode == IW_MODE_INFRA)) + mode = wrq.u.mode; + } + else diff --git a/debian/patches/24-libnl1-pre8_fix.patch b/debian/patches/24-libnl1-pre8_fix.patch deleted file mode 100644 index 26a54e7b..00000000 --- a/debian/patches/24-libnl1-pre8_fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -=== modified file 'src/NetworkManagerSystem.c' ---- src/NetworkManagerSystem.c 2007-12-20 06:06:27 +0000 -+++ src/NetworkManagerSystem.c 2007-12-20 06:57:47 +0000 -@@ -224,16 +224,33 @@ - - static struct nl_handle * new_nl_handle (void) - { -- struct nl_handle * nlh = NULL; -- -- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); -- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); -- if (nl_connect(nlh, NETLINK_ROUTE) < 0) -- { -- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); -+ struct nl_handle * nlh = NULL; -+ struct nl_cb *cb; -+ -+ cb = nl_cb_alloc (NL_CB_VERBOSE); -+ nlh = nl_handle_alloc_cb (cb); -+ -+ if (!nlh) { -+ nm_warning ("couldn't allocate netlink handle."); -+ return NULL; -+ } -+ -+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { -+ /* HACK: try one more time. Because the netlink monitor for link state -+ * inits before we get here, it grabs the port that matches the PID -+ * of the NM process, which also happens to be the PID that libnl uses -+ * the first time too. The real fix is to convert nm-netlink-monitor.c -+ * over to use libnl. -+ */ - nl_handle_destroy (nlh); - nlh = NULL; -- } -+ -+ nlh = new_nl_handle (); -+ if (!nlh) { -+ nm_error ("couldn't connect to netlink: %s", nl_geterror ()); -+ return NULL; -+ } -+ } - - return nlh; - } - diff --git a/debian/patches/25-libnl_unique_pid_r3155.patch b/debian/patches/25-libnl_unique_pid_r3155.patch new file mode 100644 index 00000000..a14aad83 --- /dev/null +++ b/debian/patches/25-libnl_unique_pid_r3155.patch @@ -0,0 +1,417 @@ +Index: src/NetworkManagerSystem.c +=================================================================== +--- src/NetworkManagerSystem.c (Revision 3154) ++++ src/NetworkManagerSystem.c (Revision 3155) +@@ -177,24 +177,6 @@ + } + + +-static struct nl_cache * get_link_cache (struct nl_handle *nlh) +-{ +- static GStaticMutex mutex = G_STATIC_MUTEX_INIT; +- static struct nl_cache * link_cache = NULL; +- +- g_static_mutex_lock (&mutex); +- if (!link_cache) +- link_cache = rtnl_link_alloc_cache (nlh); +- if (!link_cache) +- nm_warning ("ERROR: couldn't allocate rtnl link cache!"); +- else +- nl_cache_update (nlh, link_cache); +- g_static_mutex_unlock (&mutex); +- +- return link_cache; +-} +- +- + static void iface_to_rtnl_index (const char *iface, struct nl_handle *nlh, struct rtnl_addr *addr) + { + struct nl_cache * cache = NULL; +@@ -204,14 +186,17 @@ + g_return_if_fail (nlh != NULL); + g_return_if_fail (addr != NULL); + +- if ((cache = get_link_cache (nlh))) +- { +- i = rtnl_link_name2i (cache, iface); +- if (RTNL_LINK_NOT_FOUND != i) +- rtnl_addr_set_ifindex (addr, i); ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache.", __func__); ++ return; + } +- else +- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); ++ ++ nl_cache_update (nlh, cache); ++ i = rtnl_link_name2i (cache, iface); ++ if (RTNL_LINK_NOT_FOUND != i) ++ rtnl_addr_set_ifindex (addr, i); ++ nl_cache_destroy_and_free (cache); + } + + +@@ -223,45 +208,104 @@ + g_return_val_if_fail (iface != NULL, NULL); + g_return_val_if_fail (nlh != NULL, NULL); + +- if ((cache = get_link_cache (nlh))) +- have_link = rtnl_link_get_by_name (cache, iface); +- else +- nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache.", __func__); ++ return NULL; ++ } + ++ nl_cache_update (nlh, cache); ++ have_link = rtnl_link_get_by_name (cache, iface); ++ nl_cache_destroy_and_free (cache); ++ + return have_link; + } + ++static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; + +-static struct nl_handle * new_nl_handle (void) ++GHashTable *nl_pids = NULL; ++ ++static struct ++nl_handle * new_nl_handle (void) + { +- struct nl_handle * nlh = NULL; ++ struct nl_handle * nlh = NULL; ++ guint32 nl_pid; ++ int i = 0; + +- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE); +- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid())); +- if (nl_connect(nlh, NETLINK_ROUTE) < 0) +- { +- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror()); +- nl_handle_destroy (nlh); +- nlh = NULL; ++ g_static_mutex_lock (&nlh_mutex); ++ ++ if (nl_pids == NULL) { ++ nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); ++ g_assert (nl_pids); ++ ++ /* Insert the PID used by nm-netlink-monitor.c */ ++ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); + } + ++ while (i++ < 10) { ++ nl_pid = g_random_int (); ++ if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) ++ break; ++ } ++ ++ if (i < 10) { ++ nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); ++ nl_handle_set_pid (nlh, nl_pid); ++ ++ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); ++ nl_handle_destroy (nlh); ++ nlh = NULL; ++ } else { ++ g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); ++ } ++ } else { ++ g_warning ("%s: couldn't find free netlink pid.", __func__); ++ } ++ ++ g_static_mutex_unlock (&nlh_mutex); ++ + return nlh; + } + ++static void ++destroy_nl_handle (struct nl_handle *nlh) ++{ ++ g_return_if_fail (nlh != NULL); + ++ g_static_mutex_lock (&nlh_mutex); ++ g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); ++ g_static_mutex_unlock (&nlh_mutex); ++ ++ nl_close (nlh); ++ nl_handle_destroy (nlh); ++ ++} ++ ++ + int + nm_system_get_rtnl_index_from_iface (const char *iface) + { + struct nl_handle * nlh = NULL; +- struct nl_cache * cache = NULL; ++ struct nl_cache * cache; + int i = RTNL_LINK_NOT_FOUND; + + nlh = new_nl_handle (); +- if (nlh && (cache = get_link_cache (nlh))) +- i = rtnl_link_name2i (cache, iface); +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ if (!nlh) ++ return RTNL_LINK_NOT_FOUND; + ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache."); ++ goto out; ++ } ++ ++ nl_cache_update (nlh, cache); ++ i = rtnl_link_name2i (cache, iface); ++ nl_cache_destroy_and_free (cache); ++ ++out: ++ destroy_nl_handle (nlh); + return i; + } + +@@ -275,18 +319,31 @@ + char * buf = NULL; + + nlh = new_nl_handle (); +- if (nlh && (cache = get_link_cache (nlh))) +- { +- buf = g_malloc0 (MAX_IFACE_LEN); +- if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) +- { +- g_free (buf); +- buf = NULL; +- } ++ if (!nlh) ++ return NULL; ++ ++ cache = rtnl_link_alloc_cache (nlh); ++ if (!cache) { ++ nm_warning ("%s: couldn't allocate link cache."); ++ goto out; + } +- nl_close (nlh); +- nl_handle_destroy (nlh); + ++ nl_cache_update (nlh, cache); ++ ++ buf = g_malloc0 (MAX_IFACE_LEN); ++ if (!buf) ++ goto destroy_cache; ++ ++ if (!rtnl_link_i2name (cache, rtnl_index, buf, MAX_IFACE_LEN - 1)) { ++ g_free (buf); ++ buf = NULL; ++ } ++ ++destroy_cache: ++ nl_cache_destroy_and_free (cache); ++ ++out: ++ destroy_nl_handle (nlh); + return buf; + } + +@@ -313,13 +370,15 @@ + config = nm_device_get_ip4_config (dev); + g_return_val_if_fail (config != NULL, FALSE); + ++ nlh = new_nl_handle (); ++ if (!nlh) ++ return FALSE; ++ + nm_system_delete_default_route (); + nm_system_device_flush_addresses (dev); + nm_system_device_flush_routes (dev); + nm_system_flush_arp_cache (); + +- nlh = new_nl_handle (); +- + if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_DEFAULT))) + { + iface_to_rtnl_index (nm_device_get_iface (dev), nlh, addr); +@@ -330,8 +389,7 @@ + else + nm_warning ("nm_system_device_set_from_ip4_config(): couldn't create rtnl address!\n"); + +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ destroy_nl_handle (nlh); + + sleep (1); + nm_system_device_set_ip4_route (dev, nm_ip4_config_get_gateway (config), 0, 0, nm_ip4_config_get_mss (config)); +@@ -424,7 +482,13 @@ + * Set IPv4 configuration of a VPN device from an NMIP4Config object. + * + */ +-gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevice *active_device, const char *iface, NMIP4Config *config, char **routes, int num_routes) ++gboolean ++nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, ++ NMDevice *active_device, ++ const char *iface, ++ NMIP4Config *config, ++ char **routes, ++ int num_routes) + { + NMIP4Config * ad_config = NULL; + struct nl_handle * nlh = NULL; +@@ -437,71 +501,73 @@ + if (active_device && (ad_config = nm_device_get_ip4_config (active_device))) + nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF, nm_ip4_config_get_mss (config)); + +- if (iface != NULL && strlen (iface)) +- { +- nm_system_device_set_up_down_with_iface (iface, TRUE); ++ if (!iface || !strlen (iface)) ++ goto done; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (); ++ if (!nlh) ++ goto done; + +- if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) +- { +- int err = 0; +- iface_to_rtnl_index (iface, nlh, addr); +- if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) +- nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); +- rtnl_addr_put (addr); +- } +- else +- nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); ++ nm_system_device_set_up_down_with_iface (iface, TRUE); + +- /* Set the MTU */ +- if ((request = rtnl_link_alloc ())) +- { +- struct rtnl_link * old; ++ if ((addr = nm_ip4_config_to_rtnl_addr (config, NM_RTNL_ADDR_PTP_DEFAULT))) ++ { ++ int err = 0; ++ iface_to_rtnl_index (iface, nlh, addr); ++ if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) ++ nm_warning ("nm_system_device_set_from_ip4_config(): error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); ++ rtnl_addr_put (addr); ++ } ++ else ++ nm_warning ("nm_system_vpn_device_set_from_ip4_config(): couldn't create rtnl address!\n"); + +- old = iface_to_rtnl_link (iface, nlh); +- rtnl_link_set_mtu (request, 1412); +- rtnl_link_change (nlh, old, request, 0); ++ /* Set the MTU */ ++ if ((request = rtnl_link_alloc ())) ++ { ++ struct rtnl_link * old; + +- rtnl_link_put (old); +- rtnl_link_put (request); +- } ++ old = iface_to_rtnl_link (iface, nlh); ++ rtnl_link_set_mtu (request, 1412); ++ rtnl_link_change (nlh, old, request, 0); + +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ rtnl_link_put (old); ++ rtnl_link_put (request); ++ } + +- sleep (1); ++ destroy_nl_handle (nlh); + +- nm_system_device_flush_routes_with_iface (iface); +- if (num_routes <= 0) ++ sleep (1); ++ ++ nm_system_device_flush_routes_with_iface (iface); ++ if (num_routes <= 0) ++ { ++ nm_system_delete_default_route (); ++ nm_system_device_add_default_route_via_device_with_iface (iface); ++ } ++ else ++ { ++ int i; ++ for (i = 0; i < num_routes; i++) + { +- nm_system_delete_default_route (); +- nm_system_device_add_default_route_via_device_with_iface (iface); +- } +- else +- { +- int i; +- for (i = 0; i < num_routes; i++) ++ char *valid_ip4_route; ++ ++ /* Make sure the route is valid, otherwise it's a security risk as the route ++ * text is simply taken from the user, and passed directly to system(). If ++ * we did not check the route, think of: ++ * ++ * system("/sbin/ip route add `rm -rf /` dev eth0") ++ * ++ * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. ++ */ ++ if ((valid_ip4_route = validate_ip4_route (routes[i]))) + { +- char *valid_ip4_route; +- +- /* Make sure the route is valid, otherwise it's a security risk as the route +- * text is simply taken from the user, and passed directly to system(). If +- * we did not check the route, think of: +- * +- * system("/sbin/ip route add `rm -rf /` dev eth0") +- * +- * where `rm -rf /` was the route text. As UID 0 (root), we have to be careful. +- */ +- if ((valid_ip4_route = validate_ip4_route (routes[i]))) +- { +- nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); +- g_free (valid_ip4_route); +- } ++ nm_system_device_add_route_via_device_with_iface (iface, valid_ip4_route); ++ g_free (valid_ip4_route); + } + } + } + ++done: + nm_named_manager_add_ip4_config (named, config); + + return TRUE; +@@ -548,7 +614,8 @@ + + g_return_val_if_fail (iface != NULL, FALSE); + +- if (!(nlh = new_nl_handle ())) ++ nlh = new_nl_handle (); ++ if (!nlh) + return FALSE; + + if (!(request = rtnl_link_alloc ())) +@@ -569,9 +636,7 @@ + success = TRUE; + + out: +- nl_close (nlh); +- nl_handle_destroy (nlh); +- ++ destroy_nl_handle (nlh); + return success; + } + +@@ -614,6 +679,6 @@ + out_request: + rtnl_link_put (request); + out_nl_close: +- nl_close (nlh); +- nl_handle_destroy (nlh); ++ destroy_nl_handle (nlh); + } ++ diff --git a/debian/patches/26-libnl_1.0-pre8_r3206.patch b/debian/patches/26-libnl_1.0-pre8_r3206.patch new file mode 100644 index 00000000..6f96215d --- /dev/null +++ b/debian/patches/26-libnl_1.0-pre8_r3206.patch @@ -0,0 +1,202 @@ +Index: src/nm-netlink-monitor.c +=================================================================== +--- src/nm-netlink-monitor.c (Revision 3205) ++++ src/nm-netlink-monitor.c (Revision 3206) +@@ -174,7 +174,7 @@ + } + + monitor_address.nl_family = AF_NETLINK; +- monitor_address.nl_pid = getpid (); ++ monitor_address.nl_pid = UINT_MAX; + monitor_address.nl_groups = RTMGRP_LINK; + + if (bind (fd, +@@ -365,7 +365,7 @@ + packet.header.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtgenmsg)); + packet.header.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; + packet.header.nlmsg_type = RTM_GETLINK; +- packet.header.nlmsg_pid = getpid (); ++ packet.header.nlmsg_pid = UINT_MAX; + /* Might be good to generate a unique sequence number and track + the response */ + packet.header.nlmsg_seq = sequence_number << 16; +Index: src/NetworkManagerSystem.c +=================================================================== +--- src/NetworkManagerSystem.c (Revision 3205) ++++ src/NetworkManagerSystem.c (Revision 3206) +@@ -196,7 +196,7 @@ + i = rtnl_link_name2i (cache, iface); + if (RTNL_LINK_NOT_FOUND != i) + rtnl_addr_set_ifindex (addr, i); +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + } + + +@@ -216,55 +216,42 @@ + + nl_cache_update (nlh, cache); + have_link = rtnl_link_get_by_name (cache, iface); +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + + return have_link; + } + +-static GStaticMutex nlh_mutex = G_STATIC_MUTEX_INIT; +- +-GHashTable *nl_pids = NULL; +- + static struct +-nl_handle * new_nl_handle (void) ++nl_handle *new_nl_handle (gboolean recursive) + { +- struct nl_handle * nlh = NULL; +- guint32 nl_pid; +- int i = 0; ++ struct nl_handle *nlh = NULL; ++ struct nl_cb *cb; + +- g_static_mutex_lock (&nlh_mutex); +- +- if (nl_pids == NULL) { +- nl_pids = g_hash_table_new (g_direct_hash, g_direct_equal); +- g_assert (nl_pids); +- +- /* Insert the PID used by nm-netlink-monitor.c */ +- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (getpid ()), GUINT_TO_POINTER (1)); ++ cb = nl_cb_alloc (NL_CB_VERBOSE); ++ nlh = nl_handle_alloc_cb (cb); ++ if (!nlh) { ++ nm_warning ("%s: couldn't allocate netlink handle: %s", __func__, nl_geterror ()); ++ return NULL; + } + +- while (i++ < 10) { +- nl_pid = g_random_int (); +- if (!g_hash_table_lookup (nl_pids, GUINT_TO_POINTER (nl_pid))) +- break; +- } ++ if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ /* HACK: try one more time. Because the netlink monitor for link state ++ * inits before we get here, it grabs the port that matches the PID ++ * of the NM process, which also happens to be the PID that libnl uses ++ * the first time too. The real fix is to convert nm-netlink-monitor.c ++ * over to use libnl. ++ */ ++ nl_handle_destroy (nlh); ++ if (recursive) ++ return NULL; + +- if (i < 10) { +- nlh = nl_handle_alloc_nondefault (NL_CB_VERBOSE); +- nl_handle_set_pid (nlh, nl_pid); +- +- if (nl_connect (nlh, NETLINK_ROUTE) < 0) { ++ nlh = new_nl_handle (TRUE); ++ if (!nlh) { + nm_warning ("%s: couldn't connect to netlink: %s", __func__, nl_geterror ()); +- nl_handle_destroy (nlh); +- nlh = NULL; +- } else { +- g_hash_table_insert (nl_pids, GUINT_TO_POINTER (nl_pid), GUINT_TO_POINTER (1)); ++ return NULL; + } +- } else { +- g_warning ("%s: couldn't find free netlink pid.", __func__); + } + +- g_static_mutex_unlock (&nlh_mutex); +- + return nlh; + } + +@@ -273,16 +260,10 @@ + { + g_return_if_fail (nlh != NULL); + +- g_static_mutex_lock (&nlh_mutex); +- g_hash_table_remove (nl_pids, GUINT_TO_POINTER (nl_handle_get_pid (nlh))); +- g_static_mutex_unlock (&nlh_mutex); +- + nl_close (nlh); + nl_handle_destroy (nlh); +- + } + +- + int + nm_system_get_rtnl_index_from_iface (const char *iface) + { +@@ -290,7 +271,7 @@ + struct nl_cache * cache; + int i = RTNL_LINK_NOT_FOUND; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return RTNL_LINK_NOT_FOUND; + +@@ -302,7 +283,7 @@ + + nl_cache_update (nlh, cache); + i = rtnl_link_name2i (cache, iface); +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + + out: + destroy_nl_handle (nlh); +@@ -318,7 +299,7 @@ + struct nl_cache * cache = NULL; + char * buf = NULL; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return NULL; + +@@ -340,7 +321,7 @@ + } + + destroy_cache: +- nl_cache_destroy_and_free (cache); ++ nl_cache_free (cache); + + out: + destroy_nl_handle (nlh); +@@ -370,7 +351,7 @@ + config = nm_device_get_ip4_config (dev); + g_return_val_if_fail (config != NULL, FALSE); + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return FALSE; + +@@ -504,7 +485,7 @@ + if (!iface || !strlen (iface)) + goto done; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + goto done; + +@@ -614,7 +595,7 @@ + + g_return_val_if_fail (iface != NULL, FALSE); + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return FALSE; + +@@ -658,7 +639,7 @@ + if (!mtu) + return; + +- nlh = new_nl_handle (); ++ nlh = new_nl_handle (FALSE); + if (!nlh) + return; + -- cgit 1.3.0-6-gf8a5 From 650bce9abb175131d9494880baf1d5b6877b75be Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 22:00:58 +0000 Subject: fix typo in lsb-base dependency. 3.0-6 is shipping the required log_msg* functions. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2057 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 44ba3354..d67c779c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 2.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>=0.5.7.1), ifupdown, adduser +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>=1.12-2), lsb-base (>= 3.0-6), wpasupplicant (>= 0.4.8), dbus (>= 0.60), hal (>= 0.5.7.1), ifupdown, adduser Recommends: network-manager-gnome | network-manager-kde Conflicts: network-manager-gnome (<< 0.6.5-1) Replaces: network-manager-gnome (<< 0.6.5-1) -- cgit 1.3.0-6-gf8a5 From a450971ec0fd237ad7984a936d4d04a4da0f1e67 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 23:09:01 +0000 Subject: * debian/patches/27-dont_repeat_errors.patch - Backported r3160 from upstream stable branch. - Don't repeat killswitch errors too often. (Closes: #456363) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2058 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 +++- debian/patches/27-dont_repeat_errors.patch | 37 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 debian/patches/27-dont_repeat_errors.patch diff --git a/debian/changelog b/debian/changelog index 6d4ed972..e7e19f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,11 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low * debian/patches/13-validate_mac_addr.patch - Drop APs with an invalid MAC address. (Closes: #461500) Thanks to Sjoerd Simons for the patch. + * debian/patches/27-dont_repeat_errors.patch + - Backported r3160 from upstream stable branch. + - Don't repeat killswitch errors too often. (Closes: #456363) - -- Michael Biebl Thu, 24 Jan 2008 22:49:09 +0100 + -- Michael Biebl Fri, 25 Jan 2008 00:07:19 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch new file mode 100644 index 00000000..64e23223 --- /dev/null +++ b/debian/patches/27-dont_repeat_errors.patch @@ -0,0 +1,37 @@ +diff --git a/src/NetworkManager.c b/src/NetworkManager.c +index 4f89f63..ddb5a4a 100644 +--- a/src/NetworkManager.c ++++ b/src/NetworkManager.c +@@ -65,6 +65,8 @@ + */ + static NMData *nm_data = NULL; + ++char *ks_err_message = NULL; ++ + static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data); + static void nm_data_free (NMData *data); + static gboolean nm_poll_killswitches(gpointer user_data); +@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da + if (message_is_error (reply)) { + dbus_error_init (&err); + dbus_set_error_from_message (&err, reply); +- nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); ++ if (!ks_err_message || strcmp (ks_err_message, err.message)) { ++ nm_info ("Error getting killswitch power: %s - %s", err.name, err.message); ++ g_free (ks_err_message); ++ ks_err_message = g_strdup (err.message); ++ } + dbus_error_free (&err); + goto out; + } + + if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) { +- nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); ++ if (!ks_err_message || strcmp (ks_err_message, err.message)) { ++ nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message); ++ g_free (ks_err_message); ++ ks_err_message = g_strdup (err.message); ++ } + dbus_error_free (&err); + goto out; + } -- cgit 1.3.0-6-gf8a5 From d002b93c4fcff7a8e9b5274ff4b07d1feed81a51 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 23:21:18 +0000 Subject: * debian/network-manager.init, debian/network-manager.network-manager-dispatcher.init - Fix LSB init header. Use $remote_fs instead of $local_fs as the daemon requires /usr to be mounted. Remove S from Should-Stop. (Closes: #459480) - Shorten retry-time to 5 secs on stop. - Don't fail to start if daemon is already running. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2059 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 11 +++++++++-- debian/network-manager.init | 11 +++++------ debian/network-manager.network-manager-dispatcher.init | 11 +++++------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7e19f3b..896637d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,15 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low * debian/patches/27-dont_repeat_errors.patch - Backported r3160 from upstream stable branch. - Don't repeat killswitch errors too often. (Closes: #456363) - - -- Michael Biebl Fri, 25 Jan 2008 00:07:19 +0100 + * debian/network-manager.init, + debian/network-manager.network-manager-dispatcher.init + - Fix LSB init header. Use $remote_fs instead of $local_fs as the + daemon requires /usr to be mounted. + Remove S from Should-Stop. (Closes: #459480) + - Shorten retry-time to 5 secs on stop. + - Don't fail to start if daemon is already running. + + -- Michael Biebl Fri, 25 Jan 2008 00:11:47 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/network-manager.init b/debian/network-manager.init index d096e950..9e6fcf0b 100644 --- a/debian/network-manager.init +++ b/debian/network-manager.init @@ -1,12 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManager -# Required-Start: $local_fs dbus dhcdbd hal -# Required-Stop: $local_fs dbus dhcdbd hal +# Required-Start: $remote_fs dbus dhcdbd hal +# Required-Stop: $remote_fs dbus dhcdbd hal # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: network connection manager # Description: Daemon for automatically switching network # connections to the best available connection. @@ -34,7 +34,6 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions -test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/NetworkManager && . /etc/default/NetworkManager # @@ -47,7 +46,7 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE } @@ -55,7 +54,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON } diff --git a/debian/network-manager.network-manager-dispatcher.init b/debian/network-manager.network-manager-dispatcher.init index 2f386b2b..4384f18c 100644 --- a/debian/network-manager.network-manager-dispatcher.init +++ b/debian/network-manager.network-manager-dispatcher.init @@ -1,12 +1,12 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: NetworkManagerDispatcher -# Required-Start: $local_fs -# Required-Stop: $local_fs +# Required-Start: $remote_fs +# Required-Stop: $remote_fs # Should-Start: $syslog # Should-Stop: $syslog # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: network events dispatcher # Description: This daemon automatically runs scripts when # NetworkManager changes the network state. @@ -28,7 +28,6 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions -test -f /etc/default/rcS && . /etc/default/rcS test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher # @@ -41,7 +40,7 @@ d_start() { fi start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE + --oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE } @@ -49,7 +48,7 @@ d_start() { # Function that stops the daemon/service. # d_stop() { - start-stop-daemon --stop --retry 60 --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ --oknodo --user $USER --exec $DAEMON } -- cgit 1.3.0-6-gf8a5 From 13a4c904828864b472ba0a8b87a02340e7f7048b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 23:27:20 +0000 Subject: Upload to unstable git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2060 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 896637d6..e7dea542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -network-manager (0.6.5-5) UNRELEASED; urgency=low +network-manager (0.6.5-5) unstable; urgency=low * Rebuild against libnl1. (Closes: #461922) * debian/patches/24-get_mode_fix_r3122.patch @@ -6,7 +6,7 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low - Fix getting mode of device. * debian/patches/25-libnl_unique_pid_r3155.patch - Pull r3155 from stable branch. - - Ensures that the pid acquired by libnl is unique. + - Ensures that the netlink pid is unique. * debian/patches/26-libnl_1.0-pre8_r3206.patch - Pull r3206 from upstream stable branch. - Replaces 24-libnl1-pre8_fix.patch, which has been removed. -- cgit 1.3.0-6-gf8a5